Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/2233205/?format=api
{ "id": 2233205, "url": "http://patchwork.ozlabs.org/api/1.2/patches/2233205/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505201905.997996-8-zycai@linux.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.2/projects/14/?format=api", "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-8-zycai@linux.ibm.com>", "list_archive_url": null, "date": "2026-05-05T20:18:39", "name": "[v11,07/32] s390x/diag: Implement DIAG 320 subcode 1", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "abd8d0f0f1a7b0ad40187c38718638efa36d31d4", "submitter": { "id": 90643, "url": "http://patchwork.ozlabs.org/api/1.2/people/90643/?format=api", "name": "Zhuoying Cai", "email": "zycai@linux.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505201905.997996-8-zycai@linux.ibm.com/mbox/", "series": [ { "id": 502896, "url": "http://patchwork.ozlabs.org/api/1.2/series/502896/?format=api", "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/2233205/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2233205/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=gOYrQm3H;\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 4g992B6yVRz1yK2\n\tfor <incoming@patchwork.ozlabs.org>; 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 <qemu-devel-bounces@nongnu.org>)\n\tid 1wKMEu-0007cC-Fz; Tue, 05 May 2026 16:19:32 -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 <zycai@linux.ibm.com>)\n id 1wKMEr-0007Vb-Fz; Tue, 05 May 2026 16:19:29 -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 <zycai@linux.ibm.com>)\n id 1wKMEo-0000Co-Ka; Tue, 05 May 2026 16:19:29 -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 645IaiFA3183452; Tue, 5 May 2026 20:19:23 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 4dw9w6d6pk-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:22 +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 645K9Trw029225;\n Tue, 5 May 2026 20:19:22 GMT", "from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70])\n by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dwuyw3dev-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Tue, 05 May 2026 20:19:22 +0000 (GMT)", "from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com\n [10.39.53.229])\n by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 645KIrlT29557344\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Tue, 5 May 2026 20:18:53 GMT", "from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 07E8A5805B;\n Tue, 5 May 2026 20:19:21 +0000 (GMT)", "from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 5B6C158059;\n Tue, 5 May 2026 20:19:19 +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:19 +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=dpz8+JqiT29Nsi3jq\n EgwLpBXkyi+/DfQXhbX28XLKKc=; b=gOYrQm3Hwx0OXc7FlO4XsakvZF7rleBl0\n U/ggZygewLNhc7qzdH4FMY31yxVsmo6tf7tMuqABxPN6S0ynDro9P+OQm+IapiVq\n 6LK0V1htKDKwzkKwN5lgmKQdtKExVYTcUaHAm7RI73krxRjkrWAlzzYh+eX9T8/a\n 4p3LTDi4MGvDUb8i0DiHV1UxQucE67VJUQ6HiwtomNRiv+/FgHHx0PawoRM0bVRY\n l57RmSE/DHeLzNntIc0xG7MCnmoM81d6zG4DZdMu3P/SReClaT58yq7X/iMsTBAk\n aIppqQcLk8wTukCsLC5bqjTe+kh+ru/2CQVq7NxgqquDkxCZvOfsQ==", "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,\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 07/32] s390x/diag: Implement DIAG 320 subcode 1", "Date": "Tue, 5 May 2026 16:18:39 -0400", "Message-ID": "<20260505201905.997996-8-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=69fa50ca 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=MguaJt8dR91BFOVN_IAA:9", "X-Proofpoint-ORIG-GUID": "8kRbaZpaa10nVcQwKOwhQRaBFBj55-2D", "X-Proofpoint-GUID": "8kRbaZpaa10nVcQwKOwhQRaBFBj55-2D", "X-Proofpoint-Spam-Details-Enc": "AW1haW4tMjYwNTA1MDE5NSBTYWx0ZWRfX77RdVkqEosXt\n D2KwVEwmmv5oqpY94J10fz6zZc0qBl/YKtddvexWGTX4QnTf/EIDmmlac1CYrHm6mD4A9QJKqQz\n 7/i48rNkZcwho9JeVtc5/GsCquAh/eADP+ygwkzPkwUlIKRnxlasxpOh8gBBuZTqo0gd6u8qC3Q\n MNs+fUtDBYVdMq9xYHla/QgoizfH6x4sSRFIYDdUWppJSzLq1BNjn5kbP+e3QW1vix6UOf6RyX4\n SYt3jBe4eOdUQeYKPnuGF3LuAPPa4xn+8I4S1UbqsC/xNP2Q6qDa8BXTL7ZyjVHbA7piWkUJYgO\n v3+Lx5UxZ/NbKP97Gk0u8cqO2iCfNYOD/SmxqRfIV9L2b4AuOH9T0gREq5sUhFpGgeKTZ3cpuuF\n 3CI9Ck5H5wgB/+/Av1oUmsKGSPejqbgIW1jncOvwIofW1uOyycv7X0Uu9SCZroTVmQUP3ba5Mzx\n PS9QiE2YG9r14YuyF4g==", "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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "DIAG 320 subcode 1 provides information needed to determine\nthe amount of storage to store one or more certificates from the\ncertificate store.\n\nUpon successful completion, this subcode returns information of the current\ncert store, such as the number of certificates stored and allowed in the cert\nstore, amount of space may need to be allocate to store a certificate,\netc for verification-certificate blocks (VCBs).\n\nThe subcode value is denoted by setting the left-most bit\nof an 8-byte field.\n\nThe verification-certificate-storage-size block (VCSSB) contains\nthe output data when the operation completes successfully. A VCSSB\nlength of 4 indicates that no certificate are available in the cert\nstore.\n\nSigned-off-by: Zhuoying Cai <zycai@linux.ibm.com>\nReviewed-by: Farhan Ali <alifm@linux.ibm.com>\nReviewed-by: Collin Walling <walling@linux.ibm.com>\n---\n docs/specs/s390x-secure-ipl.rst | 12 ++++++\n hw/s390x/cert-store.h | 3 +-\n include/hw/s390x/ipl/diag320.h | 57 +++++++++++++++++++++++++++++\n target/s390x/diag.c | 65 ++++++++++++++++++++++++++++++++-\n 4 files changed, 134 insertions(+), 3 deletions(-)", "diff": "diff --git a/docs/specs/s390x-secure-ipl.rst b/docs/specs/s390x-secure-ipl.rst\nindex 5f7b5bf559..807a8ae393 100644\n--- a/docs/specs/s390x-secure-ipl.rst\n+++ b/docs/specs/s390x-secure-ipl.rst\n@@ -26,3 +26,15 @@ Subcode 0 - query installed subcodes\n Returns a 256-bit installed subcodes mask (ISM) stored in the installed\n subcodes block (ISB). This mask indicates which subcodes are currently\n installed and available for use.\n+\n+Subcode 1 - query verification certificate storage information\n+ Provides the information required to determine the amount of memory needed\n+ to store one or more verification-certificates (VCs) from the certificate\n+ store (CS).\n+\n+ Upon successful completion, this subcode returns various storage size values\n+ for verification-certificate blocks (VCBs).\n+\n+ The output is returned in the verification-certificate-storage-size block\n+ (VCSSB). A VCSSB length of 4 indicates that no certificates are available\n+ in the CS.\ndiff --git a/hw/s390x/cert-store.h b/hw/s390x/cert-store.h\nindex 7fc9503cb9..6f5ee63177 100644\n--- a/hw/s390x/cert-store.h\n+++ b/hw/s390x/cert-store.h\n@@ -11,10 +11,9 @@\n #define HW_S390_CERT_STORE_H\n \n #include \"hw/s390x/ipl/qipl.h\"\n+#include \"hw/s390x/ipl/diag320.h\"\n #include \"crypto/x509-utils.h\"\n \n-#define CERT_NAME_MAX_LEN 64\n-\n #define CERT_KEY_ID_LEN QCRYPTO_HASH_DIGEST_LEN_SHA256\n #define CERT_HASH_LEN QCRYPTO_HASH_DIGEST_LEN_SHA256\n \ndiff --git a/include/hw/s390x/ipl/diag320.h b/include/hw/s390x/ipl/diag320.h\nindex aa04b699c6..90797728d8 100644\n--- a/include/hw/s390x/ipl/diag320.h\n+++ b/include/hw/s390x/ipl/diag320.h\n@@ -11,10 +11,67 @@\n #define S390X_DIAG320_H\n \n #define DIAG_320_SUBC_QUERY_ISM 0\n+#define DIAG_320_SUBC_QUERY_VCSI 1\n \n #define DIAG_320_RC_OK 0x0001\n #define DIAG_320_RC_NOT_SUPPORTED 0x0102\n+#define DIAG_320_RC_INVAL_VCSSB_LEN 0x0202\n \n #define DIAG_320_ISM_QUERY_SUBCODES 0x80000000\n+#define DIAG_320_ISM_QUERY_VCSI 0x40000000\n+\n+#define VCSSB_NO_VC 4\n+#define VCSSB_MIN_LEN 128\n+\n+#define CERT_NAME_MAX_LEN 64\n+\n+struct VCStorageSizeBlock {\n+ uint32_t length;\n+ uint8_t reserved0[3];\n+ uint8_t version;\n+ uint32_t reserved1[6];\n+ uint16_t total_vc_ct;\n+ uint16_t max_vc_ct;\n+ uint32_t reserved3[11];\n+ uint32_t max_single_vcb_len;\n+ uint32_t total_vcb_len;\n+ uint32_t reserved4[10];\n+};\n+typedef struct VCStorageSizeBlock VCStorageSizeBlock;\n+\n+struct VCEntryHeader {\n+ uint32_t len;\n+ uint8_t flags;\n+ uint8_t key_type;\n+ uint16_t cert_idx;\n+ uint8_t name[CERT_NAME_MAX_LEN];\n+ uint8_t format;\n+ uint8_t reserved0;\n+ uint16_t keyid_len;\n+ uint8_t reserved1;\n+ uint8_t hash_type;\n+ uint16_t hash_len;\n+ uint32_t reserved2;\n+ uint32_t cert_len;\n+ uint32_t reserved3[2];\n+ uint16_t hash_offset;\n+ uint16_t cert_offset;\n+ uint32_t reserved4[7];\n+};\n+typedef struct VCEntryHeader VCEntryHeader;\n+\n+struct VCBlockHeader {\n+ uint32_t in_len;\n+ uint32_t reserved0;\n+ uint16_t first_vc_index;\n+ uint16_t last_vc_index;\n+ uint32_t reserved1[5];\n+ uint32_t out_len;\n+ uint8_t reserved2[4];\n+ uint16_t stored_ct;\n+ uint16_t remain_ct;\n+ uint32_t reserved3[5];\n+};\n+typedef struct VCBlockHeader VCBlockHeader;\n \n #endif\ndiff --git a/target/s390x/diag.c b/target/s390x/diag.c\nindex 8ab40437a2..f531ce9d82 100644\n--- a/target/s390x/diag.c\n+++ b/target/s390x/diag.c\n@@ -198,11 +198,56 @@ out:\n }\n }\n \n+static int handle_diag320_query_vcsi(S390CPU *cpu, uint64_t addr, uint64_t r1,\n+ uintptr_t ra, S390IPLCertificateStore *cs)\n+{\n+ g_autofree VCStorageSizeBlock *vcssb = NULL;\n+\n+ vcssb = g_new0(VCStorageSizeBlock, 1);\n+ if (s390_cpu_virt_mem_read(cpu, addr, r1, vcssb, sizeof(*vcssb))) {\n+ s390_cpu_virt_mem_handle_exc(cpu, ra);\n+ return -1;\n+ }\n+\n+ if (be32_to_cpu(vcssb->length) > sizeof(*vcssb)) {\n+ return DIAG_320_RC_INVAL_VCSSB_LEN;\n+ }\n+\n+ if (be32_to_cpu(vcssb->length) < VCSSB_MIN_LEN) {\n+ return DIAG_320_RC_INVAL_VCSSB_LEN;\n+ }\n+\n+ if (!cs->count) {\n+ vcssb->length = cpu_to_be32(VCSSB_NO_VC);\n+ } else {\n+ vcssb->version = 0;\n+ vcssb->total_vc_ct = cpu_to_be16(cs->count);\n+ vcssb->max_vc_ct = cpu_to_be16(MAX_CERTIFICATES);\n+ vcssb->max_single_vcb_len = cpu_to_be32(sizeof(VCBlockHeader) +\n+ sizeof(VCEntryHeader) +\n+ cs->largest_cert_size);\n+ vcssb->total_vcb_len = cpu_to_be32(sizeof(VCBlockHeader) +\n+ cs->count * sizeof(VCEntryHeader) +\n+ cs->total_bytes);\n+ }\n+\n+ if (s390_cpu_virt_mem_write(cpu, addr, r1, vcssb, be32_to_cpu(vcssb->length))) {\n+ s390_cpu_virt_mem_handle_exc(cpu, ra);\n+ return -1;\n+ }\n+ return DIAG_320_RC_OK;\n+}\n+\n+QEMU_BUILD_BUG_MSG(sizeof(VCStorageSizeBlock) != VCSSB_MIN_LEN,\n+ \"size of VCStorageSizeBlock is wrong\");\n+\n void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n {\n S390CPU *cpu = env_archcpu(env);\n+ S390IPLCertificateStore *cs = s390_ipl_get_certificate_store();\n uint64_t subcode = env->regs[r3];\n uint64_t addr = env->regs[r1];\n+ int rc;\n \n if (env->psw.mask & PSW_MASK_PSTATE) {\n s390_program_interrupt(env, PGM_PRIVILEGED, ra);\n@@ -224,7 +269,8 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n * but the current set of subcodes can fit within a single word\n * for now.\n */\n- uint32_t ism_word0 = cpu_to_be32(DIAG_320_ISM_QUERY_SUBCODES);\n+ uint32_t ism_word0 = cpu_to_be32(DIAG_320_ISM_QUERY_SUBCODES |\n+ DIAG_320_ISM_QUERY_VCSI);\n \n if (s390_cpu_virt_mem_write(cpu, addr, r1, &ism_word0, sizeof(ism_word0))) {\n s390_cpu_virt_mem_handle_exc(cpu, ra);\n@@ -233,6 +279,23 @@ void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)\n \n env->regs[r1 + 1] = DIAG_320_RC_OK;\n break;\n+ case DIAG_320_SUBC_QUERY_VCSI:\n+ if (addr & 0x7) {\n+ s390_program_interrupt(env, PGM_SPECIFICATION, ra);\n+ return;\n+ }\n+\n+ if (!diag_parm_addr_valid(addr, sizeof(VCStorageSizeBlock), true)) {\n+ s390_program_interrupt(env, PGM_ADDRESSING, ra);\n+ return;\n+ }\n+\n+ rc = handle_diag320_query_vcsi(cpu, addr, r1, ra, cs);\n+ if (rc == -1) {\n+ return;\n+ }\n+ env->regs[r1 + 1] = rc;\n+ break;\n default:\n env->regs[r1 + 1] = DIAG_320_RC_NOT_SUPPORTED;\n break;\n", "prefixes": [ "v11", "07/32" ] }