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

Commit 684135e0 authored by Thomas Huth's avatar Thomas Huth Committed by Christian Borntraeger
Browse files

KVM: s390: Avoid endless loops of specification exceptions 



If the new PSW for program interrupts is invalid, the VM ends up
in an endless loop of specification exceptions. Since there is not
much left we can do in this case, we should better drop to userspace
instead so that the crash can be reported to the user.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a3fb577e

arch/s390/kvm/intercept.c

+9 −1
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static int handle_itdb(struct kvm_vcpu *vcpu) 
static int handle_prog(struct kvm_vcpu *vcpu)

{

	struct kvm_s390_pgm_info pgm_info;

	psw_t psw;

	int rc;



	vcpu->stat.exit_program_interruption++;
@@ -207,7 +208,14 @@ static int handle_prog(struct kvm_vcpu *vcpu) 
	}



	trace_kvm_s390_intercept_prog(vcpu, vcpu->arch.sie_block->iprcc);



	if (vcpu->arch.sie_block->iprcc == PGM_SPECIFICATION) {

		rc = read_guest_lc(vcpu, __LC_PGM_NEW_PSW, &psw, sizeof(psw_t));

		if (rc)

			return rc;

		/* Avoid endless loops of specification exceptions */

		if (!is_valid_psw(&psw))

			return -EOPNOTSUPP;

	}

	rc = handle_itdb(vcpu);

	if (rc)

		return rc;