Skip to content

Commit 4d24550

Browse files
sean-jcbonzini
authored andcommitted
KVM: x86: Serialize vendor module initialization (hardware setup)
Acquire a new mutex, vendor_module_lock, in kvm_x86_vendor_init() while doing hardware setup to ensure that concurrent calls are fully serialized. KVM rejects attempts to load vendor modules if a different module has already been loaded, but doesn't handle the case where multiple vendor modules are loaded at the same time, and module_init() doesn't run under the global module_mutex. Note, in practice, this is likely a benign bug as no platform exists that supports both SVM and VMX, i.e. barring a weird VM setup, one of the vendor modules is guaranteed to fail a support check before modifying common KVM state. Alternatively, KVM could perform an atomic CMPXCHG on .hardware_enable, but that comes with its own ugliness as it would require setting .hardware_enable before success is guaranteed, e.g. attempting to load the "wrong" could result in spurious failure to load the "right" module. Introduce a new mutex as using kvm_lock is extremely deadlock prone due to kvm_lock being taken under cpus_write_lock(), and in the future, under under cpus_read_lock(). Any operation that takes cpus_read_lock() while holding kvm_lock would potentially deadlock, e.g. kvm_timer_init() takes cpus_read_lock() to register a callback. In theory, KVM could avoid such problematic paths, i.e. do less setup under kvm_lock, but avoiding all calls to cpus_read_lock() is subtly difficult and thus fragile. E.g. updating static calls also acquires cpus_read_lock(). Inverting the lock ordering, i.e. always taking kvm_lock outside cpus_read_lock(), is not a viable option as kvm_lock is taken in various callbacks that may be invoked under cpus_read_lock(), e.g. x86's kvmclock_cpufreq_notifier(). The lockdep splat below is dependent on future patches to take cpus_read_lock() in hardware_enable_all(), but as above, deadlock is already is already possible. ====================================================== WARNING: possible circular locking dependency detected 6.0.0-smp--7ec93244f194-init2 #27 Tainted: G O ------------------------------------------------------ stable/251833 is trying to acquire lock: ffffffffc097ea28 (kvm_lock){+.+.}-{3:3}, at: hardware_enable_all+0x1f/0xc0 [kvm] but task is already holding lock: ffffffffa2456828 (cpu_hotplug_lock){++++}-{0:0}, at: hardware_enable_all+0xf/0xc0 [kvm] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (cpu_hotplug_lock){++++}-{0:0}: cpus_read_lock+0x2a/0xa0 __cpuhp_setup_state+0x2b/0x60 __kvm_x86_vendor_init+0x16a/0x1870 [kvm] kvm_x86_vendor_init+0x23/0x40 [kvm] 0xffffffffc0a4d02b do_one_initcall+0x110/0x200 do_init_module+0x4f/0x250 load_module+0x1730/0x18f0 __se_sys_finit_module+0xca/0x100 __x64_sys_finit_module+0x1d/0x20 do_syscall_64+0x3d/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd -> #0 (kvm_lock){+.+.}-{3:3}: __lock_acquire+0x16f4/0x30d0 lock_acquire+0xb2/0x190 __mutex_lock+0x98/0x6f0 mutex_lock_nested+0x1b/0x20 hardware_enable_all+0x1f/0xc0 [kvm] kvm_dev_ioctl+0x45e/0x930 [kvm] __se_sys_ioctl+0x77/0xc0 __x64_sys_ioctl+0x1d/0x20 do_syscall_64+0x3d/0x80 entry_SYSCALL_64_after_hwframe+0x63/0xcd other info that might help us debug this: Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(cpu_hotplug_lock); lock(kvm_lock); lock(cpu_hotplug_lock); lock(kvm_lock); *** DEADLOCK *** 1 lock held by stable/251833: #0: ffffffffa2456828 (cpu_hotplug_lock){++++}-{0:0}, at: hardware_enable_all+0xf/0xc0 [kvm] Signed-off-by: Sean Christopherson <seanjc@google.com> Message-Id: <20221130230934.1014142-16-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 1a19354 commit 4d24550

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

Documentation/virt/kvm/locking.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,3 +282,9 @@ time it will be set using the Dirty tracking mechanism described above.
282282
wakeup notification event since external interrupts from the
283283
assigned devices happens, we will find the vCPU on the list to
284284
wakeup.
285+
286+
``vendor_module_lock``
287+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
288+
:Type: mutex
289+
:Arch: x86
290+
:Protects: loading a vendor module (kvm_amd or kvm_intel)

arch/x86/kvm/x86.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ static int kvm_vcpu_do_singlestep(struct kvm_vcpu *vcpu);
128128
static int __set_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2);
129129
static void __get_sregs2(struct kvm_vcpu *vcpu, struct kvm_sregs2 *sregs2);
130130

131+
static DEFINE_MUTEX(vendor_module_lock);
131132
struct kvm_x86_ops kvm_x86_ops __read_mostly;
132133

133134
#define KVM_X86_OP(func) \
@@ -9301,7 +9302,7 @@ void kvm_arch_exit(void)
93019302

93029303
}
93039304

9304-
int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
9305+
static int __kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
93059306
{
93069307
u64 host_pat;
93079308
int r;
@@ -9434,6 +9435,17 @@ int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
94349435
kmem_cache_destroy(x86_emulator_cache);
94359436
return r;
94369437
}
9438+
9439+
int kvm_x86_vendor_init(struct kvm_x86_init_ops *ops)
9440+
{
9441+
int r;
9442+
9443+
mutex_lock(&vendor_module_lock);
9444+
r = __kvm_x86_vendor_init(ops);
9445+
mutex_unlock(&vendor_module_lock);
9446+
9447+
return r;
9448+
}
94379449
EXPORT_SYMBOL_GPL(kvm_x86_vendor_init);
94389450

94399451
void kvm_x86_vendor_exit(void)
@@ -9457,14 +9469,16 @@ void kvm_x86_vendor_exit(void)
94579469
cancel_work_sync(&pvclock_gtod_work);
94589470
#endif
94599471
static_call(kvm_x86_hardware_unsetup)();
9460-
kvm_x86_ops.hardware_enable = NULL;
94619472
kvm_mmu_vendor_module_exit();
94629473
free_percpu(user_return_msrs);
94639474
kmem_cache_destroy(x86_emulator_cache);
94649475
#ifdef CONFIG_KVM_XEN
94659476
static_key_deferred_flush(&kvm_xen_enabled);
94669477
WARN_ON(static_branch_unlikely(&kvm_xen_enabled.key));
94679478
#endif
9479+
mutex_lock(&vendor_module_lock);
9480+
kvm_x86_ops.hardware_enable = NULL;
9481+
mutex_unlock(&vendor_module_lock);
94689482
}
94699483
EXPORT_SYMBOL_GPL(kvm_x86_vendor_exit);
94709484

0 commit comments

Comments
 (0)