[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-517c3ba00916383af6411aec99442c307c23f684@git.kernel.org>
Date: Thu, 25 Jul 2019 03:55:16 -0700
From: tip-bot for Zhenzhong Duan <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, mingo@...nel.org, zhenzhong.duan@...cle.com,
hpa@...or.com, linux-kernel@...r.kernel.org
Subject: [tip:x86/urgent] x86/speculation/mds: Apply more accurate check on
hypervisor platform
Commit-ID: 517c3ba00916383af6411aec99442c307c23f684
Gitweb: https://git.kernel.org/tip/517c3ba00916383af6411aec99442c307c23f684
Author: Zhenzhong Duan <zhenzhong.duan@...cle.com>
AuthorDate: Thu, 25 Jul 2019 10:39:09 +0800
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Thu, 25 Jul 2019 12:51:55 +0200
x86/speculation/mds: Apply more accurate check on hypervisor platform
X86_HYPER_NATIVE isn't accurate for checking if running on native platform,
e.g. CONFIG_HYPERVISOR_GUEST isn't set or "nopv" is enabled.
Checking the CPU feature bit X86_FEATURE_HYPERVISOR to determine if it's
running on native platform is more accurate.
This still doesn't cover the platforms on which X86_FEATURE_HYPERVISOR is
unsupported, e.g. VMware, but there is nothing which can be done about this
scenario.
Fixes: 8a4b06d391b0 ("x86/speculation/mds: Add sysfs reporting for MDS")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@...cle.com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: stable@...r.kernel.org
Link: https://lkml.kernel.org/r/1564022349-17338-1-git-send-email-zhenzhong.duan@oracle.com
---
arch/x86/kernel/cpu/bugs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 66ca906aa790..801ecd1c3fd5 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1226,7 +1226,7 @@ static ssize_t l1tf_show_state(char *buf)
static ssize_t mds_show_state(char *buf)
{
- if (!hypervisor_is_type(X86_HYPER_NATIVE)) {
+ if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
return sprintf(buf, "%s; SMT Host state unknown\n",
mds_strings[mds_mitigation]);
}
Powered by blists - more mailing lists