AMD broadcast TLB invalidation
Subsystems (7)
v7 cover AMD broadcast TLB invalidation
Add support for broadcast TLB invalidation using AMD's INVLPGB instruction.
This allows the kernel to invalidate TLB entries on remote CPUs without needing to send IPIs, without having to wait for remote CPUs to handle those interrupts, and with less interruption to what was running on those CPUs.
Because x86 PCID space is limited, and there are some very large systems out there, broadcast TLB invalidation is only used for processes that are active on 3 or more CPUs, with the threshold being gradually increased the more the PCID space gets exhausted.
Combined with the removal of unnecessary lru_add_drain calls (see https://lkml.org/lkml/2024/12/19/1388) this results in a nice performance boost for the will-it-scale tlb_flush2_threads test on an AMD Milan system with 36 cores:
- vanilla kernel: 527k loops/second - lru_add_drain removal: 731k loops/second - only INVLPGB: 527k loops/second
- lru_add_drain + INVLPGB: 1157k loops/second
Profiling with only the INVLPGB changes showed while TLB invalidation went down from 40% of the total CPU time to only around 4% of CPU time, the contention simply moved to the LRU lock.
Fixing both at the same time about doubles the
number of iterations per second from this case.
Some numbers closer to real world performance
can be found at Phoronix, thanks to Michael:
https://www.phoronix.com/news/AMD-INVLPGB-Linux-Benefits
My current plan is to implement support for Intel's RAR (Remote Action Request) TLB flushing in a follow-up series, after this thing has been merged into -tip. Making things any larger would just be unwieldy for reviewers.
v7:
- a few small code cleanups (Nadav)
- fix spurious VM_WARN_ON_ONCE in mm_global_asid
- code simplifications & better barriers (Peter & Dave)
v6:
- fix info->end check in flush_tlb_kernel_range (Michael)
- disable broadcast TLB flushing on 32 bit x86
v5:
- use byte assembly for compatibility with older toolchains (Borislav, Michael)
- ensure a panic on an invalid number of extra pages (Dave, Tom)
- add cant_migrate() assertion to tlbsync (Jann)
- a bunch more cleanups (Nadav)
- key TCE enabling off X86_FEATURE_TCE (Andrew)
- fix a race between reclaim and ASID transition (Jann)
v4:
- Use only bitmaps to track free global ASIDs (Nadav)
- Improved AMD initialization (Borislav & Tom)
- Various naming and documentation improvements (Peter, Nadav, Tom, Dave)
- Fixes for subtle race conditions (Jann)
v3:
- Remove paravirt tlb_remove_table call (thank you Qi Zheng)
- More suggested cleanups and changelog fixes by Peter and Nadav
v2:
- Apply suggestions by Peter and Borislav (thank you!)
- Fix bug in arch_tlbbatch_flush, where we need to do both
the TLBSYNC, and flush the CPUs that are in the cpumask.
- Some updates to comments and changelogs based on questions.
PATCH v7 1/12 x86/mm: make MMU_GATHER_RCU_TABLE_FREE unconditional
Currently x86 uses CONFIG_MMU_GATHER_TABLE_FREE when using paravirt, and not when running on bare metal.
There is no real good reason to do things differently for each setup. Make them all the same.
Currently get_user_pages_fast synchronizes against page table freeing in two different ways:
- on bare metal, by blocking IRQs, which block TLB flush IPIs
- on paravirt, with MMU_GATHER_RCU_TABLE_FREE
This is done because some paravirt TLB flush implementations handle the TLB flush in the hypervisor, and will do the flush even when the target CPU has interrupts disabled.
Always handle page table freeing with MMU_GATHER_RCU_TABLE_FREE. Using RCU synchronization between page table freeing and get_user_pages_fast() allows bare metal to also do TLB flushing while interrupts are disabled.
Various places in the mm do still block IRQs or disable preemption as an implicit way to block RCU frees.
That makes it safe to use INVLPGB on AMD CPUs.
--- arch/x86/Kconfig | 2 +- arch/x86/kernel/paravirt.c | 7 +------ arch/x86/mm/pgtable.c | 16 ++++------------ 3 files changed, 6 insertions(+), 19 deletions(-)
arch/x86/Kconfig +1 -1
@@ -274,7 +274,7 @@ config X86 select HAVE_PCI select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP - select MMU_GATHER_RCU_TABLE_FREE if PARAVIRT + select MMU_GATHER_RCU_TABLE_FREE select MMU_GATHER_MERGE_VMAS select HAVE_POSIX_CPU_TIMERS_TASK_WORK select HAVE_REGS_AND_STACK_ACCESS_API
arch/x86/kernel/paravirt.c +1 -6
@@ -59,11 +59,6 @@ void __init native_pv_lock_init(void)static_branch_enable (&virt_spin_lock_key); } -static void native_tlb_remove_table (struct mmu_gather *tlb,void *table) -{ -tlb_remove_page (tlb, table); -} -struct static_key paravirt_steal_enabled;struct static_key paravirt_steal_rq_enabled;
@@ -191,7 +186,7 @@ struct paravirt_patch_template pv_ops = { .mmu.flush_tlb_kernel = native_flush_tlb_global, .mmu.flush_tlb_one_user = native_flush_tlb_one_user, .mmu.flush_tlb_multi = native_flush_tlb_multi, - .mmu.tlb_remove_table = native_tlb_remove_table, + .mmu.tlb_remove_table = tlb_remove_table, .mmu.exit_mmap = paravirt_nop, .mmu.notify_page_enc_status_changed = paravirt_nop,
arch/x86/mm/pgtable.c +4 -12
@@ -18,14 +18,6 @@ EXPORT_SYMBOL(physical_mask);#define PGTABLE_HIGHMEM 0#endif -#ifndef CONFIG_PARAVIRT -static inline -void paravirt_tlb_remove_table (struct mmu_gather *tlb,void *table) -{ -tlb_remove_page (tlb, table); -} -#endif -gfp_t __userpte_alloc_gfp =GFP_PGTABLE_USER |PGTABLE_HIGHMEM ;pgtable_t pte_alloc_one (struct mm_struct *mm)
@@ -54,7 +46,7 @@ void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte) {pagetable_pte_dtor (page_ptdesc (pte));paravirt_release_pte (page_to_pfn (pte)); -paravirt_tlb_remove_table (tlb, pte); +tlb_remove_table (tlb, pte); }#if CONFIG_PGTABLE_LEVELS >2
@@ -70,7 +62,7 @@ void ___pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) tlb->need_flush_all =1 ;#endif pagetable_pmd_dtor (ptdesc); -paravirt_tlb_remove_table (tlb,ptdesc_page (ptdesc)); +tlb_remove_table (tlb,ptdesc_page (ptdesc)); }#if CONFIG_PGTABLE_LEVELS >3
@@ -80,14 +72,14 @@ void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)pagetable_pud_dtor (ptdesc);paravirt_release_pud (__pa (pud) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb,virt_to_page (pud)); +tlb_remove_table (tlb,virt_to_page (pud)); }#if CONFIG_PGTABLE_LEVELS >4 void ___p4d_free_tlb (struct mmu_gather *tlb,p4d_t *p4d) {paravirt_release_p4d (__pa (p4d) >>PAGE_SHIFT ); -paravirt_tlb_remove_table (tlb,virt_to_page (p4d)); +tlb_remove_table (tlb,virt_to_page (p4d)); }#endif /* CONFIG_PGTABLE_LEVELS > 4 */ #endif /* CONFIG_PGTABLE_LEVELS > 3 */
Signature · 1 line
2.47.1
PATCH v7 2/12 x86/mm: remove pv_ops.mmu.tlb_remove_table call
In reply to Rik van RielEvery pv_ops.mmu.tlb_remove_table call ends up calling tlb_remove_table.
Get rid of the indirection by simply calling tlb_remove_table directly, and not going through the paravirt function pointers.
--- arch/x86/hyperv/mmu.c | 1 - arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 2 -- arch/x86/kernel/kvm.c | 1 - arch/x86/kernel/paravirt.c | 1 - arch/x86/xen/mmu_pv.c | 1 - 6 files changed, 11 deletions(-)
arch/x86/hyperv/mmu.c +0 -1
@@ -240,5 +240,4 @@ void hyperv_setup_mmu_ops(void)pr_info ("Using hypercall for remote TLB flush\n" ); pv_ops.mmu.flush_tlb_multi = hyperv_flush_tlb_multi; - pv_ops.mmu.tlb_remove_table = tlb_remove_table; }
arch/x86/include/asm/paravirt.h +0 -5
@@ -91,11 +91,6 @@ static inline void __flush_tlb_multi(const struct cpumask *cpumask,PVOP_VCALL2 (mmu.flush_tlb_multi, cpumask, info); } -static inline void paravirt_tlb_remove_table (struct mmu_gather *tlb,void *table) -{ -PVOP_VCALL2 (mmu.tlb_remove_table, tlb, table); -} -static inline void paravirt_arch_exit_mmap (struct mm_struct *mm) {PVOP_VCALL1 (mmu.exit_mmap, mm);
arch/x86/include/asm/paravirt_types.h +0 -2
@@ -136,8 +136,6 @@ struct pv_mmu_ops {void (*flush_tlb_multi)(const struct cpumask *cpus,const struct flush_tlb_info *info); -void (*tlb_remove_table)(struct mmu_gather *tlb,void *table); -/* Hook for intercepting the destruction of an mm_struct. */ void (*exit_mmap)(struct mm_struct *mm);void (*notify_page_enc_status_changed)(unsigned long pfn,int npages,bool enc);
arch/x86/kernel/kvm.c +0 -1
@@ -838,7 +838,6 @@ static void __init kvm_guest_init(void)#ifdef CONFIG_SMP if (pv_tlb_flush_supported ()) { pv_ops.mmu.flush_tlb_multi = kvm_flush_tlb_multi; - pv_ops.mmu.tlb_remove_table = tlb_remove_table;pr_info ("KVM setup pv remote TLB flush\n" ); }
arch/x86/kernel/paravirt.c +0 -1
@@ -186,7 +186,6 @@ struct paravirt_patch_template pv_ops = { .mmu.flush_tlb_kernel = native_flush_tlb_global, .mmu.flush_tlb_one_user = native_flush_tlb_one_user, .mmu.flush_tlb_multi = native_flush_tlb_multi, - .mmu.tlb_remove_table = tlb_remove_table, .mmu.exit_mmap = paravirt_nop, .mmu.notify_page_enc_status_changed = paravirt_nop,
arch/x86/xen/mmu_pv.c +0 -1
@@ -2137,7 +2137,6 @@ static const typeof(pv_ops) xen_mmu_ops __initconst = { .flush_tlb_kernel = xen_flush_tlb, .flush_tlb_one_user = xen_flush_tlb_one_user, .flush_tlb_multi = xen_flush_tlb_multi, - .tlb_remove_table = tlb_remove_table, .pgd_alloc = xen_pgd_alloc, .pgd_free = xen_pgd_free,
Signature · 1 line
2.47.1
PATCH v7 3/12 x86/mm: consolidate full flush threshold decision
In reply to Rik van RielReduce code duplication by consolidating the decision point for whether to do individual invalidations or a full flush inside get_flush_tlb_info.
--- arch/x86/mm/tlb.c | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-)
arch/x86/mm/tlb.c +20 -23
@@ -1009,6 +1009,15 @@ static struct flush_tlb_info *get_flush_tlb_info(struct mm_struct *mm, info->initiating_cpu =smp_processor_id (); info->trim_cpumask =0 ; +/* +* If the number of flushes is so large that a full flush +* would be faster, do a full flush. +*/ +if ((end - start) >> stride_shift > tlb_single_page_flush_ceiling) { + info->start =0 ; + info->end =TLB_FLUSH_ALL ; + } +return info; }
@@ -1026,17 +1035,8 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, bool freed_tables) {struct flush_tlb_info *info; +int cpu =get_cpu ();u64 new_tlb_gen; -int cpu; - - cpu =get_cpu (); - -/* Should we flush just the requested range? */ -if ((end ==TLB_FLUSH_ALL ) || - ((end - start) >> stride_shift) > tlb_single_page_flush_ceiling) { - start =0 ; - end =TLB_FLUSH_ALL ; - }/* This is also a barrier that synchronizes with switch_mm(). */ new_tlb_gen =inc_mm_tlb_gen (mm);
@@ -1089,22 +1089,19 @@ static void do_kernel_range_flush(void *info)void flush_tlb_kernel_range (unsigned long start,unsigned long end) { -/* Balance as user space task's flush, a bit conservative */ -if (end ==TLB_FLUSH_ALL || - (end - start) > tlb_single_page_flush_ceiling <<PAGE_SHIFT ) { -on_each_cpu (do_flush_tlb_all,NULL ,1 ); - }else { -struct flush_tlb_info *info; +struct flush_tlb_info *info; -preempt_disable (); - info =get_flush_tlb_info (NULL , start, end,0 , false, -TLB_GENERATION_INVALID ); +guard (preempt)(); + info =get_flush_tlb_info (NULL , start, end,PAGE_SHIFT , false, +TLB_GENERATION_INVALID ); + +if (info->end ==TLB_FLUSH_ALL ) +on_each_cpu (do_flush_tlb_all,NULL ,1 ); +else on_each_cpu (do_kernel_range_flush, info,1 ); -put_flush_tlb_info (); -preempt_enable (); - } +put_flush_tlb_info (); }/*
@@ -1276,7 +1273,7 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)int cpu =get_cpu (); - info =get_flush_tlb_info (NULL ,0 ,TLB_FLUSH_ALL ,0 , false, + info =get_flush_tlb_info (NULL ,0 ,TLB_FLUSH_ALL ,PAGE_SHIFT , false,TLB_GENERATION_INVALID );/* * flush_tlb_multi() is not optimized for the common case in which only
Signature · 1 line
2.47.1
PATCH v7 4/12 x86/mm: get INVLPGB count max from CPUID
In reply to Rik van RielThe CPU advertises the maximum number of pages that can be shot down with one INVLPGB instruction in the CPUID data.
Save that information for later use.
--- arch/x86/Kconfig.cpu | 5 +++++ arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/tlbflush.h | 7 +++++++ arch/x86/kernel/cpu/amd.c | 8 ++++++++ 4 files changed, 21 insertions(+)
arch/x86/Kconfig.cpu +5 -0
@@ -395,6 +395,10 @@ config X86_VMX_FEATURE_NAMES def_bool y depends on IA32_FEAT_CTL +config X86_BROADCAST_TLB_FLUSH + def_bool y + depends on CPU_SUP_AMD && 64BIT + menuconfig PROCESSOR_SELECT bool "Supported processor vendors" if EXPERT help
@@ -431,6 +435,7 @@ config CPU_SUP_CYRIX_32 config CPU_SUP_AMD default y bool "Support AMD processors" if PROCESSOR_SELECT + select X86_BROADCAST_TLB_FLUSH help This enables detection, tunings and quirks for AMD processors
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -338,6 +338,7 @@#define X86_FEATURE_CLZERO (13*32+ 0)/* "clzero" CLZERO instruction */ #define X86_FEATURE_IRPERF (13*32+ 1)/* "irperf" Instructions Retired Count */ #define X86_FEATURE_XSAVEERPTR (13*32+ 2)/* "xsaveerptr" Always save/restore FP error pointers */ +#define X86_FEATURE_INVLPGB (13*32+ 3)/* INVLPGB and TLBSYNC instruction supported. */ #define X86_FEATURE_RDPRU (13*32+ 4)/* "rdpru" Read processor register at user level */ #define X86_FEATURE_WBNOINVD (13*32+ 9)/* "wbnoinvd" WBNOINVD instruction */ #define X86_FEATURE_AMD_IBPB (13*32+12)/* Indirect Branch Prediction Barrier */
arch/x86/include/asm/tlbflush.h +7 -0
@@ -183,6 +183,13 @@ static inline void cr4_init_shadow(void)extern unsigned long mmu_cr4_features;extern u32 *trampoline_cr4_features; +/* How many pages can we invalidate with one INVLPGB. */ +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +extern u16 invlpgb_count_max; +#else +#define invlpgb_count_max 1 +#endif +extern void initialize_tlbstate_and_flush (void );/*
arch/x86/kernel/cpu/amd.c +8 -0
@@ -29,6 +29,8 @@#include "cpu.h" +u16 invlpgb_count_max__ro_after_init ; +static inline int rdmsrl_amd_safe (unsigned msr,unsigned long long *p) {u32 gprs[8 ] = {0 };
@@ -1135,6 +1137,12 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) tlb_lli_2m[ENTRIES ] = eax & mask; tlb_lli_4m[ENTRIES ] = tlb_lli_2m[ENTRIES ] >>1 ; + +/* Max number of pages INVLPGB can invalidate in one shot */ +if (boot_cpu_has (X86_FEATURE_INVLPGB )) { +cpuid (0x80000008 , &eax, &ebx, &ecx, &edx); + invlpgb_count_max = (edx &0xffff ) +1 ; + } }static const struct cpu_dev amd_cpu_dev = {
Signature · 1 line
2.47.1
PATCH v7 5/12 x86/mm: add INVLPGB support code
In reply to Rik van RielAdd invlpgb.h with the helper functions and definitions needed to use broadcast TLB invalidation on AMD EPYC 3 and newer CPUs.
--- arch/x86/include/asm/invlpgb.h | 101 ++++++++++++++++++++++++++++++++ arch/x86/include/asm/tlbflush.h | 1 + 2 files changed, 102 insertions(+) create mode 100644 arch/x86/include/asm/invlpgb.h
arch/x86/include/asm/invlpgb.h new file +101 -0
@@ -0,0 +1,101 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_INVLPGB +#define _ASM_X86_INVLPGB + +#include <linux/kernel.h> +#include <vdso/bits.h> +#include <vdso/page.h> + +/* +* INVLPGB does broadcast TLB invalidation across all the CPUs in the system. +* +* The INVLPGB instruction is weakly ordered, and a batch of invalidations can +* be done in a parallel fashion. +* +* TLBSYNC is used to ensure that pending INVLPGB invalidations initiated from +* this CPU have completed. +*/ +static inline void __invlpgb (unsigned long asid,unsigned long pcid, +unsigned long addr,u16 extra_count, +bool pmd_stride,u8 flags) +{ +u32 edx = (pcid <<16 ) | asid; +u32 ecx = (pmd_stride <<31 ) | extra_count; +u64 rax = addr | flags; + +/* The low bits in rax are for flags. Verify addr is clean. */ +VM_WARN_ON_ONCE (addr & ~PAGE_MASK ); + +/* INVLPGB; supported in binutils >= 2.36. */ + asmvolatile (".byte 0x0f, 0x01, 0xfe" : :"a" (rax),"c" (ecx),"d" (edx)); +} + +/* Wait for INVLPGB originated by this CPU to complete. */ +static inline void tlbsync (void ) +{ +cant_migrate (); +/* TLBSYNC: supported in binutils >= 0.36. */ + asmvolatile (".byte 0x0f, 0x01, 0xff" :::"memory" ); +} + +/* +* INVLPGB can be targeted by virtual address, PCID, ASID, or any combination +* of the three. For example: +* - INVLPGB_VA | INVLPGB_INCLUDE_GLOBAL: invalidate all TLB entries at the address +* - INVLPGB_PCID: invalidate all TLB entries matching the PCID +* +* The first can be used to invalidate (kernel) mappings at a particular +* address across all processes. +* +* The latter invalidates all TLB entries matching a PCID. +*/ +#define INVLPGB_VA BIT(0) +#define INVLPGB_PCID BIT(1) +#define INVLPGB_ASID BIT(2) +#define INVLPGB_INCLUDE_GLOBAL BIT(3) +#define INVLPGB_FINAL_ONLY BIT(4) +#define INVLPGB_INCLUDE_NESTED BIT(5) + +/* Flush all mappings for a given pcid and addr, not including globals. */ +static inline void invlpgb_flush_user (unsigned long pcid, +unsigned long addr) +{ +__invlpgb (0 , pcid, addr,0 ,0 ,INVLPGB_PCID |INVLPGB_VA ); +tlbsync (); +} + +static inline void invlpgb_flush_user_nr_nosync (unsigned long pcid, +unsigned long addr, +u16 nr, +bool pmd_stride) +{ +__invlpgb (0 , pcid, addr, nr -1 , pmd_stride,INVLPGB_PCID |INVLPGB_VA ); +} + +/* Flush all mappings for a given PCID, not including globals. */ +static inline void invlpgb_flush_single_pcid_nosync (unsigned long pcid) +{ +__invlpgb (0 , pcid,0 ,0 ,0 ,INVLPGB_PCID ); +} + +/* Flush all mappings, including globals, for all PCIDs. */ +static inline void invlpgb_flush_all (void ) +{ +__invlpgb (0 ,0 ,0 ,0 ,0 ,INVLPGB_INCLUDE_GLOBAL ); +tlbsync (); +} + +/* Flush addr, including globals, for all PCIDs. */ +static inline void invlpgb_flush_addr_nosync (unsigned long addr,u16 nr) +{ +__invlpgb (0 ,0 , addr, nr -1 ,0 ,INVLPGB_INCLUDE_GLOBAL ); +} + +/* Flush all mappings for all PCIDs except globals. */ +static inline void invlpgb_flush_all_nonglobals (void ) +{ +__invlpgb (0 ,0 ,0 ,0 ,0 ,0 ); +tlbsync (); +} + +#endif /* _ASM_X86_INVLPGB */
arch/x86/include/asm/tlbflush.h +1 -0
@@ -10,6 +10,7 @@#include <asm/cpufeature.h> #include <asm/special_insns.h> #include <asm/smp.h> +#include <asm/invlpgb.h> #include <asm/invpcid.h> #include <asm/pti.h> #include <asm/processor-flags.h>
Signature · 1 line
2.47.1
PATCH v7 6/12 x86/mm: use INVLPGB for kernel TLB flushes
In reply to Rik van RielUse broadcast TLB invalidation for kernel addresses when available.
Remove the need to send IPIs for kernel TLB flushes.
--- arch/x86/mm/tlb.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
arch/x86/mm/tlb.c +27 -1
@@ -1077,6 +1077,30 @@ void flush_tlb_all(void)on_each_cpu (do_flush_tlb_all,NULL ,1 ); } +static bool broadcast_kernel_range_flush (struct flush_tlb_info *info) +{ +unsigned long addr; +unsigned long nr; + +if (!IS_ENABLED (CONFIG_X86_BROADCAST_TLB_FLUSH )) +return false; + +if (!cpu_feature_enabled (X86_FEATURE_INVLPGB )) +return false; + +if (info->end ==TLB_FLUSH_ALL ) { +invlpgb_flush_all (); +return true; + } + +for (addr = info->start; addr < info->end; addr += nr <<PAGE_SHIFT ) { + nr =min ((info->end - addr) >>PAGE_SHIFT , invlpgb_count_max); +invlpgb_flush_addr_nosync (addr, nr); + } +tlbsync (); +return true; +} +static void do_kernel_range_flush (void *info) {struct flush_tlb_info *f = info;
@@ -1096,7 +1120,9 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) info =get_flush_tlb_info (NULL , start, end,PAGE_SHIFT , false,TLB_GENERATION_INVALID ); -if (info->end ==TLB_FLUSH_ALL ) +if (broadcast_kernel_range_flush (info)) + ;/* Fall through. */ +else if (info->end ==TLB_FLUSH_ALL )on_each_cpu (do_flush_tlb_all,NULL ,1 );else on_each_cpu (do_kernel_range_flush, info,1 );
Signature · 1 line
2.47.1
PATCH v7 7/12 x86/mm: use INVLPGB in flush_tlb_all
In reply to Rik van RielThe flush_tlb_all() function is not used a whole lot, but we might as well use broadcast TLB flushing there, too.
--- arch/x86/mm/tlb.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/mm/tlb.c +15 -0
@@ -1065,6 +1065,19 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, } +static bool broadcast_flush_tlb_all (void ) +{ +if (!IS_ENABLED (CONFIG_X86_BROADCAST_TLB_FLUSH )) +return false; + +if (!cpu_feature_enabled (X86_FEATURE_INVLPGB )) +return false; + +guard (preempt)(); +invlpgb_flush_all (); +return true; +} +static void do_flush_tlb_all (void *info) {count_vm_tlb_event (NR_TLB_REMOTE_FLUSH_RECEIVED );
@@ -1073,6 +1086,8 @@ static void do_flush_tlb_all(void *info)void flush_tlb_all (void ) { +if (broadcast_flush_tlb_all ()) +return ;count_vm_tlb_event (NR_TLB_REMOTE_FLUSH );on_each_cpu (do_flush_tlb_all,NULL ,1 ); }
Signature · 1 line
2.47.1
PATCH v7 8/12 x86/mm: use broadcast TLB flushing for page reclaim TLB flushing
In reply to Rik van RielIn the page reclaim code, we only track the CPU(s) where the TLB needs to be flushed, rather than all the individual mappings that may be getting invalidated.
Use broadcast TLB flushing when that is available.
--- arch/x86/mm/tlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/mm/tlb.c +3 -1
@@ -1321,7 +1321,9 @@ void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)* a local TLB flush is needed. Optimize this use-case by calling * flush_tlb_func_local() directly in this case. */ -if (cpumask_any_but (&batch->cpumask, cpu) < nr_cpu_ids) { +if (cpu_feature_enabled (X86_FEATURE_INVLPGB )) { +invlpgb_flush_all_nonglobals (); + }else if (cpumask_any_but (&batch->cpumask, cpu) < nr_cpu_ids) {flush_tlb_multi (&batch->cpumask, info); }else if (cpumask_test_cpu (cpu, &batch->cpumask)) {lockdep_assert_irqs_enabled ();
Signature · 1 line
2.47.1
PATCH v7 9/12 x86/mm: enable broadcast TLB invalidation for multi-threaded processes
In reply to Rik van RielUse broadcast TLB invalidation, using the INVPLGB instruction, on AMD EPYC 3 and newer CPUs.
In order to not exhaust PCID space, and keep TLB flushes local for single threaded processes, we only hand out broadcast ASIDs to processes active on 3 or more CPUs, and gradually increase the threshold as broadcast ASID space is depleted.
--- arch/x86/include/asm/mmu.h | 6 + arch/x86/include/asm/mmu_context.h | 14 ++ arch/x86/include/asm/tlbflush.h | 73 ++++++ arch/x86/mm/tlb.c | 344 ++++++++++++++++++++++++++++- 4 files changed, 425 insertions(+), 12 deletions(-)
arch/x86/include/asm/mmu.h +6 -0
@@ -69,6 +69,12 @@ typedef struct {u16 pkey_allocation_map;s16 execute_only_pkey;#endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +u16 global_asid; +bool asid_transition; +#endif + } mm_context_t;#define INIT_MM_CONTEXT (mm) \
arch/x86/include/asm/mmu_context.h +14 -0
@@ -139,6 +139,8 @@ static inline void mm_reset_untag_mask(struct mm_struct *mm)#define enter_lazy_tlb enter_lazy_tlbextern void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk); +extern void destroy_context_free_global_asid (struct mm_struct *mm); +/* * Init a new mm. Used on mm copies, like at fork() * and on mm's that are brand-new, like at execve().
@@ -161,6 +163,14 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.execute_only_pkey = -1; }#endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +if (cpu_feature_enabled (X86_FEATURE_INVLPGB )) { + mm->context.global_asid =0 ; + mm->context.asid_transition = false; + } +#endif +mm_reset_untag_mask (mm);init_new_context_ldt (mm);return 0 ;
@@ -170,6 +180,10 @@ static inline int init_new_context(struct task_struct *tsk,static inline void destroy_context (struct mm_struct *mm) {destroy_context_ldt (mm); +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +if (cpu_feature_enabled (X86_FEATURE_INVLPGB )) +destroy_context_free_global_asid (mm); +#endif } extern void switch_mm(struct mm_struct *prev, struct mm_struct *next,
arch/x86/include/asm/tlbflush.h +73 -0
85 lines not on this page · raw message
arch/x86/mm/tlb.c +332 -12
426 lines not on this page · raw message
Signature · 1 line
2.47.1
Re: [PATCH v7 09/12] x86/mm: enable broadcast TLB invalidation for multi-threaded processes
Quoted 7 lines · Rik van Riel
Use broadcast TLB invalidation, using the INVPLGB instruction, on AMD EPYC 3 and newer CPUs.
In order to not exhaust PCID space, and keep TLB flushes local for single threaded processes, we only hand out broadcast ASIDs to processes active on 3 or more CPUs, and gradually increase the threshold as broadcast ASID space is depleted.
Since the threshold is fixed at "3" and does not gradually increase in this version, would it be more accurate to update the commit message to reflect this?
-Manali
Quoted 598 lines
Signed-off-by Rik van Riel <[email protected]>--- arch/x86/include/asm/mmu.h | 6 + arch/x86/include/asm/mmu_context.h | 14 ++ arch/x86/include/asm/tlbflush.h | 73 ++++++ arch/x86/mm/tlb.c | 344 ++++++++++++++++++++++++++++- 4 files changed, 425 insertions(+), 12 deletions(-)arch/x86/include/asm/mmu.h +6
-0@@ -69,6 +69,12 @@ typedef struct {u16 pkey_allocation_map;s16 execute_only_pkey;#endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +u16 global_asid; +bool asid_transition; +#endif + } mm_context_t;#define INIT_MM_CONTEXT (mm) \arch/x86/include/asm/mmu_context.h +14
-0@@ -139,6 +139,8 @@ static inline void mm_reset_untag_mask(struct mm_struct *mm)#define enter_lazy_tlb enter_lazy_tlbextern void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk); +extern void destroy_context_free_global_asid (struct mm_struct *mm); +/* * Init a new mm. Used on mm copies, like at fork() * and on mm's that are brand-new, like at execve(). @@ -161,6 +163,14 @@ static inline int init_new_context(struct task_struct *tsk, mm->context.execute_only_pkey = -1; }#endif + +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +if (cpu_feature_enabled (X86_FEATURE_INVLPGB )) { + mm->context.global_asid =0 ; + mm->context.asid_transition = false; + } +#endif +mm_reset_untag_mask (mm);init_new_context_ldt (mm);return 0 ;@@ -170,6 +180,10 @@ static inline int init_new_context(struct task_struct *tsk,static inline void destroy_context (struct mm_struct *mm) {destroy_context_ldt (mm); +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +if (cpu_feature_enabled (X86_FEATURE_INVLPGB )) +destroy_context_free_global_asid (mm); +#endif } extern void switch_mm(struct mm_struct *prev, struct mm_struct *next,arch/x86/include/asm/tlbflush.h +73
-0@@ -6,6 +6,7 @@#include <linux/mmu_notifier.h> #include <linux/sched.h> +#include <asm/barrier.h> #include <asm/processor.h> #include <asm/cpufeature.h> #include <asm/special_insns.h> @@ -239,6 +240,78 @@ void flush_tlb_one_kernel(unsigned long addr);void flush_tlb_multi (const struct cpumask *cpumask,const struct flush_tlb_info *info); +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +static inline bool is_dyn_asid (u16 asid) +{ +if (!cpu_feature_enabled (X86_FEATURE_INVLPGB )) +return true; + +return asid <TLB_NR_DYN_ASIDS ; +} + +static inline bool is_global_asid (u16 asid) +{ +return !is_dyn_asid (asid); +} + +static inline bool in_asid_transition (const struct flush_tlb_info *info) +{ +if (!cpu_feature_enabled (X86_FEATURE_INVLPGB )) +return false; + +return info->mm &&READ_ONCE (info->mm->context.asid_transition); +} + +static inline u16 mm_global_asid (struct mm_struct *mm) +{ +u16 asid; + +if (!cpu_feature_enabled (X86_FEATURE_INVLPGB )) +return 0 ; + + asid =smp_load_acquire (&mm->context.global_asid); + +/* mm->context.global_asid is either 0, or a global ASID */ +VM_WARN_ON_ONCE (asid &&is_dyn_asid (asid)); + +return asid; +} +#else +static inline bool is_dyn_asid (u16 asid) +{ +return true; +} + +static inline bool is_global_asid (u16 asid) +{ +return false; +} + +static inline bool in_asid_transition (const struct flush_tlb_info *info) +{ +return false; +} + +static inline u16 mm_global_asid (struct mm_struct *mm) +{ +return 0 ; +} + +static inline bool needs_global_asid_reload (struct mm_struct *next,u16 prev_asid) +{ +return false; +} + +static inline void broadcast_tlb_flush (struct flush_tlb_info *info) +{ +VM_WARN_ON_ONCE (1 ); +} + +static inline void consider_global_asid (struct mm_struct *mm) +{ +} +#endif +#ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #endif arch/x86/mm/tlb.c +332
-12@@ -74,13 +74,15 @@* use different names for each of them: * * ASID - [0, TLB_NR_DYN_ASIDS-1] -* the canonical identifier for an mm +* the canonical identifier for an mm, dynamically allocated on each CPU +* [TLB_NR_DYN_ASIDS, MAX_ASID_AVAILABLE-1] +* the canonical, global identifier for an mm, identical across all CPUs * -* kPCID - [1, TLB_NR_DYN_ASIDS] +* kPCID - [1, MAX_ASID_AVAILABLE] * the value we write into the PCID part of CR3; corresponds to the * ASID+1, because PCID 0 is special. * -* uPCID - [2048 + 1, 2048 + TLB_NR_DYN_ASIDS] +* uPCID - [2048 + 1, 2048 + MAX_ASID_AVAILABLE] * for KPTI each mm has two address spaces and thus needs two * PCID values, but we can still do with a single ASID denomination * for each mm. Corresponds to kPCID + 2048. @@ -225,6 +227,20 @@ static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen,return ; } +/* +* TLB consistency for global ASIDs is maintained with broadcast TLB +* flushing. The TLB is never outdated, and does not need flushing. +*/ +if (IS_ENABLED (CONFIG_X86_BROADCAST_TLB_FLUSH ) &&static_cpu_has (X86_FEATURE_INVLPGB )) { +u16 global_asid =mm_global_asid (next); + +if (global_asid) { + *new_asid = global_asid; + *need_flush = false; +return ; + } + } +if (this_cpu_read (cpu_tlbstate.invalidate_other))clear_asid_other ();@@ -251,6 +267,272 @@ static void choose_new_asid(struct mm_struct *next, u64 next_tlb_gen, *need_flush = true; } +#ifdef CONFIG_X86_BROADCAST_TLB_FLUSH +/* +* Logic for broadcast TLB invalidation. +*/ +static DEFINE_RAW_SPINLOCK (global_asid_lock); +static u16 last_global_asid =MAX_ASID_AVAILABLE ; +static DECLARE_BITMAP(global_asid_used, MAX_ASID_AVAILABLE) = { 0 }; +static DECLARE_BITMAP(global_asid_freed, MAX_ASID_AVAILABLE) = { 0 }; +static int global_asid_available =MAX_ASID_AVAILABLE -TLB_NR_DYN_ASIDS -1 ; + +static void reset_global_asid_space (void ) +{ +lockdep_assert_held (&global_asid_lock); + +/* +* A global TLB flush guarantees that any stale entries from +* previously freed global ASIDs get flushed from the TLB +* everywhere, making these global ASIDs safe to reuse. +*/ +invlpgb_flush_all_nonglobals (); + +/* +* Clear all the previously freed global ASIDs from the +* broadcast_asid_used bitmap, now that the global TLB flush +* has made them actually available for re-use. +*/ +bitmap_andnot (global_asid_used, global_asid_used, + global_asid_freed,MAX_ASID_AVAILABLE ); +bitmap_clear (global_asid_freed,0 ,MAX_ASID_AVAILABLE ); + +/* +* ASIDs 0-TLB_NR_DYN_ASIDS are used for CPU-local ASID +* assignments, for tasks doing IPI based TLB shootdowns. +* Restart the search from the start of the global ASID space. +*/ + last_global_asid =TLB_NR_DYN_ASIDS ; +} + +static u16 get_global_asid (void ) +{ + +u16 asid; + +lockdep_assert_held (&global_asid_lock); + +/* The previous allocated ASID is at the top of the address space. */ +if (last_global_asid >=MAX_ASID_AVAILABLE -1 ) +reset_global_asid_space (); + + asid =find_next_zero_bit (global_asid_used,MAX_ASID_AVAILABLE , last_global_asid); + +if (asid >=MAX_ASID_AVAILABLE ) { +/* This should never happen. */ +VM_WARN_ONCE (1 ,"Unable to allocate global ASID despite %d available\n" , global_asid_available); +return 0 ; + } + +/* Claim this global ASID. */ +__set_bit (asid, global_asid_used); + last_global_asid = asid; + global_asid_available--; +return asid; +} + +/* +* Returns true if the mm is transitioning from a CPU-local ASID to a global +* (INVLPGB) ASID, or the other way around. +*/ +static bool needs_global_asid_reload (struct mm_struct *next,u16 prev_asid) +{ +u16 global_asid =mm_global_asid (next); + +if (global_asid && prev_asid != global_asid) +return true; + +if (!global_asid &&is_global_asid (prev_asid)) +return true; + +return false; +} + +void destroy_context_free_global_asid (struct mm_struct *mm) +{ +if (!mm->context.global_asid) +return ; + +guard (raw_spinlock_irqsave)(&global_asid_lock); + +/* The global ASID can be re-used only after flush at wrap-around. */ +__set_bit (mm->context.global_asid, global_asid_freed); + + mm->context.global_asid =0 ; + global_asid_available++; +} + +/* +* Check whether a process is currently active on more than "threshold" CPUs. +* This is a cheap estimation on whether or not it may make sense to assign +* a global ASID to this process, and use broadcast TLB invalidation. +*/ +static bool mm_active_cpus_exceeds (struct mm_struct *mm,int threshold) +{ +int count =0 ; +int cpu; + +/* This quick check should eliminate most single threaded programs. */ +if (cpumask_weight (mm_cpumask (mm)) <= threshold) +return false; + +/* Slower check to make sure. */ +for_each_cpu (cpu,mm_cpumask (mm)) { +/* Skip the CPUs that aren't really running this process. */ +if (per_cpu (cpu_tlbstate.loaded_mm, cpu) != mm) +continue ; + +if (per_cpu (cpu_tlbstate_shared.is_lazy, cpu)) +continue ; + +if (++count > threshold) +return true; + } +return false; +} + +/* +* Assign a global ASID to the current process, protecting against +* races between multiple threads in the process. +*/ +static void use_global_asid (struct mm_struct *mm) +{ +u16 asid; + +guard (raw_spinlock_irqsave)(&global_asid_lock); + +/* This process is already using broadcast TLB invalidation. */ +if (mm->context.global_asid) +return ; + +/* The last global ASID was consumed while waiting for the lock. */ +if (!global_asid_available) { +VM_WARN_ONCE (1 ,"Ran out of global ASIDs\n" ); +return ; + } + + asid =get_global_asid (); +if (!asid) +return ; + +/* +* Notably flush_tlb_mm_range() -> broadcast_tlb_flush() -> +* finish_asid_transition() needs to observe asid_transition = true +* once it observes global_asid. +*/ + mm->context.asid_transition = true; +smp_store_release (&mm->context.global_asid, asid); +} + +static bool meets_global_asid_threshold (struct mm_struct *mm) +{ +if (!global_asid_available) +return false; + +/* +* Assign a global ASID if the process is active on +* 4 or more CPUs simultaneously. +*/ +return mm_active_cpus_exceeds (mm,3 ); +} + +static void consider_global_asid (struct mm_struct *mm) +{ +if (!static_cpu_has (X86_FEATURE_INVLPGB )) +return ; + +/* Check every once in a while. */ +if ((current->pid &0x1f ) != (jiffies &0x1f )) +return ; + +if (meets_global_asid_threshold (mm)) +use_global_asid (mm); +} + +static void finish_asid_transition (struct flush_tlb_info *info) +{ +struct mm_struct *mm = info->mm; +int bc_asid =mm_global_asid (mm); +int cpu; + +if (!READ_ONCE (mm->context.asid_transition)) +return ; + +for_each_cpu (cpu,mm_cpumask (mm)) { +/* +* The remote CPU is context switching. Wait for that to +* finish, to catch the unlikely case of it switching to +* the target mm with an out of date ASID. +*/ +while (READ_ONCE (per_cpu (cpu_tlbstate.loaded_mm, cpu)) ==LOADED_MM_SWITCHING ) +cpu_relax (); + +if (READ_ONCE (per_cpu (cpu_tlbstate.loaded_mm, cpu)) != mm) +continue ; + +/* +* If at least one CPU is not using the global ASID yet, +* send a TLB flush IPI. The IPI should cause stragglers +* to transition soon. +* +* This can race with the CPU switching to another task; +* that results in a (harmless) extra IPI. +*/ +if (READ_ONCE (per_cpu (cpu_tlbstate.loaded_mm_asid, cpu)) != bc_asid) { +flush_tlb_multi (mm_cpumask (info->mm), info); +return ; + } + } + +/* All the CPUs running this process are using the global ASID. */ +WRITE_ONCE (mm->context.asid_transition, false); +} + +static void broadcast_tlb_flush (struct flush_tlb_info *info) +{ +bool pmd = info->stride_shift ==PMD_SHIFT ; +unsigned long maxnr = invlpgb_count_max; +unsigned long asid = info->mm->context.global_asid; +unsigned long addr = info->start; +unsigned long nr; + +/* Flushing multiple pages at once is not supported with 1GB pages. */ +if (info->stride_shift >PMD_SHIFT ) + maxnr =1 ; + +/* +* TLB flushes with INVLPGB are kicked off asynchronously. +* The inc_mm_tlb_gen() guarantees page table updates are done +* before these TLB flushes happen. +*/ +if (info->end ==TLB_FLUSH_ALL ) { +invlpgb_flush_single_pcid_nosync (kern_pcid (asid)); +/* Do any CPUs supporting INVLPGB need PTI? */ +if (static_cpu_has (X86_FEATURE_PTI )) +invlpgb_flush_single_pcid_nosync (user_pcid (asid)); + }else do { +/* +* Calculate how many pages can be flushed at once; if the +* remainder of the range is less than one page, flush one. +*/ + nr =min (maxnr, (info->end - addr) >> info->stride_shift); + nr =max (nr,1 ); + +invlpgb_flush_user_nr_nosync (kern_pcid (asid), addr, nr, pmd); +/* Do any CPUs supporting INVLPGB need PTI? */ +if (static_cpu_has (X86_FEATURE_PTI )) +invlpgb_flush_user_nr_nosync (user_pcid (asid), addr, nr, pmd); + + addr += nr << info->stride_shift; + }while (addr < info->end); + +finish_asid_transition (info); + +/* Wait for the INVLPGBs kicked off above to finish. */ +tlbsync (); +} +#endif /* CONFIG_X86_BROADCAST_TLB_FLUSH */ +/* * Given an ASID, flush the corresponding user ASID. We can delay this * until the next time we switch to it. @@ -556,8 +838,9 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next,*/ if (prev == next) {/* Not actually switching mm's */ -VM_WARN_ON (this_cpu_read (cpu_tlbstate.ctxs[prev_asid].ctx_id) != - next->context.ctx_id); +VM_WARN_ON (is_dyn_asid (prev_asid) && +this_cpu_read (cpu_tlbstate.ctxs[prev_asid].ctx_id) != + next->context.ctx_id);/* * If this races with another thread that enables lam, 'new_lam' @@ -573,6 +856,23 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, !cpumask_test_cpu(cpu, mm_cpumask(next))))cpumask_set_cpu (cpu,mm_cpumask (next)); +/* +* Check if the current mm is transitioning to a new ASID. +*/ +if (needs_global_asid_reload (next, prev_asid)) { + next_tlb_gen =atomic64_read (&next->context.tlb_gen); + +choose_new_asid (next, next_tlb_gen, &new_asid, &need_flush); + goto reload_tlb; + } + +/* +* Broadcast TLB invalidation keeps this PCID up to date +* all the time. +*/ +if (is_global_asid (prev_asid)) +return ; +/* * If the CPU is not in lazy TLB mode, we are just switching * from one thread in a process to another thread in the same @@ -606,6 +906,13 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next,*/ cond_mitigation (tsk); +/* +* Let nmi_uaccess_okay() and finish_asid_transition() +* know that we're changing CR3. +*/ +this_cpu_write (cpu_tlbstate.loaded_mm,LOADED_MM_SWITCHING ); +barrier (); +/* * Leave this CPU in prev's mm_cpumask. Atomic writes to * mm_cpumask can be expensive under contention. The CPU @@ -620,14 +927,12 @@ void switch_mm_irqs_off(struct mm_struct *unused, struct mm_struct *next, next_tlb_gen =atomic64_read (&next->context.tlb_gen);choose_new_asid (next, next_tlb_gen, &new_asid, &need_flush); - -/* Let nmi_uaccess_okay() know that we're changing CR3. */ -this_cpu_write (cpu_tlbstate.loaded_mm,LOADED_MM_SWITCHING ); -barrier (); } +reload_tlb: new_lam =mm_lam_cr3_mask (next);if (need_flush) { +VM_WARN_ON_ONCE (is_global_asid (new_asid));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);load_new_mm_cr3 (next->pgd, new_asid, new_lam, true);@@ -746,7 +1051,7 @@ static void flush_tlb_func(void *info)const struct flush_tlb_info *f = info;struct mm_struct *loaded_mm =this_cpu_read (cpu_tlbstate.loaded_mm);u32 loaded_mm_asid =this_cpu_read (cpu_tlbstate.loaded_mm_asid); -u64 local_tlb_gen =this_cpu_read (cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen); +u64 local_tlb_gen;bool local =smp_processor_id () == f->initiating_cpu;unsigned long nr_invalidate =0 ;u64 mm_tlb_gen;@@ -769,6 +1074,16 @@ static void flush_tlb_func(void *info)if (unlikely (loaded_mm == &init_mm))return ; +/* Reload the ASID if transitioning into or out of a global ASID */ +if (needs_global_asid_reload (loaded_mm, loaded_mm_asid)) { +switch_mm_irqs_off (NULL , loaded_mm,NULL ); + loaded_mm_asid =this_cpu_read (cpu_tlbstate.loaded_mm_asid); + } + +/* Broadcast ASIDs are always kept up to date with INVLPGB. */ +if (is_global_asid (loaded_mm_asid)) +return ; +VM_WARN_ON (this_cpu_read (cpu_tlbstate.ctxs[loaded_mm_asid].ctx_id) != loaded_mm->context.ctx_id);@@ -786,6 +1101,8 @@ static void flush_tlb_func(void *info)return ; } + local_tlb_gen =this_cpu_read (cpu_tlbstate.ctxs[loaded_mm_asid].tlb_gen); +if (unlikely (f->new_tlb_gen !=TLB_GENERATION_INVALID && f->new_tlb_gen <= local_tlb_gen)) {/* @@ -953,7 +1270,7 @@ STATIC_NOPV void native_flush_tlb_multi(const struct cpumask *cpumask,* up on the new contents of what used to be page tables, while * doing a speculative memory access. */ -if (info->freed_tables) +if (info->freed_tables ||in_asid_transition (info))on_each_cpu_mask (cpumask, flush_tlb_func, (void *)info, true);else on_each_cpu_cond_mask(should_flush_tlb, flush_tlb_func,@@ -1049,9 +1366,12 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,* a local TLB flush is needed. Optimize this use-case by calling * flush_tlb_func_local() directly in this case. */ -if (cpumask_any_but (mm_cpumask (mm), cpu) < nr_cpu_ids) { +if (mm_global_asid (mm)) { +broadcast_tlb_flush (info); + }else if (cpumask_any_but (mm_cpumask (mm), cpu) < nr_cpu_ids) { info->trim_cpumask =should_trim_cpumask (mm);flush_tlb_multi (mm_cpumask (mm), info); +consider_global_asid (mm); }else if (mm ==this_cpu_read (cpu_tlbstate.loaded_mm)) {lockdep_assert_irqs_enabled ();local_irq_disable ();
PATCH v7 10/12 x86/mm: do targeted broadcast flushing from tlbbatch code
In reply to Rik van RielInstead of doing a system-wide TLB flush from arch_tlbbatch_flush, queue up asynchronous, targeted flushes from arch_tlbbatch_add_pending.
This also allows us to avoid adding the CPUs of processes using broadcast flushing to the batch->cpumask, and will hopefully further reduce TLB flushing from the reclaim and compaction paths.
--- arch/x86/include/asm/tlbbatch.h | 1 + arch/x86/include/asm/tlbflush.h | 12 ++----- arch/x86/mm/tlb.c | 57 +++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 12 deletions(-)
arch/x86/include/asm/tlbbatch.h +1 -0
@@ -10,6 +10,7 @@ struct arch_tlbflush_unmap_batch {* the PFNs being flushed.. */ struct cpumask cpumask; + bool used_invlpgb; };#endif /* _ARCH_X86_TLBBATCH_H */
arch/x86/include/asm/tlbflush.h +3 -9
@@ -359,21 +359,15 @@ static inline u64 inc_mm_tlb_gen(struct mm_struct *mm)return atomic64_inc_return (&mm->context.tlb_gen); } -static inline void arch_tlbbatch_add_pending (struct arch_tlbflush_unmap_batch *batch, -struct mm_struct *mm, -unsigned long uaddr) -{ -inc_mm_tlb_gen (mm); -cpumask_or (&batch->cpumask, &batch->cpumask,mm_cpumask (mm)); -mmu_notifier_arch_invalidate_secondary_tlbs (mm,0 ,-1UL ); -} -static inline void arch_flush_tlb_batched_pending (struct mm_struct *mm) {flush_tlb_mm (mm); }extern void arch_tlbbatch_flush (struct arch_tlbflush_unmap_batch *batch); +extern void arch_tlbbatch_add_pending (struct arch_tlbflush_unmap_batch *batch, +struct mm_struct *mm, +unsigned long uaddr); static inline bool pte_flags_need_flush(unsigned long oldflags, unsigned long newflags,
arch/x86/mm/tlb.c +54 -3
75 lines not on this page · raw message
Signature · 1 line
2.47.1
PATCH v7 11/12 x86/mm: enable AMD translation cache extensions
In reply to Rik van RielWith AMD TCE (translation cache extensions) only the intermediate mappings that cover the address range zapped by INVLPG / INVLPGB get invalidated, rather than all intermediate mappings getting zapped at every TLB invalidation.
This can help reduce the TLB miss rate, by keeping more intermediate mappings in the cache.
From the AMD manual:
Translation Cache Extension (TCE) Bit. Bit 15, read/write. Setting this bit to 1 changes how the INVLPG, INVLPGB, and INVPCID instructions operate on TLB entries. When this bit is 0, these instructions remove the target PTE from the TLB as well as all upper-level table entries that are cached in the TLB, whether or not they are associated with the target PTE. When this bit is set, these instructions will remove the target PTE and only those upper-level entries that lead to the target PTE in the page table hierarchy, leaving unrelated upper-level entries intact.
--- arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 4 ++++ tools/arch/x86/include/asm/msr-index.h | 2 ++ 3 files changed, 8 insertions(+)
arch/x86/include/asm/msr-index.h +2 -0
@@ -25,6 +25,7 @@#define _EFER_SVME 12/* Enable virtualization */ #define _EFER_LMSLE 13/* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14/* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_TCE 15/* Enable Translation Cache Extensions */ #define _EFER_AUTOIBRS 21/* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE)
@@ -34,6 +35,7 @@#define EFER_SVME (1<<_EFER_SVME)#define EFER_LMSLE (1<<_EFER_LMSLE)#define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_TCE (1<<_EFER_TCE)#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)/*
arch/x86/kernel/cpu/amd.c +4 -0
@@ -1071,6 +1071,10 @@ static void init_amd(struct cpuinfo_x86 *c)/* AMD CPUs don't need fencing after x2APIC/TSC_DEADLINE MSR writes. */ clear_cpu_cap (c,X86_FEATURE_APIC_MSRS_FENCE ); + +/* Enable Translation Cache Extension */ +if (cpu_feature_enabled (X86_FEATURE_TCE )) +msr_set_bit (MSR_EFER , _EFER_TCE); }#ifdef CONFIG_X86_32
tools/arch/x86/include/asm/msr-index.h +2 -0
@@ -25,6 +25,7 @@#define _EFER_SVME 12/* Enable virtualization */ #define _EFER_LMSLE 13/* Long Mode Segment Limit Enable */ #define _EFER_FFXSR 14/* Enable Fast FXSAVE/FXRSTOR */ +#define _EFER_TCE 15/* Enable Translation Cache Extensions */ #define _EFER_AUTOIBRS 21/* Enable Automatic IBRS */ #define EFER_SCE (1<<_EFER_SCE)
@@ -34,6 +35,7 @@#define EFER_SVME (1<<_EFER_SVME)#define EFER_LMSLE (1<<_EFER_LMSLE)#define EFER_FFXSR (1<<_EFER_FFXSR) +#define EFER_TCE (1<<_EFER_TCE)#define EFER_AUTOIBRS (1<<_EFER_AUTOIBRS)/*
Signature · 1 line
2.47.1
PATCH v7 12/12 x86/mm: only invalidate final translations with INVLPGB
In reply to Rik van RielUse the INVLPGB_FINAL_ONLY flag when invalidating mappings with INVPLGB. This way only leaf mappings get removed from the TLB, leaving intermediate translations cached.
On the (rare) occasions where we free page tables we do a full flush, ensuring intermediate translations get flushed from the TLB.
--- arch/x86/include/asm/invlpgb.h | 10 ++++++++-- arch/x86/mm/tlb.c | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-)
arch/x86/include/asm/invlpgb.h +8 -2
@@ -67,9 +67,15 @@ static inline void invlpgb_flush_user(unsigned long pcid,static inline void invlpgb_flush_user_nr_nosync (unsigned long pcid,unsigned long addr,u16 nr, -bool pmd_stride) +bool pmd_stride, +bool freed_tables) { -__invlpgb (0 , pcid, addr, nr -1 , pmd_stride,INVLPGB_PCID |INVLPGB_VA ); +unsigned long flags =INVLPGB_PCID |INVLPGB_VA ; + +if (!freed_tables) + flags |=INVLPGB_FINAL_ONLY ; + +__invlpgb (0 , pcid, addr, nr -1 , pmd_stride, flags); }/* Flush all mappings for a given PCID, not including globals. */
arch/x86/mm/tlb.c +4 -4
@@ -518,10 +518,10 @@ static void broadcast_tlb_flush(struct flush_tlb_info *info) nr =min (maxnr, (info->end - addr) >> info->stride_shift); nr =max (nr,1 ); -invlpgb_flush_user_nr_nosync (kern_pcid (asid), addr, nr, pmd); +invlpgb_flush_user_nr_nosync (kern_pcid (asid), addr, nr, pmd, info->freed_tables);/* Do any CPUs supporting INVLPGB need PTI? */ if (static_cpu_has (X86_FEATURE_PTI )) -invlpgb_flush_user_nr_nosync (user_pcid (asid), addr, nr, pmd); +invlpgb_flush_user_nr_nosync (user_pcid (asid), addr, nr, pmd, info->freed_tables); addr += nr << info->stride_shift; }while (addr < info->end);
@@ -1683,10 +1683,10 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_unmap_batch *batch, batch->used_invlpgb = true;migrate_disable (); } -invlpgb_flush_user_nr_nosync (kern_pcid (asid), uaddr,1 , false); +invlpgb_flush_user_nr_nosync (kern_pcid (asid), uaddr,1 , false, false);/* Do any CPUs supporting INVLPGB need PTI? */ if (static_cpu_has (X86_FEATURE_PTI )) -invlpgb_flush_user_nr_nosync (user_pcid (asid), uaddr,1 , false); +invlpgb_flush_user_nr_nosync (user_pcid (asid), uaddr,1 , false, false);/* * Some CPUs might still be using a local ASID for this
Signature · 1 line
2.47.1
Quoted 59 lines · Rik van Riel
Add support for broadcast TLB invalidation using AMD's INVLPGB instruction.
This allows the kernel to invalidate TLB entries on remote CPUs without needing to send IPIs, without having to wait for remote CPUs to handle those interrupts, and with less interruption to what was running on those CPUs.
Because x86 PCID space is limited, and there are some very large systems out there, broadcast TLB invalidation is only used for processes that are active on 3 or more CPUs, with the threshold being gradually increased the more the PCID space gets exhausted.
Combined with the removal of unnecessary
lru_add_draincalls (see https://lkml.org/lkml/2024/12/19/1388) this results in a nice performance boost for the will-it-scaletlb_flush2_threadstest on an AMD Milan system with 36 cores:- vanilla kernel: 527k loops/second - lru_add_drain removal: 731k loops/second - only INVLPGB: 527k loops/second-
lru_add_drain+ INVLPGB: 1157k loops/secondProfiling with only the INVLPGB changes showed while TLB invalidation went down from 40% of the total CPU time to only around 4% of CPU time, the contention simply moved to the LRU lock.
Fixing both at the same time about doubles the
number of iterations per second from this case.Some numbers closer to real world performance
can be found at Phoronix, thanks to Michael:https://www.phoronix.com/news/AMD-INVLPGB-Linux-Benefits
My current plan is to implement support for Intel's RAR (Remote Action Request) TLB flushing in a follow-up series, after this thing has been merged into -tip. Making things any larger would just be unwieldy for reviewers.
v7:
- a few small code cleanups (Nadav)
- fix spuriousVM_WARN_ON_ONCEinmm_global_asid
- code simplifications & better barriers (Peter & Dave)
v6:
- fixinfo->endcheck inflush_tlb_kernel_range(Michael)
- disable broadcast TLB flushing on 32 bit x86
v5:
- use byte assembly for compatibility with older toolchains (Borislav, Michael)
- ensure a panic on an invalid number of extra pages (Dave, Tom)
- addcant_migrate()assertion to tlbsync (Jann)
- a bunch more cleanups (Nadav)
- key TCE enabling offX86_FEATURE_TCE(Andrew)
- fix a race between reclaim and ASID transition (Jann)
v4:
- Use only bitmaps to track free global ASIDs (Nadav)
- Improved AMD initialization (Borislav & Tom)
- Various naming and documentation improvements (Peter, Nadav, Tom, Dave)
- Fixes for subtle race conditions (Jann)
Quoted 10 lines
v3:
- Remove paravirttlb_remove_tablecall (thank you Qi Zheng)
- More suggested cleanups and changelog fixes by Peter and Nadav
v2:
- Apply suggestions by Peter and Borislav (thank you!)
- Fix bug inarch_tlbbatch_flush, where we need to do both the TLBSYNC, and flush the CPUs that are in the cpumask.
- Some updates to comments and changelogs based on questions.
I have collected performance data using the will-it-scale tlb_flush2_threads benchmark on my AMD Milan, Genoa, and Turin systems.
As expected, I don't see any discrepancies in the data. (Performance Testing is done based on 6.13.0-rc7).
------------------------------------------------------------------------------------------------------------------------------------------------
| ./tlb_flush2_threads -s 5 -t 128 | Milan 1P (NPS1) | Milan 1P (NPS2) | Genoa 1P (NPS1) | Genoa 1P (NPS2) | Turin 2P (NPS1) | Turin 2P (NPS2) |
------------------------------------------------------------------------------------------------------------------------------------------------
| Vanila | 357647 | 419631 | 319885 | 311069 | 380559 | 379286 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain removal | 784734 | 796056 | 540862 | 530472 | 549168 | 482683 |
------------------------------------------------------------------------------------------------------------------------------------------------
| INVLPGB | 581069 | 950848 | 501033 | 553987 | 528660 | 536535 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain removal + INVLPGB | 1094941 | 1086826 | 980293 | 979005 | 1228823 | 1238440 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain vs. Vanila | 54.42% | 47.29% | 40.86% | 41.36% | 30.70% | 21.42% |
------------------------------------------------------------------------------------------------------------------------------------------------
| INVLPGB vs. Vanila | 38.45% | 55.87% | 55.87% | 43.85% | 28.01% | 29.31% |
------------------------------------------------------------------------------------------------------------------------------------------------
| (LRU drain + INVLPGB) vs. Vanila | 67.34% | 61.39% | 67.37% | 68.23% | 69.03% | 69.37% |
------------------------------------------------------------------------------------------------------------------------------------------------
Feel free to add:
I would be happy to test future versions, if needed.
-Manali
Quoted 95 lines · Manali Shukla
Quoted 59 lines · Rik van Riel
Add support for broadcast TLB invalidation using AMD's INVLPGB instruction.
This allows the kernel to invalidate TLB entries on remote CPUs without needing to send IPIs, without having to wait for remote CPUs to handle those interrupts, and with less interruption to what was running on those CPUs.
Because x86 PCID space is limited, and there are some very large systems out there, broadcast TLB invalidation is only used for processes that are active on 3 or more CPUs, with the threshold being gradually increased the more the PCID space gets exhausted.
Combined with the removal of unnecessary
lru_add_draincalls (see https://lkml.org/lkml/2024/12/19/1388) this results in a nice performance boost for the will-it-scaletlb_flush2_threadstest on an AMD Milan system with 36 cores:- vanilla kernel: 527k loops/second - lru_add_drain removal: 731k loops/second - only INVLPGB: 527k loops/second-
lru_add_drain+ INVLPGB: 1157k loops/secondProfiling with only the INVLPGB changes showed while TLB invalidation went down from 40% of the total CPU time to only around 4% of CPU time, the contention simply moved to the LRU lock.
Fixing both at the same time about doubles the
number of iterations per second from this case.Some numbers closer to real world performance
can be found at Phoronix, thanks to Michael:https://www.phoronix.com/news/AMD-INVLPGB-Linux-Benefits
My current plan is to implement support for Intel's RAR (Remote Action Request) TLB flushing in a follow-up series, after this thing has been merged into -tip. Making things any larger would just be unwieldy for reviewers.
v7:
- a few small code cleanups (Nadav)
- fix spuriousVM_WARN_ON_ONCEinmm_global_asid
- code simplifications & better barriers (Peter & Dave)
v6:
- fixinfo->endcheck inflush_tlb_kernel_range(Michael)
- disable broadcast TLB flushing on 32 bit x86
v5:
- use byte assembly for compatibility with older toolchains (Borislav, Michael)
- ensure a panic on an invalid number of extra pages (Dave, Tom)
- addcant_migrate()assertion to tlbsync (Jann)
- a bunch more cleanups (Nadav)
- key TCE enabling offX86_FEATURE_TCE(Andrew)
- fix a race between reclaim and ASID transition (Jann)
v4:
- Use only bitmaps to track free global ASIDs (Nadav)
- Improved AMD initialization (Borislav & Tom)
- Various naming and documentation improvements (Peter, Nadav, Tom, Dave)
- Fixes for subtle race conditions (Jann)Quoted 10 lines
v3:
- Remove paravirttlb_remove_tablecall (thank you Qi Zheng)
- More suggested cleanups and changelog fixes by Peter and Nadav
v2:
- Apply suggestions by Peter and Borislav (thank you!)
- Fix bug inarch_tlbbatch_flush, where we need to do both the TLBSYNC, and flush the CPUs that are in the cpumask.
- Some updates to comments and changelogs based on questions.I have collected performance data using the will-it-scale
tlb_flush2_threadsbenchmark on my AMD Milan, Genoa, and Turin systems.As expected, I don't see any discrepancies in the data. (Performance Testing is done based on 6.13.0-rc7).
------------------------------------------------------------------------------------------------------------------------------------------------
| ./tlb_flush2_threads -s 5 -t 128 | Milan 1P (NPS1) | Milan 1P (NPS2) | Genoa 1P (NPS1) | Genoa 1P (NPS2) | Turin 2P (NPS1) | Turin 2P (NPS2) |
------------------------------------------------------------------------------------------------------------------------------------------------
| Vanila | 357647 | 419631 | 319885 | 311069 | 380559 | 379286 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain removal | 784734 | 796056 | 540862 | 530472 | 549168 | 482683 |
------------------------------------------------------------------------------------------------------------------------------------------------
| INVLPGB | 581069 | 950848 | 501033 | 553987 | 528660 | 536535 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain removal + INVLPGB | 1094941 | 1086826 | 980293 | 979005 | 1228823 | 1238440 |
------------------------------------------------------------------------------------------------------------------------------------------------
| LRU drain vs. Vanila | 54.42% | 47.29% | 40.86% | 41.36% | 30.70% | 21.42% |
------------------------------------------------------------------------------------------------------------------------------------------------
| INVLPGB vs. Vanila | 38.45% | 55.87% | 55.87% | 43.85% | 28.01% | 29.31% |
------------------------------------------------------------------------------------------------------------------------------------------------
| (LRU drain + INVLPGB) vs. Vanila | 67.34% | 61.39% | 67.37% | 68.23% | 69.03% | 69.37% |
------------------------------------------------------------------------------------------------------------------------------------------------
Quoted 2 lines
Feel free to add:
Tested-by Manali Shukla <[email protected]>
Great data!
Could we please add all the scalability testing results to patch #9 or so, so that it's preserved in the kernel Git history and provides a background as to why we want this feature?
Thanks,
Ingo