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

Commit cd1836f5 authored by Janosch Frank's avatar Janosch Frank Committed by Christian Borntraeger
Browse files

KVM: s390: instruction-execution-protection support 



The new Instruction Execution Protection needs to be enabled before
the guest can use it. Therefore we pass the IEP facility bit to the
guest and enable IEP interpretation.

Signed-off-by: default avatarJanosch Frank <frankja@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a679c547

arch/s390/kvm/kvm-s390.c

+2 −0
Original line number Diff line number Diff line
@@ -1938,6 +1938,8 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 


	if (test_kvm_facility(vcpu->kvm, 8) && sclp.has_pfmfi)

		vcpu->arch.sie_block->ecb2 |= 0x08;

	if (test_kvm_facility(vcpu->kvm, 130))

		vcpu->arch.sie_block->ecb2 |= 0x20;

	vcpu->arch.sie_block->eca = 0x1002000U;

	if (sclp.has_cei)

		vcpu->arch.sie_block->eca |= 0x80000000U;

arch/s390/kvm/vsie.c

+3 −0
Original line number Diff line number Diff line
@@ -324,6 +324,9 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) 
	/* Run-time-Instrumentation */

	if (test_kvm_facility(vcpu->kvm, 64))

		scb_s->ecb3 |= scb_o->ecb3 & 0x01U;

	/* Instruction Execution Prevention */

	if (test_kvm_facility(vcpu->kvm, 130))

		scb_s->ecb2 |= scb_o->ecb2 & 0x20U;

	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))

arch/s390/tools/gen_facilities.c

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static struct facility_def facility_defs[] = { 
			76, /* msa extension 3 */

			77, /* msa extension 4 */

			78, /* enhanced-DAT 2 */

			130, /* instruction-execution-protection */

			131, /* enhanced-SOP 2 and side-effect */

			-1  /* END */

		}