Commit 67e87d43 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86: Convert some slow-path static_cpu_has() callers to boot_cpu_has() 



Using static_cpu_has() is pointless on those paths, convert them to the
boot_cpu_has() variant.

No functional changes.

Reported-by: default avatarNadav Amit <nadav.amit@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarRik van Riel <riel@surriel.com>
Reviewed-by: Juergen Gross <jgross@suse.com> # for paravirt
Cc: Aubrey Li <aubrey.li@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Thomas Lendacky <Thomas.Lendacky@amd.com>
Cc: linux-edac@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: virtualization@lists.linux-foundation.org
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20190330112022.28888-3-bp@alien8.de
parent bfdd5a67

arch/x86/include/asm/fpu/internal.h

+3 −4
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static inline void copy_xregs_to_kernel_booting(struct xregs_state *xstate) 


	WARN_ON(system_state != SYSTEM_BOOTING);



	if (static_cpu_has(X86_FEATURE_XSAVES))

	if (boot_cpu_has(X86_FEATURE_XSAVES))

		XSTATE_OP(XSAVES, xstate, lmask, hmask, err);

	else

		XSTATE_OP(XSAVE, xstate, lmask, hmask, err);
@@ -275,7 +275,7 @@ static inline void copy_kernel_to_xregs_booting(struct xregs_state *xstate) 


	WARN_ON(system_state != SYSTEM_BOOTING);



	if (static_cpu_has(X86_FEATURE_XSAVES))

	if (boot_cpu_has(X86_FEATURE_XSAVES))

		XSTATE_OP(XRSTORS, xstate, lmask, hmask, err);

	else

		XSTATE_OP(XRSTOR, xstate, lmask, hmask, err);
@@ -497,8 +497,7 @@ static inline void fpregs_activate(struct fpu *fpu) 
 *  - switch_fpu_finish() restores the new state as

 *    necessary.

 */

static inline void

switch_fpu_prepare(struct fpu *old_fpu, int cpu)

static inline void switch_fpu_prepare(struct fpu *old_fpu, int cpu)

{

	if (static_cpu_has(X86_FEATURE_FPU) && old_fpu->initialized) {

		if (!copy_fpregs_to_fpstate(old_fpu))

arch/x86/kernel/apic/apic_numachip.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static void fixup_cpu_id(struct cpuinfo_x86 *c, int node) 
	this_cpu_write(cpu_llc_id, node);



	/* Account for nodes per socket in multi-core-module processors */

	if (static_cpu_has(X86_FEATURE_NODEID_MSR)) {

	if (boot_cpu_has(X86_FEATURE_NODEID_MSR)) {

		rdmsrl(MSR_FAM10H_NODE_ID, val);

		nodes = ((val >> 3) & 7) + 1;

	}

arch/x86/kernel/cpu/aperfmperf.c

+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ unsigned int aperfmperf_get_khz(int cpu) 
	if (!cpu_khz)

		return 0;



	if (!static_cpu_has(X86_FEATURE_APERFMPERF))

	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))

		return 0;



	aperfmperf_snapshot_cpu(cpu, ktime_get(), true);
@@ -99,7 +99,7 @@ void arch_freq_prepare_all(void) 
	if (!cpu_khz)

		return;



	if (!static_cpu_has(X86_FEATURE_APERFMPERF))

	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))

		return;



	for_each_online_cpu(cpu)
@@ -115,7 +115,7 @@ unsigned int arch_freq_get_on_cpu(int cpu) 
	if (!cpu_khz)

		return 0;



	if (!static_cpu_has(X86_FEATURE_APERFMPERF))

	if (!boot_cpu_has(X86_FEATURE_APERFMPERF))

		return 0;



	if (aperfmperf_snapshot_cpu(cpu, ktime_get(), true))

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -1668,7 +1668,7 @@ static void setup_getcpu(int cpu) 
	unsigned long cpudata = vdso_encode_cpunode(cpu, early_cpu_to_node(cpu));

	struct desc_struct d = { };



	if (static_cpu_has(X86_FEATURE_RDTSCP))

	if (boot_cpu_has(X86_FEATURE_RDTSCP))

		write_rdtscp_aux(cpudata);



	/* Store CPU and node number in limit. */

arch/x86/kernel/cpu/mce/inject.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static void do_inject(void) 
	 * only on the node base core. Refer to D18F3x44[NbMcaToMstCpuEn] for

	 * Fam10h and later BKDGs.

	 */

	if (static_cpu_has(X86_FEATURE_AMD_DCM) &&

	if (boot_cpu_has(X86_FEATURE_AMD_DCM) &&

	    b == 4 &&

	    boot_cpu_data.x86 < 0x17) {

		toggle_nb_mca_mst_cpu(amd_get_nb_id(cpu));

CRA Git | Maintained and supported by SUSTech CRA and CCSE