x86,spinlock: make disabling virt_spin_lock_key contingent on CONFIG_PARAVIRT
Subsystems (2)
PATCH 1/1 x86,spinlock: make disabling virt_spin_lock_key contingent on CONFIG_PARAVIRT
The existence of virt_spin_lock_key is contingent only on CONFIG_PARAVIRT, not on CONFIG_PARAVIRT_SPINLOCKS.
As a result, a kernel with CONFIG_PARAVIRT enabled, but CONFIG_PARAVIRT_SPINLOCKS disabled will end up disabling queued spinlocks when running on bare metal.
Making the disabling of virt_spin_lock_key contingent on CONFIG_PARAVIRT, which controls whether the key exists, results in queued spinlocks being enabled on bare metal again.
--- arch/x86/kernel/paravirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/paravirt.c +1 -1
@@ -55,7 +55,7 @@ DEFINE_STATIC_KEY_TRUE(virt_spin_lock_key);void __init native_pv_lock_init (void ) { -if (IS_ENABLED (CONFIG_PARAVIRT_SPINLOCKS ) && +if (IS_ENABLED (CONFIG_PARAVIRT ) && !boot_cpu_has (X86_FEATURE_HYPERVISOR ))static_branch_disable (&virt_spin_lock_key); }
Signature · 1 line
2.45.2
Quoted 6 lines · Rik van Riel
The existence of
virt_spin_lock_keyis contingent only onCONFIG_PARAVIRT, not onCONFIG_PARAVIRT_SPINLOCKS.As a result, a kernel with
CONFIG_PARAVIRTenabled, butCONFIG_PARAVIRT_SPINLOCKSdisabled will end up disabling queued spinlocks when running on bare metal.
Quoted 7 lines
Making the disabling of
virt_spin_lock_keycontingent onCONFIG_PARAVIRT, which controls whether the key exists, results in queued spinlocks being enabled on bare metal again.Signed-off-by Rik van Riel <[email protected]>Fixes ce0a1b608bfc ("x86/paravirt: Silence unused native_pv_lock_init() function warning")
Juergen