Skip to content

Commit 5fcc48d

Browse files
Peter ZijlstraThomas Gleixner
authored andcommitted
x86/kvm/vmx: Fix VMX vs hrtimer_rearm_deferred()
Vishal reported that KVM unit test 'x2apic' started failing after commit 0e98eb1 ("entry: Prepare for deferred hrtimer rearming"). The reason is that KVM/VMX is injecting interrupts while it has interrupts disabled, for a context that will enable interrupts, this means that regs->flags.X86_EFLAGS_IF == 0 and irqentry_exit() will not do the right thing. Notably, irqentry_exit() must not call hrtimer_rearm_deferred() when the return context does not have IF set, because this will cause problems vs NMIs. Therefore, fix up the state after the injection. Fixes: 0e98eb1 ("entry: Prepare for deferred hrtimer rearming") Reported-by: "Verma, Vishal L" <vishal.l.verma@intel.com> Suggested-by: Thomas Gleixner <tglx@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@kernel.org> Tested-by: "Verma, Vishal L" <vishal.l.verma@intel.com> Tested-by: David Woodhouse <dwmw@amazon.co.uk> Tested-by: Zhao Liu <zhao1.liu@intel.com> Tested-by: Sean Christopherson <seanjc@google.com> Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> Link: https://patch.msgid.link/20260423155936.957351833@infradead.org Closes: https://lore.kernel.org/r/70cd3e97fbb796e2eb2ff8cd4b7614ada05a5f24.camel%40intel.com
1 parent 0701c9e commit 5fcc48d

1 file changed

Lines changed: 13 additions & 0 deletions

File tree

arch/x86/entry/common.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <linux/entry-common.h>
44
#include <linux/kvm_types.h>
5+
#include <linux/hrtimer_rearm.h>
56
#include <asm/fred.h>
67
#include <asm/desc.h>
78

@@ -27,6 +28,18 @@ noinstr void x86_entry_from_kvm(unsigned int event_type, unsigned int vector)
2728
#else
2829
idt_entry_from_kvm(vector);
2930
#endif
31+
/*
32+
* Strictly speaking, only the NMI path requires noinstr.
33+
*/
34+
instrumentation_begin();
35+
/*
36+
* KVM/VMX will dispatch from IRQ-disabled but for a context
37+
* that will have IRQs-enabled. This confuses the entry code
38+
* and it will not have reprogrammed the timer. Do so now.
39+
*/
40+
hrtimer_rearm_deferred();
41+
instrumentation_end();
42+
3043
return;
3144
}
3245

0 commit comments

Comments
 (0)