From: Zhuoying Cai <zycai@linux.ibm.com>
To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Cc: jrossi@linux.ibm.com, cohuck@redhat.com, berrange@redhat.com,
richard.henderson@linaro.org, david@kernel.org,
walling@linux.ibm.com, jjherne@linux.ibm.com,
pasic@linux.ibm.com, borntraeger@linux.ibm.com,
farman@linux.ibm.com, mjrosato@linux.ibm.com, iii@linux.ibm.com,
eblake@redhat.com, armbru@redhat.com, zycai@linux.ibm.com,
alifm@linux.ibm.com, brueckner@linux.ibm.com,
pierrick.bouvier@oss.qualcomm.com, jdaley@linux.ibm.com
Subject: [PATCH v12 22/35] pc-bios/s390-ccw: Introduce ZiplBootMode enum for IPL mode selection
Date: Wed, 1 Jul 2026 16:49:08 -0400 [thread overview]
Message-ID: <20260701204922.1320349-23-zycai@linux.ibm.com> (raw)
In-Reply-To: <20260701204922.1320349-1-zycai@linux.ibm.com>
Add ZiplBootMode enumeration to support multiple IPL boot configurations.
Boot modes differentiate between normal boot and secure IPL operations,
enabled based on boot certificates specified via the boot-certs option.
Normal Mode: IPL when no certificates are provided. No signature
verification is performed.
This prepares for future secure IPL modes requiring signature
verification.
Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com>
Reviewed-by: Collin Walling <walling@linux.ibm.com>
---
docs/system/s390x/secure-ipl.rst | 21 +++++++++++++++++++++
pc-bios/s390-ccw/bootmap.c | 16 +++++++++++++++-
pc-bios/s390-ccw/main.c | 6 ++++++
pc-bios/s390-ccw/s390-ccw.h | 6 ++++++
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/docs/system/s390x/secure-ipl.rst b/docs/system/s390x/secure-ipl.rst
index 88df52ce2f..9d7d33f5ed 100644
--- a/docs/system/s390x/secure-ipl.rst
+++ b/docs/system/s390x/secure-ipl.rst
@@ -18,3 +18,24 @@ Note: certificate files must have a .pem extension.
.. code-block:: shell
qemu-system-s390x -machine s390-ccw-virtio,boot-certs.0.path=/.../qemu/certs,boot-certs.1.path=/another/path/cert.pem ...
+
+
+IPL Modes
+---------
+
+Multiple IPL modes are available to differentiate between the various IPL
+configurations. These modes are mutually exclusive and enabled based on the
+``boot-certs`` option on the QEMU command line.
+
+Normal Mode
+^^^^^^^^^^^
+
+The absence of certificates will attempt to IPL a guest without secure IPL
+operations. No checks are performed, and no warnings/errors are reported.
+This is the default mode.
+
+Configuration:
+
+.. code-block:: shell
+
+ qemu-system-s390x -machine s390-ccw-virtio ...
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index b19981feb1..667a69f80d 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -733,7 +733,14 @@ static int zipl_run(ScsiBlockPtr *pte)
/* Load image(s) into RAM */
entry = (ComponentEntry *)(&header[1]);
- rc = zipl_run_normal(&entry, tmp_sec);
+ switch (boot_mode) {
+ case ZIPL_BOOT_MODE_NORMAL:
+ rc = zipl_run_normal(&entry, tmp_sec);
+ break;
+ default:
+ panic("Unknown boot mode");
+ }
+
if (rc) {
return rc;
}
@@ -1105,12 +1112,16 @@ void zipl_load(void)
VDev *vdev = virtio_get_device();
if (vdev->is_cdrom) {
+ IPL_assert((boot_mode == ZIPL_BOOT_MODE_NORMAL),
+ "Secure boot from ISO image is not supported!");
ipl_iso_el_torito();
puts("Failed to IPL this ISO image!");
return;
}
if (virtio_get_device_type() == VIRTIO_ID_NET) {
+ IPL_assert((boot_mode == ZIPL_BOOT_MODE_NORMAL),
+ "Virtio net boot device does not support secure boot!");
netmain();
puts("Failed to IPL from this network!");
return;
@@ -1121,6 +1132,9 @@ void zipl_load(void)
return;
}
+ IPL_assert((boot_mode == ZIPL_BOOT_MODE_NORMAL),
+ "Secure boot with the ECKD scheme is not supported!");
+
switch (virtio_get_device_type()) {
case VIRTIO_ID_BLOCK:
zipl_load_vblk();
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index b8f836c682..cd3d0776b0 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -30,6 +30,7 @@ IplParameterBlock *iplb;
bool have_iplb;
static uint16_t cutype;
LowCore *lowcore; /* Yes, this *is* a pointer to address 0 */
+ZiplBootMode boot_mode;
#define LOADPARM_PROMPT "PROMPT "
#define LOADPARM_EMPTY " "
@@ -303,6 +304,9 @@ static void ipl_ccw_device(void)
switch (cutype) {
case CU_TYPE_DASD_3990:
case CU_TYPE_DASD_2107:
+ IPL_assert((boot_mode == ZIPL_BOOT_MODE_NORMAL),
+ "Passthrough (vfio) CCW device does not support secure boot!");
+
dasd_ipl(blk_schid, cutype);
break;
case CU_TYPE_VIRTIO:
@@ -390,6 +394,8 @@ void main(void)
probe_boot_device();
}
+ boot_mode = ZIPL_BOOT_MODE_NORMAL;
+
while (have_iplb) {
boot_setup();
if (have_iplb && find_boot_device()) {
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 1e1f71775e..5420443ad2 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -69,6 +69,12 @@ int sclp_read(char *str, size_t count);
/* bootmap.c */
void zipl_load(void);
+typedef enum ZiplBootMode {
+ ZIPL_BOOT_MODE_NORMAL = 0,
+} ZiplBootMode;
+
+extern ZiplBootMode boot_mode;
+
/* jump2ipl.c */
void write_reset_psw(uint64_t psw);
int jump_to_IPL_code(uint64_t address);
--
2.54.0
next prev parent reply other threads:[~2026-07-01 20:55 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-01 20:48 [PATCH v12 00/35] Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 01/35] Add boot-certs to s390-ccw-virtio machine type option Zhuoying Cai
2026-07-01 23:30 ` Jared Rossi
2026-07-02 0:47 ` Matthew Rosato
2026-07-02 17:12 ` Matthew Rosato
2026-07-01 20:48 ` [PATCH v12 02/35] crypto/x509-utils: Refactor with GNUTLS fallback Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 03/35] crypto/x509-utils: Add helper functions for certificate store Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 04/35] hw/s390x/ipl: Create " Zhuoying Cai
2026-07-02 0:41 ` Jared Rossi
2026-07-01 20:48 ` [PATCH v12 05/35] s390x/diag: Introduce DIAG 320 for Certificate Store Facility Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 06/35] s390x/diag: Refactor address validation check from diag308_parm_check Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 07/35] s390x/diag: Implement DIAG 320 subcode 1 Zhuoying Cai
2026-07-02 3:52 ` Eric Farman
2026-07-01 20:48 ` [PATCH v12 08/35] crypto/x509-utils: Add helper functions for DIAG 320 subcode 2 Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 09/35] s390x/diag: Implement " Zhuoying Cai
2026-07-01 23:29 ` Matthew Rosato
2026-07-02 3:41 ` Eric Farman
2026-07-01 20:48 ` [PATCH v12 10/35] hw/s390x: Define finite size for single entry VCEntry Zhuoying Cai
2026-07-02 1:02 ` Matthew Rosato
2026-07-02 3:54 ` Eric Farman
2026-07-01 20:48 ` [PATCH v12 11/35] s390x/diag: Introduce DIAG 508 for secure IPL operations Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 12/35] crypto/x509-utils: Add helper functions for DIAG 508 subcode 1 Zhuoying Cai
2026-07-01 20:48 ` [PATCH v12 13/35] s390x/diag: generalize s390_ipl_read/write to accept void * Zhuoying Cai
2026-07-02 1:30 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 14/35] s390x/diag: Implement DIAG 508 subcode 1 for signature verification Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 15/35] s390x/ipl: Introduce IPL Information Report Block (IIRB) Zhuoying Cai
2026-07-02 1:39 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 16/35] pc-bios/s390-ccw: Define memory for IPLB and convert IPLB to pointers Zhuoying Cai
2026-07-02 1:42 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 17/35] hw/s390x/ipl: Add IPIB flags to IPL Parameter Block Zhuoying Cai
2026-07-02 1:47 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 18/35] hw/s390x/ipl: Rework s390_ipl_map_iplb_chain for certificate storage Zhuoying Cai
2026-07-02 14:56 ` Eric Farman
2026-07-02 15:38 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 19/35] s390x: Guest support for Secure-IPL Facility Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 20/35] pc-bios/s390-ccw: Refactor zipl_run() Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 21/35] pc-bios/s390-ccw: Rework zipl_load_segment function Zhuoying Cai
2026-07-02 1:58 ` Jared Rossi
2026-07-01 20:49 ` Zhuoying Cai [this message]
2026-07-02 2:01 ` [PATCH v12 22/35] pc-bios/s390-ccw: Introduce ZiplBootMode enum for IPL mode selection Jared Rossi
2026-07-01 20:49 ` [PATCH v12 23/35] pc-bios/s390-ccw: Add signature verification for secure IPL in audit mode Zhuoying Cai
2026-07-02 4:08 ` Eric Farman
2026-07-02 14:13 ` Jared Rossi
2026-07-02 15:26 ` Zhuoying Cai
2026-07-02 16:11 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 24/35] pc-bios/s390-ccw: Add signed component address overlap checks Zhuoying Cai
2026-07-02 2:49 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 25/35] s390x: Guest support for Secure-IPL Code Loading Attributes Facility (SCLAF) Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 26/35] pc-bios/s390-ccw: Add additional security checks for secure boot Zhuoying Cai
2026-07-02 16:08 ` Eric Farman
2026-07-02 20:47 ` Zhuoying Cai
2026-07-03 2:27 ` Eric Farman
2026-07-01 20:49 ` [PATCH v12 27/35] Add secure-boot to s390-ccw-virtio machine type option Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 28/35] hw/s390x/ipl: Set IPIB flags for secure IPL Zhuoying Cai
2026-07-02 3:16 ` Jared Rossi
2026-07-01 20:49 ` [PATCH v12 29/35] pc-bios/s390-ccw: Handle true secure IPL mode Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 30/35] hw/s390x/ipl: Handle secure boot with multiple boot devices Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 31/35] hw/s390x/ipl: Handle secure boot without specifying a boot device Zhuoying Cai
2026-07-02 3:28 ` Jared Rossi
2026-07-02 21:15 ` Zhuoying Cai
2026-07-01 20:49 ` [PATCH v12 32/35] s390x/ipl: re-apply secure boot flags on DIAG 308 reboot Zhuoying Cai
2026-07-02 3:47 ` Jared Rossi
2026-07-02 17:25 ` Jason J. Herne
2026-07-01 20:49 ` [PATCH v12 33/35] tests/functional/s390x: Add secure IPL functional test Zhuoying Cai
2026-07-02 1:48 ` Matthew Rosato
2026-07-02 15:38 ` Zhuoying Cai
2026-07-02 16:06 ` Matthew Rosato
2026-07-01 20:49 ` [PATCH v12 34/35] docs/specs: Add secure IPL documentation Zhuoying Cai
2026-07-02 2:54 ` Matthew Rosato
2026-07-01 20:49 ` [PATCH v12 35/35] docs/system/s390x: " Zhuoying Cai
2026-07-02 3:06 ` Matthew Rosato
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260701204922.1320349-23-zycai@linux.ibm.com \
--to=zycai@linux.ibm.com \
--cc=alifm@linux.ibm.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@linux.ibm.com \
--cc=brueckner@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@kernel.org \
--cc=eblake@redhat.com \
--cc=farman@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=jdaley@linux.ibm.com \
--cc=jjherne@linux.ibm.com \
--cc=jrossi@linux.ibm.com \
--cc=mjrosato@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=pierrick.bouvier@oss.qualcomm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=walling@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.