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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,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 5CF04C10DCE for ; Fri, 13 Mar 2020 09:36:22 +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 33E842073E for ; Fri, 13 Mar 2020 09:36:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33E842073E 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]:56082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCgjt-0006x9-Cv for qemu-devel@archiver.kernel.org; Fri, 13 Mar 2020 05:36:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47720) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCgj5-00062P-4z for qemu-devel@nongnu.org; Fri, 13 Mar 2020 05:35:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCgj0-0000Ad-Kw for qemu-devel@nongnu.org; Fri, 13 Mar 2020 05:35:31 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:26584) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCgj0-00007M-BG for qemu-devel@nongnu.org; Fri, 13 Mar 2020 05:35:26 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02D9Wo23030073 for ; Fri, 13 Mar 2020 05:35:24 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2yqyuw87dg-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 13 Mar 2020 05:35:23 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Mar 2020 09:35:20 -0000 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Fri, 13 Mar 2020 09:35:17 -0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 02D9YGvv40829328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Mar 2020 09:34:16 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A196642042; Fri, 13 Mar 2020 09:35:16 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 458824203F; Fri, 13 Mar 2020 09:35:16 +0000 (GMT) Received: from localhost.localdomain (unknown [9.145.48.117]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Fri, 13 Mar 2020 09:35:16 +0000 (GMT) Subject: Re: [PATCH v9 02/15] s390x: protvirt: Support unpack facility To: Christian Borntraeger , qemu-devel@nongnu.org References: <20200311132151.172389-1-frankja@linux.ibm.com> <20200311132151.172389-3-frankja@linux.ibm.com> From: Janosch Frank Autocrypt: addr=frankja@linux.ibm.com; prefer-encrypt=mutual; keydata= mQINBFubpD4BEADX0uhkRhkj2AVn7kI4IuPY3A8xKat0ihuPDXbynUC77mNox7yvK3X5QBO6 qLqYr+qrG3buymJJRD9xkp4mqgasHdB5WR9MhXWKH08EvtvAMkEJLnqxgbqf8td3pCQ2cEpv 15mH49iKSmlTcJ+PvJpGZcq/jE42u9/0YFHhozm8GfQdb9SOI/wBSsOqcXcLTUeAvbdqSBZe zuMRBivJQQI1esD9HuADmxdE7c4AeMlap9MvxvUtWk4ZJ/1Z3swMVCGzZb2Xg/9jZpLsyQzb lDbbTlEeyBACeED7DYLZI3d0SFKeJZ1SUyMmSOcr9zeSh4S4h4w8xgDDGmeDVygBQZa1HaoL Esb8Y4avOYIgYDhgkCh0nol7XQ5i/yKLtnNThubAcxNyryw1xSstnKlxPRoxtqTsxMAiSekk 0m3WJwvwd1s878HrQNK0orWd8BzzlSswzjNfQYLF466JOjHPWFOok9pzRs+ucrs6MUwDJj0S cITWU9Rxb04XyigY4XmZ8dywaxwi2ZVTEg+MD+sPmRrTw+5F+sU83cUstuymF3w1GmyofgsU Z+/ldjToHnq21MNa1wx0lCEipCCyE/8K9B9bg9pUwy5lfx7yORP3JuAUfCYb8DVSHWBPHKNj HTOLb2g2UT65AjZEQE95U2AY9iYm5usMqaWD39pAHfhC09/7NQARAQABtCVKYW5vc2NoIEZy YW5rIDxmcmFua2phQGxpbnV4LmlibS5jb20+iQI3BBMBCAAhBQJbm6Q+AhsjBQsJCAcCBhUI CQoLAgQWAgMBAh4BAheAAAoJEONU5rjiOLn4p9gQALjkdj5euJVI2nNT3/IAxAhQSmRhPEt0 AmnCYnuTcHRWPujNr5kqgtyER9+EMQ0ZkX44JU2q7OWxTdSNSAN/5Z7qmOR9JySvDOf4d3mS bMB5zxL9d8SbnSs1uW96H9ZBTlTQnmLfsiM9TetAjSrR8nUmjGhe2YUhJLR1v1LguME+YseT eXnLzIzqqpu311/eYiiIGcmaOjPCE+vFjcXL5oLnGUE73qSYiujwhfPCCUK0850o1fUAYq5p CNBCoKT4OddZR+0itKc/cT6NwEDwdokeg0+rAhxb4Rv5oFO70lziBplEjOxu3dqgIKbHbjza EXTb+mr7VI9O4tTdqrwJo2q9zLqqOfDBi7NDvZFLzaCewhbdEpDYVu6/WxprAY94hY3F4trT rQMHJKQENtF6ZTQc9fcT5I3gAmP+OEvDE5hcTALpWm6Z6SzxO7gEYCnF+qGXqp8sJVrweMub UscyLqHoqdZC2UG4LQ1OJ97nzDpIRe0g6oJ9ZIYHKmfw5jjwH6rASTld5MFWajWdNsqK15k/ RZnHAGICKVIBOBsq26m4EsBlfCdt3b/6emuBjUXR1pyjHMz2awWzCq6/6OWs5eANZ0sdosNq dq2v0ULYTazJz2rlCXV89qRa7ukkNwdBSZNEwsD4eEMicj1LSrqWDZMAALw50L4jxaMD7lPL jJbauQINBFubpD4BEADAcUTRqXF/aY53OSH7IwIK9lFKxIm0IoFkOEh7LMfp7FGzaP7ANrZd cIzhZi38xyOkcaFY+npGEWvko7rlIAn0JpBO4x3hfhmhBD/WSY8LQIFQNNjEm3vzrMo7b9Jb JAqQxfbURY3Dql3GUzeWTG9uaJ00u+EEPlY8zcVShDltIl5PLih20e8xgTnNzx5c110lQSu0 iZv2lAE6DM+2bJQTsMSYiwKlwTuv9LI9Chnoo6+tsN55NqyMxYqJgElk3VzlTXSr3+rtSCwf tq2cinETbzxc1XuhIX6pu/aCGnNfuEkM34b7G1D6CPzDMqokNFbyoO6DQ1+fW6c5gctXg/lZ 602iEl4C4rgcr3+EpfoPUWzKeM8JXv5Kpq4YDxhvbitr8Dm8gr38+UKFZKlWLlwhQ56r/zAU v6LIsm11GmFs2/cmgD1bqBTNHHcTWwWtRTLgmnqJbVisMJuYJt4KNPqphTWsPY8SEtbufIlY HXOJ2lqUzOReTrie2u0qcSvGAbSfec9apTFl2Xko/ddqPcZMpKhBiXmY8tJzSPk3+G4tqur4 6TYAm5ouitJsgAR61Cu7s+PNuq/pTLDhK+6/Njmc94NGBcRA4qTuysEGE79vYWP2oIAU4Fv6 gqaWHZ4MEI2XTqH8wiwzPdCQPYsSE0fXWiYu7ObeErT6iLSTZGx4rQARAQABiQIfBBgBCAAJ BQJbm6Q+AhsMAAoJEONU5rjiOLn4DDEP/RuyckW65SZcPG4cMfNgWxZF8rVjeVl/9PBfy01K 8R0hajU40bWtXSMiby7j0/dMjz99jN6L+AJHJvrLz4qYRzn2Ys843W+RfXj62Zde4YNBE5SL jJweRCbMWKaJLj6499fctxTyeb9+AMLQS4yRSwHuAZLmAb5AyCW1gBcTWZb8ON5BmWnRqeGm IgC1EvCnHy++aBnHTn0m+zV89BhTLTUal35tcjUFwluBY39R2ux/HNlBO1GY3Z+WYXhBvq7q katThLjaQSmnOrMhzqYmdShP1leFTVbzXUUIYv/GbynO/YrL2gaQpaP1bEUEi8lUAfXJbEWG dnHFkciryi092E8/9j89DJg4mmZqOau7TtUxjRMlBcIliXkzSLUk+QvD4LK1kWievJse4mte FBdkWHfP4BH/+8DxapRcG1UAheSnSRQ5LiO50annOB7oXF+vgKIaie2TBfZxQNGAs3RQ+bga DchCqFm5adiSP5+OT4NjkKUeGpBe/aRyQSle/RropTgCi85pje/juYEn2P9UAgkfBJrOHvQ9 Z+2Sva8FRd61NJLkCJ4LFumRn9wQlX2icFbi8UDV3do0hXJRRYTWCxrHscMhkrFWLhYiPF4i phX7UNdOWBQ90qpHyAxHmDazdo27gEjfvsgYMdveKknEOTEb5phwxWgg7BcIDoJf9UMC Date: Fri, 13 Mar 2020 10:35:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zsOSBrIii4hu4DbGriJaXv2Rdr0w2zHuu" X-TM-AS-GCONF: 00 x-cbid: 20031309-0008-0000-0000-0000035C89E9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20031309-0009-0000-0000-00004A7DD667 Message-Id: <41642e69-cc5d-f597-79f5-be9e6aa084c4@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-13_04:2020-03-11, 2020-03-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 adultscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2003130052 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 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: qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.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) --zsOSBrIii4hu4DbGriJaXv2Rdr0w2zHuu Content-Type: multipart/mixed; boundary="SwG9mqyMFYW3td7y0jpFCr8spPyLWrgCB" --SwG9mqyMFYW3td7y0jpFCr8spPyLWrgCB Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 3/12/20 9:33 AM, Christian Borntraeger wrote: >=20 >=20 > On 11.03.20 14:21, Janosch Frank wrote: > [...] >> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c >> index b81942e1e6f9002e..98df89e62c25f583 100644 >> --- a/hw/s390x/ipl.c >> +++ b/hw/s390x/ipl.c >> @@ -27,6 +27,7 @@ >> #include "hw/s390x/vfio-ccw.h" >> #include "hw/s390x/css.h" >> #include "hw/s390x/ebcdic.h" >> +#include "hw/s390x/pv.h" >> #include "ipl.h" >> #include "qemu/error-report.h" >> #include "qemu/config-file.h" >> @@ -566,12 +567,31 @@ void s390_ipl_update_diag308(IplParameterBlock *= iplb) >> { >> S390IPLState *ipl =3D get_ipl_device(); >> =20 >> - ipl->iplb =3D *iplb; >> - ipl->iplb_valid =3D true; >> + /* >> + * The IPLB set and retrieved by subcodes 8/9 is completely >> + * separate from the one managed via subcodes 5/6. >> + */ >> + if (iplb->pbt =3D=3D S390_IPL_TYPE_PV) { >> + ipl->iplb_pv =3D *iplb; >> + ipl->iplb_valid_pv =3D true; >> + } else { >> + ipl->iplb =3D *iplb; >> + ipl->iplb_valid =3D true; >> + } >=20 > We call this for DIAG308_SET and DIAG308_PV_SET in diag.c (see below). > Doesnt this allow to set S390_IPL_TYPE_PV via subcode 5 and an CCW type= > via subcode 8. It is certainly not an issue security-wise, but it seems= to violate > the architecture. > Shouldnt we add a check in diag.c? That would make sense, I'll add it >=20 > [...] >> diff --git a/target/s390x/diag.c b/target/s390x/diag.c > [..] >> @@ -93,6 +102,11 @@ void handle_diag_308(CPUS390XState *env, uint64_t = r1, uint64_t r3, uintptr_t ra) >> return; >> } >> =20 >> + if (subcode >=3D DIAG308_PV_SET && !s390_has_feat(S390_FEAT_UNPAC= K)) { >> + s390_program_interrupt(env, PGM_SPECIFICATION, ra); >> + return; >> + } >> + >> switch (subcode) { >> case DIAG308_RESET_MOD_CLR: >> s390_ipl_reset_request(cs, S390_RESET_MODIFIED_CLEAR); >> @@ -105,6 +119,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 > somewhere here after we have loaded the block.=20 >=20 >=20 >=20 > Other than that this looks good. >=20 >=20 --SwG9mqyMFYW3td7y0jpFCr8spPyLWrgCB-- --zsOSBrIii4hu4DbGriJaXv2Rdr0w2zHuu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEwGNS88vfc9+v45Yq41TmuOI4ufgFAl5rU9MACgkQ41TmuOI4 ufirThAAypofkGdk6eg6hYhjCLnFzIrfCGTRXs0OIdOokKE57zoakmS5kspnyITo v8wXb+Xjd/0JrOh3WPZqL6SG4hEWGnARwFrxyuNFnJ40jWd2ILIfyRn4IgSB7x9+ Kagos7iV94wB5CvZPZ3lYPcVCKgMRnys4BE3+14CHzPp8QUjXocsFMQxd6bOl5mv +otZjCsNIRlblGFkto34CXOJ0iEZE7rYHDRVAeKBF2697zVbxs88g/MgM8PN40pN 6tfvy5IOP9FyszYx8ov9sw/0FWL1jwerFDKzJCWs+7doxKYUJoic7/DfFw79bJlr T1O+koBCaf2HTJv468TrEBj5uQ18EbOon1gh6qQiKKuO18MDM6sZtfu9yOYnpJy0 Ljl65NuDLLJjxWH4W9lD8/5zUOKgd5kXzO14fiQHs5hmdI0RP7MXQJaVA1fRr4Oa YApp2W4S1qJRWjs4jm8JlcLS6A7uRd2DpR0I3Py6eJmNoOeVilHm9Nz0JXmqnNmR PMJwAo5YpMQDufltMsBVBtW8QLo0nj8bw1U4iwQXighSLU3gT8mEkHYfgRp4svlu d4wDlUerdHf541gSrTv3QKliIH/CWFKyrEeL4OAM+N6p9Z45dXoPi0LwEWrGPt8O rTBmbiHqJCt8UpqvnS3kgMsHRNOcQ+0Tkp9XmSDk2+/Xr16IV4g= =RUBr -----END PGP SIGNATURE----- --zsOSBrIii4hu4DbGriJaXv2Rdr0w2zHuu--