5 files changed, 33 insertions, 11 deletions

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 74b5b3e518df..949c977bc4c9 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -574,7 +574,7 @@ struct kvm_vcpu_arch {
         } exception;
 
         struct kvm_queued_interrupt {
-                bool pending;
+                bool injected;
                 bool soft;
                 u8 nr;
         } interrupt;
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c
index f171051eecf3..faa264822cee 100644
--- a/arch/x86/kvm/irq.c
+++ b/arch/x86/kvm/irq.c
@@ -73,8 +73,19 @@ static int kvm_cpu_has_extint(struct kvm_vcpu *v)
  */
 int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v)
 {
+        /*
+         * FIXME: interrupt.injected represents an interrupt that it's
+         * side-effects have already been applied (e.g. bit from IRR
+         * already moved to ISR). Therefore, it is incorrect to rely
+         * on interrupt.injected to know if there is a pending
+         * interrupt in the user-mode LAPIC.
+         * This leads to nVMX/nSVM not be able to distinguish
+         * if it should exit from L2 to L1 on EXTERNAL_INTERRUPT on
+         * pending interrupt or should re-inject an injected
+         * interrupt.
+         */
         if (!lapic_in_kernel(v))
-                return v->arch.interrupt.pending;
+                return v->arch.interrupt.injected;
 
         if (kvm_cpu_has_extint(v))
                 return 1;
@@ -91,8 +102,19 @@ int kvm_cpu_has_injectable_intr(struct kvm_vcpu *v)
  */
 int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
 {
+        /*
+         * FIXME: interrupt.injected represents an interrupt that it's
+         * side-effects have already been applied (e.g. bit from IRR
+         * already moved to ISR). Therefore, it is incorrect to rely
+         * on interrupt.injected to know if there is a pending
+         * interrupt in the user-mode LAPIC.
+         * This leads to nVMX/nSVM not be able to distinguish
+         * if it should exit from L2 to L1 on EXTERNAL_INTERRUPT on
+         * pending interrupt or should re-inject an injected
+         * interrupt.
+         */
         if (!lapic_in_kernel(v))
-                return v->arch.interrupt.pending;
+                return v->arch.interrupt.injected;
 
         if (kvm_cpu_has_extint(v))
                 return 1;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a0492cdd4891..7d2537ab262b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -11629,7 +11629,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu,
         } else if (vcpu->arch.nmi_injected) {
                 vmcs12->idt_vectoring_info_field =
                         INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR;
-        } else if (vcpu->arch.interrupt.pending) {
+        } else if (vcpu->arch.interrupt.injected) {
                 nr = vcpu->arch.interrupt.nr;
                 idt_vectoring = nr | VECTORING_INFO_VALID_MASK;
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index dfa135bb0e5a..d15dc8cd6b9d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3312,7 +3312,7 @@ static void kvm_vcpu_ioctl_x86_get_vcpu_events(struct kvm_vcpu *vcpu,
         events->exception.error_code = vcpu->arch.exception.error_code;
 
         events->interrupt.injected =
-                vcpu->arch.interrupt.pending && !vcpu->arch.interrupt.soft;
+                vcpu->arch.interrupt.injected && !vcpu->arch.interrupt.soft;
         events->interrupt.nr = vcpu->arch.interrupt.nr;
         events->interrupt.soft = 0;
         events->interrupt.shadow = kvm_x86_ops->get_interrupt_shadow(vcpu);
@@ -3365,7 +3365,7 @@ static int kvm_vcpu_ioctl_x86_set_vcpu_events(struct kvm_vcpu *vcpu,
         vcpu->arch.exception.has_error_code = events->exception.has_error_code;
         vcpu->arch.exception.error_code = events->exception.error_code;
 
-        vcpu->arch.interrupt.pending = events->interrupt.injected;
+        vcpu->arch.interrupt.injected = events->interrupt.injected;
         vcpu->arch.interrupt.nr = events->interrupt.nr;
         vcpu->arch.interrupt.soft = events->interrupt.soft;
         if (events->flags & KVM_VCPUEVENT_VALID_SHADOW)
@@ -6767,7 +6767,7 @@ static int inject_pending_event(struct kvm_vcpu *vcpu, bool req_int_win)
                         return 0;
                 }
 
-                if (vcpu->arch.interrupt.pending) {
+                if (vcpu->arch.interrupt.injected) {
                         kvm_x86_ops->set_irq(vcpu);
                         return 0;
                 }
@@ -7818,7 +7818,7 @@ static void __get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
 
         memset(sregs->interrupt_bitmap, 0, sizeof sregs->interrupt_bitmap);
 
-        if (vcpu->arch.interrupt.pending && !vcpu->arch.interrupt.soft)
+        if (vcpu->arch.interrupt.injected && !vcpu->arch.interrupt.soft)
                 set_bit(vcpu->arch.interrupt.nr,
                         (unsigned long *)sregs->interrupt_bitmap);
 }
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 42350391b62f..1e8617414ee4 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -55,19 +55,19 @@ static inline void kvm_clear_exception_queue(struct kvm_vcpu *vcpu)
 static inline void kvm_queue_interrupt(struct kvm_vcpu *vcpu, u8 vector,
         bool soft)
 {
-        vcpu->arch.interrupt.pending = true;
+        vcpu->arch.interrupt.injected = true;
         vcpu->arch.interrupt.soft = soft;
         vcpu->arch.interrupt.nr = vector;
 }
 
 static inline void kvm_clear_interrupt_queue(struct kvm_vcpu *vcpu)
 {
-        vcpu->arch.interrupt.pending = false;
+        vcpu->arch.interrupt.injected = false;
 }
 
 static inline bool kvm_event_needs_reinjection(struct kvm_vcpu *vcpu)
 {
-        return vcpu->arch.exception.injected || vcpu->arch.interrupt.pending ||
+        return vcpu->arch.exception.injected || vcpu->arch.interrupt.injected ||
                 vcpu->arch.nmi_injected;
 }