Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56563f53 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Thomas Gleixner
Browse files

x86/bugs: Move the l1tf function and define pr_fmt properly 



The pr_warn in l1tf_select_mitigation would have used the prior pr_fmt
which was defined as "Spectre V2 : ".

Move the function to be past SSBD and also define the pr_fmt.

Fixes: 17dbca11 ("x86/speculation/l1tf: Add sysfs reporting for l1tf")
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 377eeaa8

arch/x86/kernel/cpu/bugs.c

+29 −26
Original line number Diff line number Diff line
@@ -209,32 +209,6 @@ static void x86_amd_ssb_disable(void) 
		wrmsrl(MSR_AMD64_LS_CFG, msrval);

}



static void __init l1tf_select_mitigation(void)

{

	u64 half_pa;



	if (!boot_cpu_has_bug(X86_BUG_L1TF))

		return;



#if CONFIG_PGTABLE_LEVELS == 2

	pr_warn("Kernel not compiled for PAE. No mitigation for L1TF\n");

	return;

#endif



	/*

	 * This is extremely unlikely to happen because almost all

	 * systems have far more MAX_PA/2 than RAM can be fit into

	 * DIMM slots.

	 */

	half_pa = (u64)l1tf_pfn_limit() << PAGE_SHIFT;

	if (e820__mapped_any(half_pa, ULLONG_MAX - half_pa, E820_TYPE_RAM)) {

		pr_warn("System has more than MAX_PA/2 memory. L1TF mitigation not effective.\n");

		return;

	}



	setup_force_cpu_cap(X86_FEATURE_L1TF_PTEINV);

}



#ifdef RETPOLINE

static bool spectre_v2_bad_module;
@@ -681,6 +655,35 @@ void x86_spec_ctrl_setup_ap(void) 
		x86_amd_ssb_disable();

}



#undef pr_fmt

#define pr_fmt(fmt)	"L1TF: " fmt

static void __init l1tf_select_mitigation(void)

{

	u64 half_pa;



	if (!boot_cpu_has_bug(X86_BUG_L1TF))

		return;



#if CONFIG_PGTABLE_LEVELS == 2

	pr_warn("Kernel not compiled for PAE. No mitigation for L1TF\n");

	return;

#endif



	/*

	 * This is extremely unlikely to happen because almost all

	 * systems have far more MAX_PA/2 than RAM can be fit into

	 * DIMM slots.

	 */

	half_pa = (u64)l1tf_pfn_limit() << PAGE_SHIFT;

	if (e820__mapped_any(half_pa, ULLONG_MAX - half_pa, E820_TYPE_RAM)) {

		pr_warn("System has more than MAX_PA/2 memory. L1TF mitigation not effective.\n");

		return;

	}



	setup_force_cpu_cap(X86_FEATURE_L1TF_PTEINV);

}

#undef pr_fmt



#ifdef CONFIG_SYSFS



static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr,