From 69e5d1f3897eb77afb3001ecb19bd3c47a62aa4e Mon Sep 17 00:00:00 2001 From: LeoLiu-oc Date: Sat, 20 Mar 2021 13:20:59 +0800 Subject: [PATCH 2894/2944] x86/speculation/swapgs: Exclude Zhaoxin CPUs from SWAPGS vulnerability commit a84de2fa962c1b0551653fe245d6cb5f6129179c upstream. 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 Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/1579227872-26972-3-git-send-email-TonyWWang-oc@zhaoxin.com Signed-off-by: LeoLiu-oc Reviewed-by: Artie Ding --- arch/x86/kernel/cpu/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 65b9c32..b2eb784 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1016,8 +1016,8 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) 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), {} }; -- 1.8.3.1