]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
x86/kvm/vmx: Fix VMX vs hrtimer_rearm_deferred()
authorPeter Zijlstra <peterz@infradead.org>
Thu, 23 Apr 2026 15:56:13 +0000 (17:56 +0200)
committerThomas Gleixner <tglx@kernel.org>
Tue, 19 May 2026 18:25:51 +0000 (20:25 +0200)
commit5fcc48d521877c5d83828d715c81f4d169ef97f3
treefb3acffb9d9a41da557185cbb951a637fa2b385e
parent0701c9e17bd903d95b2ddf7dd2e1d8be5027f331
x86/kvm/vmx: Fix VMX vs hrtimer_rearm_deferred()

Vishal reported that KVM unit test 'x2apic' started failing after commit
0e98eb14814e ("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: 0e98eb14814e ("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
arch/x86/entry/common.c