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

Commit 9497e1f2 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move triple fault request into RM int injection 



Request triple fault in kvm_inject_realmode_interrupt() instead of
returning EMULATE_FAIL and deferring to the caller.  All existing
callers request triple fault and it's highly unlikely Real Mode is
going to acquire new features.  While this consolidates a small amount
of code, the real goal is to remove the last reference to EMULATE_FAIL.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1051778f

arch/x86/kvm/vmx/vmx.c

+3 −6
Original line number Diff line number Diff line
@@ -1556,8 +1556,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu) 
		int inc_eip = 0;

		if (kvm_exception_is_soft(nr))

			inc_eip = vcpu->arch.event_exit_inst_len;

		if (kvm_inject_realmode_interrupt(vcpu, nr, inc_eip) != EMULATE_DONE)

			kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);

		kvm_inject_realmode_interrupt(vcpu, nr, inc_eip);

		return;

	}
@@ -4306,8 +4305,7 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu) 
		int inc_eip = 0;

		if (vcpu->arch.interrupt.soft)

			inc_eip = vcpu->arch.event_exit_inst_len;

		if (kvm_inject_realmode_interrupt(vcpu, irq, inc_eip) != EMULATE_DONE)

			kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);

		kvm_inject_realmode_interrupt(vcpu, irq, inc_eip);

		return;

	}

	intr = irq | INTR_INFO_VALID_MASK;
@@ -4343,8 +4341,7 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu) 
	vmx->loaded_vmcs->nmi_known_unmasked = false;



	if (vmx->rmode.vm86_active) {

		if (kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR, 0) != EMULATE_DONE)

			kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);

		kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR, 0);

		return;

	}

arch/x86/kvm/x86.c

+8 −9
Original line number Diff line number Diff line
@@ -6273,7 +6273,7 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu) 
	vcpu->arch.emulate_regs_need_sync_from_vcpu = false;

}



int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip)

void kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip)

{

	struct x86_emulate_ctxt *ctxt = &vcpu->arch.emulate_ctxt;

	int ret;
@@ -6285,14 +6285,13 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip) 
	ctxt->_eip = ctxt->eip + inc_eip;

	ret = emulate_int_real(ctxt, irq);



	if (ret != X86EMUL_CONTINUE)

		return EMULATE_FAIL;



	if (ret != X86EMUL_CONTINUE) {

		kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);

	} else {

		ctxt->eip = ctxt->_eip;

		kvm_rip_write(vcpu, ctxt->eip);

		kvm_set_rflags(vcpu, ctxt->eflags);



	return EMULATE_DONE;

	}

}

EXPORT_SYMBOL_GPL(kvm_inject_realmode_interrupt);

arch/x86/kvm/x86.h

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static inline bool kvm_check_has_quirk(struct kvm *kvm, u64 quirk) 
}



void kvm_set_pending_timer(struct kvm_vcpu *vcpu);

int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip);

void kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip);



void kvm_write_tsc(struct kvm_vcpu *vcpu, struct msr_data *msr);

u64 get_kvmclock_ns(struct kvm *kvm);