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=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 F41CAC432C3 for ; Fri, 29 Nov 2019 14:47:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CCD99217AB for ; Fri, 29 Nov 2019 14:47:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCD99217AB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iahYC-00018Y-TX for qemu-devel@archiver.kernel.org; Fri, 29 Nov 2019 09:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50529) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iagxL-0006ry-G4 for qemu-devel@nongnu.org; Fri, 29 Nov 2019 09:09:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iagxI-000797-68 for qemu-devel@nongnu.org; Fri, 29 Nov 2019 09:09:10 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45756 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iagxH-0006zE-Uy for qemu-devel@nongnu.org; Fri, 29 Nov 2019 09:09:08 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xATE2bIP102061 for ; Fri, 29 Nov 2019 09:09:05 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2wjtq0394r-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 29 Nov 2019 09:09:04 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 29 Nov 2019 14:09:03 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 29 Nov 2019 14:09:01 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xATE8xnK63176910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 29 Nov 2019 14:08:59 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 887F3A4040; Fri, 29 Nov 2019 14:08:59 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 18F02A404D; Fri, 29 Nov 2019 14:08:59 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.188.128]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 29 Nov 2019 14:08:59 +0000 (GMT) Subject: Re: [PATCH v2 01/13] s390x: protvirt: Add diag308 subcodes 8 - 10 To: Thomas Huth , qemu-devel@nongnu.org References: <20191129094809.26684-1-frankja@linux.ibm.com> <20191129094809.26684-2-frankja@linux.ibm.com> <97db1c4b-bc9e-9db0-424d-6cd3ba348e78@redhat.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= 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 Date: Fri, 29 Nov 2019 15:08:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <97db1c4b-bc9e-9db0-424d-6cd3ba348e78@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rCne7JgvRapDHsoc8cSydjTcinEEqXoZU" X-TM-AS-GCONF: 00 x-cbid: 19112914-0016-0000-0000-000002CDF21A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19112914-0017-0000-0000-0000332FDD77 Message-Id: <0dadfe48-d92f-4a54-1590-3aa4b5fbc1aa@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-29_04:2019-11-29,2019-11-29 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 priorityscore=1501 suspectscore=2 adultscore=0 mlxscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 phishscore=0 mlxlogscore=936 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911290123 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pmorel@linux.ibm.com, david@redhat.com, cohuck@redhat.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, mihajlov@linux.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --rCne7JgvRapDHsoc8cSydjTcinEEqXoZU Content-Type: multipart/mixed; boundary="eh5rIHlUjWZwxRT6XLBCL8RrqcmvFk8Ni" --eh5rIHlUjWZwxRT6XLBCL8RrqcmvFk8Ni Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 11/29/19 1:40 PM, Thomas Huth wrote: > On 29/11/2019 10.47, Janosch Frank wrote: > [...] >> Subcodes 8-10 are not valid in protected mode, we have to do a subcode= >> 3 and then the 8 and 10 combination for a protected reboot. >=20 > So if 8-10 are not valid in protected mode... >=20 >> @@ -59,6 +61,9 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1,= uint64_t r3) >> #define DIAG308_LOAD_NORMAL_DUMP 4 >> #define DIAG308_SET 5 >> #define DIAG308_STORE 6 >> +#define DIAG308_PV_SET 8 >> +#define DIAG308_PV_STORE 9 >> +#define DIAG308_PV_START 10 >> =20 >> static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64= _t addr, >> uintptr_t ra, bool write) >> @@ -105,6 +110,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t = r1, uint64_t r3, uintptr_t ra) >> s390_ipl_reset_request(cs, S390_RESET_REIPL); >> break; >> case DIAG308_SET: >> + case DIAG308_PV_SET: >=20 > ... should you maybe add a check here (and the other cases) to make sur= e > that the guest is currently not running in PV mode? Or is this taken > care of by the Ultravisor already? The Ultravisor takes care of that. >=20 >> if (diag308_parm_check(env, r1, addr, ra, false)) { >> return; >> } >> @@ -117,7 +123,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t = r1, uint64_t r3, uintptr_t ra) >> =20 >> cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));= >> =20 >> - if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb)) { >> + if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb) && >> + !(iplb_valid_se(iplb) && s390_ipl_pv_check_comp(iplb) >=3D= 0)) { >> env->regs[r1 + 1] =3D DIAG_308_RC_INVALID; >> goto out; >> } >> @@ -128,10 +135,15 @@ out: >> g_free(iplb); >> return; >> case DIAG308_STORE: >> + case DIAG308_PV_STORE: >> if (diag308_parm_check(env, r1, addr, ra, true)) { >> return; >> } >> - iplb =3D s390_ipl_get_iplb(); >> + if (subcode =3D=3D DIAG308_PV_STORE) { >> + iplb =3D s390_ipl_get_iplb_secure(); >> + } else { >> + iplb =3D s390_ipl_get_iplb(); >> + } >> if (iplb) { >> cpu_physical_memory_write(addr, iplb, be32_to_cpu(iplb->l= en)); >> env->regs[r1 + 1] =3D DIAG_308_RC_OK; >> @@ -139,6 +151,16 @@ out: >> env->regs[r1 + 1] =3D DIAG_308_RC_NO_CONF; >> } >> return; >> + break; >=20 > Please remove the break. Or the return. But let's not do both. Right, I forgot to remove that... >=20 >> + case DIAG308_PV_START: >> + iplb =3D s390_ipl_get_iplb_secure(); >> + if (!iplb_valid_se(iplb)) { >> + env->regs[r1 + 1] =3D DIAG_308_RC_NO_PV_CONF; >> + return; >> + } >> + >> + s390_ipl_reset_request(cs, S390_RESET_PV); >> + break; >> default: >> s390_program_interrupt(env, PGM_SPECIFICATION, ra); >> break; >> >=20 > Thomas >=20 --eh5rIHlUjWZwxRT6XLBCL8RrqcmvFk8Ni-- --rCne7JgvRapDHsoc8cSydjTcinEEqXoZU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl3hJnoACgkQ41TmuOI4 ufgx+A/+LoAcpKDMTzdpUN1X0FpXf/8XKpf4BiGZCBh0OgOgKLf0pm96RMsB2+lP e01t4Omn2PJNVXDfpfIoc7pCxyFZoKnv9rarjpG30luIRfCzSv/N7agECnTd8wwN KWOwwvwi4Dc0Z6JeD4He73+t4o+sIF1AY/WW0yGNeAH6w+eyEZ6JA7xUX7yBd3go +1vPGcID30JqDX1ja0V8ZVb7fNtr04xHVphlYBirAXfF6DQrqKD+h7CF5w+bVmIb eYoQDbTizZAva2UqAwQ4yMKAItdWO0CJzyQbEGoOrcdmWQ8xVe7ag1Z2jscBrjUw YnMTSAH0YROI+4/tr2g2a2Ge6TGCcpagM3/LtNxEHk+Ejlg2dqMeEwBEFC3ZqV8g H0yN8wysvgSEW3K6lZOCoSiHQC51RiAi05vKm7fScMrPaurObrQWm4Ee3AjvYayg N4GsoMMM9d86o7+V1WwidJAzY6uv2vSsNGIQ90+JkksVEVoRGMj6EZWQtdIu41aA 3a/xu2MNJTL3KWTxKF75ERjr6CCszMcfxDVEyEgiNKQNS++6SVtwF7l3sOyiqhT5 mq1PLMDUgFVNV1BaBOO/W/Vgy4lEGOVX2AtuTkvuRJ4RZy2kEgs+35glwfBd28qH jxAwiYwmS+irRHbY7wMpa96Lrft2kJeGf4xrb3irYtRc10l03i4= =L/jv -----END PGP SIGNATURE----- --rCne7JgvRapDHsoc8cSydjTcinEEqXoZU--