From: "tip-bot2 for Sean Christopherson" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Sean Christopherson <sean.j.christopherson@intel.com>,
Borislav Petkov <bp@suse.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/cpu] x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked
Date: Tue, 14 Jan 2020 10:16:54 -0000 [thread overview]
Message-ID: <157899701473.1022.7710565151243359704.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191221044513.21680-6-sean.j.christopherson@intel.com>
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 6d527cebfa04ba4792be9e79e0d7cab22ab6c377
Gitweb: https://git.kernel.org/tip/6d527cebfa04ba4792be9e79e0d7cab22ab6c377
Author: Sean Christopherson <sean.j.christopherson@intel.com>
AuthorDate: Fri, 20 Dec 2019 20:44:59 -08:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 13 Jan 2020 17:47:18 +01:00
x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked
WARN if the IA32_FEAT_CTL MSR is somehow left unlocked now that CPU
initialization unconditionally locks the MSR.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20191221044513.21680-6-sean.j.christopherson@intel.com
---
arch/x86/kernel/cpu/mce/intel.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/intel.c b/arch/x86/kernel/cpu/mce/intel.c
index c238518..5627b10 100644
--- a/arch/x86/kernel/cpu/mce/intel.c
+++ b/arch/x86/kernel/cpu/mce/intel.c
@@ -116,14 +116,15 @@ static bool lmce_supported(void)
/*
* BIOS should indicate support for LMCE by setting bit 20 in
* IA32_FEAT_CTL without which touching MCG_EXT_CTL will generate a #GP
- * fault.
+ * fault. The MSR must also be locked for LMCE_ENABLED to take effect.
+ * WARN if the MSR isn't locked as init_ia32_feat_ctl() unconditionally
+ * locks the MSR in the event that it wasn't already locked by BIOS.
*/
rdmsrl(MSR_IA32_FEAT_CTL, tmp);
- if ((tmp & (FEAT_CTL_LOCKED | FEAT_CTL_LMCE_ENABLED)) ==
- (FEAT_CTL_LOCKED | FEAT_CTL_LMCE_ENABLED))
- return true;
+ if (WARN_ON_ONCE(!(tmp & FEAT_CTL_LOCKED)))
+ return false;
- return false;
+ return tmp & FEAT_CTL_LMCE_ENABLED;
}
bool mce_intel_cmci_poll(void)
next prev parent reply other threads:[~2020-01-14 10:17 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 4:44 [PATCH v5 00/19] x86/cpu: Clean up handling of VMX features Sean Christopherson
2019-12-21 4:44 ` [PATCH v5 01/19] x86/msr-index: Clean up bit defines for IA32_FEATURE_CONTROL MSR Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:44 ` [PATCH v5 02/19] selftests: kvm: Replace manual MSR defs with common msr-index.h Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] selftests, " tip-bot2 for Sean Christopherson
2019-12-21 4:44 ` [PATCH v5 03/19] tools arch x86: Sync msr-index.h from kernel sources Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] tools/x86: " tip-bot2 for Sean Christopherson
2019-12-21 4:44 ` [PATCH v5 04/19] x86/intel: Initialize IA32_FEAT_CTL MSR at boot Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:44 ` [PATCH v5 05/19] x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked Sean Christopherson
2020-01-14 10:16 ` tip-bot2 for Sean Christopherson [this message]
2019-12-21 4:45 ` [PATCH v5 06/19] x86/centaur: Use common IA32_FEAT_CTL MSR initialization Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 07/19] x86/zhaoxin: " Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 08/19] x86/cpu: Clear VMX feature flag if VMX is not fully enabled Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2020-01-14 20:25 ` [PATCH] x86/cpu: Print "VMX disabled" error message iff KVM is enabled Sean Christopherson
2020-01-15 12:34 ` Borislav Petkov
2020-01-15 12:39 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 09/19] x86/vmx: Introduce VMX_FEATURES_* Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 10/19] x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 11/19] x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_* Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 12/19] x86/cpu: Set synthetic VMX cpufeatures during init_ia32_feat_ctl() Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 13/19] x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2020-02-25 21:49 ` [PATCH v5 13/19] " Jacob Keller
2020-02-25 22:12 ` Sean Christopherson
2020-02-25 22:52 ` Jacob Keller
2020-02-25 23:29 ` Sean Christopherson
2020-02-25 23:35 ` Jacob Keller
2020-02-25 23:54 ` Jacob Keller
2020-02-26 0:41 ` Jacob Keller
2020-02-26 0:42 ` Sean Christopherson
2020-02-26 0:58 ` Jacob Keller
2020-02-26 20:41 ` Jacob Keller
2020-02-26 20:57 ` Sean Christopherson
2020-02-26 21:03 ` Jacob Keller
2020-02-26 21:25 ` Sean Christopherson
2020-02-26 21:53 ` Jacob Keller
2020-02-27 2:12 ` Sean Christopherson
2020-02-27 4:20 ` Huang, Kai
2020-02-27 18:09 ` Jacob Keller
2019-12-21 4:45 ` [PATCH v5 14/19] KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 15/19] KVM: VMX: Use VMX feature flag to query BIOS enabling Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 16/19] KVM: VMX: Check for full VMX support when verifying CPU compatibility Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 17/19] KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits Sean Christopherson
2020-01-13 18:32 ` Borislav Petkov
2020-01-13 18:37 ` Sean Christopherson
2020-01-13 18:38 ` Borislav Petkov
2020-01-13 18:42 ` Sean Christopherson
2020-01-13 18:52 ` [PATCH] KVM: VMX: Rename define to CPU_BASED_USE_TSC_OFFSETTING Borislav Petkov
2020-01-13 20:16 ` Sean Christopherson
2020-01-14 9:31 ` Borislav Petkov
2020-01-14 17:27 ` Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 18/19] perf/x86: Provide stubs of KVM helpers for non-Intel CPUs Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
2019-12-21 4:45 ` [PATCH v5 19/19] KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs Sean Christopherson
2020-01-14 10:16 ` [tip: x86/cpu] " tip-bot2 for Sean Christopherson
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=157899701473.1022.7710565151243359704.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=sean.j.christopherson@intel.com \
--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
all inboxes | Powered by JetHome®