Skip to content

Commit c2c7eef

Browse files
sean-jcgregkh
authored andcommitted
KVM: nVMX: Unconditionally clear nested.pi_pending on nested VM-Enter
commit f7782bb upstream. Clear nested.pi_pending on nested VM-Enter even if L2 will run without posted interrupts enabled. If nested.pi_pending is left set from a previous L2, vmx_complete_nested_posted_interrupt() will pick up the stale flag and exit to userspace with an "internal emulation error" due the new L2 not having a valid nested.pi_desc. Arguably, vmx_complete_nested_posted_interrupt() should first check for posted interrupts being enabled, but it's also completely reasonable that KVM wouldn't screw up a fundamental flag. Not to mention that the mere existence of nested.pi_pending is a long-standing bug as KVM shouldn't move the posted interrupt out of the IRR until it's actually processed, e.g. KVM effectively drops an interrupt when it performs a nested VM-Exit with a "pending" posted interrupt. Fixing the mess is a future problem. Prior to vmx_complete_nested_posted_interrupt() interpreting a null PI descriptor as an error, this was a benign bug as the null PI descriptor effectively served as a check on PI not being enabled. Even then, the new flow did not become problematic until KVM started checking the result of kvm_check_nested_events(). Fixes: 705699a ("KVM: nVMX: Enable nested posted interrupt processing") Fixes: 966eefb ("KVM: nVMX: Disable vmcs02 posted interrupts if vmcs12 PID isn't mappable") Fixes: 47d3530f86c0 ("KVM: x86: Exit to userspace when kvm_check_nested_events fails") Cc: [email protected] Cc: Jim Mattson <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent bf36224 commit c2c7eef

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

arch/x86/kvm/vmx/nested.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,12 +2243,11 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
22432243
~PIN_BASED_VMX_PREEMPTION_TIMER);
22442244

22452245
/* Posted interrupts setting is only taken from vmcs12. */
2246-
if (nested_cpu_has_posted_intr(vmcs12)) {
2246+
vmx->nested.pi_pending = false;
2247+
if (nested_cpu_has_posted_intr(vmcs12))
22472248
vmx->nested.posted_intr_nv = vmcs12->posted_intr_nv;
2248-
vmx->nested.pi_pending = false;
2249-
} else {
2249+
else
22502250
exec_control &= ~PIN_BASED_POSTED_INTR;
2251-
}
22522251
pin_controls_set(vmx, exec_control);
22532252

22542253
/*

0 commit comments

Comments
 (0)