From: Xiaoyao Li <xiaoyao.li@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
hpa@zytor.com, Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Andy Lutomirski <luto@kernel.org>,
tony.luck@intel.com
Cc: peterz@infradead.org, fenghua.yu@intel.com,
Arvind Sankar <nivedita@alum.mit.edu>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Jim Mattson <jmattson@google.com>,
x86@kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org, Xiaoyao Li <xiaoyao.li@intel.com>
Subject: [PATCH v4 03/10] x86/split_lock: Re-define the kernel param option for split_lock_detect
Date: Sat, 14 Mar 2020 15:34:07 +0800 [thread overview]
Message-ID: <20200314073414.184213-4-xiaoyao.li@intel.com> (raw)
In-Reply-To: <20200314073414.184213-1-xiaoyao.li@intel.com>
Change sld_off to sld_disable, which means disabling feature split lock
detection and it cannot be used in kernel nor can kvm expose it guest.
Of course, the X86_FEATURE_SPLIT_LOCK_DETECT is not set.
Add a new optioin sld_kvm_only, which means kernel turns split lock
detection off, but kvm can expose it to guest.
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
---
.../admin-guide/kernel-parameters.txt | 5 ++++-
arch/x86/kernel/cpu/intel.c | 22 ++++++++++++++-----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 1ee2d1e6d89a..2b922061ff08 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4666,7 +4666,10 @@
instructions that access data across cache line
boundaries will result in an alignment check exception.
- off - not enabled
+ disable - disabled, neither kernel nor kvm can use it.
+
+ kvm_only - off in kernel but kvm can expose it to
+ guest for debug/testing scenario.
warn - the kernel will emit rate limited warnings
about applications triggering the #AC
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 4b3245035b5a..3eeab717a0d0 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -35,7 +35,8 @@
enum split_lock_detect_state {
sld_not_exist = 0,
- sld_off,
+ sld_disable,
+ sld_kvm_only,
sld_warn,
sld_fatal,
};
@@ -973,7 +974,8 @@ static const struct {
const char *option;
enum split_lock_detect_state state;
} sld_options[] __initconst = {
- { "off", sld_off },
+ { "disable", sld_disable },
+ { "kvm_only", sld_kvm_only },
{ "warn", sld_warn },
{ "fatal", sld_fatal },
};
@@ -1004,10 +1006,14 @@ static void __init split_lock_setup(void)
}
switch (sld_state) {
- case sld_off:
+ case sld_disable:
pr_info("disabled\n");
break;
+ case sld_kvm_only:
+ pr_info("off in kernel, but kvm can expose it to guest\n");
+ break;
+
case sld_warn:
pr_info("warning about user-space split_locks\n");
break;
@@ -1062,7 +1068,13 @@ static void split_lock_init(struct cpuinfo_x86 *c)
test_ctrl_val = val;
switch (sld_state) {
- case sld_off:
+ case sld_disable:
+ if (wrmsrl_safe(MSR_TEST_CTRL, test_ctrl_val & ~MSR_TEST_CTRL_SPLIT_LOCK_DETECT))
+ goto msr_broken;
+ return;
+ case sld_kvm_only:
+ if (wrmsrl_safe(MSR_TEST_CTRL, test_ctrl_val | MSR_TEST_CTRL_SPLIT_LOCK_DETECT))
+ goto msr_broken;
if (wrmsrl_safe(MSR_TEST_CTRL, test_ctrl_val & ~MSR_TEST_CTRL_SPLIT_LOCK_DETECT))
goto msr_broken;
break;
@@ -1087,7 +1099,7 @@ static void split_lock_init(struct cpuinfo_x86 *c)
* funny things and you get to keep whatever pieces.
*/
pr_warn_once("MSR fail -- disabled\n");
- sld_state = sld_off;
+ sld_state = sld_disable;
}
bool handle_user_split_lock(struct pt_regs *regs, long error_code)
--
2.20.1
next prev parent reply other threads:[~2020-03-15 2:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-14 7:34 [PATCH v4 00/10] x86/split_lock: Add feature split lock detection support in kvm Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 01/10] x86/split_lock: Rework the initialization flow of split lock detection Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 02/10] x86/split_lock: Avoid runtime reads of the TEST_CTRL MSR Xiaoyao Li
2020-03-14 7:34 ` Xiaoyao Li [this message]
2020-03-14 7:34 ` [PATCH v4 04/10] x86/split_lock: Export handle_user_split_lock() Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 05/10] x86/split_lock: Add and export several functions for KVM Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 06/10] kvm: x86: Emulate split-lock access as a write Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 07/10] kvm: vmx: Extend VMX's #AC interceptor to handle split lock #AC happens in guest Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 08/10] kvm: x86: Emulate MSR IA32_CORE_CAPABILITIES Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 09/10] kvm: vmx: Enable MSR_TEST_CTRL for intel guest Xiaoyao Li
2020-03-14 7:34 ` [PATCH v4 10/10] x86: vmx: virtualize split lock detection Xiaoyao Li
2020-03-15 2:56 ` Xiaoyao Li
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=20200314073414.184213-4-xiaoyao.li@intel.com \
--to=xiaoyao.li@intel.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=nivedita@alum.mit.edu \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vkuznets@redhat.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;
as well as URLs for NNTP newsgroup(s).