Patch "x86/mm: Move the CR3 construction functions to tlbflush.h" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/mm: Move the CR3 construction functions to tlbflush.h
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-mm-move-the-cr3-construction-functions-to-tlbflush.h.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
50fb83a62cf472dc53ba23bd3f7bd6c1b2b3b53eMon Sep 17 00:00:00 2001
From: Dave Hansen <[email protected]>
Date: Mon, 4 Dec 2017 15:07:54 +0100
Subject: x86/mm: Move the CR3 construction functions to tlbflush.h
From: Dave Hansen <[email protected]>
commit 50fb83a62cf472dc53ba23bd3f7bd6c1b2b3b53e upstream.
For flushing the TLB, the ASID which has been programmed into the hardware must be known. That differs from what is in 'cpu_tlbstate'.
Add functions to transform the 'cpu_tlbstate' values into to the one programmed into the hardware (CR3).
It's not easy to include mmu_context.h into tlbflush.h, so just move the CR3 building over to tlbflush.h.
--- arch/x86/include/asm/mmu_context.h | 29 +---------------------------- arch/x86/include/asm/tlbflush.h | 26 ++++++++++++++++++++++++++ arch/x86/mm/tlb.c | 8 ++++---- 3 files changed, 31 insertions(+), 32 deletions(-)
arch/x86/include/asm/mmu_context.h +1 -28
@@ -291,33 +291,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(). *
@@ -326,7 +299,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. */
arch/x86/include/asm/tlbflush.h +26 -0
@@ -69,6 +69,32 @@ static inline u64 inc_mm_tlb_gen(structreturn atomic64_inc_return (&mm->context.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
arch/x86/mm/tlb.c +4 -4
@@ -128,7 +128,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.
@@ -195,7 +195,7 @@ void switch_mm_irqs_off(struct mm_structif (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));/* * NB: This gets called via leave_mm() in the idle path
@@ -208,7 +208,7 @@ void switch_mm_irqs_off(struct mm_structtrace_tlb_flush_rcuidle (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));/* See above wrt _rcuidle. */ trace_tlb_flush_rcuidle (TLB_FLUSH_ON_TASK_SWITCH ,0 );
@@ -288,7 +288,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 );
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86-entry-rename-sysenter_stack-to-cpu_entry_area_entry_stack.patch queue-4.14/x86-mm-put-mmu-to-hardware-asid-translation-in-one-place.patch queue-4.14/x86-vsyscall-64-explicitly-set-_page_user-in-the-pagetable-hierarchy.patch queue-4.14/x86-uv-use-the-right-tlb-flush-api.patch queue-4.14/x86-mm-dump_pagetables-check-page_present-for-real.patch queue-4.14/x86-ldt-prevent-ldt-inheritance-on-exec.patch queue-4.14/x86-microcode-dont-abuse-the-tlb-flush-interface.patch queue-4.14/x86-doc-remove-obvious-weirdnesses-from-the-x86-mm-layout-documentation.patch queue-4.14/init-invoke-init_espfix_bsp-from-mm_init.patch queue-4.14/x86-cpu_entry_area-move-it-to-a-separate-unit.patch queue-4.14/x86-vsyscall-64-warn-and-fail-vsyscall-emulation-in-native-mode.patch queue-4.14/x86-mm-create-asm-invpcid.h.patch queue-4.14/x86-mm-remove-superfluous-barriers.patch queue-4.14/x86-ldt-rework-locking.patch queue-4.14/arch-mm-allow-arch_dup_mmap-to-fail.patch queue-4.14/x86-cpu_entry_area-move-it-out-of-the-fixmap.patch queue-4.14/x86-mm-remove-hard-coded-asid-limit-checks.patch queue-4.14/x86-kconfig-limit-nr_cpus-on-32-bit-to-a-sane-amount.patch queue-4.14/x86-mm-add-comments-to-clarify-which-tlb-flush-functions-are-supposed-to-flush-what.patch queue-4.14/x86-mm-move-the-cr3-construction-functions-to-tlbflush.h.patch queue-4.14/x86-mm-dump_pagetables-make-the-address-hints-correct-and-readable.patch queue-4.14/x86-insn-eval-add-utility-functions-to-get-segment-selector.patch queue-4.14/x86-mm-use-__flush_tlb_one-for-kernel-memory.patch queue-4.14/x86-mm-64-improve-the-memory-map-documentation.patch