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

Commit 88659d5f authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Greg Kroah-Hartman
Browse files

x86/bugs: Concentrate bug detection into a separate function 



commit 4a28bfe3267b68e22c663ac26185aa16c9b879ef upstream

Combine the various logic which goes through all those
x86_cpu_id matching structures in one function.

Suggested-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 741c026d

arch/x86/kernel/cpu/common.c

+11 −10
Original line number Diff line number Diff line
@@ -879,21 +879,27 @@ static const __initconst struct x86_cpu_id cpu_no_meltdown[] = { 
	{}

};



static bool __init cpu_vulnerable_to_meltdown(struct cpuinfo_x86 *c)

static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c)

{

	u64 ia32_cap = 0;



	if (x86_match_cpu(cpu_no_speculation))

		return;



	setup_force_cpu_bug(X86_BUG_SPECTRE_V1);

	setup_force_cpu_bug(X86_BUG_SPECTRE_V2);



	if (x86_match_cpu(cpu_no_meltdown))

		return false;

		return;



	if (cpu_has(c, X86_FEATURE_ARCH_CAPABILITIES))

		rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap);



	/* Rogue Data Cache Load? No! */

	if (ia32_cap & ARCH_CAP_RDCL_NO)

		return false;

		return;



	return true;

	setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);

}



/*
@@ -942,12 +948,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) 


	setup_force_cpu_cap(X86_FEATURE_ALWAYS);



	if (!x86_match_cpu(cpu_no_speculation)) {

		if (cpu_vulnerable_to_meltdown(c))

			setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);

		setup_force_cpu_bug(X86_BUG_SPECTRE_V1);

		setup_force_cpu_bug(X86_BUG_SPECTRE_V2);

	}

	cpu_set_bug_bits(c);



	fpu__init_system(c);