On 03/02/2020 14.19, Christian Borntraeger wrote:
> From: Janosch Frank <frankja@xxxxxxxxxxxxx>
>
> Save response to sidad and disable address checking for protected
> guests.
>
> Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx>
> ---
> arch/s390/kvm/priv.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
> index ed52ffa8d5d4..06c7e7a10825 100644
> --- a/arch/s390/kvm/priv.c
> +++ b/arch/s390/kvm/priv.c
> @@ -872,7 +872,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu)
>
> operand2 = kvm_s390_get_base_disp_s(vcpu, &ar);
>
> - if (operand2 & 0xfff)
> + if (!kvm_s390_pv_is_protected(vcpu->kvm) && (operand2 & 0xfff))
> return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
>
> switch (fc) {
> @@ -893,8 +893,13 @@ static int handle_stsi(struct kvm_vcpu *vcpu)
> handle_stsi_3_2_2(vcpu, (void *) mem);
> break;
> }
> + if (kvm_s390_pv_is_protected(vcpu->kvm)) {
> + memcpy((void *)vcpu->arch.sie_block->sidad, (void *)mem,
That should use sida_origin() or "...->sidad & PAGE_MASK".
> + PAGE_SIZE);
> + rc = 0;
> + } else
> + rc = write_guest(vcpu, operand2, ar, (void *)mem, PAGE_SIZE);
Coding style: If one branch of the if-statement uses curly braces,
please add them to the other branch as well.
> - rc = write_guest(vcpu, operand2, ar, (void *)mem, PAGE_SIZE);
> if (rc) {
> rc = kvm_s390_inject_prog_cond(vcpu, rc);
> goto out;
>
Thomas
