From: "tip-bot2 for Tony W Wang-oc" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Tony W Wang-oc" <TonyWWang-oc@zhaoxin.com>,
Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/pti] x86/speculation/swapgs: Exclude Zhaoxin CPUs from SWAPGS vulnerability
Date: Fri, 17 Jan 2020 18:19:09 -0000 [thread overview]
Message-ID: <157928514982.396.3134965085356599913.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1579227872-26972-3-git-send-email-TonyWWang-oc@zhaoxin.com>
The following commit has been merged into the x86/pti branch of tip:
Commit-ID: a84de2fa962c1b0551653fe245d6cb5f6129179c
Gitweb: https://git.kernel.org/tip/a84de2fa962c1b0551653fe245d6cb5f6129179c
Author: Tony W Wang-oc <TonyWWang-oc@zhaoxin.com>
AuthorDate: Fri, 17 Jan 2020 10:24:32 +08:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 17 Jan 2020 19:13:47 +01:00
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
---
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 6048bd3..ca4a0d2 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -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),
{}
};
prev parent reply other threads:[~2020-01-17 18:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 2:24 [PATCH v1 0/2] x86/bugs: Exclude Zhaoxin family 7 CPUs Tony W Wang-oc
2020-01-17 2:24 ` [PATCH v1 1/2] x86/speculation/spectre_v2: Exclude Zhaoxin CPUs from SPECTRE_V2 Tony W Wang-oc
2020-01-17 18:19 ` [tip: x86/pti] " tip-bot2 for Tony W Wang-oc
2020-01-17 2:24 ` [PATCH v1 2/2] x86/speculation/swapgs: Exclude Zhaoxin CPUs from SWAPGS Tony W Wang-oc
2020-01-17 18:19 ` tip-bot2 for Tony W Wang-oc [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=157928514982.396.3134965085356599913.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=TonyWWang-oc@zhaoxin.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).