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

Commit 77d18f6d authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: vsie: support guest-PER-enhancement 



We can easily forward the guest-PER-enhancement facility to guest 2 if
available.

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 0615a326

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

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct kvm_s390_vm_cpu_machine { 
#define KVM_S390_VM_CPU_FEAT_SIEF2	1

#define KVM_S390_VM_CPU_FEAT_64BSCAO	2

#define KVM_S390_VM_CPU_FEAT_SIIF	3

#define KVM_S390_VM_CPU_FEAT_GPERE	4

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
@@ -269,6 +269,8 @@ static void kvm_s390_cpu_feat_init(void) 
		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_64BSCAO);

	if (sclp.has_siif)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_SIIF);

	if (sclp.has_gpere)

		allow_cpu_feat(KVM_S390_VM_CPU_FEAT_GPERE);

}



int kvm_arch_init(void *opaque)

arch/s390/kvm/vsie.c

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ static int prepare_cpuflags(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
			return set_validity_icpt(scb_s, 0x0001U);

		newflags |= CPUSTAT_GED2;

	}

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

		newflags |= cpuflags & CPUSTAT_P;



	atomic_set(&scb_s->cpuflags, newflags);

	return 0;