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

Commit ae0bb3e0 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: VMX: Properly handle software interrupt re-injection in real mode 



When reinjecting a software interrupt or exception, use the correct
instruction length provided by the hardware instead of a hardcoded 1.

Fixes problems running the suse 9.1 livecd boot loader.

Problem introduced by commit f0a3602c20 ("KVM: Move interrupt injection
logic to x86.c").

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 74fca6a4

arch/x86/kvm/vmx.c

+6 −2
Original line number Diff line number Diff line
@@ -801,8 +801,9 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr, 
		vmx->rmode.irq.pending = true;

		vmx->rmode.irq.vector = nr;

		vmx->rmode.irq.rip = kvm_rip_read(vcpu);

		if (nr == BP_VECTOR || nr == OF_VECTOR)

			vmx->rmode.irq.rip++;

		if (kvm_exception_is_soft(nr))

			vmx->rmode.irq.rip +=

				vmx->vcpu.arch.event_exit_inst_len;

		intr_info |= INTR_TYPE_SOFT_INTR;

		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, intr_info);

		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, 1);
@@ -2468,6 +2469,9 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu) 
		vmx->rmode.irq.pending = true;

		vmx->rmode.irq.vector = irq;

		vmx->rmode.irq.rip = kvm_rip_read(vcpu);

		if (vcpu->arch.interrupt.soft)

			vmx->rmode.irq.rip +=

				vmx->vcpu.arch.event_exit_inst_len;

		vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,

			     irq | INTR_TYPE_SOFT_INTR | INTR_INFO_VALID_MASK);

		vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, 1);