Commit de585020 authored Oct 23, 2019 by Zhenzhong Duan Committed by Paolo Bonzini Jul 08, 2020

Revert "KVM: X86: Fix setup the virt_spin_lock_key before static key get initialized"



This reverts commit 34226b6b.

Commit 8990cac6 ("x86/jump_label: Initialize static branching
early") adds jump_label_init() call in setup_arch() to make static
keys initialized early, so we could use the original simpler code
again.

The similar change for XEN is in commit 090d54bc ("Revert
"x86/paravirt: Set up the virt_spin_lock_key after static keys get
initialized"")

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krcmar <rkrcmar@redhat.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Wanpeng Li <wanpengli@tencent.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent e47c4aee

arch/x86/kernel/kvm.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -570,13 +570,6 @@ static void kvm_smp_send_call_func_ipi(const struct cpumask *mask)
		}
		}

		static void __init kvm_smp_prepare_cpus(unsigned int max_cpus)
		{
		native_smp_prepare_cpus(max_cpus);
		if (kvm_para_has_hint(KVM_HINTS_REALTIME))
		static_branch_disable(&virt_spin_lock_key);
		}

		static void __init kvm_smp_prepare_boot_cpu(void)
		{
		/*
		@@ -671,7 +664,6 @@ static void __init kvm_guest_init(void)
		}

		#ifdef CONFIG_SMP
		smp_ops.smp_prepare_cpus = kvm_smp_prepare_cpus;
		smp_ops.smp_prepare_boot_cpu = kvm_smp_prepare_boot_cpu;
		if (pv_sched_yield_supported()) {
		smp_ops.send_call_func_ipi = kvm_smp_send_call_func_ipi;
		@@ -879,8 +871,10 @@ void __init kvm_spinlock_init(void)
		if (!kvm_para_has_feature(KVM_FEATURE_PV_UNHALT))
		return;

		if (kvm_para_has_hint(KVM_HINTS_REALTIME))
		if (kvm_para_has_hint(KVM_HINTS_REALTIME)) {
		static_branch_disable(&virt_spin_lock_key);
		return;
		}

		/* Don't use the pvqspinlock code if there is only 1 vCPU. */
		if (num_possible_cpus() == 1)

Admin message