{"id":2219390,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219390/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260402221453.1602899-18-zycai@linux.ibm.com>","date":"2026-04-02T22:14:39","name":"[v10,17/30] pc-bios/s390-ccw: Refactor zipl_run()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7f7521f5ab294ad88376515e1d29940afbf45ce6","submitter":{"id":90643,"url":"http://patchwork.ozlabs.org/api/1.0/people/90643/?format=json","name":"Zhuoying Cai","email":"zycai@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260402221453.1602899-18-zycai@linux.ibm.com/mbox/","series":[{"id":498557,"url":"http://patchwork.ozlabs.org/api/1.0/series/498557/?format=json","date":"2026-04-02T22:14:35","name":"Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices","version":10,"mbox":"http://patchwork.ozlabs.org/series/498557/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219390/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=XD+2f/ee;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmx753Nqyz1xtJ\n\tfor ; Fri, 03 Apr 2026 09:17:37 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w8QKf-00010Z-Av; Thu, 02 Apr 2026 18:16:09 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1w8QKF-0000rE-DZ; Thu, 02 Apr 2026 18:15:55 -0400","from mx0a-001b2d01.pphosted.com ([148.163.156.1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1w8QKC-0004pI-H1; Thu, 02 Apr 2026 18:15:43 -0400","from pps.filterd (m0360083.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 632BYPdY3721094; Thu, 2 Apr 2026 22:15:34 GMT","from ppma13.dal12v.mail.ibm.com\n (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d66g26vdb-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 22:15:34 +0000 (GMT)","from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1])\n by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 632KqepW030990;\n Thu, 2 Apr 2026 22:15:33 GMT","from smtprelay07.dal12v.mail.ibm.com ([172.16.1.9])\n by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6uhk3rnp-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 22:15:33 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 632MFWab52167022\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 2 Apr 2026 22:15:32 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 9F4C65806F;\n Thu, 2 Apr 2026 22:15:32 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id F04D858065;\n Thu, 2 Apr 2026 22:15:30 +0000 (GMT)","from fedora-workstation.ibmuc.com (unknown [9.61.183.185])\n by smtpav05.dal12v.mail.ibm.com (Postfix) with ESMTP;\n Thu, 2 Apr 2026 22:15:30 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=YZlqWCoJeWW9tmUyM\n Xnvsje1S5lvKQ59QXsYaPFmduo=; b=XD+2f/ee5QG1TEBC2H/3sE9WQHx/rx/F/\n mTYPr3gFdFmcF5ahT5TEVq+rwCeAUjCzks5HE51DvuLSFHI1D4NnQfpL/Jvhof+M\n ST9FSpswQjvUnkjo9+7+Yn/umHk3DV+4LVk6aRA0yUPC5F+V8enigwhS37tSmYUa\n H6fsGvBrCZwLKPswiPqt+Kr7J7RSoFLbKUd2KXssImLebJ+Ss/NOn9uq/M6ZZyll\n iB2SjaYRpcHE3bNTTCSC7x/tBnEeQ94bWW7v9+/1L5pd/S9a/X7+NwjoVGctlNDB\n VSy2ruDYOvI1SOfnHaeL6FwNs3jmjrwSom6GI0+x45KGSujryoHEw==","From":"Zhuoying Cai ","To":"qemu-s390x@nongnu.org, qemu-devel@nongnu.org","Cc":"jrossi@linux.ibm.com, cohuck@redhat.com, berrange@redhat.com,\n richard.henderson@linaro.org, pierrick.bouvier@linaro.org,\n david@kernel.org, walling@linux.ibm.com, jjherne@linux.ibm.com,\n pasic@linux.ibm.com, borntraeger@linux.ibm.com, farman@linux.ibm.com,\n mjrosato@linux.ibm.com, iii@linux.ibm.com, eblake@redhat.com,\n armbru@redhat.com, zycai@linux.ibm.com, alifm@linux.ibm.com,\n brueckner@linux.ibm.com, jdaley@linux.ibm.com","Subject":"[PATCH v10 17/30] pc-bios/s390-ccw: Refactor zipl_run()","Date":"Thu, 2 Apr 2026 18:14:39 -0400","Message-ID":"<20260402221453.1602899-18-zycai@linux.ibm.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260402221453.1602899-1-zycai@linux.ibm.com>","References":"<20260402221453.1602899-1-zycai@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Authority-Analysis":"v=2.4 cv=Fdo6BZ+6 c=1 sm=1 tr=0 ts=69ceea86 cx=c_pps\n a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8\n a=se3WwofzMRKbtILPOyIA:9","X-Proofpoint-ORIG-GUID":"SBnI66O81p1S8GTullF3ck0WJ0crU6-R","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDE5NSBTYWx0ZWRfX5AmJ5k0QzWRh\n osRc1ZaenZ2lS36u8a9k909Q/WQPTyIm9fjxGSZCMI8zzMuWQCiFSpyThJUhdLRTT95N6r6UpyR\n YxeOVlldTfjn8LkgYm/VHuDfJYlRlY4ldIaw2Scm9SpH3tDyonSUBx7+J6huxJtRJ+S8DTEko7l\n 2uWFx2qJquLYILdil4ZM/dQmEbekAJ2YzCW+xNv4KRrL8XqcuDMUHVm4/D1t25KumA1yBDMp0st\n RTBVerOQyg16ZyxFdZ6b6afm5/nXvFGUSsY0nM0RXvOAYbojYWXwE4J2G5K3BVwbdA/NQf5d7/5\n eTEQno2c0igIWb7KRXm3LGlQWg9tJguA+/ihunKKtpVQoy+kbAJzi4f5jngBRljqmHj6cMFFwsS\n 2V782XxUq6kW9xxuz+38kJbuT1Db87Mh+h+1Tzo1B/jfOQL6SteDNS4OMahWyL5yquZdomFToLD\n OjDPyoUnmhdfmiBJnjA==","X-Proofpoint-GUID":"SBnI66O81p1S8GTullF3ck0WJ0crU6-R","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-02_04,2026-04-02_05,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n impostorscore=0 clxscore=1015 bulkscore=0 suspectscore=0 priorityscore=1501\n adultscore=0 malwarescore=0 phishscore=0 spamscore=0 lowpriorityscore=0\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2604020195","Received-SPF":"pass client-ip=148.163.156.1; envelope-from=zycai@linux.ibm.com;\n helo=mx0a-001b2d01.pphosted.com","X-Spam_score_int":"-26","X-Spam_score":"-2.7","X-Spam_bar":"--","X-Spam_report":"(-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\n RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Refactor to enhance readability before enabling secure IPL in later\npatches.\n\nSigned-off-by: Zhuoying Cai \nReviewed-by: Thomas Huth \n---\n pc-bios/s390-ccw/bootmap.c | 51 ++++++++++++++++++++++++--------------\n 1 file changed, 33 insertions(+), 18 deletions(-)","diff":"diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c\nindex 420ee32eff..b9ba004cfc 100644\n--- a/pc-bios/s390-ccw/bootmap.c\n+++ b/pc-bios/s390-ccw/bootmap.c\n@@ -674,12 +674,42 @@ static int zipl_load_segment(ComponentEntry *entry)\n return 0;\n }\n \n+static int zipl_run_normal(ComponentEntry **entry_ptr, uint8_t *tmp_sec)\n+{\n+ ComponentEntry *entry = *entry_ptr;\n+\n+ while (entry->component_type == ZIPL_COMP_ENTRY_LOAD ||\n+ entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {\n+\n+ /* Secure boot is off, so we skip signature entries */\n+ if (entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {\n+ entry++;\n+ continue;\n+ }\n+\n+ if (zipl_load_segment(entry)) {\n+ return -1;\n+ }\n+\n+ entry++;\n+\n+ if ((uint8_t *)&entry[1] > tmp_sec + MAX_SECTOR_SIZE) {\n+ puts(\"Wrong entry value\");\n+ return -EINVAL;\n+ }\n+ }\n+\n+ *entry_ptr = entry;\n+ return 0;\n+}\n+\n /* Run a zipl program */\n static int zipl_run(ScsiBlockPtr *pte)\n {\n ComponentHeader *header;\n ComponentEntry *entry;\n uint8_t tmp_sec[MAX_SECTOR_SIZE];\n+ int rc;\n \n if (virtio_read(pte->blockno, tmp_sec)) {\n puts(\"Cannot read header\");\n@@ -700,25 +730,10 @@ static int zipl_run(ScsiBlockPtr *pte)\n \n /* Load image(s) into RAM */\n entry = (ComponentEntry *)(&header[1]);\n- while (entry->component_type == ZIPL_COMP_ENTRY_LOAD ||\n- entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {\n-\n- /* We don't support secure boot yet, so we skip signature entries */\n- if (entry->component_type == ZIPL_COMP_ENTRY_SIGNATURE) {\n- entry++;\n- continue;\n- }\n-\n- if (zipl_load_segment(entry)) {\n- return -1;\n- }\n \n- entry++;\n-\n- if ((uint8_t *)(&entry[1]) > (tmp_sec + MAX_SECTOR_SIZE)) {\n- puts(\"Wrong entry value\");\n- return -EINVAL;\n- }\n+ rc = zipl_run_normal(&entry, tmp_sec);\n+ if (rc) {\n+ return rc;\n }\n \n if (entry->component_type != ZIPL_COMP_ENTRY_EXEC) {\n","prefixes":["v10","17/30"]}