From: Ashok Raj <ashok.raj@intel.com>
To: linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Tim Chen <tim.c.chen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg KH <gregkh@linuxfoundation.org>
Cc: Ashok Raj <ashok.raj@intel.com>,
Dave Hansen <dave.hansen@intel.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Andi Kleen <ak@linux.intel.com>,
Arjan Van De Ven <arjan.van.de.ven@intel.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Peter Zijlstra <peterz@infradead.org>,
Dan Williams <dan.j.williams@intel.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Jun Nakajima <jun.nakajima@intel.com>,
Asit Mallick <asit.k.mallick@intel.com>
Subject: [PATCH 2/5] x86/ibrs: Add new helper macros to save/restore MSR_IA32_SPEC_CTRL
Date: Thu, 11 Jan 2018 17:32:16 -0800 [thread overview]
Message-ID: <1515720739-43819-3-git-send-email-ashok.raj@intel.com> (raw)
In-Reply-To: <1515720739-43819-1-git-send-email-ashok.raj@intel.com>
Add some helper macros to save/restore MSR_IA32_SPEC_CTRL.
Although we could use the spec_ctrl_unprotected_begin/end macros they seem
be bit unreadable for some uses.
spec_ctrl_get - read MSR_IA32_SPEC_CTRL to save
spec_ctrl_set - write value restore MSR_IA32_SPEC_CTRL
spec_ctrl_restriction_off - same as spec_ctrl_unprotected_begin
spec_ctrl_restriction_on - same as spec_ctrl_unprotected_end
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
---
arch/x86/include/asm/spec_ctrl.h | 12 ++++++++++++
arch/x86/kernel/cpu/spec_ctrl.c | 11 +++++++++++
2 files changed, 23 insertions(+)
diff --git a/arch/x86/include/asm/spec_ctrl.h b/arch/x86/include/asm/spec_ctrl.h
index 2dfa31b..926feb2 100644
--- a/arch/x86/include/asm/spec_ctrl.h
+++ b/arch/x86/include/asm/spec_ctrl.h
@@ -9,6 +9,10 @@
void spec_ctrl_scan_feature(struct cpuinfo_x86 *c);
void spec_ctrl_unprotected_begin(void);
void spec_ctrl_unprotected_end(void);
+void spec_ctrl_set(u64 val);
+
+#define spec_ctrl_restriction_on spec_ctrl_unprotected_end
+#define spec_ctrl_restriction_off spec_ctrl_unprotected_begin
static inline u64 native_rdmsrl(unsigned int msr)
{
@@ -34,4 +38,12 @@ static inline void __enable_indirect_speculation(void)
native_wrmsrl(MSR_IA32_SPEC_CTRL, SPEC_CTRL_DISABLE_IBRS);
}
+static inline u64 spec_ctrl_get(void)
+{
+ u64 val;
+
+ val = native_rdmsrl(MSR_IA32_SPEC_CTRL);
+
+ return val;
+}
#endif /* _ASM_X86_SPEC_CTRL_H */
diff --git a/arch/x86/kernel/cpu/spec_ctrl.c b/arch/x86/kernel/cpu/spec_ctrl.c
index 9e9d013..02fc630 100644
--- a/arch/x86/kernel/cpu/spec_ctrl.c
+++ b/arch/x86/kernel/cpu/spec_ctrl.c
@@ -47,3 +47,14 @@ void spec_ctrl_unprotected_end(void)
__disable_indirect_speculation();
}
EXPORT_SYMBOL_GPL(spec_ctrl_unprotected_end);
+
+void spec_ctrl_set(u64 val)
+{
+ if (boot_cpu_has(X86_FEATURE_SPEC_CTRL)) {
+ if (!val) {
+ spec_ctrl_restriction_off();
+ } else
+ spec_ctrl_restriction_on();
+ }
+}
+EXPORT_SYMBOL(spec_ctrl_set);
--
2.7.4
next prev parent reply other threads:[~2018-01-12 1:33 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-12 1:32 [PATCH 0/5] Add support for IBRS & IBPB KVM support Ashok Raj
2018-01-12 1:32 ` [PATCH 1/5] x86/ibrs: Introduce native_rdmsrl, and native_wrmsrl Ashok Raj
2018-01-12 1:41 ` Andy Lutomirski
2018-01-12 1:52 ` Raj, Ashok
2018-01-12 2:20 ` Andy Lutomirski
2018-01-12 3:01 ` Raj, Ashok
2018-01-12 5:03 ` Dave Hansen
2018-01-12 16:28 ` Josh Poimboeuf
2018-01-12 16:28 ` Woodhouse, David
2018-01-13 6:20 ` Andy Lutomirski
2018-01-13 13:52 ` Van De Ven, Arjan
2018-01-13 15:20 ` Andy Lutomirski
2018-01-13 6:19 ` Andy Lutomirski
2018-01-12 7:54 ` Greg KH
2018-01-12 12:28 ` Borislav Petkov
2018-01-12 1:32 ` Ashok Raj [this message]
2018-01-12 1:32 ` [PATCH 3/5] x86/ibrs: Add direct access support for MSR_IA32_SPEC_CTRL Ashok Raj
2018-01-12 1:58 ` Dave Hansen
2018-01-12 3:14 ` Raj, Ashok
2018-01-12 9:51 ` Peter Zijlstra
2018-01-12 10:09 ` David Woodhouse
2018-01-15 13:45 ` Peter Zijlstra
2018-01-15 13:59 ` David Woodhouse
2018-01-15 14:45 ` Peter Zijlstra
2018-01-12 1:32 ` [PATCH 4/5] x86/svm: Direct access to MSR_IA32_SPEC_CTRL Ashok Raj
2018-01-12 7:23 ` David Woodhouse
2018-01-12 9:58 ` Peter Zijlstra
2018-01-12 10:13 ` David Woodhouse
2018-01-12 12:38 ` Paolo Bonzini
2018-01-12 15:14 ` Tom Lendacky
2018-01-12 1:32 ` [PATCH 5/5] x86/feature: Detect the x86 feature Indirect Branch Prediction Barrier Ashok Raj
2018-01-12 10:08 ` Peter Zijlstra
2018-01-12 12:32 ` Borislav Petkov
2018-01-12 12:39 ` Woodhouse, David
2018-01-12 15:21 ` Tom Lendacky
2018-01-12 15:31 ` Tom Lendacky
2018-01-12 15:36 ` Woodhouse, David
2018-01-12 17:06 ` Tom Lendacky
2018-02-01 21:59 [PATCH v6 0/5] KVM: Expose speculation control feature to guests KarimAllah Ahmed
2018-02-01 21:59 ` [PATCH v6 1/5] KVM: x86: Update the reverse_cpuid list to include CPUID_7_EDX KarimAllah Ahmed
2018-02-02 17:37 ` Jim Mattson
2018-02-03 22:50 ` [tip:x86/pti] KVM/x86: " tip-bot for KarimAllah Ahmed
2018-02-01 21:59 ` [PATCH v6 2/5] KVM: x86: Add IBPB support KarimAllah Ahmed
2018-02-02 17:49 ` Konrad Rzeszutek Wilk
2018-02-02 18:02 ` David Woodhouse
2018-02-02 19:56 ` Konrad Rzeszutek Wilk
2018-02-02 20:16 ` David Woodhouse
2018-02-02 20:28 ` Konrad Rzeszutek Wilk
2018-02-02 20:31 ` David Woodhouse
2018-02-02 20:52 ` Konrad Rzeszutek Wilk
2018-02-02 20:52 ` Alan Cox
2018-02-05 19:22 ` Paolo Bonzini
2018-02-05 19:24 ` Paolo Bonzini
2018-02-03 22:50 ` [tip:x86/pti] KVM/x86: " tip-bot for Ashok Raj
2018-02-16 3:44 ` [PATCH v6 2/5] KVM: x86: " Jim Mattson
2018-02-16 4:22 ` Andi Kleen
2018-05-03 1:27 ` Wanpeng Li
2018-05-03 9:19 ` Paolo Bonzini
2018-05-03 12:01 ` Wanpeng Li
2018-05-03 12:46 ` Tian, Kevin
2018-02-01 21:59 ` [PATCH v6 3/5] KVM: VMX: Emulate MSR_IA32_ARCH_CAPABILITIES KarimAllah Ahmed
2018-02-02 10:53 ` Darren Kenny
2018-02-02 17:35 ` Jim Mattson
2018-02-02 17:51 ` Konrad Rzeszutek Wilk
2018-02-03 22:51 ` [tip:x86/pti] KVM/VMX: " tip-bot for KarimAllah Ahmed
2018-02-01 21:59 ` [PATCH v6 4/5] KVM: VMX: Allow direct access to MSR_IA32_SPEC_CTRL KarimAllah Ahmed
2018-02-02 11:03 ` Darren Kenny
2018-02-02 11:27 ` David Woodhouse
2018-02-02 17:53 ` Konrad Rzeszutek Wilk
2018-02-02 18:05 ` David Woodhouse
2018-02-02 18:19 ` Konrad Rzeszutek Wilk
2018-02-02 17:57 ` Jim Mattson
2018-02-03 22:51 ` [tip:x86/pti] KVM/VMX: " tip-bot for KarimAllah Ahmed
2018-02-01 21:59 ` [PATCH v6 5/5] KVM: SVM: " KarimAllah Ahmed
2018-02-02 11:06 ` Darren Kenny
2018-02-02 18:02 ` Konrad Rzeszutek Wilk
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=1515720739-43819-3-git-send-email-ashok.raj@intel.com \
--to=ashok.raj@intel.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=arjan.van.de.ven@intel.com \
--cc=asit.k.mallick@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=dwmw@amazon.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jun.nakajima@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=tim.c.chen@linux.intel.com \
--cc=torvalds@linux-foundation.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).