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

Commit 2f32d4ea authored by Cornelia Huck's avatar Cornelia Huck Committed by Christian Borntraeger
Browse files

KVM: s390: reinject io interrupt on tpi failure 



The tpi instruction should be suppressed on addressing and protection
exceptions, so we need to re-inject the dequeued io interrupt in that
case.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 4799b557

arch/s390/kvm/interrupt.c

+6 −0
Original line number Diff line number Diff line
@@ -846,6 +846,12 @@ int kvm_s390_inject_vm(struct kvm *kvm, 
	return __inject_vm(kvm, inti);

}



void kvm_s390_reinject_io_int(struct kvm *kvm,

			      struct kvm_s390_interrupt_info *inti)

{

	__inject_vm(kvm, inti);

}



int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,

			 struct kvm_s390_interrupt *s390int)

{

arch/s390/kvm/kvm-s390.h

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ int __must_check kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, 
int __must_check kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);

struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm,

						    u64 cr6, u64 schid);

void kvm_s390_reinject_io_int(struct kvm *kvm,

			      struct kvm_s390_interrupt_info *inti);

int kvm_s390_mask_adapter(struct kvm *kvm, unsigned int id, bool masked);



/* implemented in priv.c */

arch/s390/kvm/priv.c

+9 −1
Original line number Diff line number Diff line
@@ -259,7 +259,15 @@ static int handle_tpi(struct kvm_vcpu *vcpu) 
		if (write_guest_lc(vcpu, __LC_SUBCHANNEL_ID, &tpi_data, len))

			rc = -EFAULT;

	}

	/*

	 * If we encounter a problem storing the interruption code, the

	 * instruction is suppressed from the guest's view: reinject the

	 * interrupt.

	 */

	if (!rc)

		kfree(inti);

	else

		kvm_s390_reinject_io_int(vcpu->kvm, inti);

no_interrupt:

	/* Set condition code and we're done. */

	if (!rc)