From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-s390-owner@vger.kernel.org>
Received: from us-smtp-1.mimecast.com ([207.211.31.81]:45952 "EHLO
        us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL)
        by vger.kernel.org with ESMTP id S1726182AbfKOIEO (ORCPT
        <rfc822;linux-s390@vger.kernel.org>);
        Fri, 15 Nov 2019 03:04:14 -0500
Subject: Re: [RFC 24/37] KVM: s390: protvirt: Write sthyi data to instruction
 data area
References: <20191024114059.102802-1-frankja@linux.ibm.com>
 <20191024114059.102802-25-frankja@linux.ibm.com>
From: Thomas Huth <thuth@redhat.com>
Message-ID: <cf52261e-9281-b11c-fee4-b97013a77ff2@redhat.com>
Date: Fri, 15 Nov 2019 09:04:00 +0100
MIME-Version: 1.0
In-Reply-To: <20191024114059.102802-25-frankja@linux.ibm.com>
Content-Language: en-US
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-s390-owner@vger.kernel.org
List-ID: <linux-s390.vger.kernel.org>
To: Janosch Frank <frankja@linux.ibm.com>, kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, david@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.ibm.com, mihajlov@linux.ibm.com, mimu@linux.ibm.com, cohuck@redhat.com, gor@linux.ibm.com

On 24/10/2019 13.40, Janosch Frank wrote:
> STHYI data has to go through the bounce buffer.
>=20
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
> ---
>  arch/s390/kvm/intercept.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>=20
> diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
> index 510b1dee3320..37cb62bc261b 100644
> --- a/arch/s390/kvm/intercept.c
> +++ b/arch/s390/kvm/intercept.c
> @@ -391,7 +391,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu)
>  =09=09goto out;
>  =09}
> =20
> -=09if (addr & ~PAGE_MASK)
> +=09if (!kvm_s390_pv_is_protected(vcpu->kvm) && (addr & ~PAGE_MASK))
>  =09=09return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
> =20
>  =09sctns =3D (void *)get_zeroed_page(GFP_KERNEL);
> @@ -402,10 +402,15 @@ int handle_sthyi(struct kvm_vcpu *vcpu)
> =20
>  out:
>  =09if (!cc) {
> -=09=09r =3D write_guest(vcpu, addr, reg2, sctns, PAGE_SIZE);
> -=09=09if (r) {
> -=09=09=09free_page((unsigned long)sctns);
> -=09=09=09return kvm_s390_inject_prog_cond(vcpu, r);
> +=09=09if (kvm_s390_pv_is_protected(vcpu->kvm)) {
> +=09=09=09memcpy((void *)vcpu->arch.sie_block->sidad, sctns,

sidad & PAGE_MASK, just to be sure?

> +=09=09=09       PAGE_SIZE);
> +=09=09} else {
> +=09=09=09r =3D write_guest(vcpu, addr, reg2, sctns, PAGE_SIZE);
> +=09=09=09if (r) {
> +=09=09=09=09free_page((unsigned long)sctns);
> +=09=09=09=09return kvm_s390_inject_prog_cond(vcpu, r);
> +=09=09=09}
>  =09=09}
>  =09}
> =20
>=20

With "& PAGE_MASK":

Reviewed-by: Thomas Huth <thuth@redhat.com>