{"id":2233204,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233204/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505201905.997996-16-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-16-zycai@linux.ibm.com>","list_archive_url":null,"date":"2026-05-05T20:18:47","name":"[v11,15/32] 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.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-16-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/2233204/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233204/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=gV0zQ2fd;\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 4g992B259tz1yJx\n\tfor ; Wed, 06 May 2026 06:23:30 +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 1wKMF7-0007od-OY; Tue, 05 May 2026 16:19:45 -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 1wKMF5-0007mX-7G; Tue, 05 May 2026 16:19:43 -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 1wKMF3-0000GM-DX; Tue, 05 May 2026 16:19:42 -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 645K7ESx3351555; Tue, 5 May 2026 20:19:37 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 4dw9w6d6qk-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:37 +0000 (GMT)","from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1])\n by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id\n 645K9Q9l031250;\n Tue, 5 May 2026 20:19:36 GMT","from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71])\n by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dwukqbftj-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:36 +0000 (GMT)","from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com\n [10.39.53.229])\n by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 645KJZ6P22938150\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Tue, 5 May 2026 20:19:35 GMT","from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 43AA258059;\n Tue, 5 May 2026 20:19:35 +0000 (GMT)","from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 9E7D45805B;\n Tue, 5 May 2026 20:19:33 +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:33 +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=cMxAlHK7rC0yRgIIS\n rOWIjuyy2vv/rGpiMnaRglU9lI=; b=gV0zQ2fdadb3MrZFoHqzfA+Hg+VxgS5dk\n W53A75IGj6KHbhfCfHS2/OYiYeH9ilakg4+jexS59lzijWTCDnMIpzhr2h9whis9\n ipTJy9aKOFRCOrJ/U8VJbVURxTfxJMw1SZ+kj5ahU5oQ/dNPvtSgHUPMLc+/9Aso\n bmCUZ9NHrZoaYKDaDA3obdzXZqwaMrim1QQiBh7xpwDutnvohIAZlYfw3nHzn3CC\n LAOgFhzxvY4HPaP1nygo1o8NRVGHTu5bQKxeV8ZVTYfFOAzB0l6dVLLlblJl/N2H\n 20iWN2Pc8/uFXo8ddlPgtdhay+ujJIQTpCNpCc16poA1X0aiq4ksg==","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 15/32] pc-bios/s390-ccw: Define memory for IPLB and\n convert IPLB to pointers","Date":"Tue, 5 May 2026 16:18:47 -0400","Message-ID":"<20260505201905.997996-16-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=69fa50d9 cx=c_pps\n a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17\n a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=20KFwNOVAAAA:8\n a=_GZQR2ZoBes7ElOevS0A:9","X-Proofpoint-ORIG-GUID":"XYzzPAifZFMA-Lnd_YDgwQ6v1wa6Skby","X-Proofpoint-GUID":"XYzzPAifZFMA-Lnd_YDgwQ6v1wa6Skby","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNTA1MDE5NSBTYWx0ZWRfX/STOm2fmgnj4\n R7nQ2tSzDc73pqe0T7mUuVzIcpPXja52Hre1xip9eyfs+HM+MTXPmiMhMLSNgE7gsa3cvy+3RyG\n BAY9CD16iBpIemEtHVgTKTOsz9XV6itkcbWzjZEEYV86C5aaHjk0qq376yZ+Asss3+YVXYAf9Po\n 9x7dSwFnfbNcsbKNxalTwLRkVAwYIoM6LRLqaEybqfIJ4+Nz3ETSBJxLt9eFSP30+d9UQlNILzf\n sQpjh+1Z+XPgUeEIYSW8rb10Zx6vu6mIQD/pmmuyZ4KueXeE/tuJYzy4zqXo5L7DcBd3x2ebB3v\n XlRkxGpqm4z8WhjJ6nwysBNBsvP0G8qsqO/p1EtLb9myUGBWRzaORvWui7cUEB68AQLMrDynnoF\n XMGFV5oj4ZstLrY7fzgJMgXbx47n3ezEXcDbPPZAHyY8jj/NygYvomTpZm34HnDLQ6uk1qFutqd\n o1nO8fxM1HDbWnop7aQ==","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":"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 \nReviewed-by: Farhan Ali\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 45d25264f4..9940f1457c 100644\n--- a/include/hw/s390x/ipl/qipl.h\n+++ b/include/hw/s390x/ipl/qipl.h\n@@ -208,4 +208,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":["v11","15/32"]}