| Message ID | 20190417152842.71730-7-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: s390: new guest facilities | expand |
On 17.04.19 17:28, Christian Borntraeger wrote: > This enables stfle.150 and adds the subfunctions for SORTL. Bit 150 is > added to the list of facilities that will be enabled when there is no > cpu model involved as sortl requires no additional handling from > userspace, e.g. for migration. > > Please note that a cpu model enabled user space can and will have the > final decision on the facility bits for a guests. > > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > Reviewed-by: Collin Walling <walling@linux.ibm.com> > --- > arch/s390/include/uapi/asm/kvm.h | 3 ++- > arch/s390/kvm/kvm-s390.c | 20 ++++++++++++++++++++ > arch/s390/tools/gen_facilities.c | 1 + > 3 files changed, 23 insertions(+), 1 deletion(-) > > diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h > index 09652eabe769..eba5bac08348 100644 > --- a/arch/s390/include/uapi/asm/kvm.h > +++ b/arch/s390/include/uapi/asm/kvm.h > @@ -153,7 +153,8 @@ struct kvm_s390_vm_cpu_subfunc { > __u8 ppno[16]; /* with MSA5 */ > __u8 kma[16]; /* with MSA8 */ > __u8 kdsa[16]; /* with MSA9 */ > - __u8 reserved[1792]; > + __u8 sortl[32]; /* with STFLE.150 */ > + __u8 reserved[1760]; > }; > > /* kvm attributes for crypto */ > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index f0404960a715..24b6960d01b4 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -334,6 +334,8 @@ static inline void __insn32_query(unsigned int opcode, u8 query[32]) > : "cc"); > } > > +#define INSN_SORTL 0xb938 > + > static void kvm_s390_cpu_feat_init(void) > { > int i; > @@ -385,6 +387,9 @@ static void kvm_s390_cpu_feat_init(void) > __cpacf_query(CPACF_KDSA, (cpacf_mask_t *) > kvm_s390_available_subfunc.kdsa); > > + if (test_facility(150)) /* SORTL */ > + __insn32_query(INSN_SORTL, kvm_s390_available_subfunc.sortl); > + > if (MACHINE_HAS_ESOP) > allow_cpu_feat(KVM_S390_VM_CPU_FEAT_ESOP); > /* > @@ -1351,6 +1356,11 @@ static int kvm_s390_set_processor_subfunc(struct kvm *kvm, > VM_EVENT(kvm, 3, "SET: guest KDSA subfunc 0x%16.16lx.%16.16lx", > ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[0], > ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[1]); > + VM_EVENT(kvm, 3, "SET: guest SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[0], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[1], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[2], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[3]); > > return 0; > } > @@ -1522,6 +1532,11 @@ static int kvm_s390_get_processor_subfunc(struct kvm *kvm, > VM_EVENT(kvm, 3, "GET: guest KDSA subfunc 0x%16.16lx.%16.16lx", > ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[0], > ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[1]); > + VM_EVENT(kvm, 3, "GET: guest SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[0], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[1], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[2], > + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[3]); > > return 0; > } > @@ -1580,6 +1595,11 @@ static int kvm_s390_get_machine_subfunc(struct kvm *kvm, > VM_EVENT(kvm, 3, "GET: host KDSA subfunc 0x%16.16lx.%16.16lx", > ((unsigned long *) &kvm_s390_available_subfunc.kdsa)[0], > ((unsigned long *) &kvm_s390_available_subfunc.kdsa)[1]); > + VM_EVENT(kvm, 3, "GET: host SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", > + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[0], > + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[1], > + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[2], > + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[3]); > > return 0; > } > diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c > index e952cb3b75b2..1ec6bed785e8 100644 > --- a/arch/s390/tools/gen_facilities.c > +++ b/arch/s390/tools/gen_facilities.c > @@ -93,6 +93,7 @@ static struct facility_def facility_defs[] = { > 131, /* enhanced-SOP 2 and side-effect */ > 139, /* multiple epoch facility */ > 146, /* msa extension 8 */ > + 150, /* enhanced sort */ > 155, /* msa extension 9 */ > -1 /* END */ > } > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h index 09652eabe769..eba5bac08348 100644 --- a/arch/s390/include/uapi/asm/kvm.h +++ b/arch/s390/include/uapi/asm/kvm.h @@ -153,7 +153,8 @@ struct kvm_s390_vm_cpu_subfunc { __u8 ppno[16]; /* with MSA5 */ __u8 kma[16]; /* with MSA8 */ __u8 kdsa[16]; /* with MSA9 */ - __u8 reserved[1792]; + __u8 sortl[32]; /* with STFLE.150 */ + __u8 reserved[1760]; }; /* kvm attributes for crypto */ diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index f0404960a715..24b6960d01b4 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -334,6 +334,8 @@ static inline void __insn32_query(unsigned int opcode, u8 query[32]) : "cc"); } +#define INSN_SORTL 0xb938 + static void kvm_s390_cpu_feat_init(void) { int i; @@ -385,6 +387,9 @@ static void kvm_s390_cpu_feat_init(void) __cpacf_query(CPACF_KDSA, (cpacf_mask_t *) kvm_s390_available_subfunc.kdsa); + if (test_facility(150)) /* SORTL */ + __insn32_query(INSN_SORTL, kvm_s390_available_subfunc.sortl); + if (MACHINE_HAS_ESOP) allow_cpu_feat(KVM_S390_VM_CPU_FEAT_ESOP); /* @@ -1351,6 +1356,11 @@ static int kvm_s390_set_processor_subfunc(struct kvm *kvm, VM_EVENT(kvm, 3, "SET: guest KDSA subfunc 0x%16.16lx.%16.16lx", ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[0], ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[1]); + VM_EVENT(kvm, 3, "SET: guest SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[0], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[1], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[2], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[3]); return 0; } @@ -1522,6 +1532,11 @@ static int kvm_s390_get_processor_subfunc(struct kvm *kvm, VM_EVENT(kvm, 3, "GET: guest KDSA subfunc 0x%16.16lx.%16.16lx", ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[0], ((unsigned long *) &kvm->arch.model.subfuncs.kdsa)[1]); + VM_EVENT(kvm, 3, "GET: guest SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[0], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[1], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[2], + ((unsigned long *) &kvm->arch.model.subfuncs.sortl)[3]); return 0; } @@ -1580,6 +1595,11 @@ static int kvm_s390_get_machine_subfunc(struct kvm *kvm, VM_EVENT(kvm, 3, "GET: host KDSA subfunc 0x%16.16lx.%16.16lx", ((unsigned long *) &kvm_s390_available_subfunc.kdsa)[0], ((unsigned long *) &kvm_s390_available_subfunc.kdsa)[1]); + VM_EVENT(kvm, 3, "GET: host SORTL subfunc 0x%16.16lx.%16.16lx.%16.16lx.%16.16lx", + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[0], + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[1], + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[2], + ((unsigned long *) &kvm_s390_available_subfunc.sortl)[3]); return 0; } diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c index e952cb3b75b2..1ec6bed785e8 100644 --- a/arch/s390/tools/gen_facilities.c +++ b/arch/s390/tools/gen_facilities.c @@ -93,6 +93,7 @@ static struct facility_def facility_defs[] = { 131, /* enhanced-SOP 2 and side-effect */ 139, /* multiple epoch facility */ 146, /* msa extension 8 */ + 150, /* enhanced sort */ 155, /* msa extension 9 */ -1 /* END */ }