| Message ID | 20250408155527.123341-15-zycai@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Secure IPL Support for SCSI Scheme of virtio-blk/virtio-scsi Devices | expand |
On 08/04/2025 17.55, Zhuoying Cai wrote: > Introduce Secure-IPL (SIPL) facility. > > Use the abbreviation CBL (Consolidated-Boot-Loader facility at bit 0 of > byte 136) to represent bytes 136 and 137 for IPL device facilities of the > SCLP Read Info block. > > Availability of SIPL facility is determined by byte 136 bit 1 of the > SCLP Read Info block. > > When SIPL facility is installed, the IPL Parameter Block length must > contains value that is multiple of 8 bytes. > > Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> > --- ... > diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc > index 65d38f546d..f874b9da6f 100644 > --- a/target/s390x/cpu_features_def.h.inc > +++ b/target/s390x/cpu_features_def.h.inc > @@ -140,6 +140,9 @@ DEF_FEAT(SIE_IBS, "ibs", SCLP_CONF_CHAR_EXT, 10, "SIE: Interlock-and-broadcast-s > DEF_FEAT(DIAG_318, "diag318", SCLP_FAC134, 0, "Control program name and version codes") > DEF_FEAT(DIAG_320, "diag320", SCLP_FAC134, 5, "Provide Certificate Store functions") > > +/* Features exposed via SCLP SCCB Facilities byte 136 - 137 (bit numbers relative to byte-136) */ > +DEF_FEAT(SIPL, "sipl", SCLP_CBL, 1, "Seucre-IPL facility") s/Seucre/Secure/ Thomas
On 4/8/25 11:55 AM, Zhuoying Cai wrote: > Introduce Secure-IPL (SIPL) facility. > > Use the abbreviation CBL (Consolidated-Boot-Loader facility at bit 0 of > byte 136) to represent bytes 136 and 137 for IPL device facilities of the > SCLP Read Info block. This should *not* be used to label these bytes! This facility is represented by a specific bit on the entire byte, and the other bits are used for multiple things unrelated to CBL. Just use the generic byte-naming scheme (e.g. fac136) for now until these bits are defined and a better name comes up. Further, you only need byte 136 for the secure IPL bit. Further, explain the significance for the dependency of ELS in the commit message: "Byte 136's facilities cannot be represented without the availability of the extended-length-SCCB, so add it as a check for consistency." > > Availability of SIPL facility is determined by byte 136 bit 1 of the > SCLP Read Info block. > > When SIPL facility is installed, the IPL Parameter Block length must > contains value that is multiple of 8 bytes. > > Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> > --- > hw/s390x/sclp.c | 2 ++ > include/hw/s390x/sclp.h | 4 +++- > target/s390x/cpu_features.c | 3 +++ > target/s390x/cpu_features.h | 1 + > target/s390x/cpu_features_def.h.inc | 3 +++ > target/s390x/cpu_models.c | 2 ++ > target/s390x/gen-features.c | 1 + > target/s390x/kvm/kvm.c | 3 +++ > 8 files changed, 18 insertions(+), 1 deletion(-) > > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index 5945c9b1d8..bab65955b7 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -145,6 +145,8 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) > if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB)) { > s390_get_feat_block(S390_FEAT_TYPE_SCLP_FAC134, > &read_info->fac134); > + s390_get_feat_block(S390_FEAT_TYPE_SCLP_CBL, > + read_info->cbl); > } > > read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO | > diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h > index d32f6180e0..97af95a78d 100644 > --- a/include/hw/s390x/sclp.h > +++ b/include/hw/s390x/sclp.h > @@ -136,7 +136,9 @@ typedef struct ReadInfo { > uint32_t hmfai; > uint8_t _reserved7[134 - 128]; /* 128-133 */ > uint8_t fac134; > - uint8_t _reserved8[144 - 135]; /* 135-143 */ > + uint8_t _reserved8; > + uint8_t cbl[2]; /* 136-137 */ > + uint8_t _reserved9[144 - 137]; /* 138-143 */ > struct CPUEntry entries[]; > /* > * When the Extended-Length SCCB (ELS) feature is enabled the > diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c > index 99089ab3f5..e9371569cc 100644 > --- a/target/s390x/cpu_features.c > +++ b/target/s390x/cpu_features.c > @@ -149,6 +149,9 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, > clear_be_bit(s390_feat_def(S390_FEAT_DIAG_318)->bit, data); > clear_be_bit(s390_feat_def(S390_FEAT_DIAG_320)->bit, data); > break; > + case S390_FEAT_TYPE_SCLP_CBL: > + clear_be_bit(s390_feat_def(S390_FEAT_SIPL)->bit, data); > + break; > default: > return; > } > diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h > index 5635839d03..823fcf8b90 100644 > --- a/target/s390x/cpu_features.h > +++ b/target/s390x/cpu_features.h > @@ -24,6 +24,7 @@ typedef enum { > S390_FEAT_TYPE_SCLP_CONF_CHAR, > S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, > S390_FEAT_TYPE_SCLP_FAC134, > + S390_FEAT_TYPE_SCLP_CBL, > S390_FEAT_TYPE_SCLP_CPU, > S390_FEAT_TYPE_MISC, > S390_FEAT_TYPE_PLO, > diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc > index 65d38f546d..f874b9da6f 100644 > --- a/target/s390x/cpu_features_def.h.inc > +++ b/target/s390x/cpu_features_def.h.inc > @@ -140,6 +140,9 @@ DEF_FEAT(SIE_IBS, "ibs", SCLP_CONF_CHAR_EXT, 10, "SIE: Interlock-and-broadcast-s > DEF_FEAT(DIAG_318, "diag318", SCLP_FAC134, 0, "Control program name and version codes") > DEF_FEAT(DIAG_320, "diag320", SCLP_FAC134, 5, "Provide Certificate Store functions") > > +/* Features exposed via SCLP SCCB Facilities byte 136 - 137 (bit numbers relative to byte-136) */ > +DEF_FEAT(SIPL, "sipl", SCLP_CBL, 1, "Seucre-IPL facility") > + > /* Features exposed via SCLP CPU info. */ > DEF_FEAT(SIE_F2, "sief2", SCLP_CPU, 4, "SIE: interception format 2 (Virtual SIE)") > DEF_FEAT(SIE_SKEY, "skey", SCLP_CPU, 5, "SIE: Storage-key facility") > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index 7d65c40bd1..a83c27dcb8 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -263,6 +263,7 @@ bool s390_has_feat(S390Feat feat) > case S390_FEAT_SIE_CMMA: > case S390_FEAT_SIE_PFMFI: > case S390_FEAT_SIE_IBS: > + case S390_FEAT_SIPL: > case S390_FEAT_CONFIGURATION_TOPOLOGY: > return false; > break; > @@ -507,6 +508,7 @@ static void check_consistency(const S390CPUModel *model) > { S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, S390_FEAT_AP }, > { S390_FEAT_DIAG_318, S390_FEAT_EXTENDED_LENGTH_SCCB }, > { S390_FEAT_DIAG_320, S390_FEAT_EXTENDED_LENGTH_SCCB }, > + { S390_FEAT_SIPL, S390_FEAT_EXTENDED_LENGTH_SCCB }, > { S390_FEAT_NNPA, S390_FEAT_VECTOR }, > { S390_FEAT_RDP, S390_FEAT_LOCAL_TLB_CLEARING }, > { S390_FEAT_UV_FEAT_AP, S390_FEAT_AP }, > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index 52c649adcd..d973efbf72 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -697,6 +697,7 @@ static uint16_t full_GEN14_GA1[] = { > S390_FEAT_SIE_KSS, > S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, > S390_FEAT_DIAG_320, > + S390_FEAT_SIPL, > }; > > #define full_GEN14_GA2 EmptyFeat > diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c > index a5c5150c04..f418102b7f 100644 > --- a/target/s390x/kvm/kvm.c > +++ b/target/s390x/kvm/kvm.c > @@ -2517,6 +2517,9 @@ bool kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) > > set_bit(S390_FEAT_DIAG_320, model->features); > > + /* Secure-IPL facility is handled entirely within QEMU */ > + set_bit(S390_FEAT_SIPL, model->features); > + > /* Test for Ultravisor features that influence secure guest behavior */ > query_uv_feat_guest(model->features); >
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 5945c9b1d8..bab65955b7 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -145,6 +145,8 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) if (s390_has_feat(S390_FEAT_EXTENDED_LENGTH_SCCB)) { s390_get_feat_block(S390_FEAT_TYPE_SCLP_FAC134, &read_info->fac134); + s390_get_feat_block(S390_FEAT_TYPE_SCLP_CBL, + read_info->cbl); } read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO | diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index d32f6180e0..97af95a78d 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -136,7 +136,9 @@ typedef struct ReadInfo { uint32_t hmfai; uint8_t _reserved7[134 - 128]; /* 128-133 */ uint8_t fac134; - uint8_t _reserved8[144 - 135]; /* 135-143 */ + uint8_t _reserved8; + uint8_t cbl[2]; /* 136-137 */ + uint8_t _reserved9[144 - 137]; /* 138-143 */ struct CPUEntry entries[]; /* * When the Extended-Length SCCB (ELS) feature is enabled the diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c index 99089ab3f5..e9371569cc 100644 --- a/target/s390x/cpu_features.c +++ b/target/s390x/cpu_features.c @@ -149,6 +149,9 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, clear_be_bit(s390_feat_def(S390_FEAT_DIAG_318)->bit, data); clear_be_bit(s390_feat_def(S390_FEAT_DIAG_320)->bit, data); break; + case S390_FEAT_TYPE_SCLP_CBL: + clear_be_bit(s390_feat_def(S390_FEAT_SIPL)->bit, data); + break; default: return; } diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h index 5635839d03..823fcf8b90 100644 --- a/target/s390x/cpu_features.h +++ b/target/s390x/cpu_features.h @@ -24,6 +24,7 @@ typedef enum { S390_FEAT_TYPE_SCLP_CONF_CHAR, S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT, S390_FEAT_TYPE_SCLP_FAC134, + S390_FEAT_TYPE_SCLP_CBL, S390_FEAT_TYPE_SCLP_CPU, S390_FEAT_TYPE_MISC, S390_FEAT_TYPE_PLO, diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_features_def.h.inc index 65d38f546d..f874b9da6f 100644 --- a/target/s390x/cpu_features_def.h.inc +++ b/target/s390x/cpu_features_def.h.inc @@ -140,6 +140,9 @@ DEF_FEAT(SIE_IBS, "ibs", SCLP_CONF_CHAR_EXT, 10, "SIE: Interlock-and-broadcast-s DEF_FEAT(DIAG_318, "diag318", SCLP_FAC134, 0, "Control program name and version codes") DEF_FEAT(DIAG_320, "diag320", SCLP_FAC134, 5, "Provide Certificate Store functions") +/* Features exposed via SCLP SCCB Facilities byte 136 - 137 (bit numbers relative to byte-136) */ +DEF_FEAT(SIPL, "sipl", SCLP_CBL, 1, "Seucre-IPL facility") + /* Features exposed via SCLP CPU info. */ DEF_FEAT(SIE_F2, "sief2", SCLP_CPU, 4, "SIE: interception format 2 (Virtual SIE)") DEF_FEAT(SIE_SKEY, "skey", SCLP_CPU, 5, "SIE: Storage-key facility") diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 7d65c40bd1..a83c27dcb8 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -263,6 +263,7 @@ bool s390_has_feat(S390Feat feat) case S390_FEAT_SIE_CMMA: case S390_FEAT_SIE_PFMFI: case S390_FEAT_SIE_IBS: + case S390_FEAT_SIPL: case S390_FEAT_CONFIGURATION_TOPOLOGY: return false; break; @@ -507,6 +508,7 @@ static void check_consistency(const S390CPUModel *model) { S390_FEAT_AP_QUEUE_INTERRUPT_CONTROL, S390_FEAT_AP }, { S390_FEAT_DIAG_318, S390_FEAT_EXTENDED_LENGTH_SCCB }, { S390_FEAT_DIAG_320, S390_FEAT_EXTENDED_LENGTH_SCCB }, + { S390_FEAT_SIPL, S390_FEAT_EXTENDED_LENGTH_SCCB }, { S390_FEAT_NNPA, S390_FEAT_VECTOR }, { S390_FEAT_RDP, S390_FEAT_LOCAL_TLB_CLEARING }, { S390_FEAT_UV_FEAT_AP, S390_FEAT_AP }, diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 52c649adcd..d973efbf72 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -697,6 +697,7 @@ static uint16_t full_GEN14_GA1[] = { S390_FEAT_SIE_KSS, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF, S390_FEAT_DIAG_320, + S390_FEAT_SIPL, }; #define full_GEN14_GA2 EmptyFeat diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index a5c5150c04..f418102b7f 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -2517,6 +2517,9 @@ bool kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) set_bit(S390_FEAT_DIAG_320, model->features); + /* Secure-IPL facility is handled entirely within QEMU */ + set_bit(S390_FEAT_SIPL, model->features); + /* Test for Ultravisor features that influence secure guest behavior */ query_uv_feat_guest(model->features);
Introduce Secure-IPL (SIPL) facility. Use the abbreviation CBL (Consolidated-Boot-Loader facility at bit 0 of byte 136) to represent bytes 136 and 137 for IPL device facilities of the SCLP Read Info block. Availability of SIPL facility is determined by byte 136 bit 1 of the SCLP Read Info block. When SIPL facility is installed, the IPL Parameter Block length must contains value that is multiple of 8 bytes. Signed-off-by: Zhuoying Cai <zycai@linux.ibm.com> --- hw/s390x/sclp.c | 2 ++ include/hw/s390x/sclp.h | 4 +++- target/s390x/cpu_features.c | 3 +++ target/s390x/cpu_features.h | 1 + target/s390x/cpu_features_def.h.inc | 3 +++ target/s390x/cpu_models.c | 2 ++ target/s390x/gen-features.c | 1 + target/s390x/kvm/kvm.c | 3 +++ 8 files changed, 18 insertions(+), 1 deletion(-)