From: Dave Hansen <dave.hansen@linux.intel.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, dave.hansen@linux.intel.com,
moritz.lipp@iaik.tugraz.at, daniel.gruss@iaik.tugraz.at,
michael.schwarz@iaik.tugraz.at, luto@kernel.org,
torvalds@linux-foundation.org, keescook@google.com,
hughd@google.com, x86@kernel.org
Subject: [PATCH 18/23] x86, mm: Move CR3 construction functions
Date: Tue, 31 Oct 2017 15:32:19 -0700 [thread overview]
Message-ID: <20171031223219.620D984B@viggo.jf.intel.com> (raw)
In-Reply-To: <20171031223146.6B47C861@viggo.jf.intel.com>
For flushing the TLB, we need to know which ASID has been programmed
into the hardware. Since that differs from what is in 'cpu_tlbstate',
we need to be able to transform the ASID in cpu_tlbstate to the one
programmed into the hardware.
It's not easy to include mmu_context.h into tlbflush.h, so just move
the CR3 building over to tlbflush.h.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Moritz Lipp <moritz.lipp@iaik.tugraz.at>
Cc: Daniel Gruss <daniel.gruss@iaik.tugraz.at>
Cc: Michael Schwarz <michael.schwarz@iaik.tugraz.at>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Kees Cook <keescook@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: x86@kernel.org
---
b/arch/x86/include/asm/mmu_context.h | 29 +----------------------------
b/arch/x86/include/asm/tlbflush.h | 27 +++++++++++++++++++++++++++
b/arch/x86/mm/tlb.c | 8 ++++----
3 files changed, 32 insertions(+), 32 deletions(-)
diff -puN arch/x86/include/asm/mmu_context.h~kaiser-pcid-pre-build-func-move arch/x86/include/asm/mmu_context.h
--- a/arch/x86/include/asm/mmu_context.h~kaiser-pcid-pre-build-func-move 2017-10-31 15:03:58.508498981 -0700
+++ b/arch/x86/include/asm/mmu_context.h 2017-10-31 15:03:58.516499360 -0700
@@ -281,33 +281,6 @@ static inline bool arch_vma_access_permi
}
/*
- * If PCID is on, ASID-aware code paths put the ASID+1 into the PCID
- * bits. This serves two purposes. It prevents a nasty situation in
- * which PCID-unaware code saves CR3, loads some other value (with PCID
- * == 0), and then restores CR3, thus corrupting the TLB for ASID 0 if
- * the saved ASID was nonzero. It also means that any bugs involving
- * loading a PCID-enabled CR3 with CR4.PCIDE off will trigger
- * deterministically.
- */
-
-static inline unsigned long build_cr3(struct mm_struct *mm, u16 asid)
-{
- if (static_cpu_has(X86_FEATURE_PCID)) {
- VM_WARN_ON_ONCE(asid > 4094);
- return __sme_pa(mm->pgd) | (asid + 1);
- } else {
- VM_WARN_ON_ONCE(asid != 0);
- return __sme_pa(mm->pgd);
- }
-}
-
-static inline unsigned long build_cr3_noflush(struct mm_struct *mm, u16 asid)
-{
- VM_WARN_ON_ONCE(asid > 4094);
- return __sme_pa(mm->pgd) | (asid + 1) | CR3_NOFLUSH;
-}
-
-/*
* This can be used from process context to figure out what the value of
* CR3 is without needing to do a (slow) __read_cr3().
*
@@ -316,7 +289,7 @@ static inline unsigned long build_cr3_no
*/
static inline unsigned long __get_current_cr3_fast(void)
{
- unsigned long cr3 = build_cr3(this_cpu_read(cpu_tlbstate.loaded_mm),
+ unsigned long cr3 = build_cr3(this_cpu_read(cpu_tlbstate.loaded_mm)->pgd,
this_cpu_read(cpu_tlbstate.loaded_mm_asid));
/* For now, be very restrictive about when this can be called. */
diff -puN arch/x86/include/asm/tlbflush.h~kaiser-pcid-pre-build-func-move arch/x86/include/asm/tlbflush.h
--- a/arch/x86/include/asm/tlbflush.h~kaiser-pcid-pre-build-func-move 2017-10-31 15:03:58.510499076 -0700
+++ b/arch/x86/include/asm/tlbflush.h 2017-10-31 15:03:58.518499454 -0700
@@ -74,6 +74,33 @@ static inline u64 inc_mm_tlb_gen(struct
return new_tlb_gen;
}
+/*
+ * If PCID is on, ASID-aware code paths put the ASID+1 into the PCID
+ * bits. This serves two purposes. It prevents a nasty situation in
+ * which PCID-unaware code saves CR3, loads some other value (with PCID
+ * == 0), and then restores CR3, thus corrupting the TLB for ASID 0 if
+ * the saved ASID was nonzero. It also means that any bugs involving
+ * loading a PCID-enabled CR3 with CR4.PCIDE off will trigger
+ * deterministically.
+ */
+struct pgd_t;
+static inline unsigned long build_cr3(pgd_t *pgd, u16 asid)
+{
+ if (static_cpu_has(X86_FEATURE_PCID)) {
+ VM_WARN_ON_ONCE(asid > 4094);
+ return __sme_pa(pgd) | (asid + 1);
+ } else {
+ VM_WARN_ON_ONCE(asid != 0);
+ return __sme_pa(pgd);
+ }
+}
+
+static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid)
+{
+ VM_WARN_ON_ONCE(asid > 4094);
+ return __sme_pa(pgd) | (asid + 1) | CR3_NOFLUSH;
+}
+
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
#else
diff -puN arch/x86/mm/tlb.c~kaiser-pcid-pre-build-func-move arch/x86/mm/tlb.c
--- a/arch/x86/mm/tlb.c~kaiser-pcid-pre-build-func-move 2017-10-31 15:03:58.512499170 -0700
+++ b/arch/x86/mm/tlb.c 2017-10-31 15:03:58.518499454 -0700
@@ -127,7 +127,7 @@ void switch_mm_irqs_off(struct mm_struct
* isn't free.
*/
#ifdef CONFIG_DEBUG_VM
- if (WARN_ON_ONCE(__read_cr3() != build_cr3(real_prev, prev_asid))) {
+ if (WARN_ON_ONCE(__read_cr3() != build_cr3(real_prev->pgd, prev_asid))) {
/*
* If we were to BUG here, we'd be very likely to kill
* the system so hard that we don't see the call trace.
@@ -194,12 +194,12 @@ void switch_mm_irqs_off(struct mm_struct
if (need_flush) {
this_cpu_write(cpu_tlbstate.ctxs[new_asid].ctx_id, next->context.ctx_id);
this_cpu_write(cpu_tlbstate.ctxs[new_asid].tlb_gen, next_tlb_gen);
- write_cr3(build_cr3(next, new_asid));
+ write_cr3(build_cr3(next->pgd, new_asid));
trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH,
TLB_FLUSH_ALL);
} else {
/* The new ASID is already up to date. */
- write_cr3(build_cr3_noflush(next, new_asid));
+ write_cr3(build_cr3_noflush(next->pgd, new_asid));
trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, 0);
}
@@ -277,7 +277,7 @@ void initialize_tlbstate_and_flush(void)
!(cr4_read_shadow() & X86_CR4_PCIDE));
/* Force ASID 0 and force a TLB flush. */
- write_cr3(build_cr3(mm, 0));
+ write_cr3(build_cr3(mm->pgd, 0));
/* Reinitialize tlbstate. */
this_cpu_write(cpu_tlbstate.loaded_mm_asid, 0);
_
next prev parent reply other threads:[~2017-10-31 22:32 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 22:31 [PATCH 00/23] KAISER: unmap most of the kernel from userspace page tables Dave Hansen
2017-10-31 22:31 ` [PATCH 01/23] x86, kaiser: prepare assembly for entry/exit CR3 switching Dave Hansen
2017-11-01 0:43 ` Brian Gerst
2017-11-01 1:08 ` Dave Hansen
2017-11-01 18:18 ` Borislav Petkov
2017-11-01 18:27 ` Dave Hansen
2017-11-01 20:42 ` Borislav Petkov
2017-11-01 21:01 ` Thomas Gleixner
2017-11-01 22:58 ` Dave Hansen
2017-10-31 22:31 ` [PATCH 02/23] x86, kaiser: do not set _PAGE_USER for init_mm page tables Dave Hansen
2017-11-01 21:11 ` Thomas Gleixner
2017-11-01 21:24 ` Andy Lutomirski
2017-11-01 21:28 ` Thomas Gleixner
2017-11-01 21:52 ` Dave Hansen
2017-11-01 22:11 ` Thomas Gleixner
2017-11-01 22:12 ` Linus Torvalds
2017-11-01 22:20 ` Thomas Gleixner
2017-11-01 22:45 ` Kees Cook
2017-11-02 7:10 ` Andy Lutomirski
2017-11-02 11:33 ` Thomas Gleixner
2017-11-02 11:59 ` Andy Lutomirski
2017-11-02 12:56 ` Thomas Gleixner
2017-11-02 16:38 ` Dave Hansen
2017-11-02 18:19 ` Andy Lutomirski
2017-11-02 18:24 ` Thomas Gleixner
2017-11-02 18:24 ` Linus Torvalds
2017-11-02 18:40 ` Thomas Gleixner
2017-11-02 18:57 ` Linus Torvalds
2017-11-02 21:41 ` Thomas Gleixner
2017-11-02 7:07 ` Andy Lutomirski
2017-11-02 11:21 ` Thomas Gleixner
2017-10-31 22:31 ` [PATCH 03/23] x86, kaiser: disable global pages Dave Hansen
2017-11-01 21:18 ` Thomas Gleixner
2017-11-01 22:12 ` Dave Hansen
2017-11-01 22:28 ` Thomas Gleixner
2017-10-31 22:31 ` [PATCH 04/23] x86, tlb: make CR4-based TLB flushes more robust Dave Hansen
2017-11-01 8:01 ` Andy Lutomirski
2017-11-01 10:11 ` Kirill A. Shutemov
2017-11-01 10:38 ` Andy Lutomirski
2017-11-01 10:56 ` Kirill A. Shutemov
2017-11-01 11:18 ` Andy Lutomirski
2017-11-01 22:21 ` Dave Hansen
2017-11-01 21:25 ` Thomas Gleixner
2017-11-01 22:24 ` Dave Hansen
2017-11-01 22:30 ` Thomas Gleixner
2017-10-31 22:31 ` [PATCH 05/23] x86, mm: document X86_CR4_PGE toggling behavior Dave Hansen
2017-10-31 23:31 ` Kees Cook
2017-10-31 22:31 ` [PATCH 06/23] x86, kaiser: introduce user-mapped percpu areas Dave Hansen
2017-11-01 21:47 ` Thomas Gleixner
2017-10-31 22:31 ` [PATCH 07/23] x86, kaiser: unmap kernel from userspace page tables (core patch) Dave Hansen
2017-10-31 22:32 ` [PATCH 08/23] x86, kaiser: only populate shadow page tables for userspace Dave Hansen
2017-10-31 23:35 ` Kees Cook
2017-10-31 22:32 ` [PATCH 09/23] x86, kaiser: allow NX to be set in p4d/pgd Dave Hansen
2017-10-31 22:32 ` [PATCH 10/23] x86, kaiser: make sure static PGDs are 8k in size Dave Hansen
2017-10-31 22:32 ` [PATCH 11/23] x86, kaiser: map GDT into user page tables Dave Hansen
2017-10-31 22:32 ` [PATCH 12/23] x86, kaiser: map dynamically-allocated LDTs Dave Hansen
2017-11-01 8:00 ` Andy Lutomirski
2017-11-01 8:06 ` Ingo Molnar
2017-10-31 22:32 ` [PATCH 13/23] x86, kaiser: map espfix structures Dave Hansen
2017-10-31 22:32 ` [PATCH 14/23] x86, kaiser: map entry stack variables Dave Hansen
2017-10-31 22:32 ` [PATCH 15/23] x86, kaiser: map trace interrupt entry Dave Hansen
2017-10-31 22:32 ` [PATCH 16/23] x86, kaiser: map debug IDT tables Dave Hansen
2017-10-31 22:32 ` [PATCH 17/23] x86, kaiser: map virtually-addressed performance monitoring buffers Dave Hansen
2017-10-31 22:32 ` Dave Hansen [this message]
2017-10-31 22:32 ` [PATCH 19/23] x86, mm: remove hard-coded ASID limit checks Dave Hansen
2017-10-31 22:32 ` [PATCH 20/23] x86, mm: put mmu-to-h/w ASID translation in one place Dave Hansen
2017-10-31 22:32 ` [PATCH 21/23] x86, pcid, kaiser: allow flushing for future ASID switches Dave Hansen
2017-11-01 8:03 ` Andy Lutomirski
2017-11-01 14:17 ` Dave Hansen
2017-11-01 20:31 ` Andy Lutomirski
2017-11-01 20:59 ` Dave Hansen
2017-11-01 21:04 ` Andy Lutomirski
2017-11-01 21:06 ` Dave Hansen
2017-10-31 22:32 ` [PATCH 22/23] x86, kaiser: use PCID feature to make user and kernel switches faster Dave Hansen
2017-10-31 22:32 ` [PATCH 23/23] x86, kaiser: add Kconfig Dave Hansen
2017-10-31 23:59 ` Kees Cook
2017-11-01 9:07 ` Borislav Petkov
2017-10-31 23:27 ` [PATCH 00/23] KAISER: unmap most of the kernel from userspace page tables Linus Torvalds
2017-10-31 23:44 ` Dave Hansen
2017-11-01 0:21 ` Dave Hansen
2017-11-01 7:59 ` Andy Lutomirski
2017-11-01 16:08 ` Linus Torvalds
2017-11-01 17:31 ` Dave Hansen
2017-11-01 17:58 ` Randy Dunlap
2017-11-01 18:27 ` Linus Torvalds
2017-11-01 18:46 ` Dave Hansen
2017-11-01 19:05 ` Linus Torvalds
2017-11-01 20:33 ` Andy Lutomirski
2017-11-02 7:32 ` Andy Lutomirski
2017-11-02 7:54 ` Andy Lutomirski
2017-11-01 15:53 ` Dave Hansen
2017-11-01 8:54 ` Ingo Molnar
2017-11-01 14:09 ` Thomas Gleixner
2017-11-01 22:14 ` Dave Hansen
2017-11-01 22:28 ` Linus Torvalds
2017-11-02 8:03 ` Peter Zijlstra
2017-11-03 11:07 ` Kirill A. Shutemov
2017-11-02 19:01 ` Will Deacon
2017-11-02 19:38 ` Dave Hansen
2017-11-03 13:41 ` Will Deacon
2017-11-22 16:19 ` Pavel Machek
2017-11-23 10:47 ` Pavel Machek
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=20171031223219.620D984B@viggo.jf.intel.com \
--to=dave.hansen@linux.intel.com \
--cc=daniel.gruss@iaik.tugraz.at \
--cc=hughd@google.com \
--cc=keescook@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=michael.schwarz@iaik.tugraz.at \
--cc=moritz.lipp@iaik.tugraz.at \
--cc=torvalds@linux-foundation.org \
--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).