LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Fenghua Yu <fenghua.yu@intel.com> To: "Thomas Gleixner" <tglx@linutronix.de>, "Ingo Molnar" <mingo@elte.hu>, "H. Peter Anvin" <hpa@linux.intel.com>, "Ashok Raj" <ashok.raj@intel.com>, "Ravi V Shankar" <ravi.v.shankar@intel.com>, "Tony Luck" <tony.luck@intel.com>, "Dave Hansen" <dave.hansen@intel.com>, "Rafael Wysocki" <rafael.j.wysocki@intel.com>, "Arjan van de Ven" <arjan@infradead.org>, "Alan Cox" <alan@linux.intel.com> Cc: "x86" <x86@kernel.org>, "linux-kernel" <linux-kernel@vger.kernel.org>, Fenghua Yu <fenghua.yu@intel.com> Subject: [PATCH 01/15] x86/split_lock: Add CONFIG and enumerate #AC exception for split locked access feature Date: Mon, 14 May 2018 11:52:11 -0700 [thread overview] Message-ID: <1526323945-211107-2-git-send-email-fenghua.yu@intel.com> (raw) In-Reply-To: <1526323945-211107-1-git-send-email-fenghua.yu@intel.com> Add CONFIG_SPLIT_LOCK_AC (default: y, dependent on X86 and CPU_SUP_INTEL) to control inclusion of the feature. Bit 29 in MSR TEST_CTL 0x33 can only be set on processors that support the feature. On processors not supporting the feature, the bit is reserved i.e. can not be set as one) or the MSR doesn't exist. To detect the feature, attempt to set the bit in the MSR. If the writing succeeds, the feature is available. Otherwise, the feature is not supported on this platform. And the enumeration happens before SMP so all processors can use enumerated result when SMP boots. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> --- arch/x86/Kconfig | 12 ++++++++ arch/x86/include/asm/cpu.h | 5 ++++ arch/x86/include/asm/msr-index.h | 5 ++++ arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/cpu/split_lock.c | 62 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+) create mode 100644 arch/x86/kernel/cpu/split_lock.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c07f492b871a..38baf5fb8556 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -448,6 +448,18 @@ config INTEL_RDT Say N if unsure. +config SPLIT_LOCK_AC + bool "#AC exception for split locked accesses support" + default y + depends on X86 && CPU_SUP_INTEL + help + Select to support #AC exception for split locked accesses. More + detailed information about the feature can be found in + Intel Architecture Instruction Set Extensions and Future Feature + Programming Reference. + + Say N if unsure. + if X86_32 config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index adc6cc86b062..c73b6d369047 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -40,4 +40,9 @@ int mwait_usable(const struct cpuinfo_x86 *); unsigned int x86_family(unsigned int sig); unsigned int x86_model(unsigned int sig); unsigned int x86_stepping(unsigned int sig); +#ifdef CONFIG_SPLIT_LOCK_AC +int __init enumerate_split_lock(void); +#else /* CONFIG_SPLIT_LOCK_AC */ +static inline int enumerate_split_lock(void) { return 0; } +#endif /* CONFIG_SPLIT_LOCK_AC */ #endif /* _ASM_X86_CPU_H */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 53d5b1b9255e..c791190c8c71 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -39,6 +39,11 @@ /* Intel MSRs. Some also available on other CPUs */ +#define MSR_TEST_CTL 0x00000033 +#define MSR_TEST_CTL_ENABLE_AC_SPLIT_LOCK_SHIFT 29 +#define MSR_TEST_CTL_ENABLE_AC_SPLIT_LOCK BIT(29) +#define MSR_TEST_CTL_DISABLE_LOCK_ASSERT_SPLIT_LOCK BIT(31) + #define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */ #define SPEC_CTRL_IBRS (1 << 0) /* Indirect Branch Restricted Speculation */ #define SPEC_CTRL_STIBP (1 << 1) /* Single Thread Indirect Branch Predictors */ diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index a66229f51b12..1b633450e372 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_MICROCODE) += microcode/ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o +obj-$(CONFIG_SPLIT_LOCK_AC) += split_lock.o ifdef CONFIG_X86_FEATURE_NAMES quiet_cmd_mkcapflags = MKCAP $@ diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index ce243f7d2d4e..7684e82e254f 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1008,6 +1008,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) */ setup_clear_cpu_cap(X86_FEATURE_PCID); #endif + enumerate_split_lock(); } void __init early_cpu_init(void) diff --git a/arch/x86/kernel/cpu/split_lock.c b/arch/x86/kernel/cpu/split_lock.c new file mode 100644 index 000000000000..2ab28419e080 --- /dev/null +++ b/arch/x86/kernel/cpu/split_lock.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Enable #AC exception for split locked accesses + * + * Copyright (C) 2018 Intel Corporation + * + * Author: + * Fenghua Yu <fenghua.yu@intel.com> + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/printk.h> +#include <asm/msr.h> + +static bool split_lock_ac_supported; + +/* + * On processors not supporting #AC exception for split lock feature, + * MSR_TEST_CTL may not exist or MSR_TEST_CTL exists but the bit 29 is + * reserved. + * + * MSR_TEST_CTL exists and the bit 29 can be set as one only on processors + * that support the feature. + * + * To enumerate #AC exception for split lock feature, try to set bit 29 as + * one in MSR_TEST_CTL. If the bit is successfully set as 1, the feature + * is supported and the variable split_lock_ac_supported is set as true. + * Otherwise, the feature is not available. + */ +void __init enumerate_split_lock(void) +{ + u32 l, h, l_orig; + int ret; + + /* Attempt to read the MSR. If the MSR doesn't exist, reading fails. */ + ret = rdmsr_safe(MSR_TEST_CTL, &l, &h); + if (ret) + return; + + l_orig = l; + + /* Turn on the split lock bit */ + l |= MSR_TEST_CTL_ENABLE_AC_SPLIT_LOCK; + + /* Set the bit in the MSR */ + ret = wrmsr_safe(MSR_TEST_CTL, l, h); + if (ret) + return; + + /* When coming to here, the feature is supported on this platform. */ + split_lock_ac_supported = true; + + /* + * + * Need to restore split lock setting to original BIOS setting before + * leaving. + */ + wrmsr(MSR_TEST_CTL, l_orig, h); + + pr_info("#AC exception for split locked accesses is supported\n"); +} -- 2.5.0
next prev parent reply other threads:[~2018-05-14 18:56 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-14 18:52 [PATCH 0/15] x86/split_lock: Enable #AC exception for split locked accesses Fenghua Yu 2018-05-14 18:52 ` Fenghua Yu [this message] 2018-05-15 15:36 ` [PATCH 01/15] x86/split_lock: Add CONFIG and enumerate #AC exception for split locked access feature Dave Hansen 2018-05-15 15:41 ` Fenghua Yu 2018-05-15 15:54 ` Dave Hansen 2018-05-14 18:52 ` [PATCH 02/15] x86/split_lock: Set up #AC exception for split locked accesses Fenghua Yu 2018-05-14 18:52 ` [PATCH 03/15] x86/split_lock: Handle #AC exception for split lock in kernel mode Fenghua Yu 2018-05-15 15:51 ` Dave Hansen 2018-05-15 16:35 ` Luck, Tony 2018-05-15 17:21 ` Fenghua Yu 2018-05-16 16:44 ` Dave Hansen 2018-05-16 21:35 ` Fenghua Yu 2018-05-14 18:52 ` [PATCH 04/15] x86/split_lock: Use non locked bit set instruction in set_cpu_cap Fenghua Yu 2018-05-14 18:52 ` [PATCH 05/15] x86/split_lock: Use non atomic set and clear bit instructions to clear cpufeature Fenghua Yu 2018-05-14 18:52 ` [PATCH 06/15] x86/split_lock: Save #AC setting for split lock in BIOS in boot time and restore the setting in reboot Fenghua Yu 2018-05-14 18:52 ` [PATCH 07/15] x86/split_lock: Handle suspend/hibernate and resume Fenghua Yu 2018-05-14 21:42 ` Rafael J. Wysocki 2018-05-14 18:52 ` [PATCH 08/15] x86/split_lock: Set split lock during EFI runtime service Fenghua Yu 2018-05-14 18:52 ` [PATCH 09/15] x86/split_lock: Explicitly enable or disable #AC for split locked accesses Fenghua Yu 2018-05-15 16:15 ` Dave Hansen 2018-05-15 17:29 ` Fenghua Yu 2018-05-16 16:37 ` Dave Hansen 2018-05-14 18:52 ` [PATCH 10/15] x86/split_lock: Add a sysfs interface to allow user to enable or disable split lock during run time Fenghua Yu 2018-05-14 18:52 ` [PATCH 11/15] x86/split_lock: Add sysfs interface to control user mode behavior Fenghua Yu 2018-05-14 18:52 ` [PATCH 12/15] x86/split_lock: Add sysfs interface to show and control BIOS split lock setting Fenghua Yu 2018-05-14 18:52 ` [PATCH 13/15] x86/split_lock: Trace #AC exception for split lock Fenghua Yu 2018-05-14 18:52 ` [PATCH 14/15] x86/split_lock: Add CONFIG and testing sysfs interface Fenghua Yu 2018-05-14 18:52 ` [PATCH 15/15] x86/split_lock: Add split lock user space test in selftest Fenghua Yu 2018-05-15 15:10 ` [PATCH 0/15] x86/split_lock: Enable #AC exception for split locked accesses Dave Hansen 2018-05-15 16:26 ` Alan Cox 2018-05-15 16:30 ` Dave Hansen
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=1526323945-211107-2-git-send-email-fenghua.yu@intel.com \ --to=fenghua.yu@intel.com \ --cc=alan@linux.intel.com \ --cc=arjan@infradead.org \ --cc=ashok.raj@intel.com \ --cc=dave.hansen@intel.com \ --cc=hpa@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=rafael.j.wysocki@intel.com \ --cc=ravi.v.shankar@intel.com \ --cc=tglx@linutronix.de \ --cc=tony.luck@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: linkBe 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).