Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5630a8e8 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: support intervention-bypass 



We can easily enable intervention bypass for guest 2, so it can use it
for guest 3.

Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a1b7b9b2

arch/s390/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ struct kvm_s390_vm_cpu_machine { 
#define KVM_S390_VM_CPU_FEAT_SIIF	3

#define KVM_S390_VM_CPU_FEAT_GPERE	4

#define KVM_S390_VM_CPU_FEAT_GSLS	5

#define KVM_S390_VM_CPU_FEAT_IB		6

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ static void kvm_s390_cpu_feat_init(void) 
		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_GPERE);

	if (sclp.has_gsls)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_GSLS);

	if (sclp.has_ib)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_IB);

}



int kvm_arch_init(void *opaque)

arch/s390/kvm/vsie.c

+2 −0
Original line number Diff line number Diff line
@@ -322,6 +322,8 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
		scb_s->ecb3 |= scb_o->ecb3 & 0x01U;

	if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_SIIF))

		scb_s->eca |= scb_o->eca & 0x00000001U;

	if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_IB))

		scb_s->eca |= scb_o->eca & 0x40000000U;



	prepare_ibc(vcpu, vsie_page);

	rc = shadow_crycb(vcpu, vsie_page);