]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: nVMX: Check PAUSE_EXITING, not BUS_LOCK_DETECTION, on PAUSE emulation
authorSean Christopherson <seanjc@google.com>
Sat, 1 Feb 2025 01:55:08 +0000 (17:55 -0800)
committerSean Christopherson <seanjc@google.com>
Mon, 24 Feb 2025 17:01:06 +0000 (09:01 -0800)
When emulating PAUSE on behalf of L2, check for interception in vmcs12 by
looking at primary execution controls, not secondary execution controls.
Checking for PAUSE_EXITING in secondary execution controls effectively
results in KVM looking for BUS_LOCK_DETECTION, which KVM doesn't expose to
L1, i.e. is always off in vmcs12, and ultimately results in KVM failing to
"intercept" PAUSE.

Because KVM doesn't handle interception during emulation correctly on VMX,
i.e. the "fixed" code is still quite broken, and not intercepting PAUSE is
relatively benign, for all intents and purposes the bug means that L2 gets
to live when it would otherwise get an unexpected #UD.

Fixes: 4984563823f0 ("KVM: nVMX: Emulate NOPs in L2, and PAUSE if it's not intercepted")
Link: https://lore.kernel.org/r/20250201015518.689704-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/vmx/vmx.c

index b60de7f8e563e1442eb577dbb5a2cef514ecf84e..e8672c4cb6250e07722b7e40805490643e4bab13 100644 (file)
@@ -8092,7 +8092,7 @@ int vmx_check_intercept(struct kvm_vcpu *vcpu,
                 * the PAUSE.
                 */
                if ((info->rep_prefix != REPE_PREFIX) ||
-                   !nested_cpu_has2(vmcs12, CPU_BASED_PAUSE_EXITING))
+                   !nested_cpu_has(vmcs12, CPU_BASED_PAUSE_EXITING))
                        return X86EMUL_CONTINUE;
 
                break;