leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: VMX: Emulated real mode interrupt injection

Browse Source 
Replace the inject-as-software-interrupt hack we currently have with
emulated injection.

Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Mohammed Gamal 2010-09-19 14:34:07 +02:00 committed by Avi Kivity
parent 63995653ad
commit a92601bb70
1 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
arch/x86/kvm/vmx.c
View File

@ -155,11 +155,6 @@ struct vcpu_vmx {
u32 limit; u32 limit;
u32 ar; u32 ar;
} tr, es, ds, fs, gs; } tr, es, ds, fs, gs;
struct {
bool pending;
u8 vector;
unsigned rip;
} irq;
} rmode; } rmode;
int vpid; int vpid;
bool emulation_required; bool emulation_required;
@ -1028,16 +1023,8 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
} }
if (vmx->rmode.vm86_active) { if (vmx->rmode.vm86_active) {
vmx->rmode.irq.pending = true; if (kvm_inject_realmode_interrupt(vcpu, nr) != EMULATE_DONE)
vmx->rmode.irq.vector = nr; kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
vmx->rmode.irq.rip = kvm_rip_read(vcpu);
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);
kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1);
return; return;
} }
@ -2816,16 +2803,8 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu)
++vcpu->stat.irq_injections; ++vcpu->stat.irq_injections;
if (vmx->rmode.vm86_active) { if (vmx->rmode.vm86_active) {
vmx->rmode.irq.pending = true; if (kvm_inject_realmode_interrupt(vcpu, irq) != EMULATE_DONE)
vmx->rmode.irq.vector = irq; kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
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);
kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1);
return; return;
} }
intr = irq | INTR_INFO_VALID_MASK; intr = irq | INTR_INFO_VALID_MASK;
@ -2857,14 +2836,8 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu)
++vcpu->stat.nmi_injections; ++vcpu->stat.nmi_injections;
if (vmx->rmode.vm86_active) { if (vmx->rmode.vm86_active) {
vmx->rmode.irq.pending = true; if (kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR) != EMULATE_DONE)
vmx->rmode.irq.vector = NMI_VECTOR; kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
vmx->rmode.irq.rip = kvm_rip_read(vcpu);
vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
NMI_VECTOR | INTR_TYPE_SOFT_INTR |
INTR_INFO_VALID_MASK);
vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, 1);
kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1);
return; return;
} }
vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
@ -3826,29 +3799,6 @@ static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
ktime_to_ns(ktime_sub(ktime_get(), vmx->entry_time)); ktime_to_ns(ktime_sub(ktime_get(), vmx->entry_time));
} }
/*
* Failure to inject an interrupt should give us the information
* in IDT_VECTORING_INFO_FIELD. However, if the failure occurs
* when fetching the interrupt redirection bitmap in the real-mode
* tss, this doesn't happen. So we do it ourselves.
*/
static void fixup_rmode_irq(struct vcpu_vmx *vmx, u32 *idt_vectoring_info)
{
vmx->rmode.irq.pending = 0;
if (kvm_rip_read(&vmx->vcpu) + 1 != vmx->rmode.irq.rip)
return;
kvm_rip_write(&vmx->vcpu, vmx->rmode.irq.rip);
if (*idt_vectoring_info & VECTORING_INFO_VALID_MASK) {
*idt_vectoring_info &= ~VECTORING_INFO_TYPE_MASK;
*idt_vectoring_info |= INTR_TYPE_EXT_INTR;
return;
}
*idt_vectoring_info =
VECTORING_INFO_VALID_MASK
| INTR_TYPE_EXT_INTR
| vmx->rmode.irq.vector;
}
static void __vmx_complete_interrupts(struct vcpu_vmx *vmx, static void __vmx_complete_interrupts(struct vcpu_vmx *vmx,
u32 idt_vectoring_info, u32 idt_vectoring_info,
int instr_len_field, int instr_len_field,
@ -3858,9 +3808,6 @@ static void __vmx_complete_interrupts(struct vcpu_vmx *vmx,
int type; int type;
bool idtv_info_valid; bool idtv_info_valid;
if (vmx->rmode.irq.pending)
fixup_rmode_irq(vmx, &idt_vectoring_info);
idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK; idtv_info_valid = idt_vectoring_info & VECTORING_INFO_VALID_MASK;
vmx->vcpu.arch.nmi_injected = false; vmx->vcpu.arch.nmi_injected = false;