From: Alexandre Chartre <alexandre.chartre@oracle.com>
To: "tglx@linutronix.de"@aserv0122.oracle.com,
"mingo@redhat.com"@aserv0122.oracle.com,
"bp@alien8.de"@aserv0122.oracle.com,
"hpa@zytor.com"@aserv0122.oracle.com,
"x86@kernel.org"@aserv0122.oracle.com,
"dave.hansen@linux.intel.com"@aserv0122.oracle.com,
"luto@kernel.org"@aserv0122.oracle.com,
"peterz@infradead.org"@aserv0122.oracle.com,
"linux-kernel@vger.kernel.org"@aserv0122.oracle.com,
"thomas.lendacky@amd.com"@aserv0122.oracle.com,
"jroedel@suse.de"@aserv0122.oracle.com
Cc: "konrad.wilk@oracle.com"@aserv0122.oracle.com,
"jan.setjeeilers@oracle.com"@aserv0122.oracle.com,
"junaids@google.com"@aserv0122.oracle.com,
"oweisse@google.com"@aserv0122.oracle.com,
"rppt@linux.vnet.ibm.com"@aserv0122.oracle.com,
"graf@amazon.de"@aserv0122.oracle.com,
"mgross@linux.intel.com"@aserv0122.oracle.com,
"kuzuno@gmail.com"@aserv0122.oracle.com,
"alexandre.chartre@oracle.com"@aserv0122.oracle.com
Subject: [RFC][PATCH 06/24] x86/pti: Provide C variants of PTI switch CR3 macros
Date: Mon, 9 Nov 2020 12:23:01 +0100 [thread overview]
Message-ID: <20201109112319.264511-7-alexandre.chartre@oracle.com> (raw)
In-Reply-To: <20201109112319.264511-1-alexandre.chartre@oracle.com>
Page Table Isolation (PTI) use assembly macros to switch the CR3
register between kernel and user page-tables. Add C functions which
implement the same features. For now, these C functions are not
used but they will eventually replace using the assembly macros.
Signed-off-by: Alexandre Chartre <alexandre.chartre@oracle.com>
---
arch/x86/entry/common.c | 44 +++++++++++++++
arch/x86/include/asm/entry-common.h | 84 +++++++++++++++++++++++++++++
2 files changed, 128 insertions(+)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 7ee15a12c115..d09b1ded5287 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -343,3 +343,47 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)
}
}
#endif /* CONFIG_XEN_PV */
+
+#ifdef CONFIG_PAGE_TABLE_ISOLATION
+
+static __always_inline unsigned long save_and_switch_to_kernel_cr3(void)
+{
+ unsigned long cr3, saved_cr3;
+
+ if (!static_cpu_has(X86_FEATURE_PTI))
+ return 0;
+
+ saved_cr3 = cr3 = __read_cr3();
+ if (cr3 & PTI_USER_PGTABLE_MASK) {
+ adjust_kernel_cr3(&cr3);
+ native_write_cr3(cr3);
+ }
+
+ return saved_cr3;
+}
+
+static __always_inline void restore_cr3(unsigned long cr3)
+{
+ if (!static_cpu_has(X86_FEATURE_PTI))
+ return;
+
+ if (static_cpu_has(X86_FEATURE_PCID)) {
+ if (cr3 & PTI_USER_PGTABLE_MASK)
+ adjust_user_cr3(&cr3);
+ else
+ cr3 |= X86_CR3_PCID_NOFLUSH;
+ }
+
+ native_write_cr3(cr3);
+}
+
+#else /* CONFIG_PAGE_TABLE_ISOLATION */
+
+static __always_inline unsigned long save_and_switch_to_kernel_cr3(void)
+{
+ return 0;
+}
+
+static __always_inline void restore_cr3(unsigned long cr3) {}
+
+#endif /* CONFIG_PAGE_TABLE_ISOLATION */
diff --git a/arch/x86/include/asm/entry-common.h b/arch/x86/include/asm/entry-common.h
index 6fe54b2813c1..b05b212f5ebc 100644
--- a/arch/x86/include/asm/entry-common.h
+++ b/arch/x86/include/asm/entry-common.h
@@ -7,6 +7,7 @@
#include <asm/nospec-branch.h>
#include <asm/io_bitmap.h>
#include <asm/fpu/api.h>
+#include <asm/tlbflush.h>
/* Check that the stack and regs on entry from user mode are sane. */
static __always_inline void arch_check_user_regs(struct pt_regs *regs)
@@ -81,4 +82,87 @@ static __always_inline void arch_exit_to_user_mode(void)
}
#define arch_exit_to_user_mode arch_exit_to_user_mode
+#ifndef MODULE
+#ifdef CONFIG_PAGE_TABLE_ISOLATION
+
+/*
+ * PAGE_TABLE_ISOLATION PGDs are 8k. Flip bit 12 to switch between the two
+ * halves:
+ */
+#define PTI_USER_PGTABLE_BIT PAGE_SHIFT
+#define PTI_USER_PGTABLE_MASK (1 << PTI_USER_PGTABLE_BIT)
+#define PTI_USER_PCID_BIT X86_CR3_PTI_PCID_USER_BIT
+#define PTI_USER_PCID_MASK (1 << PTI_USER_PCID_BIT)
+#define PTI_USER_PGTABLE_AND_PCID_MASK \
+ (PTI_USER_PCID_MASK | PTI_USER_PGTABLE_MASK)
+
+static __always_inline void adjust_kernel_cr3(unsigned long *cr3)
+{
+ if (static_cpu_has(X86_FEATURE_PCID))
+ *cr3 |= X86_CR3_PCID_NOFLUSH;
+
+ /*
+ * Clear PCID and "PAGE_TABLE_ISOLATION bit", point CR3
+ * at kernel pagetables.
+ */
+ *cr3 &= ~PTI_USER_PGTABLE_AND_PCID_MASK;
+}
+
+static __always_inline void adjust_user_cr3(unsigned long *cr3)
+{
+ unsigned short mask;
+ unsigned long asid;
+
+ /*
+ * Test if the ASID needs a flush.
+ */
+ asid = *cr3 & 0x7ff;
+ mask = this_cpu_read(cpu_tlbstate.user_pcid_flush_mask);
+ if (mask & (1 << asid)) {
+ /* Flush needed, clear the bit */
+ this_cpu_and(cpu_tlbstate.user_pcid_flush_mask, ~(1 << asid));
+ } else {
+ *cr3 |= X86_CR3_PCID_NOFLUSH;
+ }
+}
+
+static __always_inline void switch_to_kernel_cr3(void)
+{
+ unsigned long cr3;
+
+ if (!static_cpu_has(X86_FEATURE_PTI))
+ return;
+
+ cr3 = __read_cr3();
+ adjust_kernel_cr3(&cr3);
+ native_write_cr3(cr3);
+}
+
+static __always_inline void switch_to_user_cr3(void)
+{
+ unsigned long cr3;
+
+ if (!static_cpu_has(X86_FEATURE_PTI))
+ return;
+
+ cr3 = __read_cr3();
+ if (static_cpu_has(X86_FEATURE_PCID)) {
+ adjust_user_cr3(&cr3);
+ /* Flip the ASID to the user version */
+ cr3 |= PTI_USER_PCID_MASK;
+ }
+
+ /* Flip the PGD to the user version */
+ cr3 |= PTI_USER_PGTABLE_MASK;
+ native_write_cr3(cr3);
+}
+
+#else /* CONFIG_PAGE_TABLE_ISOLATION */
+
+static inline void switch_to_kernel_cr3(void) {}
+static inline void switch_to_user_cr3(void) {}
+
+#endif /* CONFIG_PAGE_TABLE_ISOLATION */
+#endif /* MODULE */
+
#endif
--
2.18.4
next prev parent reply other threads:[~2020-11-09 11:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 11:22 [RFC][PATCH 00/24] x86/pti: Defer CR3 switch to C code Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 01/24] x86/syscall: Add wrapper for invoking syscall function Alexandre Chartre
2020-11-09 17:25 ` Andy Lutomirski
2020-11-09 17:45 ` Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 02/24] x86/entry: Update asm_call_on_stack to support more function arguments Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 03/24] x86/entry: Consolidate IST entry from userspace Alexandre Chartre
2020-11-09 11:22 ` [RFC][PATCH 04/24] x86/sev-es: Define a setup stack function for the VC idtentry Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 05/24] x86/entry: Implement ret_from_fork body with C code Alexandre Chartre
2020-11-09 11:23 ` Alexandre Chartre [this message]
2020-11-09 11:23 ` [RFC][PATCH 07/24] x86/entry: Fill ESPFIX stack using " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 08/24] x86/entry: Add C version of SWAPGS and SWAPGS_UNSAFE_STACK Alexandre Chartre
2020-11-09 17:38 ` Andy Lutomirski
2020-11-09 18:04 ` Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 09/24] x86/entry: Add C version of paranoid_entry/exit Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 10/24] x86/pti: Introduce per-task PTI trampoline stack Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 11/24] x86/pti: Function to clone page-table entries from a specified mm Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 12/24] x86/pti: Function to map per-cpu page-table entry Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 13/24] x86/pti: Extend PTI user mappings Alexandre Chartre
2020-11-09 17:28 ` Andy Lutomirski
2020-11-09 17:52 ` Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 14/24] x86/pti: Use PTI stack instead of trampoline stack Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 15/24] x86/pti: Execute syscall functions on the kernel stack Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 16/24] x86/pti: Execute IDT handlers " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 17/24] x86/pti: Execute IDT handlers with error code " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 18/24] x86/pti: Execute system vector handlers " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 19/24] x86/pti: Execute page fault handler " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 20/24] x86/pti: Execute NMI " Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 21/24] x86/entry: Disable stack-protector for IST entry C handlers Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 22/24] x86/entry: Defer paranoid entry/exit to C code Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 23/24] x86/entry: Remove paranoid_entry and paranoid_exit Alexandre Chartre
2020-11-09 11:23 ` [RFC][PATCH 24/24] x86/pti: Defer CR3 switch to C code for non-IST and syscall entries Alexandre Chartre
2020-11-09 14:00 ` [RFC][PATCH 00/24] x86/pti: Defer CR3 switch to C code Alexandre Chartre
2020-11-09 14:44 Alexandre Chartre
2020-11-09 14:44 ` [RFC][PATCH 06/24] x86/pti: Provide C variants of PTI switch CR3 macros Alexandre Chartre
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=20201109112319.264511-7-alexandre.chartre@oracle.com \
--to=alexandre.chartre@oracle.com \
--cc="alexandre.chartre@oracle.com"@aserv0122.oracle.com \
--cc="bp@alien8.de"@aserv0122.oracle.com \
--cc="dave.hansen@linux.intel.com"@aserv0122.oracle.com \
--cc="graf@amazon.de"@aserv0122.oracle.com \
--cc="hpa@zytor.com"@aserv0122.oracle.com \
--cc="jan.setjeeilers@oracle.com"@aserv0122.oracle.com \
--cc="jroedel@suse.de"@aserv0122.oracle.com \
--cc="junaids@google.com"@aserv0122.oracle.com \
--cc="konrad.wilk@oracle.com"@aserv0122.oracle.com \
--cc="kuzuno@gmail.com"@aserv0122.oracle.com \
--cc="linux-kernel@vger.kernel.org"@aserv0122.oracle.com \
--cc="luto@kernel.org"@aserv0122.oracle.com \
--cc="mgross@linux.intel.com"@aserv0122.oracle.com \
--cc="mingo@redhat.com"@aserv0122.oracle.com \
--cc="oweisse@google.com"@aserv0122.oracle.com \
--cc="peterz@infradead.org"@aserv0122.oracle.com \
--cc="rppt@linux.vnet.ibm.com"@aserv0122.oracle.com \
--cc="tglx@linutronix.de"@aserv0122.oracle.com \
--cc="thomas.lendacky@amd.com"@aserv0122.oracle.com \
--cc="x86@kernel.org"@aserv0122.oracle.com \
/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
all inboxes | Powered by JetHome®