From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC63BC433E7 for ; Fri, 16 Oct 2020 07:35:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 45D6020848 for ; Fri, 16 Oct 2020 07:35:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Jn4LM37f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404682AbgJPHfI (ORCPT ); Fri, 16 Oct 2020 03:35:08 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38614 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2404620AbgJPHfI (ORCPT ); Fri, 16 Oct 2020 03:35:08 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09G7Wx0S083325 for ; Fri, 16 Oct 2020 03:35:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type; s=pp1; bh=wwvref7+058m8GpoJUbZBbIDBqMoh0AZao9jPdv9LHU=; b=Jn4LM37f8lLFSmJWWe2SX34ulLeVocIT9Scs2QaSSgl8I/U5yamx07gbPq+7dwP+OJNT xV8fHA+rD1oLaiI0I8nfmUtVT+8EhNgiUKm2jbAjYO83EPgtPoBJQEcfxk+XyxLOZ8XX 1/FvSIGdg5dH9E3pWzlldrUingSnCQ6wHFYfNCqXJ02f0DKHZ7cr0vS8oQlVkxymr9D2 E4iVyzEKXDzDdZq5B7kHfG2pPMc8U2KW0w+W3KDLVodLRHSMdN4GGavfj6R3Lac+YrQ4 kZIp+YJFwxcNJzh+yttRT5gjMAld8ihFL8xiLqShknlbv8HJw5Myti7YMeoErWwkx6l9 Sg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 34772cras0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 16 Oct 2020 03:35:06 -0400 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 09G7XU9C085291 for ; Fri, 16 Oct 2020 03:35:06 -0400 Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 34772craqn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 03:35:05 -0400 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 09G7WAPT029792; Fri, 16 Oct 2020 07:35:03 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma04ams.nl.ibm.com with ESMTP id 3434k7x10b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Oct 2020 07:35:03 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 09G7Z09420185482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Oct 2020 07:35:00 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88E37A405B; Fri, 16 Oct 2020 07:35:00 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 32BADA4055; Fri, 16 Oct 2020 07:35:00 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.30.241]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 16 Oct 2020 07:35:00 +0000 (GMT) Subject: Re: [PATCH v2 1/2] s390/kvm: fix diag318 reset To: Collin Walling , kvm@vger.kernel.org Cc: david@redhat.com, thuth@redhat.com, cohuck@redhat.com, Christian Borntraeger References: <20201015195913.101065-1-walling@linux.ibm.com> <20201015195913.101065-2-walling@linux.ibm.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Fri, 16 Oct 2020 09:34:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20201015195913.101065-2-walling@linux.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="OPXuzsPEJrKCxmpVs1rK0NaBwGxgQONnM" X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687 definitions=2020-10-16_02:2020-10-16,2020-10-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 priorityscore=1501 mlxscore=0 impostorscore=0 suspectscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010160049 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --OPXuzsPEJrKCxmpVs1rK0NaBwGxgQONnM Content-Type: multipart/mixed; boundary="5It1OFadATfViLoAajgFC3yZ4nIPJHjI0" --5It1OFadATfViLoAajgFC3yZ4nIPJHjI0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 10/15/20 9:59 PM, Collin Walling wrote: > The DIAGNOSE 0x0318 instruction must be reset on a normal and clear > reset. However, this was missed for the clear reset case. >=20 > Let's fix this by resetting the information during a normal reset.=20 > Since clear reset is a superset of normal reset, the info will > still reset on a clear reset. The architecture really confuses me here but I think we don't want this in the kernel VCPU reset handlers at all. This needs to be reset per VM *NOT* per VCPU. Hence the resets are bound to diag308 and not SIGP. I.e. we need to clear it in QEMU's VM reset handler. It's still early and I have yet to consume my first coffee, am I missing something? >=20 > Signed-off-by: Collin Walling > --- > arch/s390/kvm/kvm-s390.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index 6b74b92c1a58..b0cf8367e261 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -3516,6 +3516,7 @@ static void kvm_arch_vcpu_ioctl_normal_reset(stru= ct kvm_vcpu *vcpu) > vcpu->arch.sie_block->gpsw.mask &=3D ~PSW_MASK_RI; > vcpu->arch.pfault_token =3D KVM_S390_PFAULT_TOKEN_INVALID; > memset(vcpu->run->s.regs.riccb, 0, sizeof(vcpu->run->s.regs.riccb)); > + vcpu->run->s.regs.diag318 =3D 0; > =20 > kvm_clear_async_pf_completion_queue(vcpu); > if (!kvm_s390_user_cpu_state_ctrl(vcpu->kvm)) > @@ -3582,7 +3583,6 @@ static void kvm_arch_vcpu_ioctl_clear_reset(struc= t kvm_vcpu *vcpu) > =20 > regs->etoken =3D 0; > regs->etoken_extension =3D 0; > - regs->diag318 =3D 0; > } > =20 > int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_reg= s *regs) >=20 --5It1OFadATfViLoAajgFC3yZ4nIPJHjI0-- --OPXuzsPEJrKCxmpVs1rK0NaBwGxgQONnM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl+JTSMACgkQ41TmuOI4 ufgXyhAAlIp/W4XbjaIWNKUiVURcKXzr7NAKjyTH9XTWI6tTNKQ58q/Hs0glecEr Hamx+EeFWi9/+p2Oo5F4NJRp5U0dBUiuyBdKc2r8tKEHpw6HbfYCa2MPewoSw6aw Fbv8IHK/Mc0ht5/eaSjS6hK2YSrv9/UmG43vhsUsi020agBL/sy0A61JvJruuzCA pKCJYqZ9BvJSMAZpl8KxUhCjE+IJxqHLGJEUgrLz1Hj5RObBtrURzd/VSRR2VU7H SBL0im0Uuiz+ofThh/P49Izq1+cBntfPSEjm34u0yvUv4IrmXOEfWKqb8w9z3+nk JqwqADVE1kJfFCmEHn4IVomtUC0PSsneJfiC7l4WrBqjP/SAkqWu0udmSus/LGqO MLaoSLsUKd82YdgVjJh2/UL4HeahqFnTbhSf2SLj3FnEqtQmRq46MVP4VA79A+jJ aGza3XqM1JZKqV+g8TcihBU0UIHWcBID0gAYy7PqMM4Frb9IEAdb80Xn6bqlW0hH KqGJtGcsOjFiq1sk8pBt70e2t6h8oeuM5fxOyUZPamcBAPpd3CJO8rL+JoYBN5mF +z6wi3F69vh7Ji0LNIPQeV1RwKjAGAqi2fHGsT1NpeooJdgKqRDoN0JH7DpQiftj ejoZRlqvv+op1QbcJggmWlEPT6SaTzc762bJ1BE2dm5N+XrPJKQ= =8CTs -----END PGP SIGNATURE----- --OPXuzsPEJrKCxmpVs1rK0NaBwGxgQONnM--