Lorenzo Stoakes 01c373e9a5 mm: rework vm_ops->close() handling on VMA merge ... In commit 714965ca82 ("mm/mmap: start distinguishing if vma can be removed in mergeability test") we relaxed the VMA merge rules for VMAs possessing a vm_ops->close() hook, permitting this operation in instances where we wouldn't delete the VMA as part of the merge operation. This was later corrected in commit fc0c8f9089 ("mm, mmap: fix vma_merge() case 7 with vma_ops->close") to account for a subtle case that the previous commit had not taken into account. In both instances, we first rely on is_mergeable_vma() to determine whether we might be dealing with a VMA that might be removed, taking advantage of the fact that a 'previous' VMA will never be deleted, only VMAs that follow it. The second patch corrects the instance where a merge of the previous VMA into a subsequent one did not correctly check whether the subsequent VMA had a vm_ops->close() handler. Both changes prevent merge cases that are actually permissible (for instance a merge of a VMA into a following VMA with a vm_ops->close(), but with no previous VMA, which would result in the next VMA being extended, not deleted). In addition, both changes fail to consider the case where a VMA that would otherwise be merged with the previous and next VMA might have vm_ops->close(), on the assumption that for this to be the case, all three would have to have the same vma->vm_file to be mergeable and thus the same vm_ops. And in addition both changes operate at 50,000 feet, trying to guess whether a VMA will be deleted. As we have majorly refactored the VMA merge operation and de-duplicated code to the point where we know precisely where deletions will occur, this patch removes the aforementioned checks altogether and instead explicitly checks whether a VMA will be deleted. In cases where a reduced merge is still possible (where we merge both previous and next VMA but the next VMA has a vm_ops->close hook, meaning we could just merge the previous and current VMA), we do so, otherwise the merge is not permitted. We take advantage of our userland testing to assert that this functions correctly - replacing the previous limited vm_ops->close() tests with tests for every single case where we delete a VMA. We also update all testing for both new and modified VMAs to set vma->vm_ops->close() in every single instance where this would not prevent the merge, to assert that we never do so. Link: https://lkml.kernel.org/r/9f96b8cfeef3d14afabddac3d6144afdfbef2e22.1725040657.git.lorenzo.stoakes@oracle.com Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Acked-by: Vlastimil Babka <vbabka@suse.cz> Cc: Liam R. Howlett <Liam.Howlett@oracle.com> Cc: Mark Brown <broonie@kernel.org> Cc: Bert Karwatzki <spasswolf@web.de> Cc: Jeff Xu <jeffxu@chromium.org> Cc: Jiri Olsa <olsajiri@gmail.com> Cc: Kees Cook <kees@kernel.org> Cc: Lorenzo Stoakes <lstoakes@gmail.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: "Paul E. McKenney" <paulmck@kernel.org> Cc: Paul Moore <paul@paul-moore.com> Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com> Cc: Suren Baghdasaryan <surenb@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>		2024-09-03 21:15:55 -07:00
..
damon	mm/damon/lru_sort: adjust local variable to dynamic allocation	2024-09-01 20:25:45 -07:00
kasan	kasan: fix bad call to unpoison_slab_object	2024-06-24 20:52:09 -07:00
kfence	kfence: save freeing stack trace at calling time instead of freeing time	2024-09-01 20:26:12 -07:00
kmsan	kmsan: do not pass NULL pointers as 0	2024-07-03 19:30:26 -07:00
backing-dev.c	writeback: support retrieving per group debug writeback stats of bdi	2024-05-05 17:53:51 -07:00
balloon_compaction.c	mm: remove MIGRATE_SYNC_NO_COPY mode	2024-07-03 19:30:00 -07:00
bootmem_info.c	bootmem: use kmemleak_free_part_phys in put_page_bootmem	2023-10-25 16:47:13 -07:00
cma_debug.c	mm/cma_debug: show complete cma name in debugfs directories	2022-09-11 20:25:50 -07:00
cma_sysfs.c	mm/cma: add sysfs file 'release_pages_success'	2024-02-22 10:24:57 -08:00
cma.c	mm/cma: add cma_{alloc,free}_folio()	2024-09-03 21:15:36 -07:00
cma.h	mm/cma: add sysfs file 'release_pages_success'	2024-02-22 10:24:57 -08:00
compaction.c	mm:page_alloc: fix the NULL ac->nodemask in __alloc_pages_slowpath()	2024-09-03 21:15:47 -07:00
debug_page_alloc.c	mm: page_alloc: consolidate free page accounting	2024-04-25 20:56:04 -07:00
debug_page_ref.c
debug_vm_pgtable.c	mm/debug_vm_pgtable: drop RANDOM_ORVALUE trick	2024-06-15 10:43:08 -07:00
debug.c	mm: support only one page_type per page	2024-09-03 21:15:43 -07:00
dmapool_test.c	mm/dmapool: add MODULE_DESCRIPTION()	2024-07-03 19:29:58 -07:00
dmapool.c	mm/mempool/dmapool: remove CONFIG_DEBUG_SLAB ifdefs	2023-12-05 11:17:58 +01:00
early_ioremap.c	mm/early_ioremap.c: improve the execution efficiency of early_ioremap_setup()	2023-06-09 16:25:56 -07:00
execmem.c	mm/execmem, arch: convert remaining overrides of module_alloc to execmem	2024-05-14 00:31:43 -07:00
fadvise.c	mm: remove unnecessary pagevec includes	2023-06-23 16:59:31 -07:00
fail_page_alloc.c	mm, page_alloc: put should_fail_alloc_page() back behing CONFIG_FAIL_PAGE_ALLOC	2024-07-17 21:05:18 -07:00
failslab.c	mm, slab: put should_failslab() back behind CONFIG_SHOULD_FAILSLAB	2024-07-17 21:05:18 -07:00
filemap.c	mm: allow read-ahead with IOCB_NOWAIT set	2024-09-03 21:15:40 -07:00
folio-compat.c	mm: remove page_mapping()	2024-07-03 19:29:59 -07:00
gup_test.c	Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.	2023-06-23 16:58:19 -07:00
gup_test.h	mm/gup_test: start/stop/read functionality for PIN LONGTERM test	2022-11-08 17:37:15 -08:00
gup.c	mm: remove follow_page()	2024-09-01 20:26:01 -07:00
highmem.c	mm/highmem: make nr_free_highpages() return "unsigned long"	2024-07-03 19:30:06 -07:00
hmm.c	mm: provide mm_struct and address to huge_ptep_get()	2024-07-12 15:52:15 -07:00
huge_memory.c	x86: remove PG_uncached	2024-09-03 21:15:46 -07:00
hugetlb_cgroup.c	mm: memcg: don't call propagate_protected_usage() needlessly	2024-09-01 20:25:50 -07:00
hugetlb_vmemmap.c	mm/hugetlb_vmemmap: don't synchronize_rcu() without HVO	2024-09-01 20:25:45 -07:00
hugetlb_vmemmap.h	mm: hugetlb_vmemmap: fix reference to nonexistent file	2023-10-25 16:47:14 -07:00
hugetlb.c	mm/hugetlb: use __GFP_COMP for gigantic folios	2024-09-03 21:15:36 -07:00
hwpoison-inject.c	mm/hwpoison: add MODULE_DESCRIPTION()	2024-07-03 19:29:58 -07:00
init-mm.c	mm: Deprecate pasid field	2023-12-12 10:11:32 +01:00
internal.h	printf: remove %pGt support	2024-09-03 21:15:42 -07:00
interval_tree.c
io-mapping.c
ioremap.c	mm: ioremap: remove unneeded ioremap_allowed and iounmap_allowed	2023-08-18 10:12:36 -07:00
Kconfig	x86: remove PG_uncached	2024-09-03 21:15:46 -07:00
Kconfig.debug	mm/slub: unify all sl[au]b parameters with "slab_$param"	2024-01-22 10:31:08 +01:00
khugepaged.c	mm: khugepaged: support shmem mTHP collapse	2024-09-03 21:15:39 -07:00
kmemleak.c	mm/kmemleak: use IS_ERR_PCPU() for pointer in the percpu address space	2024-09-03 21:15:38 -07:00
ksm.c	mm: remove PageSwapCache	2024-09-03 21:15:44 -07:00
list_lru.c	mm: list_lru: fix UAF for memory cgroup	2024-08-07 18:33:56 -07:00
maccess.c	mm: Fix copy_from_user_nofault().	2023-04-12 17:36:23 -07:00
madvise.c	mseal: replace can_modify_mm_madv with a vma variant	2024-09-03 21:15:41 -07:00
Makefile	mm: introduce numa_emulation	2024-09-03 21:15:31 -07:00
mapping_dirty_helpers.c	mm: fix clean_record_shared_mapping_range kernel-doc	2023-08-24 16:20:30 -07:00
memblock.c	mm: rework accept memory helpers	2024-09-01 20:26:07 -07:00
memcontrol-v1.c	memcg: initiate deprecation of pressure_level	2024-09-01 20:26:21 -07:00
memcontrol-v1.h	memcg: allocate v1 event percpu only on v1 deployment	2024-09-01 20:26:20 -07:00
memcontrol.c	mm,memcg: provide per-cgroup counters for NUMA balancing operations	2024-09-03 21:15:36 -07:00
memfd.c	mm/gup: introduce memfd_pin_folios() for pinning memfd folios	2024-07-12 15:52:09 -07:00
memory_hotplug.c	mm/memory_hotplug: get rid of __ref	2024-09-01 20:25:56 -07:00
memory-failure.c	mm/memory-failure: use raw_spinlock_t in struct memory_failure_cpu	2024-08-15 22:16:14 -07:00
memory-tiers.c	memory tiering: introduce folio_use_access_time() check	2024-09-01 20:25:47 -07:00
memory.c	mm,memcg: provide per-cgroup counters for NUMA balancing operations	2024-09-03 21:15:36 -07:00
mempolicy.c	mm,memcg: provide per-cgroup counters for NUMA balancing operations	2024-09-03 21:15:36 -07:00
mempool.c	mm: fix xyz_noprof functions calling profiled functions	2024-06-05 19:19:26 -07:00
memremap.c	mm: convert put_devmap_managed_page_refs() to put_devmap_managed_folio_refs()	2024-05-05 17:53:49 -07:00
memtest.c	memtest: use {READ,WRITE}_ONCE in memory scanning	2024-03-13 12:12:21 -07:00
migrate_device.c	mm: extend rmap flags arguments for folio_add_new_anon_rmap	2024-07-03 19:30:18 -07:00
migrate.c	mm: remove PageSwapCache	2024-09-03 21:15:44 -07:00
mincore.c	mm: provide mm_struct and address to huge_ptep_get()	2024-07-12 15:52:15 -07:00
mlock.c	Random number generator updates for Linux 6.11-rc1.	2024-07-24 10:29:50 -07:00
mm_init.c	mm: drop CONFIG_HAVE_ARCH_NODEDATA_EXTENSION	2024-09-03 21:15:28 -07:00
mm_slot.h	mm: introduce common struct mm_slot	2022-10-03 14:02:43 -07:00
mmap_lock.c	mm: mmap_lock: replace get_memcg_path_buf() with on-stack buffer	2024-07-03 19:30:26 -07:00
mmap.c	mm: avoid using vma_merge() for new VMAs	2024-09-03 21:15:54 -07:00
mmu_gather.c	mm/mmu_gather: improve cond_resched() handling with large folios and expensive page freeing	2024-02-22 15:27:17 -08:00
mmu_notifier.c	mm: move internal core VMA manipulation functions to own file	2024-09-01 20:25:54 -07:00
mmzone.c	mm: improve code consistency with zonelist_* helper functions	2024-09-01 20:25:55 -07:00
mprotect.c	mm/mprotect: replace can_modify_mm with can_modify_vma	2024-09-03 21:15:41 -07:00
mremap.c	mm/mremap: replace can_modify_mm with can_modify_vma	2024-09-03 21:15:41 -07:00
mseal.c	mm: remove can_modify_mm()	2024-09-03 21:15:42 -07:00
msync.c	mm/msync: use vma_find() instead of vma linked list	2022-09-26 19:46:25 -07:00
nommu.c	mm: remove follow_page()	2024-09-01 20:26:01 -07:00
numa_emulation.c	mm: introduce numa_emulation	2024-09-03 21:15:31 -07:00
numa_memblks.c	mm: make range-to-target_node lookup facility a part of numa_memblks	2024-09-03 21:15:32 -07:00
numa.c	mm: make range-to-target_node lookup facility a part of numa_memblks	2024-09-03 21:15:32 -07:00
oom_kill.c	memory: remove the now superfluous sentinel element from ctl_table array	2024-04-25 20:56:32 -07:00
page_alloc.c	mm:page_alloc: fix the NULL ac->nodemask in __alloc_pages_slowpath()	2024-09-03 21:15:47 -07:00
page_counter.c	mm, memcg: cg2 memory{.swap,}.peak write handlers	2024-09-01 20:25:53 -07:00
page_ext.c	mm: don't account memmap per-node	2024-08-15 22:16:14 -07:00
page_idle.c	mm: page_idle: convert page idle to use a folio	2023-01-18 17:12:52 -08:00
page_io.c	mm: store zero pages to be swapped out in a bitmap	2024-09-03 21:15:47 -07:00
page_isolation.c	mm: remove migration for HugePage in isolate_single_pageblock()	2024-09-03 21:15:40 -07:00
page_owner.c	mm/page-owner: use gfp_nested_mask() instead of open coded masking	2024-05-19 14:40:44 -07:00
page_poison.c	mm/page_poison: replace kmap_atomic() with kmap_local_page()	2023-12-10 16:51:50 -08:00
page_reporting.c	mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER	2024-01-08 15:27:15 -08:00
page_reporting.h
page_table_check.c	mm/page_table_check: fix crash on ZONE_DEVICE	2024-06-15 10:43:04 -07:00
page_vma_mapped.c	mm: make page_mapped_in_vma conditional on CONFIG_MEMORY_FAILURE	2024-05-05 17:53:45 -07:00
page-writeback.c	mm:page-writeback: use folio_next_index() helper in writeback_iter()	2024-09-03 21:15:46 -07:00
pagewalk.c	mm/pagewalk: introduce folio_walk_start() + folio_walk_end()	2024-09-01 20:25:59 -07:00
percpu-internal.h	mm: remove CONFIG_MEMCG_KMEM	2024-07-10 12:14:54 -07:00
percpu-km.c
percpu-stats.c
percpu-vm.c	percpu: clean up all mappings when pcpu_map_pages() fails	2024-04-25 20:55:49 -07:00
percpu.c	percpu: remove pcpu_alloc_size()	2024-09-01 20:26:04 -07:00
pgalloc-track.h
pgtable-generic.c	mm: fix race between __split_huge_pmd_locked() and GUP-fast	2024-05-07 10:37:00 -07:00
process_vm_access.c	mm: fix process_vm_rw page counts	2023-12-10 16:51:39 -08:00
ptdump.c	mm: ptdump: add check_wx_pages debugfs attribute	2024-02-22 10:24:47 -08:00
readahead.c	Merge branch 'mm-hotfixes-stable' into mm-stable to pick up "mm: fix	2024-07-06 11:44:41 -07:00
rmap.c	mm/rmap: use folio->_mapcount for small folios	2024-09-03 21:15:37 -07:00
rodata_test.c	mm/rodata_test: use PAGE_ALIGNED() helper	2022-10-03 14:03:05 -07:00
secretmem.c	mm/secretmem: use a folio in secretmem_fault()	2023-08-21 13:38:02 -07:00
shmem_quota.c	shmem_quota: build the object file conditionally to the config option	2024-09-01 20:25:45 -07:00
shmem.c	mm: remove PageSwapCache	2024-09-03 21:15:44 -07:00
show_mem.c	lib: add memory allocations report in show_mem()	2024-04-25 20:55:57 -07:00
shrinker_debug.c	mm: shrinker: use min() to improve shrinker_debugfs_scan_write()	2024-09-03 21:15:40 -07:00
shrinker.c	mm: shrinker: use kvzalloc_node() from expand_one_shrinker_info()	2024-01-05 09:58:32 -08:00
shuffle.c	mm/shuffle: convert module_param_call to module_param_cb	2022-10-03 14:03:07 -07:00
shuffle.h	mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER	2024-01-08 15:27:15 -08:00
slab_common.c	mm: krealloc: clarify valid usage of __GFP_ZERO	2024-09-03 21:15:37 -07:00
slab.h	- 875fa64577da ("mm/hugetlb_vmemmap: fix race with speculative PFN	2024-07-21 17:15:46 -07:00
slub.c	mm, slub: do not call do_slab_free for kfence object	2024-07-30 11:50:00 +02:00
sparse-vmemmap.c	mm: don't account memmap per-node	2024-08-15 22:16:14 -07:00
sparse.c	mm: don't account memmap per-node	2024-08-15 22:16:14 -07:00
swap_cgroup.c	mm: attempt to batch free swap entries for zap_pte_range()	2024-09-03 21:15:33 -07:00
swap_slots.c	mm: swap: update get_swap_pages() to take folio order	2024-04-25 20:56:37 -07:00
swap_state.c	mm: return the folio from swapin_readahead	2024-09-01 20:26:05 -07:00
swap.c	mm/swap: take folio refcount after testing the LRU flag	2024-09-01 20:26:10 -07:00
swap.h	mm: return the folio from swapin_readahead	2024-09-01 20:26:05 -07:00
swapfile.c	mm: store zero pages to be swapped out in a bitmap	2024-09-03 21:15:47 -07:00
truncate.c	mm: Fix missing folio invalidation calls during truncation	2024-08-24 16:09:16 +02:00
usercopy.c	mm: Fix copy_from_user_nofault().	2023-04-12 17:36:23 -07:00
userfaultfd.c	userfaultfd: move core VMA manipulation logic to mm/userfaultfd.c	2024-09-01 20:25:53 -07:00
util.c	mm: only enforce minimum stack gap size if it's sensible	2024-09-01 20:26:02 -07:00
vma_internal.h	mm: remove duplicated include in vma_internal.h	2024-09-01 20:26:02 -07:00
vma.c	mm: rework vm_ops->close() handling on VMA merge	2024-09-03 21:15:55 -07:00
vma.h	mm: make vma_prepare() and friends static and internal to vma.c	2024-09-03 21:15:54 -07:00
vmalloc.c	mm: vmalloc: add optimization hint on page existence check	2024-09-01 20:26:08 -07:00
vmpressure.c	eventfd: simplify eventfd_signal()	2023-11-28 14:08:38 +01:00
vmscan.c	mm,memcg: provide per-cgroup counters for NUMA balancing operations	2024-09-03 21:15:36 -07:00
vmstat.c	mm: print the promo watermark in zoneinfo	2024-09-01 20:25:59 -07:00
workingset.c	cachestat: do not flush stats in recency check	2024-07-03 22:40:37 -07:00
z3fold.c	mm/z3fold: add __percpu annotation to *unbuddied pointer in struct z3fold_pool	2024-09-01 20:25:56 -07:00
zbud.c	mm: zpool: return pool size in pages	2024-04-25 20:55:48 -07:00
zpool.c	mm: zpool: return pool size in pages	2024-04-25 20:55:48 -07:00
zsmalloc.c	zsmalloc: use all available 24 bits of page_type	2024-09-03 21:15:43 -07:00
zswap.c	mm: remove code to handle same filled pages	2024-09-03 21:15:47 -07:00