From: Fenghua Yu <fenghua.yu@intel.com>
To: "Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>, "H Peter Anvin" <hpa@zytor.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Dave Hansen" <dave.hansen@intel.com>,
"Ashok Raj" <ashok.raj@intel.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Ravi V Shankar" <ravi.v.shankar@intel.com>,
"Xiaoyao Li " <xiaoyao.li@intel.com>
Cc: "linux-kernel" <linux-kernel@vger.kernel.org>,
"x86" <x86@kernel.org>,
kvm@vger.kernel.org, Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH v4 14/17] x86/split_lock: Add a sysfs interface to allow user to enable or disable split lock detection on all CPUs during run time
Date: Fri, 1 Mar 2019 18:45:08 -0800 [thread overview]
Message-ID: <1551494711-213533-15-git-send-email-fenghua.yu@intel.com> (raw)
In-Reply-To: <1551494711-213533-1-git-send-email-fenghua.yu@intel.com>
The interface /sys/device/system/cpu/split_lock_detect is added
to allow user to control split lock detection and show current split
lock detection setting.
Writing 1 to the file enables split lock detection and writing 0
disables split lock detection. Split lock detection is enabled or
disabled on all CPUs.
Reading the file shows current global split lock detection setting:
disabled when 0 and enabled when 1.
Please note the interface only shows global setting. During run time,
split lock detection on one CPU may be disabled if split lock
in kernel code happens on the CPU. The interface doesn't show split
lock detection status on individual CPU. User can run rdmsr on 0x33
to check split lock detection on each CPU.
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
arch/x86/kernel/cpu/intel.c | 96 ++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 95 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 1c1ec413a9a9..1512e96287b8 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -33,6 +33,12 @@
#include <asm/apic.h>
#endif
+#define DISABLE_SPLIT_LOCK_DETECT 0
+#define ENABLE_SPLIT_LOCK_DETECT 1
+
+static DEFINE_MUTEX(split_lock_detect_mutex);
+static int split_lock_detect_val;
+
/*
* Just in case our CPU detection goes bad, or you have a weird system,
* allow a way to override the automatic disabling of MPX.
@@ -163,10 +169,35 @@ static bool bad_spectre_microcode(struct cpuinfo_x86 *c)
return false;
}
+static u32 new_sp_test_ctl_val(u32 test_ctl_val)
+{
+ /* Change the split lock setting. */
+ if (split_lock_detect_val == DISABLE_SPLIT_LOCK_DETECT)
+ test_ctl_val &= ~TEST_CTL_ENABLE_SPLIT_LOCK_DETECT;
+ else
+ test_ctl_val |= TEST_CTL_ENABLE_SPLIT_LOCK_DETECT;
+
+ return test_ctl_val;
+}
+
+static void init_split_lock_detect(struct cpuinfo_x86 *c)
+{
+ if (cpu_has(c, X86_FEATURE_SPLIT_LOCK_DETECT)) {
+ u32 l, h;
+
+ rdmsr(MSR_TEST_CTL, l, h);
+ l = new_sp_test_ctl_val(l);
+ wrmsr(MSR_TEST_CTL, l, h);
+ pr_info_once("#AC for split lock is enabled\n");
+ }
+}
+
static void early_init_intel(struct cpuinfo_x86 *c)
{
u64 misc_enable;
+ init_split_lock_detect(c);
+
/* Unmask CPUID levels if masked: */
if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
if (msr_clear_bit(MSR_IA32_MISC_ENABLE,
@@ -1095,7 +1126,70 @@ void init_core_capability(struct cpuinfo_x86 *c)
rdmsrl(MSR_IA32_CORE_CAPABILITY, val);
- if (val & CORE_CAP_SPLIT_LOCK_DETECT)
+ if (val & CORE_CAP_SPLIT_LOCK_DETECT) {
setup_force_cpu_cap(X86_FEATURE_SPLIT_LOCK_DETECT);
+ split_lock_detect_val = 1;
+ }
}
}
+
+static ssize_t
+split_lock_detect_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ return sprintf(buf, "%u\n", READ_ONCE(split_lock_detect_val));
+}
+
+static ssize_t
+split_lock_detect_store(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ u32 val, l, h;
+ int cpu, ret;
+
+ ret = kstrtou32(buf, 10, &val);
+ if (ret)
+ return ret;
+
+ if (val != DISABLE_SPLIT_LOCK_DETECT && val != ENABLE_SPLIT_LOCK_DETECT)
+ return -EINVAL;
+
+ /* No need to update MSR if new setting is the same as old one. */
+ if (val == split_lock_detect_val)
+ return count;
+
+ /* Only one write can happen at the same time. */
+ mutex_lock(&split_lock_detect_mutex);
+
+ WRITE_ONCE(split_lock_detect_val, val);
+
+ /* Get MSR_TEST_CTL on this CPU, assuming all CPUs have same value. */
+ rdmsr(MSR_TEST_CTL, l, h);
+ l = new_sp_test_ctl_val(l);
+ /* Update the split lock detection setting on all online CPUs. */
+ for_each_online_cpu(cpu)
+ wrmsr_on_cpu(cpu, MSR_TEST_CTL, l, h);
+
+ mutex_unlock(&split_lock_detect_mutex);
+
+ return count;
+}
+
+static DEVICE_ATTR_RW(split_lock_detect);
+
+static int __init split_lock_init(void)
+{
+ int ret;
+
+ if (!boot_cpu_has(X86_FEATURE_SPLIT_LOCK_DETECT))
+ return -ENODEV;
+
+ ret = device_create_file(cpu_subsys.dev_root,
+ &dev_attr_split_lock_detect);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+subsys_initcall(split_lock_init);
--
2.7.4
next prev parent reply other threads:[~2019-03-02 2:45 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-02 2:44 [PATCH v4 00/17] x86/split_lock: Enable #AC exception for split locked accesses Fenghua Yu
2019-03-02 2:44 ` [PATCH v4 01/17] x86/common: Align cpu_caps_cleared and cpu_caps_set to unsigned long Fenghua Yu
2019-03-04 8:33 ` Paolo Bonzini
2019-03-04 10:17 ` Peter Zijlstra
2019-03-04 10:48 ` Paolo Bonzini
2019-03-04 12:44 ` Peter Zijlstra
2019-03-04 13:13 ` Paolo Bonzini
2019-03-02 2:44 ` [PATCH v4 02/17] drivers/net/b44: Align pwol_mask to unsigned long for better performance Fenghua Yu
2019-03-04 10:00 ` Peter Zijlstra
2019-03-04 14:45 ` Fenghua Yu
2019-03-04 15:27 ` Peter Zijlstra
2019-03-02 2:44 ` [PATCH v4 03/17] wlcore: Align reg_ch_conf_pending and tmp_ch_bitmap " Fenghua Yu
2019-03-04 10:11 ` Peter Zijlstra
2019-03-04 10:46 ` Paolo Bonzini
2019-03-04 12:41 ` Peter Zijlstra
2019-03-04 13:09 ` Paolo Bonzini
2019-03-04 13:30 ` Peter Zijlstra
2019-03-04 14:40 ` Fenghua Yu
2019-03-04 15:54 ` Paolo Bonzini
2019-03-02 2:44 ` [PATCH v4 04/17] x86/split_lock: Align x86_capability to unsigned long to avoid split locked access Fenghua Yu
2019-03-04 18:52 ` Dave Hansen
2019-03-04 19:15 ` Fenghua Yu
2019-03-04 19:29 ` Dave Hansen
2019-03-04 20:08 ` Peter Zijlstra
2019-03-04 20:12 ` Peter Zijlstra
2019-03-02 2:44 ` [PATCH v4 05/17] x86/cpufeatures: Enumerate IA32_CORE_CAPABILITIES MSR Fenghua Yu
2019-03-04 18:53 ` Dave Hansen
2019-03-04 18:55 ` Yu, Fenghua
2019-03-04 19:01 ` Dave Hansen
2019-03-02 2:45 ` [PATCH v4 06/17] x86/msr-index: Define IA32_CORE_CAPABILITY MSR and #AC exception for split lock bit Fenghua Yu
2019-03-02 2:45 ` [PATCH v4 07/17] x86/split_lock: Enumerate #AC for split lock by MSR IA32_CORE_CAPABILITY Fenghua Yu
2019-03-04 18:58 ` Dave Hansen
2019-03-04 18:59 ` Fenghua Yu
2019-03-04 19:19 ` Dave Hansen
2019-03-02 2:45 ` [PATCH v4 08/17] x86/clearcpuid: Support multiple clearcpuid options Fenghua Yu
2019-03-02 2:45 ` [PATCH v4 09/17] x86/clearcpuid: Support feature flag string in kernel option clearcpuid Fenghua Yu
2019-03-02 2:45 ` [PATCH v4 10/17] x86/clearcpuid: Apply cleared feature bits that are forced set before Fenghua Yu
2019-03-02 2:45 ` [PATCH v4 11/17] x86/clearcpuid: Clear CPUID bit in CPUID faulting Fenghua Yu
2019-03-04 22:04 ` kbuild test robot
2019-03-05 7:27 ` kbuild test robot
2019-03-02 2:45 ` [PATCH v4 12/17] Change document for kernel option clearcpuid Fenghua Yu
2019-03-02 2:45 ` [PATCH v4 13/17] x86/split_lock: Handle #AC exception for split lock Fenghua Yu
2019-03-02 2:45 ` Fenghua Yu [this message]
2019-03-02 2:45 ` [PATCH v4 15/17] kvm: x86: Report CORE_CAPABILITY on GET_SUPPORTED_CPUID Fenghua Yu
2019-03-04 8:38 ` Paolo Bonzini
2019-03-04 10:47 ` Xiaoyao Li
2019-03-04 10:49 ` Paolo Bonzini
2019-03-04 11:10 ` Xiaoyao Li
2019-03-04 11:14 ` Paolo Bonzini
2019-03-04 11:21 ` Xiaoyao Li
2019-03-05 7:03 ` Xiaoyao Li
2019-03-02 2:45 ` [PATCH v4 16/17] kvm: x86: Add support IA32_CORE_CAPABILITY MSR Fenghua Yu
2019-03-04 8:42 ` Paolo Bonzini
2019-03-04 12:32 ` Xiaoyao Li
2019-03-08 6:10 ` Xiaoyao Li
2019-03-08 7:54 ` Paolo Bonzini
2019-03-08 8:03 ` Xiaoyao Li
2019-03-02 2:45 ` [PATCH v4 17/17] kvm: vmx: Emulate TEST_CTL MSR Fenghua Yu
2019-03-09 2:31 ` Xiaoyao Li
2019-03-11 13:31 ` Paolo Bonzini
2019-03-11 15:10 ` Xiaoyao Li
2019-03-11 15:21 ` Paolo Bonzini
2019-03-11 16:58 ` Xiaoyao Li
2019-03-04 21:55 ` [PATCH v4 00/17] x86/split_lock: Enable #AC exception for split locked accesses Konrad Rzeszutek Wilk
2019-03-05 0:06 ` Fenghua Yu
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=1551494711-213533-15-git-send-email-fenghua.yu@intel.com \
--to=fenghua.yu@intel.com \
--cc=ashok.raj@intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=ravi.v.shankar@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xiaoyao.li@intel.com \
/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