{"id":2219371,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219371/?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-15-zycai@linux.ibm.com>","date":"2026-04-02T22:14:36","name":"[v10,14/30] pc-bios/s390-ccw: Define memory for IPLB and convert IPLB to pointers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4b4ce81bdc11151cdd37d61a2702012fca90bb52","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-15-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/2219371/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=TFaAlb8s;\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 4fmx5j0jhLz1xtJ\n\tfor ; Fri, 03 Apr 2026 09:16:25 +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 1w8QKS-0000s3-Pr; Thu, 02 Apr 2026 18:15:58 -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 1w8QK8-0000q7-DZ; Thu, 02 Apr 2026 18:15:36 -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 1w8QK6-0004oi-IE; Thu, 02 Apr 2026 18:15:36 -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 632EdjOd442944; Thu, 2 Apr 2026 22:15:30 GMT","from ppma12.dal12v.mail.ibm.com\n (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4d66g26vd8-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 22:15:30 +0000 (GMT)","from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1])\n by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 632JLDgW021631;\n Thu, 2 Apr 2026 22:15:29 GMT","from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72])\n by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4d6sasv37u-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Thu, 02 Apr 2026 22:15:29 +0000","from smtpav05.dal12v.mail.ibm.com (smtpav05.dal12v.mail.ibm.com\n [10.241.53.104])\n by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 632MFRVY32506470\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Thu, 2 Apr 2026 22:15:28 GMT","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 82CB558067;\n Thu, 2 Apr 2026 22:15:27 +0000 (GMT)","from smtpav05.dal12v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 3833258056;\n Thu, 2 Apr 2026 22:15:26 +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:26 +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=FxZ30VdtqzblhY5nE\n 2mToW5TbMN+L8uSZ3wZSAxyypA=; b=TFaAlb8sU+RZ70+yXvtRLFFhklki87aoE\n aIR/sC5AoODs/sEHOGCNhxb5QLvcMxyhQKbOC8P2TDadCzZ2O4n5f5EUroWnp9EG\n DdKE72nGUBVN6+RDn9h+xK1nttC2hhbp+VHlEA0dfRsM0ZRdrO5dk1BP0LF8HvF6\n /QL3bxloi66FpcQGlKMtOyC6+wOXIUtfnHsW0n/tmGWYQB3kVlxWWRfCg+fQze/a\n MS/Lio8q+HfQm/5mMV0fDsWEIUfADhlrk3LLeTuMwVVwPzXpipWCiMJkd+unD1zq\n CegR/PRSbSBzh4sa2yMpDSeieAGPg2r6zwFA9ZXDBb8i8kX+c4uZA==","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 14/30] pc-bios/s390-ccw: Define memory for IPLB and\n convert IPLB to pointers","Date":"Thu, 2 Apr 2026 18:14:36 -0400","Message-ID":"<20260402221453.1602899-15-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=69ceea82 cx=c_pps\n a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8\n a=_GZQR2ZoBes7ElOevS0A:9","X-Proofpoint-ORIG-GUID":"H0D0TQVnJdX3n2dUANQqTgN05xwrOUlw","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDAyMDE5NSBTYWx0ZWRfX8/7Pq/itIwMk\n vYPIdpCtRZBFJpdnPjSmKRHp1UGPLU8DHZSD6Xh+ZLMVvSOmzQ+ub0p5a2xUcm78mcnHOixhztF\n bQQCt8QF2FoDNBGSEHQbuvsXcFomboj3SuppSEspz0gD1a2MLC8w4Qr3FGUaBrlWzkliFN5lwV7\n YtG4brgKFDzwIfn4bwJ1/e/wUfk04r0bIjav64+QJx6YX1S8d+aFM8dpUO9Kqp3A2xt7FI7QKtl\n YwOHZdiUj8vyxMyTbmObgl/hyoix0ReHoCLliyx6N9W/zejYTOgT4d86tqNGbyn4VpBaW7Udm4Y\n gbUAybz7f4Ve+nDC5TjqZop2qpyVAqVaGHsWix3GNUZ012rvQIYtZwvFb+fqLtCG8IqHjY2bF+D\n PSi60igE9HDye2AgM6Yqd3Ku/MU5dxfUpuCV6kYhe5iZeI/KncicBxMIjcMX1D2+ke+GRG27OL5\n B4xRVu6tePR24eelc9g==","X-Proofpoint-GUID":"H0D0TQVnJdX3n2dUANQqTgN05xwrOUlw","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":"Define a memory space for both IPL Parameter Block (IPLB) and\nIPL Information Report Block (IIRB) since IIRB is stored immediately\nfollowing IPLB.\n\nConvert IPLB to pointer and it points to the start of the defined memory space.\nIIRB points to the end of IPLB.\n\nSigned-off-by: Zhuoying Cai \nReviewed-by: Thomas Huth \n---\n include/hw/s390x/ipl/qipl.h | 6 ++++++\n pc-bios/s390-ccw/iplb.h | 5 +++--\n pc-bios/s390-ccw/jump2ipl.c | 6 +++---\n pc-bios/s390-ccw/main.c | 34 +++++++++++++++++++---------------\n pc-bios/s390-ccw/netmain.c | 8 ++++----\n 5 files changed, 35 insertions(+), 24 deletions(-)","diff":"diff --git a/include/hw/s390x/ipl/qipl.h b/include/hw/s390x/ipl/qipl.h\nindex 7f91270255..b46e787259 100644\n--- a/include/hw/s390x/ipl/qipl.h\n+++ b/include/hw/s390x/ipl/qipl.h\n@@ -205,4 +205,10 @@ struct IplInfoReportBlock {\n };\n typedef struct IplInfoReportBlock IplInfoReportBlock;\n \n+struct IplBlocks {\n+ IplParameterBlock iplb;\n+ IplInfoReportBlock iirb;\n+};\n+typedef struct IplBlocks IplBlocks;\n+\n #endif\ndiff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h\nindex 926e8eed5d..c828466f51 100644\n--- a/pc-bios/s390-ccw/iplb.h\n+++ b/pc-bios/s390-ccw/iplb.h\n@@ -20,8 +20,9 @@\n #include \n \n extern QemuIplParameters qipl;\n-extern IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));\n+extern IplParameterBlock *iplb;\n extern bool have_iplb;\n+extern IplBlocks ipl_data;\n \n static inline bool manage_iplb(IplParameterBlock *iplb, bool store)\n {\n@@ -61,7 +62,7 @@ static inline bool load_next_iplb(void)\n \n qipl.index++;\n next_iplb = (IplParameterBlock *) qipl.next_iplb;\n- memcpy(&iplb, next_iplb, sizeof(IplParameterBlock));\n+ memcpy(iplb, next_iplb, sizeof(IplParameterBlock));\n \n qipl.chain_len--;\n qipl.next_iplb = qipl.next_iplb + sizeof(IplParameterBlock);\ndiff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c\nindex 86321d0f46..fa2ca5cbe1 100644\n--- a/pc-bios/s390-ccw/jump2ipl.c\n+++ b/pc-bios/s390-ccw/jump2ipl.c\n@@ -43,11 +43,11 @@ int jump_to_IPL_code(uint64_t address)\n * The IPLB for QEMU SCSI type devices must be rebuilt during re-ipl. The\n * iplb.devno is set to the boot position of the target SCSI device.\n */\n- if (iplb.pbt == S390_IPL_TYPE_QEMU_SCSI) {\n- iplb.devno = qipl.index;\n+ if (iplb->pbt == S390_IPL_TYPE_QEMU_SCSI) {\n+ iplb->devno = qipl.index;\n }\n \n- if (have_iplb && !set_iplb(&iplb)) {\n+ if (have_iplb && !set_iplb(iplb)) {\n panic(\"Failed to set IPLB\");\n }\n \ndiff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c\nindex 26287cfd81..e6d4105786 100644\n--- a/pc-bios/s390-ccw/main.c\n+++ b/pc-bios/s390-ccw/main.c\n@@ -24,7 +24,9 @@\n static SubChannelId blk_schid = { .one = 1 };\n static char loadparm_str[LOADPARM_LEN + 1];\n QemuIplParameters qipl;\n-IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));\n+/* Ensure that IPLB and IIRB are page aligned and sequential in memory */\n+IplBlocks ipl_data __attribute__((__aligned__(PAGE_SIZE)));\n+IplParameterBlock *iplb;\n bool have_iplb;\n static uint16_t cutype;\n LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */\n@@ -53,7 +55,7 @@ void write_subsystem_identification(void)\n void write_iplb_location(void)\n {\n if (cutype == CU_TYPE_VIRTIO && virtio_get_device_type() != VIRTIO_ID_NET) {\n- lowcore->ptr_iplb = ptr2u32(&iplb);\n+ lowcore->ptr_iplb = ptr2u32(iplb);\n }\n }\n \n@@ -213,14 +215,14 @@ static void boot_setup(void)\n char lpmsg[] = \"LOADPARM=[________]\\n\";\n VDev *vdev = virtio_get_device();\n \n- if (have_iplb && memcmp(iplb.loadparm, NO_LOADPARM, LOADPARM_LEN) != 0) {\n- ebcdic_to_ascii((char *) iplb.loadparm, loadparm_str, LOADPARM_LEN);\n+ if (have_iplb && memcmp(iplb->loadparm, NO_LOADPARM, LOADPARM_LEN) != 0) {\n+ ebcdic_to_ascii((char *) iplb->loadparm, loadparm_str, LOADPARM_LEN);\n } else {\n sclp_get_loadparm_ascii(loadparm_str);\n }\n \n if (have_iplb) {\n- vdev->ipl_type = iplb.pbt;\n+ vdev->ipl_type = iplb->pbt;\n menu_setup(vdev);\n } else {\n vdev->ipl_type = QEMU_DEFAULT_IPL;\n@@ -244,21 +246,21 @@ static bool find_boot_device(void)\n switch (vdev->ipl_type) {\n case S390_IPL_TYPE_CCW:\n vdev->scsi_device_selected = false;\n- debug_print_int(\"device no. \", iplb.ccw.devno);\n- blk_schid.ssid = iplb.ccw.ssid & 0x3;\n+ debug_print_int(\"device no. \", iplb->ccw.devno);\n+ blk_schid.ssid = iplb->ccw.ssid & 0x3;\n debug_print_int(\"ssid \", blk_schid.ssid);\n- found = find_subch(iplb.ccw.devno);\n+ found = find_subch(iplb->ccw.devno);\n break;\n case S390_IPL_TYPE_QEMU_SCSI:\n vdev->scsi_device_selected = true;\n- vdev->selected_scsi_device.channel = iplb.scsi.channel;\n- vdev->selected_scsi_device.target = iplb.scsi.target;\n- vdev->selected_scsi_device.lun = iplb.scsi.lun;\n- blk_schid.ssid = iplb.scsi.ssid & 0x3;\n- found = find_subch(iplb.scsi.devno);\n+ vdev->selected_scsi_device.channel = iplb->scsi.channel;\n+ vdev->selected_scsi_device.target = iplb->scsi.target;\n+ vdev->selected_scsi_device.lun = iplb->scsi.lun;\n+ blk_schid.ssid = iplb->scsi.ssid & 0x3;\n+ found = find_subch(iplb->scsi.devno);\n break;\n case S390_IPL_TYPE_PCI:\n- found = find_fid(iplb.pci.fid);\n+ found = find_fid(iplb->pci.fid);\n break;\n default:\n puts(\"Unsupported IPLB\");\n@@ -377,10 +379,12 @@ static void probe_boot_device(void)\n \n void main(void)\n {\n+ iplb = &ipl_data.iplb;\n+\n copy_qipl();\n sclp_setup();\n css_setup();\n- have_iplb = store_iplb(&iplb);\n+ have_iplb = store_iplb(iplb);\n if (!have_iplb) {\n boot_setup();\n probe_boot_device();\ndiff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c\nindex 651cedf6ef..9b4dfd4638 100644\n--- a/pc-bios/s390-ccw/netmain.c\n+++ b/pc-bios/s390-ccw/netmain.c\n@@ -528,11 +528,11 @@ static bool virtio_setup(void)\n */\n enable_mss_facility();\n \n- if (have_iplb || store_iplb(&iplb)) {\n- IPL_assert(iplb.pbt == S390_IPL_TYPE_CCW, \"IPL_TYPE_CCW expected\");\n- dev_no = iplb.ccw.devno;\n+ if (have_iplb || store_iplb(iplb)) {\n+ IPL_assert(iplb->pbt == S390_IPL_TYPE_CCW, \"IPL_TYPE_CCW expected\");\n+ dev_no = iplb->ccw.devno;\n debug_print_int(\"device no. \", dev_no);\n- net_schid.ssid = iplb.ccw.ssid & 0x3;\n+ net_schid.ssid = iplb->ccw.ssid & 0x3;\n debug_print_int(\"ssid \", net_schid.ssid);\n found = find_net_dev(&schib, dev_no);\n } else {\n","prefixes":["v10","14/30"]}