|
@@ -454,6 +454,13 @@ static void __init sev_map_percpu_data(void)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
+static void __init kvm_smp_prepare_cpus(unsigned int max_cpus)
|
|
|
+{
|
|
|
+ native_smp_prepare_cpus(max_cpus);
|
|
|
+ if (kvm_para_has_hint(KVM_HINTS_DEDICATED))
|
|
|
+ static_branch_disable(&virt_spin_lock_key);
|
|
|
+}
|
|
|
+
|
|
|
static void __init kvm_smp_prepare_boot_cpu(void)
|
|
|
{
|
|
|
/*
|
|
@@ -557,6 +564,7 @@ static void __init kvm_guest_init(void)
|
|
|
kvm_setup_vsyscall_timeinfo();
|
|
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
+ smp_ops.smp_prepare_cpus = kvm_smp_prepare_cpus;
|
|
|
smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
|
|
|
if (cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, "x86/kvm:online",
|
|
|
kvm_cpu_online, kvm_cpu_down_prepare) < 0)
|
|
@@ -737,10 +745,8 @@ void __init kvm_spinlock_init(void)
|
|
|
if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
|
|
|
return;
|
|
|
|
|
|
- if (kvm_para_has_hint(KVM_HINTS_DEDICATED)) {
|
|
|
- static_branch_disable(&virt_spin_lock_key);
|
|
|
+ if (kvm_para_has_hint(KVM_HINTS_DEDICATED))
|
|
|
return;
|
|
|
- }
|
|
|
|
|
|
__pv_init_lock_hash();
|
|
|
pv_lock_ops.queued_spin_lock_slowpath = __pv_queued_spin_lock_slowpath;
|