Commit a84de2fa authored Jan 17, 2020 by Tony W Wang-oc Committed by Thomas Gleixner Jan 17, 2020

x86/speculation/swapgs: Exclude Zhaoxin CPUs from SWAPGS vulnerability

New Zhaoxin family 7 CPUs are not affected by the SWAPGS vulnerability. So
mark these CPUs in the cpu vulnerability whitelist accordingly.

Signed-off-by: Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/1579227872-26972-3-git-send-email-TonyWWang-oc@zhaoxin.com

parent 1e41a766

arch/x86/kernel/cpu/common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1087,8 +1087,8 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = {
		VULNWL_HYGON(X86_FAMILY_ANY, NO_MELTDOWN \| NO_L1TF \| NO_MDS \| NO_SWAPGS \| NO_ITLB_MULTIHIT),

		/* Zhaoxin Family 7 */
		VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2),
		VULNWL(ZHAOXIN, 7, X86_MODEL_ANY, NO_SPECTRE_V2),
		VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2 \| NO_SWAPGS),
		VULNWL(ZHAOXIN, 7, X86_MODEL_ANY, NO_SPECTRE_V2 \| NO_SWAPGS),
		{}
		};