linux-kernel - [PATCH 1/3] KVM: nVMX: Fix virtual interrupt delivery injection

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 17 Jul 2014 12:56:49 +0800
From:	Wanpeng Li <wanpeng.li@...ux.intel.com>
To:	Paolo Bonzini <pbonzini@...hat.com>,
	Jan Kiszka <jan.kiszka@...mens.com>
Cc:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>, Bandan Das <bsd@...hat.com>,
	Zhang Yang <yang.z.zhang@...el.com>,
	Hu Robert <robert.hu@...el.com>, kvm@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Wanpeng Li <wanpeng.li@...ux.intel.com>
Subject: [PATCH 1/3] KVM: nVMX: Fix virtual interrupt delivery injection 

This patch fix bug reported in https://bugzilla.kernel.org/show_bug.cgi?id=73331, 
after the patch http://www.spinics.net/lists/kvm/msg105230.html applied, there is
some progress and the L2 can boot up, however, slowly. The original idea of this 
fix vid injection patch is from "Zhang, Yang Z" <yang.z.zhang@...el.com>.

Interrupt which delivered by vid should be injected to L1 by L0 if current is in 
L1, or should be injected to L2 by L0 through the old injection way if L1 doesn't 
have set VM_EXIT_ACK_INTR_ON_EXIT. The current logic doen't consider these cases. 
This patch fix it by vid intr to L1 if current is L1 or L2 through old injection 
way if L1 doen't have VM_EXIT_ACK_INTR_ON_EXIT set.

Signed-off-by: Wanpeng Li <wanpeng.li@...ux.intel.com>
Signed-off-by: "Zhang, Yang Z" <yang.z.zhang@...el.com>
---
 arch/x86/kvm/vmx.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 021d84a..ad36646 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -7112,8 +7112,22 @@ static void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)
 {
 	if (max_irr == -1)
 		return;
-
-	vmx_set_rvi(max_irr);
+	if (!is_guest_mode(vcpu)) {
+		vmx_set_rvi(max_irr);
+	} else if (is_guest_mode(vcpu) && !nested_exit_on_intr(vcpu)) {
+		/*
+		 * Fall back to old way to inject the interrupt since there
+		 * is no vAPIC-v for L2.
+		 */
+		if (vcpu->arch.exception.pending ||
+				vcpu->arch.nmi_injected ||
+				vcpu->arch.interrupt.pending)
+			return;
+		else if (vmx_interrupt_allowed(vcpu)) {
+			kvm_queue_interrupt(vcpu, max_irr, false);
+			vmx_inject_irq(vcpu);
+		}
+	}
 }
 
 static void vmx_load_eoi_exitmap(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/