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 07/35] s390x/diag: Implement DIAG 320 subcode 1
Date: Wed, 1 Jul 2026 16:48:53 -0400 [thread overview]
Message-ID: <20260701204922.1320349-8-zycai@linux.ibm.com> (raw)
In-Reply-To: <20260701204922.1320349-1-zycai@linux.ibm.com>
DIAG 320 subcode 1 provides information needed to determine
the amount of storage to store one or more certificates from the
certificate store.
Upon successful completion, this subcode returns information of the current
cert store, such as the number of certificates stored and allowed in the cert
store, amount of space may need to be allocate to store a certificate,
etc for verification-certificate blocks (VCBs).
The subcode value is denoted by setting the left-most bit
of an 8-byte field.
The verification-certificate-storage-size block (VCSSB) contains
the output data when the operation completes successfully. A VCSSB
length of 4 indicates that no certificate are available in the cert
store.
Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Reviewed-by: Collin Walling <walling@linux.ibm.com>
---
docs/specs/s390x-secure-ipl.rst | 12 ++++++
hw/s390x/cert-store.h | 3 +-
include/hw/s390x/ipl/diag320.h | 57 +++++++++++++++++++++++++++++
target/s390x/diag.c | 65 ++++++++++++++++++++++++++++++++-
4 files changed, 134 insertions(+), 3 deletions(-)
diff --git a/docs/specs/s390x-secure-ipl.rst b/docs/specs/s390x-secure-ipl.rst
index 331d793008..d5d4c3a24d 100644
--- a/docs/specs/s390x-secure-ipl.rst
+++ b/docs/specs/s390x-secure-ipl.rst
@@ -30,3 +30,15 @@ Subcode 0 - query installed subcodes
Returns a 256-bit installed subcodes mask (ISM) stored in the installed
subcodes block (ISB). This mask indicates which subcodes are currently
installed and available for use.
+
+Subcode 1 - query verification certificate storage information
+ Provides the information required to determine the amount of memory needed
+ to store one or more verification-certificates (VCs) from the certificate
+ store (CS).
+
+ Upon successful completion, this subcode returns various storage size values
+ for verification-certificate blocks (VCBs).
+
+ The output is returned in the verification-certificate-storage-size block
+ (VCSSB). A VCSSB length of 4 indicates that no certificates are available
+ in the CS.
diff --git a/hw/s390x/cert-store.h b/hw/s390x/cert-store.h
index 7fc9503cb9..6f5ee63177 100644
--- a/hw/s390x/cert-store.h
+++ b/hw/s390x/cert-store.h
@@ -11,10 +11,9 @@
#define HW_S390_CERT_STORE_H
#include "hw/s390x/ipl/qipl.h"
+#include "hw/s390x/ipl/diag320.h"
#include "crypto/x509-utils.h"
-#define CERT_NAME_MAX_LEN 64
-
#define CERT_KEY_ID_LEN QCRYPTO_HASH_DIGEST_LEN_SHA256
#define CERT_HASH_LEN QCRYPTO_HASH_DIGEST_LEN_SHA256
diff --git a/include/hw/s390x/ipl/diag320.h b/include/hw/s390x/ipl/diag320.h
index aa04b699c6..d37d8eaa86 100644
--- a/include/hw/s390x/ipl/diag320.h
+++ b/include/hw/s390x/ipl/diag320.h
@@ -11,10 +11,67 @@
#define S390X_DIAG320_H
#define DIAG_320_SUBC_QUERY_ISM 0
+#define DIAG_320_SUBC_QUERY_VCSI 1
#define DIAG_320_RC_OK 0x0001
#define DIAG_320_RC_NOT_SUPPORTED 0x0102
+#define DIAG_320_RC_INVAL_VCSSB_LEN 0x0202
#define DIAG_320_ISM_QUERY_SUBCODES 0x80000000
+#define DIAG_320_ISM_QUERY_VCSI 0x40000000
+
+#define VCSSB_NO_VC 4
+#define VCSSB_LEN_VALID 128
+
+#define CERT_NAME_MAX_LEN 64
+
+struct VCStorageSizeBlock {
+ uint32_t length;
+ uint8_t reserved0[3];
+ uint8_t version;
+ uint32_t reserved1[6];
+ uint16_t total_vc_ct;
+ uint16_t max_vc_ct;
+ uint32_t reserved3[11];
+ uint32_t max_single_vcb_len;
+ uint32_t total_vcb_len;
+ uint32_t reserved4[10];
+};
+typedef struct VCStorageSizeBlock VCStorageSizeBlock;
+
+struct VCEntryHeader {
+ uint32_t len;
+ uint8_t flags;
+ uint8_t key_type;
+ uint16_t cert_idx;
+ uint8_t name[CERT_NAME_MAX_LEN];
+ uint8_t format;
+ uint8_t reserved0;
+ uint16_t keyid_len;
+ uint8_t reserved1;
+ uint8_t hash_type;
+ uint16_t hash_len;
+ uint32_t reserved2;
+ uint32_t cert_len;
+ uint32_t reserved3[2];
+ uint16_t hash_offset;
+ uint16_t cert_offset;
+ uint32_t reserved4[7];
+};
+typedef struct VCEntryHeader VCEntryHeader;
+
+struct VCBlockHeader {
+ uint32_t in_len;
+ uint32_t reserved0;
+ uint16_t first_vc_index;
+ uint16_t last_vc_index;
+ uint32_t reserved1[5];
+ uint32_t out_len;
+ uint8_t reserved2[4];
+ uint16_t stored_ct;
+ uint16_t remain_ct;
+ uint32_t reserved3[5];
+};
+typedef struct VCBlockHeader VCBlockHeader;
#endif
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index 9f98e4b677..2336732c9f 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -205,11 +205,56 @@ out:
}
}
+static int handle_diag320_query_vcsi(S390CPU *cpu, uint64_t addr, uint64_t r1,
+ uintptr_t ra, S390IPLCertificateStore *cs)
+{
+ g_autofree VCStorageSizeBlock *vcssb = NULL;
+
+ vcssb = g_new0(VCStorageSizeBlock, 1);
+ if (s390_cpu_virt_mem_read(cpu, addr, r1, vcssb, sizeof(*vcssb))) {
+ s390_cpu_virt_mem_handle_exc(cpu, ra);
+ return -1;
+ }
+
+ if (be32_to_cpu(vcssb->length) > sizeof(*vcssb)) {
+ return DIAG_320_RC_INVAL_VCSSB_LEN;
+ }
+
+ if (be32_to_cpu(vcssb->length) < VCSSB_LEN_VALID) {
+ return DIAG_320_RC_INVAL_VCSSB_LEN;
+ }
+
+ if (!cs->count) {
+ vcssb->length = cpu_to_be32(VCSSB_NO_VC);
+ } else {
+ vcssb->version = 0;
+ vcssb->total_vc_ct = cpu_to_be16(cs->count);
+ vcssb->max_vc_ct = cpu_to_be16(MAX_CERTIFICATES);
+ vcssb->max_single_vcb_len = cpu_to_be32(sizeof(VCBlockHeader) +
+ sizeof(VCEntryHeader) +
+ cs->largest_cert_size);
+ vcssb->total_vcb_len = cpu_to_be32(sizeof(VCBlockHeader) +
+ cs->count * sizeof(VCEntryHeader) +
+ cs->total_bytes);
+ }
+
+ if (s390_cpu_virt_mem_write(cpu, addr, r1, vcssb, be32_to_cpu(vcssb->length))) {
+ s390_cpu_virt_mem_handle_exc(cpu, ra);
+ return -1;
+ }
+ return DIAG_320_RC_OK;
+}
+
+QEMU_BUILD_BUG_MSG(sizeof(VCStorageSizeBlock) != VCSSB_LEN_VALID,
+ "size of VCStorageSizeBlock is wrong");
+
void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
{
S390CPU *cpu = env_archcpu(env);
+ S390IPLCertificateStore *cs = s390_ipl_get_certificate_store();
uint64_t subcode = env->regs[r3];
uint64_t addr = env->regs[r1];
+ int rc;
if (env->psw.mask & PSW_MASK_PSTATE) {
s390_program_interrupt(env, PGM_PRIVILEGED, ra);
@@ -231,7 +276,8 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
* but the current set of subcodes can fit within a single word
* for now.
*/
- uint32_t ism_word0 = cpu_to_be32(DIAG_320_ISM_QUERY_SUBCODES);
+ uint32_t ism_word0 = cpu_to_be32(DIAG_320_ISM_QUERY_SUBCODES |
+ DIAG_320_ISM_QUERY_VCSI);
if (s390_cpu_virt_mem_write(cpu, addr, r1, &ism_word0, sizeof(ism_word0))) {
s390_cpu_virt_mem_handle_exc(cpu, ra);
@@ -240,6 +286,23 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)
env->regs[r1 + 1] = DIAG_320_RC_OK;
break;
+ case DIAG_320_SUBC_QUERY_VCSI:
+ if (addr & 0x7) {
+ s390_program_interrupt(env, PGM_SPECIFICATION, ra);
+ return;
+ }
+
+ if (!diag_parm_addr_valid(addr, sizeof(VCStorageSizeBlock), true)) {
+ s390_program_interrupt(env, PGM_ADDRESSING, ra);
+ return;
+ }
+
+ rc = handle_diag320_query_vcsi(cpu, addr, r1, ra, cs);
+ if (rc == -1) {
+ return;
+ }
+ env->regs[r1 + 1] = rc;
+ break;
default:
env->regs[r1 + 1] = DIAG_320_RC_NOT_SUPPORTED;
break;
--
2.54.0
next prev parent reply other threads:[~2026-07-01 20:53 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 ` Zhuoying Cai [this message]
2026-07-02 3:52 ` [PATCH v12 07/35] s390x/diag: Implement DIAG 320 subcode 1 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 ` [PATCH v12 22/35] pc-bios/s390-ccw: Introduce ZiplBootMode enum for IPL mode selection Zhuoying Cai
2026-07-02 2:01 ` 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-8-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.