Patch "x86/mm: Put MMU to hardware ASID translation in one place" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
x86/mm: Put MMU to hardware ASID translation in one place
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-put-mmu-to-hardware-asid-translation-in-one-place.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
dd95f1a4b5ca904c78e6a097091eb21436478abbMon Sep 17 00:00:00 2001
From: Dave Hansen <[email protected]>
Date: Mon, 4 Dec 2017 15:07:56 +0100
Subject: x86/mm: Put MMU to hardware ASID translation in one place
From: Dave Hansen <[email protected]>
commit dd95f1a4b5ca904c78e6a097091eb21436478abb upstream.
There are effectively two ASID types:
1. The one stored in the mmu_context that goes from 0..5
2. The one programmed into the hardware that goes from 1..6
This consolidates the locations where converting between the two (by doing a +1) to a single place which gives us a nice place to comment. PAGE_TABLE_ISOLATION will also need to, given an ASID, know which hardware ASID to flush for the userspace mapping.
--- arch/x86/include/asm/tlbflush.h | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
arch/x86/include/asm/tlbflush.h +18 -11
@@ -85,20 +85,26 @@ static inline u64 inc_mm_tlb_gen(struct*/ #define MAX_ASID_AVAILABLE ((1 << CR3_AVAIL_ASID_BITS) - 2) -/* -* 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 u16 kern_pcid (u16 asid) +{ +VM_WARN_ON_ONCE (asid >MAX_ASID_AVAILABLE ); +/* +* 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. +*/ +return asid +1 ; +} +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 >MAX_ASID_AVAILABLE ); -return __sme_pa (pgd) | (asid +1 ); +return __sme_pa (pgd) |kern_pcid (asid); }else {VM_WARN_ON_ONCE (asid !=0 );return __sme_pa (pgd);
@@ -108,7 +114,8 @@ static inline unsigned long build_cr3(pgstatic inline unsigned long build_cr3_noflush (pgd_t *pgd,u16 asid) {VM_WARN_ON_ONCE (asid >MAX_ASID_AVAILABLE ); -return __sme_pa (pgd) | (asid +1 ) |CR3_NOFLUSH ; +VM_WARN_ON_ONCE (!this_cpu_has (X86_FEATURE_PCID )); +return __sme_pa (pgd) |kern_pcid (asid) |CR3_NOFLUSH ; }#ifdef CONFIG_PARAVIRT
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