mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove.patch removed from -mm tree
The quilt patch titled
Subject: mm: change do_vmi_align_munmap() tracking of VMAs to remove
has been removed from the -mm tree. Its filename was
mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove.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: "Liam R. Howlett" <[email protected]>
Subject: mm: change do_vmi_align_munmap() tracking of VMAs to remove
Date: Mon, 24 Jul 2023 14:31:45 -0400
The majority of the calls to munmap a vm range is within a single vma. The maple tree is able to store a single entry at 0, with a size of 1 as a pointer and avoid any allocations. Change do_vmi_align_munmap() to store the VMAs being munmap()'ed into a tree indexed by the count. This will leverage the ability to store the first entry without a node allocation.
Storing the entries into a tree by the count and not the vma start and end means changing the functions which iterate over the entries. Update unmap_vmas() and free_pgtables() to take a maple state and a tree end address to support this functionality.
Passing through the same maple state to unmap_vmas() and free_pgtables() means the state needs to be reset between calls. This happens in the static unmap_region() and exit_mmap().
---
include/linux/mm.h | 4 ++-- mm/internal.h | 2 +- mm/memory.c | 16 +++++++--------- mm/mmap.c | 41 ++++++++++++++++++++++++----------------- 4 files changed, 34 insertions(+), 29 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove +2 -2
@@ -2287,9 +2287,9 @@ static inline void zap_vma_pages(structzap_page_range_single (vma, vma->vm_start, vma->vm_end - vma->vm_start,NULL ); } -void unmap_vmas (struct mmu_gather *tlb,struct maple_tree *mt, +void unmap_vmas (struct mmu_gather *tlb,struct ma_state *mas,struct vm_area_struct *start_vma,unsigned long start, -unsigned long end,bool mm_wr_locked); +unsigned long end,unsigned long tree_end,bool mm_wr_locked);struct mmu_notifier_range ;
mm/internal.h renamed from mm/internal.h~mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove +1 -1
@@ -109,7 +109,7 @@ bool __folio_end_writeback(struct foliovoid deactivate_file_folio (struct folio *folio);void folio_activate (struct folio *folio); -void free_pgtables (struct mmu_gather *tlb,struct maple_tree *mt, +void free_pgtables (struct mmu_gather *tlb,struct ma_state *mas,struct vm_area_struct *start_vma,unsigned long floor,unsigned long ceiling,bool mm_wr_locked);void pmd_install (struct mm_struct *mm,pmd_t *pmd,pgtable_t *pte);
mm/memory.c renamed from mm/memory.c~mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove +7 -9
@@ -361,12 +361,10 @@ void free_pgd_range(struct mmu_gather *t }while (pgd++, addr = next, addr != end); } -void free_pgtables (struct mmu_gather *tlb,struct maple_tree *mt, +void free_pgtables (struct mmu_gather *tlb,struct ma_state *mas,struct vm_area_struct *vma,unsigned long floor,unsigned long ceiling,bool mm_wr_locked) { -MA_STATE (mas, mt, vma->vm_end, vma->vm_end); - do { unsigned long addr = vma->vm_start; struct vm_area_struct *next;
@@ -375,7 +373,7 @@ void free_pgtables(struct mmu_gather *tl* Note: USER_PGTABLES_CEILING may be passed as ceiling and may * be 0. This will underflow and is okay. */ - next =mas_find (&mas, ceiling -1 ); + next =mas_find (mas, ceiling -1 );/* * Hide vma from rmap and truncate_pagecache before freeing
@@ -396,7 +394,7 @@ void free_pgtables(struct mmu_gather *tlwhile (next && next->vm_start <= vma->vm_end +PMD_SIZE && !is_vm_hugetlb_page (next)) { vma = next; - next =mas_find (&mas, ceiling -1 ); + next =mas_find (mas, ceiling -1 );if (mm_wr_locked)vma_start_write (vma);unlink_anon_vmas (vma);
@@ -1713,9 +1711,10 @@ static void unmap_single_vma(struct mmu_* ensure that any thus-far unmapped pages are flushed before unmap_vmas() * drops the lock and schedules. */ -void unmap_vmas (struct mmu_gather *tlb,struct maple_tree *mt, +void unmap_vmas (struct mmu_gather *tlb,struct ma_state *mas,struct vm_area_struct *vma,unsigned long start_addr, -unsigned long end_addr,bool mm_wr_locked) +unsigned long end_addr,unsigned long tree_end, +bool mm_wr_locked) {struct mmu_notifier_range range;struct zap_details details = {
@@ -1723,7 +1722,6 @@ void unmap_vmas(struct mmu_gather *tlb,/* Careful - we need to zap private pages too! */ .even_cows = true, }; -MA_STATE (mas, mt, vma->vm_end, vma->vm_end);mmu_notifier_range_init (&range,MMU_NOTIFY_UNMAP ,0 , vma->vm_mm, start_addr, end_addr);
@@ -1731,7 +1729,7 @@ void unmap_vmas(struct mmu_gather *tlb,do {unmap_single_vma (tlb, vma, start_addr, end_addr, &details, mm_wr_locked); - }while ((vma =mas_find (&mas, end_addr -1 )) !=NULL ); + }while ((vma =mas_find (mas, tree_end -1 )) !=NULL );mmu_notifier_invalidate_range_end (&range); }
mm/mmap.c renamed from mm/mmap.c~mm-change-do_vmi_align_munmap-tracking-of-vmas-to-remove +24 -17
114 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
maple_tree-add-hex-output-to-maple_arange64-dump.patch maple_tree-reorder-replacement-of-nodes-to-avoid-live-lock.patch maple_tree-introduce-mas_put_in_tree.patch maple_tree-introduce-mas_tree_parent-definition.patch maple_tree-change-mas_adopt_children-parent-usage.patch maple_tree-replace-data-before-marking-dead-in-split-and-spanning-store.patch