From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, "Andy Lutomirski" <luto@kernel.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
kvm@vger.kernel.org, "Jason A. Donenfeld" <Jason@zx2c4.com>,
"Rik van Riel" <riel@surriel.com>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>,
"Dave Hansen" <dave.hansen@intel.com>
Subject: [PATCH 12/24] x86/pkru: Provide .*_pkru_ins() functions
Date: Thu, 21 Mar 2019 21:26:20 +0100 [thread overview]
Message-ID: <20190321202632.16810-13-bigeasy@linutronix.de> (raw)
In-Reply-To: <20190321202632.16810-1-bigeasy@linutronix.de>
Dave Hansen has asked for __read_pkru() and __write_pkru() to be symmetrical.
As part of the series __write_pkru() will read back the value and only write it
if it is different.
In order to make both functions symmetrical move the function containing only
the opcode into a function with _isn() suffix. __write_pkru() will just invoke
__write_pkru_isn() but in a flowup patch will also read back the value.
Suggested-by: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/x86/include/asm/pgtable.h | 2 +-
arch/x86/include/asm/special_insns.h | 12 +++++++++---
arch/x86/kvm/vmx/vmx.c | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 2779ace16d23f..64333e5222cd9 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -127,7 +127,7 @@ static inline int pte_dirty(pte_t pte)
static inline u32 read_pkru(void)
{
if (boot_cpu_has(X86_FEATURE_OSPKE))
- return __read_pkru();
+ return __read_pkru_ins();
return 0;
}
diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h
index 43c029cdc3fe8..27328606ff687 100644
--- a/arch/x86/include/asm/special_insns.h
+++ b/arch/x86/include/asm/special_insns.h
@@ -92,7 +92,7 @@ static inline void native_write_cr8(unsigned long val)
#endif
#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
-static inline u32 __read_pkru(void)
+static inline u32 __read_pkru_ins(void)
{
u32 ecx = 0;
u32 edx, pkru;
@@ -107,7 +107,7 @@ static inline u32 __read_pkru(void)
return pkru;
}
-static inline void __write_pkru(u32 pkru)
+static inline void __write_pkru_ins(u32 pkru)
{
u32 ecx = 0, edx = 0;
@@ -118,8 +118,14 @@ static inline void __write_pkru(u32 pkru)
asm volatile(".byte 0x0f,0x01,0xef\n\t"
: : "a" (pkru), "c"(ecx), "d"(edx));
}
+
+static inline void __write_pkru(u32 pkru)
+{
+ __write_pkru_ins(pkru);
+}
+
#else
-static inline u32 __read_pkru(void)
+static inline u32 __read_pkru_ins(void)
{
return 0;
}
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index c73375e01ab8c..0753b3967423a 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6514,7 +6514,7 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
*/
if (static_cpu_has(X86_FEATURE_PKU) &&
kvm_read_cr4_bits(vcpu, X86_CR4_PKE)) {
- vcpu->arch.pkru = __read_pkru();
+ vcpu->arch.pkru = __read_pkru_ins();
if (vcpu->arch.pkru != vmx->host_pkru)
__write_pkru(vmx->host_pkru);
}
--
2.20.1
next prev parent reply other threads:[~2019-03-21 20:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-21 20:26 [PATCH v8] x86: load FPU registers on return to userland Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 01/24] x86/fpu: Remove fpu->initialized usage in __fpu__restore_sig() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 02/24] x86/fpu: Remove fpu__restore() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 03/24] x86/fpu: Remove preempt_disable() in fpu__clear() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 04/24] x86/fpu: Always init the `state' " Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 05/24] x86/fpu: Remove fpu->initialized usage in copy_fpstate_to_sigframe() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 06/24] x86/fpu: Don't save fxregs for ia32 frames " Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 07/24] x86/fpu: Remove fpu->initialized Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 08/24] x86/fpu: Remove user_fpu_begin() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 09/24] x86/fpu: Add (__)make_fpregs_active helpers Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 10/24] x86/fpu: Make __raw_xsave_addr() use feature number instead of mask Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 11/24] x86/fpu: Make get_xsave_field_ptr() and get_xsave_addr() " Sebastian Andrzej Siewior
2019-03-21 20:26 ` Sebastian Andrzej Siewior [this message]
2019-03-21 20:26 ` [PATCH 13/24] x86/fpu: Only write PKRU if it is different from current Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 14/24] x86/pkeys: Don't check if PKRU is zero before writting it Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 15/24] x86/fpu: Eager switch PKRU state Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 16/24] x86/entry: Add TIF_NEED_FPU_LOAD Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 17/24] x86/fpu: Always store the registers in copy_fpstate_to_sigframe() Sebastian Andrzej Siewior
2019-03-31 16:54 ` Thomas Gleixner
2019-03-21 20:26 ` [PATCH 18/24] x86/fpu: Prepare copy_fpstate_to_sigframe() for TIF_NEED_FPU_LOAD Sebastian Andrzej Siewior
2019-03-31 18:20 ` Thomas Gleixner
2019-04-01 8:24 ` Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 19/24] x86/fpu: Update xstate's PKRU value on write_pkru() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 20/24] x86/fpu: Inline copy_user_to_fpregs_zeroing() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 21/24] x86/fpu: Let __fpu__restore_sig() restore the !32bit+fxsr frame from kernel memory Sebastian Andrzej Siewior
2019-03-22 14:55 ` Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 22/24] x86/fpu: Merge the two code paths in __fpu__restore_sig() Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 23/24] x86/fpu: Defer FPU state load until return to userspace Sebastian Andrzej Siewior
2019-03-21 20:26 ` [PATCH 24/24] x86/pkeys: add PKRU value to init_fpstate Sebastian Andrzej Siewior
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=20190321202632.16810-13-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=Jason@zx2c4.com \
--cc=dave.hansen@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=pbonzini@redhat.com \
--cc=riel@surriel.com \
--cc=rkrcmar@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).