Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm/memory: use __zap_vma_range() in zap_vma_for_reaping()

Let's call __zap_vma_range() instead of unmap_page_range() to prepare for
further cleanups.

To keep the existing behavior, whereby we do not call uprobe_munmap()
which could block, add a new "reaping" member to zap_details and use it.

Likely we should handle the possible blocking in uprobe_munmap()
differently, but for now keep it unchanged.

Link: https://lkml.kernel.org/r/20260227200848.114019-11-david@kernel.org
Signed-off-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Alice Ryhl <aliceryhl@google.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Arve <arve@android.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Carlos Llamas <cmllamas@google.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc: Daniel Borkman <daniel@iogearbox.net>
Cc: Dave Airlie <airlied@gmail.com>
Cc: David Ahern <dsahern@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dimitri Sivanich <dimitri.sivanich@hpe.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jakub Kacinski <kuba@kernel.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Jann Horn <jannh@google.com>
Cc: Janosch Frank <frankja@linux.ibm.com>
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Namhyung kim <namhyung@kernel.org>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Todd Kjos <tkjos@android.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

David Hildenbrand (Arm) and committed by
Andrew Morton
5f10cbbd a97bc13d

+10 -4
+1
include/linux/mm.h
··· 2769 2769 struct folio *single_folio; /* Locked folio to be unmapped */ 2770 2770 bool skip_cows; /* Do not zap COWed private pages */ 2771 2771 bool reclaim_pt; /* Need reclaim page tables? */ 2772 + bool reaping; /* Reaping, do not block. */ 2772 2773 zap_flags_t zap_flags; /* Extra flags for zapping */ 2773 2774 }; 2774 2775
+9 -4
mm/memory.c
··· 2079 2079 unsigned long start, unsigned long end, 2080 2080 struct zap_details *details) 2081 2081 { 2082 + const bool reaping = details && details->reaping; 2083 + 2082 2084 VM_WARN_ON_ONCE(start >= end || !range_in_vma(vma, start, end)); 2083 2085 2084 - if (vma->vm_file) 2086 + /* uprobe_munmap() might sleep, so skip it when reaping. */ 2087 + if (vma->vm_file && !reaping) 2085 2088 uprobe_munmap(vma, start, end); 2086 2089 2087 2090 if (unlikely(is_vm_hugetlb_page(vma))) { 2088 2091 zap_flags_t zap_flags = details ? details->zap_flags : 0; 2089 2092 2093 + VM_WARN_ON_ONCE(reaping); 2090 2094 /* 2091 2095 * vm_file will be NULL when we fail early while instantiating 2092 2096 * a new mapping. In this case, no pages were mapped yet and ··· 2115 2111 */ 2116 2112 int zap_vma_for_reaping(struct vm_area_struct *vma) 2117 2113 { 2114 + struct zap_details details = { 2115 + .reaping = true, 2116 + }; 2118 2117 struct mmu_notifier_range range; 2119 2118 struct mmu_gather tlb; 2120 - 2121 - VM_WARN_ON_ONCE(is_vm_hugetlb_page(vma)); 2122 2119 2123 2120 mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, 2124 2121 vma->vm_start, vma->vm_end); ··· 2128 2123 tlb_finish_mmu(&tlb); 2129 2124 return -EBUSY; 2130 2125 } 2131 - unmap_page_range(&tlb, vma, range.start, range.end, NULL); 2126 + __zap_vma_range(&tlb, vma, range.start, range.end, &details); 2132 2127 mmu_notifier_invalidate_range_end(&range); 2133 2128 tlb_finish_mmu(&tlb); 2134 2129 return 0;