Skip to contentSkip to conversation

KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip

PATCH In review Jan Kiszka 2 participants 2 messages Nov 24, 2008 – Dec 10, 2008

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip

Push b55a50582030cf294a675492d7ab2e235b965cc8 and d3a2c20c9b850d92dae383fd6a64840de2687cd6 also to the user space irqchip path.

Signed-off-by Jan Kiszka <[email protected]>

---

 arch/x86/kvm/vmx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
arch/x86/kvm/vmx.c +3 -1
index 7ea4855..775a140 100644
@@ -2486,7 +2486,9 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu,
 	vmx_update_window_states(vcpu);
 
 	if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) {
-		if (vcpu->arch.nmi_window_open) {
+		if (vcpu->arch.interrupt.pending) {
+			enable_nmi_window(vcpu);
+		} else if (vcpu->arch.nmi_window_open) {
 			vcpu->arch.nmi_pending = false;
 			vcpu->arch.nmi_injected = true;
 		} else {
#1 lore raw
Quoted 5 lines · Jan Kiszka

Push b55a50582030cf294a675492d7ab2e235b965cc8 and d3a2c20c9b850d92dae383fd6a64840de2687cd6 also to the user space irqchip path.

Applied (belatedly...), thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function