KVM: s390: vsie: support IBS interpretation

We can easily enable ibs for guest 2, so he can use it for guest 3.

Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

3 files changed, 5 insertions, 0 deletions

diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h
index 7630dd70ed57..c128567d1cd3 100644
--- a/arch/s390/include/uapi/asm/kvm.h
+++ b/arch/s390/include/uapi/asm/kvm.h
@@ -105,6 +105,7 @@ struct kvm_s390_vm_cpu_machine {
 #define KVM_S390_VM_CPU_FEAT_GSLS       5
 #define KVM_S390_VM_CPU_FEAT_IB         6
 #define KVM_S390_VM_CPU_FEAT_CEI        7
+#define KVM_S390_VM_CPU_FEAT_IBS        8
 struct kvm_s390_vm_cpu_feat {
         __u64 feat[16];
 };
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 1c1188ba1042..8ba7a98a50cf 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -277,6 +277,8 @@ static void kvm_s390_cpu_feat_init(void)
                 allow_cpu_feat(KVM_S390_VM_CPU_FEAT_IB);
         if (sclp.has_cei)
                 allow_cpu_feat(KVM_S390_VM_CPU_FEAT_CEI);
+        if (sclp.has_ibs)
+                allow_cpu_feat(KVM_S390_VM_CPU_FEAT_IBS);
 }
 
 int kvm_arch_init(void *opaque)
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index f3a4a0bad4a7..3ececbbd6bb0 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -111,6 +111,8 @@ static int prepare_cpuflags(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
                 newflags |= cpuflags & CPUSTAT_P;
         if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_GSLS))
                 newflags |= cpuflags & CPUSTAT_SM;
+        if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_IBS))
+                newflags |= cpuflags & CPUSTAT_IBS;
 
         atomic_set(&scb_s->cpuflags, newflags);
         return 0;