KVM: s390: add gen17 facilities to CPU model

Add gen17 facilities and let KVM_CAP_S390_VECTOR_REGISTERS handle
the enablement of the vector extension facilities.

Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Link: https://lore.kernel.org/r/20241107152319.77816-4-brueckner@linux.ibm.com
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Message-ID: <20241107152319.77816-4-brueckner@linux.ibm.com>

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 20b1317..0676c41 100644 (file)
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -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;

diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
index 1d0efd3..855f818 100644 (file)
--- a/arch/s390/tools/gen_facilities.c
+++ b/arch/s390/tools/gen_facilities.c
@@ -109,6 +109,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 */