From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Andy Lutomirski <luto@amacapital.net>
Cc: x86@kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org,
David Laight <David.Laight@aculab.com>,
Xiaoyao Li <xiaoyao.li@intel.com>
Subject: [PATCH v2 1/6] x86/split_lock: Add and export get_split_lock_detect_state()
Date: Mon, 3 Feb 2020 23:16:03 +0800 [thread overview]
Message-ID: <20200203151608.28053-2-xiaoyao.li@intel.com> (raw)
In-Reply-To: <20200203151608.28053-1-xiaoyao.li@intel.com>
get_split_lock_detect_state() will be used by KVM module to get sld_state.
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
arch/x86/include/asm/cpu.h | 12 ++++++++++++
arch/x86/kernel/cpu/intel.c | 12 ++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index ff6f3ca649b3..167d0539e0ad 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -40,11 +40,23 @@ 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);
+
+enum split_lock_detect_state {
+ sld_off = 0,
+ sld_warn,
+ sld_fatal,
+};
+
#ifdef CONFIG_CPU_SUP_INTEL
+extern enum split_lock_detect_state get_split_lock_detect_state(void);
extern void __init cpu_set_core_cap_bits(struct cpuinfo_x86 *c);
extern void switch_to_sld(unsigned long tifn);
extern bool handle_user_split_lock(struct pt_regs *regs, long error_code);
#else
+static inline enum split_lock_detect_state get_split_lock_detect_state(void)
+{
+ return sld_off;
+}
static inline void __init cpu_set_core_cap_bits(struct cpuinfo_x86 *c) {}
static inline void switch_to_sld(unsigned long tifn) {}
static inline bool handle_user_split_lock(struct pt_regs *regs, long error_code)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index db3e745e5d47..a810cd022db5 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -33,12 +33,6 @@
#include <asm/apic.h>
#endif
-enum split_lock_detect_state {
- sld_off = 0,
- sld_warn,
- sld_fatal,
-};
-
/*
* Default to sld_off because most systems do not support split lock detection
* split_lock_setup() will switch this to sld_warn on systems that support
@@ -968,6 +962,12 @@ cpu_dev_register(intel_cpu_dev);
#undef pr_fmt
#define pr_fmt(fmt) "x86/split lock detection: " fmt
+enum split_lock_detect_state get_split_lock_detect_state(void)
+{
+ return sld_state;
+}
+EXPORT_SYMBOL_GPL(get_split_lock_detect_state);
+
static const struct {
const char *option;
enum split_lock_detect_state state;
--
2.23.0
next prev parent reply other threads:[~2020-02-03 15:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-03 15:16 [PATCH v2 0/6] kvm/split_lock: Add feature split lock detection support in kvm Xiaoyao Li
2020-02-03 15:16 ` Xiaoyao Li [this message]
2020-02-03 21:45 ` [PATCH v2 1/6] x86/split_lock: Add and export get_split_lock_detect_state() Sean Christopherson
2020-02-03 15:16 ` [PATCH v2 2/6] x86/split_lock: Add and export split_lock_detect_set() Xiaoyao Li
2020-02-03 15:16 ` [PATCH v2 3/6] kvm: x86: Emulate split-lock access as a write Xiaoyao Li
2020-02-03 20:54 ` Sean Christopherson
2020-02-04 2:55 ` Xiaoyao Li
2020-02-11 12:20 ` Paolo Bonzini
2020-02-11 13:22 ` Thomas Gleixner
2020-02-11 13:34 ` Paolo Bonzini
2020-02-11 14:02 ` Xiaoyao Li
2020-02-11 14:34 ` David Laight
2020-02-27 0:11 ` Sean Christopherson
2020-03-12 11:42 ` Xiaoyao Li
2020-03-12 15:00 ` Paolo Bonzini
2020-02-03 15:16 ` [PATCH v2 4/6] kvm: vmx: Extend VMX's #AC handding for split lock in guest Xiaoyao Li
2020-02-03 21:14 ` Sean Christopherson
2020-02-04 6:46 ` Xiaoyao Li
2020-02-10 21:30 ` Sean Christopherson
2020-02-03 15:16 ` [PATCH v2 5/6] kvm: x86: Emulate MSR IA32_CORE_CAPABILITIES Xiaoyao Li
2020-02-03 21:43 ` Sean Christopherson
2020-02-04 9:19 ` Xiaoyao Li
2020-02-04 9:37 ` Peter Zijlstra
2020-02-11 3:52 ` Andy Lutomirski
2020-02-11 12:38 ` Peter Zijlstra
2020-02-03 15:16 ` [PATCH v2 6/6] x86: vmx: virtualize split lock detection Xiaoyao Li
2020-02-03 15:58 ` Xiaoyao Li
2020-02-03 18:52 ` Andy Lutomirski
2020-02-03 21:42 ` Sean Christopherson
2020-02-04 2:52 ` Xiaoyao Li
2020-02-04 5:35 ` 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=20200203151608.28053-2-xiaoyao.li@intel.com \
--to=xiaoyao.li@intel.com \
--cc=David.Laight@aculab.com \
--cc=bp@alien8.de \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--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).