KVM: s390: CPU model for gen17
cover KVM: s390: CPU model for gen17
Adding gen17 features to the CPU model for features that are (partially) handled or indicated by KVM. Those comprises of:
- Concurrent-function facility with subcodes
- More vector extensions
- Ineffective-nonconstrained-transaction facility
- Even more msa crypto extensions
Feedback and review is always welcome. Thanks a lot!
Hendrik Brueckner (4):
KVM: s390: add concurrent-function facility to cpu model
KVM: s390: add msa11 to cpu model
KVM: s390: add gen17 facilities to CPU model
KVM: s390: selftests: Add regression tests for PFCR subfunctions
arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/uapi/asm/kvm.h | 3 +- arch/s390/kvm/kvm-s390.c | 43 ++++++++++++++++++- arch/s390/kvm/vsie.c | 3 +- arch/s390/tools/gen_facilities.c | 2 + tools/arch/s390/include/uapi/asm/kvm.h | 3 +- .../kvm/s390x/cpumodel_subfuncs_test.c | 15 +++++++ 7 files changed, 65 insertions(+), 5 deletions(-)
Signature · 1 line
2.43.5
PATCH 1/4 KVM: s390: add concurrent-function facility to cpu model
Adding support for concurrent-functions facility which provides additional subfunctions.
--- arch/s390/include/uapi/asm/kvm.h | 3 ++- arch/s390/kvm/kvm-s390.c | 22 ++++++++++++++++++++++ arch/s390/tools/gen_facilities.c | 1 + 3 files changed, 25 insertions(+), 1 deletion(-)
arch/s390/include/uapi/asm/kvm.h +2 -1
@@ -469,7 +469,8 @@ struct kvm_s390_vm_cpu_subfunc {__u8 kdsa[16 ];/* with MSA9 */ __u8 sortl[32 ];/* with STFLE.150 */ __u8 dfltcc[32 ];/* with STFLE.151 */ -__u8 reserved[1728 ]; +__u8 pfcr[16 ];/* with STFLE.201 */ +__u8 reserved[1712 ]; };#define KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST 6
arch/s390/kvm/kvm-s390.c +22 -0
@@ -348,6 +348,16 @@ static inline int plo_test_bit(unsigned char nr)return cc ==0 ; } +static __always_inline void pfcr_query(u8 (*query)[16]) +{ + asmvolatile ( +" lghi 0,0\n" +" .insn rsy,0xeb0000000016,0,0,%[query]\n" + : [query]"=QS" (*query) + : + :"cc" ,"0" ); +} + static __always_inline void __sortl_query(u8 (*query)[32]) { asm volatile(
@@ -429,6 +439,9 @@ static void __init kvm_s390_cpu_feat_init(void)if (test_facility (151 ))/* DFLTCC */ __dfltcc_query (&kvm_s390_available_subfunc.dfltcc); +if (test_facility (201 ))/* PFCR */ +pfcr_query (&kvm_s390_available_subfunc.pfcr); +if (MACHINE_HAS_ESOP )allow_cpu_feat (KVM_S390_VM_CPU_FEAT_ESOP );/*
@@ -1543,6 +1556,9 @@ static int kvm_s390_set_processor_subfunc(struct kvm *kvm, ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[1 ], ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[2 ], ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[3]); +VM_EVENT (kvm,3 ,"GET: guest PFCR subfunc 0x%16.16lx.%16.16lx" , + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[0 ], + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[1 ]);return 0 ; }
@@ -1757,6 +1773,9 @@ static int kvm_s390_get_processor_subfunc(struct kvm *kvm, ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[1 ], ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[2 ], ((unsigned long *) &kvm->arch.model.subfuncs.dfltcc)[3]); +VM_EVENT (kvm,3 ,"GET: guest PFCR subfunc 0x%16.16lx.%16.16lx" , + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[0 ], + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[1 ]);return 0 ; }
@@ -1825,6 +1844,9 @@ static int kvm_s390_get_machine_subfunc(struct kvm *kvm, ((unsigned long *) &kvm_s390_available_subfunc.dfltcc)[1 ], ((unsigned long *) &kvm_s390_available_subfunc.dfltcc)[2 ], ((unsigned long *) &kvm_s390_available_subfunc.dfltcc)[3]); +VM_EVENT (kvm,3 ,"GET: host PFCR subfunc 0x%16.16lx.%16.16lx" , + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[0 ], + ((unsigned long *) &kvm_s390_available_subfunc.pfcr)[1 ]);return 0 ; }
arch/s390/tools/gen_facilities.c +1 -0
@@ -116,6 +116,7 @@ static struct facility_def facility_defs[] = {194 ,/* rdp enhancement facility */ 196 ,/* processor activity instrumentation facility */ 197 ,/* processor activity instrumentation extension 1 */ +201 ,/* concurrent-functions facility */ -1 /* END */ } },
Signature · 1 line
2.43.5
PATCH 2/4 KVM: s390: add msa11 to cpu model
In reply to Hendrik BruecknerMessage-security-assist 11 introduces pckmo subfunctions to encrypt hmac keys.
--- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/kvm/kvm-s390.c | 13 +++++++++++-- arch/s390/kvm/vsie.c | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-)
arch/s390/include/asm/kvm_host.h +1 -0
@@ -356,6 +356,7 @@ struct kvm_s390_sie_block {#define ECD_MEF 0x08000000#define ECD_ETOKENF 0x02000000#define ECD_ECC 0x00200000 +#define ECD_HMAC 0x00004000__u32 ecd;/* 0x01c8 */ __u8 reserved1cc[18 ];/* 0x01cc */ __u64 pp;/* 0x01de */
arch/s390/kvm/kvm-s390.c +11 -2
@@ -3791,6 +3791,13 @@ static bool kvm_has_pckmo_ecc(struct kvm *kvm) } +static bool kvm_has_pckmo_hmac (struct kvm *kvm) +{ +/* At least one HMAC subfunction must be present */ +return kvm_has_pckmo_subfunc (kvm,118 ) || +kvm_has_pckmo_subfunc (kvm,122 ); +} +static void kvm_s390_vcpu_crypto_setup (struct kvm_vcpu *vcpu) {/*
@@ -3803,7 +3810,7 @@ static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->crycbd = vcpu->kvm->arch.crypto.crycbd; vcpu->arch.sie_block->ecb3 &= ~(ECB3_AES |ECB3_DEA ); vcpu->arch.sie_block->eca &= ~ECA_APIE ; - vcpu->arch.sie_block->ecd &= ~ECD_ECC ; + vcpu->arch.sie_block->ecd &= ~(ECD_ECC |ECD_HMAC );if (vcpu->kvm->arch.crypto.apie) vcpu->arch.sie_block->eca |=ECA_APIE ;
@@ -3811,9 +3818,11 @@ static void kvm_s390_vcpu_crypto_setup(struct kvm_vcpu *vcpu)/* Set up protected key support */ if (vcpu->kvm->arch.crypto.aes_kw) { vcpu->arch.sie_block->ecb3 |=ECB3_AES ; -/* ecc is also wrapped with AES key */ +/* ecc/hmac is also wrapped with AES key */ if (kvm_has_pckmo_ecc (vcpu->kvm)) vcpu->arch.sie_block->ecd |=ECD_ECC ; +if (kvm_has_pckmo_hmac (vcpu->kvm)) + vcpu->arch.sie_block->ecd |=ECD_HMAC ; }if (vcpu->kvm->arch.crypto.dea_kw)
arch/s390/kvm/vsie.c +2 -1
@@ -335,7 +335,8 @@ static int shadow_crycb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)/* we may only allow it if enabled for guest 2 */ ecb3_flags = scb_o->ecb3 & vcpu->arch.sie_block->ecb3 & (ECB3_AES |ECB3_DEA ); - ecd_flags = scb_o->ecd & vcpu->arch.sie_block->ecd &ECD_ECC ; + ecd_flags = scb_o->ecd & vcpu->arch.sie_block->ecd & + (ECD_ECC |ECD_HMAC );if (!ecb3_flags && !ecd_flags) goto end;
Signature · 1 line
2.43.5
PATCH 3/4 KVM: s390: add gen17 facilities to CPU model
In reply to Hendrik BruecknerAdd gen17 facilities and let KVM_CAP_S390_VECTOR_REGISTERS handle the enablement of the vector extension facilities.
--- arch/s390/kvm/kvm-s390.c | 8 ++++++++ arch/s390/tools/gen_facilities.c | 1 + 2 files changed, 9 insertions(+)
arch/s390/kvm/kvm-s390.c +8 -0
@@ -812,6 +812,14 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)set_kvm_facility (kvm->arch.model.fac_mask,192 );set_kvm_facility (kvm->arch.model.fac_list,192 ); } +if (test_facility (198 )) { +set_kvm_facility (kvm->arch.model.fac_mask,198 ); +set_kvm_facility (kvm->arch.model.fac_list,198 ); + } +if (test_facility (199 )) { +set_kvm_facility (kvm->arch.model.fac_mask,199 ); +set_kvm_facility (kvm->arch.model.fac_list,199 ); + } r =0 ; }else r = -EINVAL ;
arch/s390/tools/gen_facilities.c +1 -0
@@ -112,6 +112,7 @@ static struct facility_def facility_defs[] = {15 ,/* AP Facilities Test */ 156 ,/* etoken facility */ 165 ,/* nnpa facility */ +170 ,/* ineffective-nonconstrained-transaction facility */ 193 ,/* bear enhancement facility */ 194 ,/* rdp enhancement facility */ 196, /* processor activity instrumentation facility */
Signature · 1 line
2.43.5
PATCH 4/4 KVM: s390: selftests: Add regression tests for PFCR subfunctions
In reply to Hendrik Brueckner--- tools/arch/s390/include/uapi/asm/kvm.h | 3 ++- .../selftests/kvm/s390x/cpumodel_subfuncs_test.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-)
tools/arch/s390/include/uapi/asm/kvm.h +2 -1
@@ -469,7 +469,8 @@ struct kvm_s390_vm_cpu_subfunc {__u8 kdsa[16 ];/* with MSA9 */ __u8 sortl[32 ];/* with STFLE.150 */ __u8 dfltcc[32 ];/* with STFLE.151 */ -__u8 reserved[1728 ]; +__u8 pfcr[16 ];/* with STFLE.201 */ +__u8 reserved[1712 ]; };#define KVM_S390_VM_CPU_PROCESSOR_UV_FEAT_GUEST 6
tools/testing/selftests/kvm/s390x/cpumodel_subfuncs_test.c +15 -0
@@ -214,6 +214,19 @@ static void test_dfltcc_asm_block(u8 (*query)[32]) : "cc", "0", "1"); } +/* +* Testing Perform Function with Concurrent Results (PFCR) +* CPU subfunctions's ASM block +*/ +static void test_pfcr_asm_block (u8 (*query)[16 ]) +{ + asmvolatile (" lghi 0,0\n" +" .insn rsy,0xeb0000000016,0,0,%[query]\n" + : [query]"=QS" (*query) + : + :"cc" ,"0" ); +} +typedef void (*testfunc_t )(u8 (*array)[]);struct testdef {
@@ -249,6 +262,8 @@ struct testdef { { "SORTL", cpu_subfunc.sortl, sizeof(cpu_subfunc.sortl), test_sortl_asm_block, 150 },/* DFLTCC - Facility bit 151 */ { "DFLTCC", cpu_subfunc.dfltcc, sizeof(cpu_subfunc.dfltcc), test_dfltcc_asm_block, 151 }, +/* Concurrent-function facility - Facility bit 201 */ + { "PFCR", cpu_subfunc.pfcr, sizeof(cpu_subfunc.pfcr), test_pfcr_asm_block, 201 }, };int main (int argc,char *argv[])
Signature · 1 line
2.43.5
Janosch Frank
maintainerRe: [PATCH 4/4] KVM: s390: selftests: Add regression tests for PFCR subfunctions
Quoted 2 lines · Hendrik Brueckner
Signed-off-by Hendrik Brueckner <[email protected]>Reviewed-by Hariharan Mari <[email protected]>
How about:
Check if a PFCR query in userspace coincides with the kernel reported function list. Right now we don't mask the functions in the kernel so they have to be the same.
I can add that to the patch when picking (which I'm trying to do right now).