Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / x86 / kvm / vmx.c

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3237f6c..8da0e45 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5,7 +5,7 @@
  * machines without emulation or binary translation.
  *
  * Copyright (C) 2006 Qumranet, Inc.
- * Copyright 2010 Red Hat, Inc. and/or its affilates.
+ * Copyright 2010 Red Hat, Inc. and/or its affiliates.
  *
  * Authors:
  *   Avi Kivity   <avi@qumranet.com>
@@ -155,11 +155,6 @@ struct vcpu_vmx {
                        u32 limit;
                        u32 ar;
                } tr, es, ds, fs, gs;
-               struct {
-                       bool pending;
-                       u8 vector;
-                       unsigned rip;
-               } irq;
        } rmode;
        int vpid;
        bool emulation_required;
@@ -182,7 +177,6 @@ static int init_rmode(struct kvm *kvm);
 static u64 construct_eptp(unsigned long root_hpa);
 static void kvm_cpu_vmxon(u64 addr);
 static void kvm_cpu_vmxoff(void);
-static void fixup_rmode_irq(struct vcpu_vmx *vmx, u32 *idt_vectoring_info);
 
 static DEFINE_PER_CPU(struct vmcs *, vmxarea);
 static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
@@ -1029,16 +1023,8 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
        }
 
        if (vmx->rmode.vm86_active) {
-               vmx->rmode.irq.pending = true;
-               vmx->rmode.irq.vector = nr;
-               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);
+               if (kvm_inject_realmode_interrupt(vcpu, nr) != EMULATE_DONE)
+                       kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                return;
        }
 
@@ -2817,16 +2803,8 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu)
 
        ++vcpu->stat.irq_injections;
        if (vmx->rmode.vm86_active) {
-               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);
-               kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1);
+               if (kvm_inject_realmode_interrupt(vcpu, irq) != EMULATE_DONE)
+                       kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                return;
        }
        intr = irq | INTR_INFO_VALID_MASK;
@@ -2858,14 +2836,8 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu)
 
        ++vcpu->stat.nmi_injections;
        if (vmx->rmode.vm86_active) {
-               vmx->rmode.irq.pending = true;
-               vmx->rmode.irq.vector = NMI_VECTOR;
-               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);
+               if (kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR) != EMULATE_DONE)
+                       kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                return;
        }
        vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
@@ -3610,8 +3582,17 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
        struct vcpu_vmx *vmx = to_vmx(vcpu);
        enum emulation_result err = EMULATE_DONE;
        int ret = 1;
+       u32 cpu_exec_ctrl;
+       bool intr_window_requested;
+
+       cpu_exec_ctrl = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);
+       intr_window_requested = cpu_exec_ctrl & CPU_BASED_VIRTUAL_INTR_PENDING;
 
        while (!guest_state_valid(vcpu)) {
+               if (intr_window_requested
+                   && (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
+                       return handle_interrupt_window(&vmx->vcpu);
+
                err = emulate_instruction(vcpu, 0, 0, 0);
 
                if (err == EMULATE_DO_MMIO) {
@@ -3836,9 +3817,6 @@ static void __vmx_complete_interrupts(struct vcpu_vmx *vmx,
        int type;
        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;
 
        vmx->vcpu.arch.nmi_injected = false;
@@ -3895,27 +3873,14 @@ static void vmx_complete_interrupts(struct vcpu_vmx *vmx)
                                  IDT_VECTORING_ERROR_CODE);
 }
 
-/*
- * 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)
+static void vmx_cancel_injection(struct kvm_vcpu *vcpu)
 {
-       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;
+       __vmx_complete_interrupts(to_vmx(vcpu),
+                                 vmcs_read32(VM_ENTRY_INTR_INFO_FIELD),
+                                 VM_ENTRY_INSTRUCTION_LEN,
+                                 VM_ENTRY_EXCEPTION_ERROR_CODE);
+
+       vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);
 }
 
 #ifdef CONFIG_X86_64
@@ -4042,7 +4007,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
 #endif
                [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
              : "cc", "memory"
-               , R"bx", R"di", R"si"
+               , R"ax", R"bx", R"di", R"si"
 #ifdef CONFIG_X86_64
                , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
 #endif
@@ -4348,6 +4313,7 @@ static struct kvm_x86_ops vmx_x86_ops = {
        .set_irq = vmx_inject_irq,
        .set_nmi = vmx_inject_nmi,
        .queue_exception = vmx_queue_exception,
+       .cancel_injection = vmx_cancel_injection,
        .interrupt_allowed = vmx_interrupt_allowed,
        .nmi_allowed = vmx_nmi_allowed,
        .get_nmi_mask = vmx_get_nmi_mask,