mm-remove-arch_flush_tlb_batched_pending-arch-helper.patch removed from -mm tree
The quilt patch titled
Subject: mm: remove arch_flush_tlb_batched_pending() arch helper
has been removed from the -mm tree. Its filename was
mm-remove-arch_flush_tlb_batched_pending-arch-helper.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryan Roberts <[email protected]>
Subject: mm: remove arch_flush_tlb_batched_pending() arch helper
Date: Mon, 9 Jun 2025 11:31:30 +0100
Since commit 4b634918384c ("arm64/mm: Close theoretical race where stale TLB entry remains valid"), all arches that use tlbbatch for reclaim (arm64, riscv, x86) implement arch_flush_tlb_batched_pending() with a flush_tlb_mm().
So let's simplify by removing the unnecessary abstraction and doing the flush_tlb_mm() directly in flush_tlb_batched_pending(). This effectively reverts commit db6c1f6f236d ("mm/tlbbatch: introduce arch_flush_tlb_batched_pending()").
---
arch/arm64/include/asm/tlbflush.h | 11 ----------- arch/riscv/include/asm/tlbflush.h | 1 - arch/riscv/mm/tlbflush.c | 5 ----- arch/x86/include/asm/tlbflush.h | 5 ----- mm/rmap.c | 2 +- 5 files changed, 1 insertion(+), 23 deletions(-)
arch/arm64/include/asm/tlbflush.h renamed from arch/arm64/include/asm/tlbflush.h~mm-remove-arch_flush_tlb_batched_pending-arch-helper +0 -11
@@ -323,17 +323,6 @@ static inline bool arch_tlbbatch_should_ }/* -* If mprotect/munmap/etc occurs during TLB batched flushing, we need to ensure -* all the previously issued TLBIs targeting mm have completed. But since we -* can be executing on a remote CPU, a DSB cannot guarantee this like it can -* for arch_tlbbatch_flush(). Our only option is to flush the entire mm. -*/ -static inline void arch_flush_tlb_batched_pending (struct mm_struct *mm) -{ -flush_tlb_mm (mm); -} - -/* * To support TLB batched flush for multiple pages unmapping, we only send * the TLBI for each page in arch_tlbbatch_add_pending() and wait for the * completion at the end in arch_tlbbatch_flush(). Since we've already issued
arch/riscv/include/asm/tlbflush.h renamed from arch/riscv/include/asm/tlbflush.h~mm-remove-arch_flush_tlb_batched_pending-arch-helper +0 -1
@@ -63,7 +63,6 @@ void flush_pud_tlb_range(struct vm_area_bool arch_tlbbatch_should_defer (struct mm_struct *mm);void arch_tlbbatch_add_pending (struct arch_tlbflush_unmap_batch *batch,struct mm_struct *mm,unsigned long start,unsigned long end); -void arch_flush_tlb_batched_pending (struct mm_struct *mm);void arch_tlbbatch_flush (struct arch_tlbflush_unmap_batch *batch);extern unsigned long tlb_flush_all_threshold;
arch/riscv/mm/tlbflush.c renamed from arch/riscv/mm/tlbflush.c~mm-remove-arch_flush_tlb_batched_pending-arch-helper +0 -5
@@ -234,11 +234,6 @@ void arch_tlbbatch_add_pending(struct armmu_notifier_arch_invalidate_secondary_tlbs (mm, start, end); } -void arch_flush_tlb_batched_pending (struct mm_struct *mm) -{ -flush_tlb_mm (mm); -} -void arch_tlbbatch_flush (struct arch_tlbflush_unmap_batch *batch) { __flush_tlb_range(NULL, &batch->cpumask,
arch/x86/include/asm/tlbflush.h renamed from arch/x86/include/asm/tlbflush.h~mm-remove-arch_flush_tlb_batched_pending-arch-helper +0 -5
@@ -356,11 +356,6 @@ static inline void arch_tlbbatch_add_penmmu_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); static inline bool pte_flags_need_flush(unsigned long oldflags,
mm/rmap.c renamed from mm/rmap.c~mm-remove-arch_flush_tlb_batched_pending-arch-helper +1 -1
@@ -746,7 +746,7 @@ void flush_tlb_batched_pending(struct mmint flushed = batch >>TLB_FLUSH_BATCH_FLUSHED_SHIFT ;if (pending != flushed) { -arch_flush_tlb_batched_pending (mm); +flush_tlb_mm (mm);/* * If the new TLB flushing is pending during flushing, leave * mm->tlb_flush_batched as is, to avoid losing flushing.
_
Patches currently in -mm which might be from [email protected] are