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

Commit 1f0d0f09 authored by Carsten Otte's avatar Carsten Otte Committed by Avi Kivity
Browse files

KVM: s390: Send program check on access error 



If the guest accesses non-existing memory, the sie64a function returns
-EFAULT. We must check the return value and send a program check to the
guest if the sie instruction faulted, otherwise the guest will loop at
the faulting code.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 0ff31867

arch/s390/kvm/kvm-s390.c

+4 −1
Original line number Diff line number Diff line
@@ -443,7 +443,10 @@ static void __vcpu_run(struct kvm_vcpu *vcpu) 
	local_irq_enable();

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

	sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs);

	if (sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs)) {

		VCPU_EVENT(vcpu, 3, "%s", "fault in sie instruction");

		kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

	}

	VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",

		   vcpu->arch.sie_block->icptcode);

	local_irq_disable();