{"id":2233189,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233189/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505201905.997996-19-zycai@linux.ibm.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260505201905.997996-19-zycai@linux.ibm.com>","list_archive_url":null,"date":"2026-05-05T20:18:50","name":"[v11,18/32] 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.2/people/90643/?format=json","name":"Zhuoying Cai","email":"zycai@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505201905.997996-19-zycai@linux.ibm.com/mbox/","series":[{"id":502896,"url":"http://patchwork.ozlabs.org/api/1.2/series/502896/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502896","date":"2026-05-05T20:18:37","name":"Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices","version":11,"mbox":"http://patchwork.ozlabs.org/series/502896/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233189/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233189/checks/","tags":{},"related":[],"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=oO6EV/C6;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.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 4g990614yKz1yJx\n\tfor ; Wed, 06 May 2026 06:21:42 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wKMFh-0000xe-B6; Tue, 05 May 2026 16:20:21 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wKMFU-0008G1-3b; Tue, 05 May 2026 16:20:09 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5])\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 1wKMFS-0000Hj-37; Tue, 05 May 2026 16:20:07 -0400","from pps.filterd (m0356516.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 645Ia1EZ3104130; Tue, 5 May 2026 20:19:42 GMT","from ppma22.wdc07v.mail.ibm.com\n (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9w6d6qw-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:42 +0000 (GMT)","from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1])\n by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id\n 645K9Ts0029225;\n Tue, 5 May 2026 20:19:42 GMT","from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5])\n by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dwuyw3dg0-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:42 +0000 (GMT)","from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com\n [10.39.53.229])\n by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 645KJerA25494152\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Tue, 5 May 2026 20:19:40 GMT","from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 912055805B;\n Tue, 5 May 2026 20:19:40 +0000 (GMT)","from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id EAE5E58059;\n Tue, 5 May 2026 20:19:38 +0000 (GMT)","from fedora-workstation.pok.ibm.com (unknown [9.12.79.241])\n by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP;\n Tue, 5 May 2026 20:19:38 +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=+WTGPElbA7RaHJ7n3\n 83N6fnBzrO/oftvylUSARSdFOM=; b=oO6EV/C6m3RcD03nY/+tt4YsfaB8iayAm\n xBQF6zVcwV+hJZ94ls9So9lrsewTIfPFs3M38krWHbEqQOev34vU4kBpmwYV1zfg\n +h34SpvSd01KwB/xlA6ZVFyYy2Nc4hQGLMvsIcjf4MDE60Pl6Oaj1c+FjfsGNyoP\n I5v0djcJ5NKUZOZvLMM1TkOMn06nBcvnEIoJg4sieYa28qs0BjR8/1pZ53ZkzvYS\n v+KJRrn7Elp6p6tF3H26TCHhvqfBNNyNnByRjvh9Z++Q11pgArI2qApXFjCbcqwq\n ku+Av7fytv4B+qMgLjNoY1BBIUv6jaXBOLr8ukihL0R/DYRbgKCGw==","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, david@kernel.org, walling@linux.ibm.com,\n jjherne@linux.ibm.com, pasic@linux.ibm.com, borntraeger@linux.ibm.com,\n farman@linux.ibm.com, mjrosato@linux.ibm.com, iii@linux.ibm.com,\n eblake@redhat.com, armbru@redhat.com, zycai@linux.ibm.com,\n alifm@linux.ibm.com, brueckner@linux.ibm.com,\n pierrick.bouvier@oss.qualcomm.com, jdaley@linux.ibm.com","Subject":"[PATCH v11 18/32] pc-bios/s390-ccw: Refactor zipl_run()","Date":"Tue, 5 May 2026 16:18:50 -0400","Message-ID":"<20260505201905.997996-19-zycai@linux.ibm.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260505201905.997996-1-zycai@linux.ibm.com>","References":"<20260505201905.997996-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=XPQAjwhE c=1 sm=1 tr=0 ts=69fa50de cx=c_pps\n a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17\n a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8\n a=se3WwofzMRKbtILPOyIA:9","X-Proofpoint-ORIG-GUID":"_Cn6cRe_ixgaptEnGP0VU9OGoCpPyNUX","X-Proofpoint-GUID":"_Cn6cRe_ixgaptEnGP0VU9OGoCpPyNUX","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNTA1MDE5NSBTYWx0ZWRfX0ZIoFoRve1fj\n //Rli1j6aLUPkeUe7VEXFIgbaBYLKDPCnskFzQBXSLPJHe18QZXPNhrJG27KPU4f5oWuqRlnjuE\n Fpk3CzSW8LNR+mdRm05NcIPvQ0ddgUMjxW7FdtxMmZG0wiWgsOnvTy6xrX9Rm8Elr4wSqZq5mV3\n x9AlFidwGsR9Ab55szZFet9uY3fet0xcBc3ulWzx6kvvCCy+arN8TJLEeX2O+Rk/wwQ2pnO/Y/3\n I66y4F0JBrMu/7lf/qz+6ToQ8L2Jyey5K2RYygTY45t0OwOPNthNEqhjpaxqRSK/Y9Ko6Vu12BX\n PF8JYbJ/QNS3gCoMf7/BURWCXl+Muh9REkXC0cn3tZay6pL6pNs4Gq2NP5KfJyv3Z+A0/5nHF+s\n aU0BUYbo66YwEf+J7eYVxwsB2ePERxFE6zBa7rc8Vz0LKdp7oPaP3YyCAAJJazoEIVYvuLftCEM\n UbdGdxEdT7V16MuBqrg==","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-05-05_02,2026-04-30_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 spamscore=0\n priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 clxscore=1015\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050195","Received-SPF":"pass client-ip=148.163.158.5; envelope-from=zycai@linux.ibm.com;\n helo=mx0b-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, SPF_HELO_NONE=0.001,\n 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 \nReviewed-by: Jared Rossi \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":["v11","18/32"]}