From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BA3ACA0FED for ; Tue, 26 Aug 2025 22:33:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ur2CW-0004FV-CG; Tue, 26 Aug 2025 18:31:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ur2CP-0004Do-Sv; Tue, 26 Aug 2025 18:31:32 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ur2CC-0001iM-NB; Tue, 26 Aug 2025 18:31:26 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57QKWdOs008475; Tue, 26 Aug 2025 22:31:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=+eds93 Go/qjaCwT+QsAmJ/AL2ml+LRa33o1ekdfPMEo=; b=e3HcOlN8D+IZmcrdS9/Gt6 2Ct+5JCWOX1gHG8RuHqjkSHmIvumxHpMo8eLzFjRu2JMGOItQKxK27/Lkt75hco4 R4xESAtqigfyWNp5JVT6rqbR0dTtBt0HJBqoefsDlWtNnPDbxWcmJQMhquT9/B6z JXsKqMBvlxx3Uh+fZWTF8TZaoAV5dTE9NPWR2cQJ2w4itQ067w2Z37a7y0/cSD1f ia9uyqrBDCTe5LfEqfgmlHYUbXqCIsJUMn8bk7UyFkvqXnvyMZtEZz+0SLyliFYh koynR+EsP805WJKBEt/DGtQMYh8V8w0/Zd/YeZW3kQsSjVG6hFlo9NcNl+Js/J5Q == Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 48q5avh7j1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 26 Aug 2025 22:31:04 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 57QLmZEU007813; Tue, 26 Aug 2025 22:31:04 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 48qqyud8b5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 26 Aug 2025 22:31:04 +0000 Received: from smtpav04.wdc07v.mail.ibm.com (smtpav04.wdc07v.mail.ibm.com [10.39.53.231]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 57QMV2No49938820 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Aug 2025 22:31:02 GMT Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5F5FD58052; Tue, 26 Aug 2025 22:31:02 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C7D8E58050; Tue, 26 Aug 2025 22:31:00 +0000 (GMT) Received: from [9.61.148.204] (unknown [9.61.148.204]) by smtpav04.wdc07v.mail.ibm.com (Postfix) with ESMTPS; Tue, 26 Aug 2025 22:31:00 +0000 (GMT) Message-ID: <82c91b19-eb26-422b-9f2b-248ccd45b6db@linux.ibm.com> Date: Tue, 26 Aug 2025 18:30:59 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 07/29] s390x/diag: Implement DIAG 320 subcode 1 To: Zhuoying Cai , thuth@redhat.com, berrange@redhat.com, richard.henderson@linaro.org, david@redhat.com, qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: 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, alifm@linux.ibm.com References: <20250818214323.529501-1-zycai@linux.ibm.com> <20250818214323.529501-8-zycai@linux.ibm.com> Content-Language: en-US From: Jared Rossi In-Reply-To: <20250818214323.529501-8-zycai@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: v7llMQG7CmMdfCjOrrIPNlu3pfmBSAlq X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODIzMDAyMSBTYWx0ZWRfX0bspzoyco+Pe qdmKQeD4/wU4vlvRBWjDSCuQynsOxd08sdXj+r0XH9OAEr5zVzDi+H4iRnAYinAVZhrPbOZEnU/ PsgjMmNM8qcNna44c+j2wDD7PNSDgprPxxZmNIeybOnYf9OqAdkKLSPRQhQZIEEJ2+G4VBTdgRx 1Ota5r/1ifuQDF+JcUz9J4i4eOVekMCJS5u89N7+K4ts8vt/VtPLkA86CE7zE53pEloohs1vdRo 2ccuTTGGp35Z+kOP/anwrrvat6yq+S4uF0fRvLn1SvwdySa0FKmicpZECxHXa73cBeLYJEMQci8 nnkqyWc2UuLwrcnJRBv4t/0DnYXB1WaVooO+6UEW8yexNIjYmjDSxzBlmIhp1RChkrM3cksq3U4 S/YRs2yo X-Proofpoint-ORIG-GUID: v7llMQG7CmMdfCjOrrIPNlu3pfmBSAlq X-Authority-Analysis: v=2.4 cv=SNNCVPvH c=1 sm=1 tr=0 ts=68ae35a9 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=VnNF1IyMAAAA:8 a=NoBh4wRB9a5phwg7ey4A:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-26_02,2025-08-26_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508230021 Received-SPF: pass client-ip=148.163.156.1; envelope-from=jrossi@linux.ibm.com; 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, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 8/18/25 5:43 PM, Zhuoying Cai wrote: > 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 > --- > docs/specs/s390x-secure-ipl.rst | 10 ++++++ > include/hw/s390x/ipl/diag320.h | 22 +++++++++++++ > target/s390x/diag.c | 56 ++++++++++++++++++++++++++++++++- > 3 files changed, 87 insertions(+), 1 deletion(-) > > diff --git a/docs/specs/s390x-secure-ipl.rst b/docs/specs/s390x-secure-ipl.rst > index 70e9a66fe0..ddc15f0322 100644 > --- a/docs/specs/s390x-secure-ipl.rst > +++ b/docs/specs/s390x-secure-ipl.rst > @@ -23,3 +23,13 @@ Subcode 0 - query installed subcodes > Returns a 256-bit installed subcodes mask (ISM) stored in the installed > subcodes block (ISB). This mask indicates which sucodes 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/include/hw/s390x/ipl/diag320.h b/include/hw/s390x/ipl/diag320.h > index aa04b699c6..6e4779c699 100644 > --- a/include/hw/s390x/ipl/diag320.h > +++ b/include/hw/s390x/ipl/diag320.h > @@ -11,10 +11,32 @@ > #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_MIN_LEN 128 > +#define VCE_HEADER_LEN 128 > +#define VCB_HEADER_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; Previous versions included a build bug message for the size of this structure, was it dropped by mistake? > > #endif > diff --git a/target/s390x/diag.c b/target/s390x/diag.c > index e67ee57f01..b42cf8fe98 100644 > --- a/target/s390x/diag.c > +++ b/target/s390x/diag.c > @@ -191,11 +191,47 @@ out: > } > } > > +static int handle_diag320_query_vcsi(S390CPU *cpu, uint64_t addr, uint64_t r1, > + uintptr_t ra, S390IPLCertificateStore *qcs) > +{ > + 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) < VCSSB_MIN_LEN) { > + return DIAG_320_RC_INVAL_VCSSB_LEN; > + } > + > + if (!qcs->count) { > + vcssb->length = cpu_to_be32(VCSSB_NO_VC); > + } else { > + vcssb->version = 0; > + vcssb->total_vc_ct = cpu_to_be16(qcs->count); > + vcssb->max_vc_ct = cpu_to_be16(MAX_CERTIFICATES); > + vcssb->max_single_vcb_len = cpu_to_be32(VCB_HEADER_LEN + VCE_HEADER_LEN + > + qcs->max_cert_size); > + vcssb->total_vcb_len = cpu_to_be32(VCB_HEADER_LEN + qcs->count * VCE_HEADER_LEN + > + qcs->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; > +} > + > void handle_diag_320(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) > { > S390CPU *cpu = env_archcpu(env); > + S390IPLCertificateStore *qcs = 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); > @@ -219,7 +255,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); > @@ -228,6 +265,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 (!diag_parm_addr_valid(addr, sizeof(VCStorageSizeBlock), true)) { > + s390_program_interrupt(env, PGM_ADDRESSING, ra); > + return; > + } > + > + if (addr & 0x7) { > + s390_program_interrupt(env, PGM_ADDRESSING, ra); > + return; > + } > + > + rc = handle_diag320_query_vcsi(cpu, addr, r1, ra, qcs); > + if (rc == -1) { > + return; > + } > + env->regs[r1 + 1] = rc; > + break; > default: > env->regs[r1 + 1] = DIAG_320_RC_NOT_SUPPORTED; > break; Regards, Jared rossi