mm-madvise-fix-potential-workingset-node-list_lru-leaks.patch removed from -mm tree
The quilt patch titled
Subject: mm, madvise: fix potential workingset node list_lru leaks
has been removed from the -mm tree. Its filename was
mm-madvise-fix-potential-workingset-node-list_lru-leaks.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm, madvise: fix potential workingset node list_lru leaks
Date: Sun, 22 Dec 2024 20:29:36 +0800
Since commit 5abc1e37afa0 ("mm: list_lru: allocate list_lru_one only when needed"), all list_lru users need to allocate the items using the new infrastructure that provides list_lru info for slab allocation, ensuring that the corresponding memcg list_lru is allocated before use.
For workingset shadow nodes (which are xa_node), users are converted to use the new infrastructure by commit 9bbdc0f32409 ("xarray: use kmem_cache_alloc_lru to allocate xa_node"). The xas->xa_lru will be set correctly for filemap users. However, there is a missing case: xa_node allocations caused by madvise(..., MADV_COLLAPSE).
madvise(..., MADV_COLLAPSE) will also read in the absent parts of file map, and there will be xa_nodes allocated for the caller's memcg (assuming it's not rootcg). However, these allocations won't trigger memcg list_lru allocation because the proper xas info was not set.
If nothing else has allocated other xa_nodes for that memcg to trigger list_lru creation, and memory pressure starts to evict file pages, workingset_update_node will try to add these xa_nodes to their corresponding memcg list_lru, and it does not exist (NULL). So they will be added to rootcg's list_lru instead.
This shouldn't be a significant issue in practice, but it is indeed unexpected behavior, and these xa_nodes will not be reclaimed effectively. And may lead to incorrect counting of the list_lru->nr_items counter.
This problem wasn't exposed until recent commit 28e98022b31ef ("mm/list_lru: simplify reparenting and initial allocation") added a sanity check: only dying memcg could have a NULL list_lru when list_lru_{add,del} is called. This problem triggered this WARNING.
So make madvise(..., MADV_COLLAPSE) also call xas_set_lru() to pass the list_lru which we may want to insert xa_node into later. And move mapping_set_update to mm/internal.h, and turn into a macro to avoid including extra headers in mm/internal.h.
---
mm/filemap.c | 9 --------- mm/internal.h | 6 ++++++ mm/khugepaged.c | 3 +++ 3 files changed, 9 insertions(+), 9 deletions(-)
mm/filemap.c renamed from mm/filemap.c~mm-madvise-fix-potential-workingset-node-list_lru-leaks +0 -9
@@ -124,15 +124,6 @@* ->private_lock (zap_pte_range->block_dirty_folio) */ -static void mapping_set_update (struct xa_state *xas, -struct address_space *mapping) -{ -if (dax_mapping (mapping) ||shmem_mapping (mapping)) -return ; -xas_set_update (xas, workingset_update_node); -xas_set_lru (xas, &shadow_nodes); -} -static void page_cache_delete (struct address_space *mapping,struct folio *folio,void *shadow) {
mm/internal.h renamed from mm/internal.h~mm-madvise-fix-potential-workingset-node-list_lru-leaks +6 -0
@@ -1504,6 +1504,12 @@ static inline void shrinker_debugfs_remo/* Only track the nodes of mappings with shadow entries */ void workingset_update_node (struct xa_node *node);extern struct list_lru shadow_nodes; +#define mapping_set_update (xas, mapping) do { \ + if (!dax_mapping(mapping) && !shmem_mapping(mapping)) { \ + xas_set_update(xas, workingset_update_node); \ + xas_set_lru(xas, &shadow_nodes); \ + } \ +} while (0)/* mremap.c */ unsigned long move_page_tables(struct vm_area_struct *vma,
mm/khugepaged.c renamed from mm/khugepaged.c~mm-madvise-fix-potential-workingset-node-list_lru-leaks +3 -0
@@ -19,6 +19,7 @@#include <linux/rcupdate_wait.h> #include <linux/swapops.h> #include <linux/shmem_fs.h> +#include <linux/dax.h> #include <linux/ksm.h> #include <asm/tlb.h>
@@ -1837,6 +1838,8 @@ static int collapse_file(struct mm_strucif (result !=SCAN_SUCCEED ) goto out; +mapping_set_update (&xas, mapping); +__folio_set_locked (new_folio);if (is_shmem)__folio_set_swapbacked (new_folio);
_
Patches currently in -mm which might be from [email protected] are
mm-memcontrol-avoid-duplicated-memcg-enable-check.patch mm-swap_cgroup-remove-swap_cgroup_cmpxchg.patch mm-swap_cgroup-remove-global-swap-cgroup-lock.patch mm-swap_cgroup-decouple-swap-cgroup-recording-and-clearing.patch mm-swap-minor-clean-up-for-swap-entry-allocation.patch mm-swap-fold-swap_info_get_cont-in-the-only-caller.patch mm-swap-remove-old-allocation-path-for-hdd.patch mm-swap-use-cluster-lock-for-hdd.patch mm-swap-clean-up-device-availability-check.patch mm-swap-clean-up-plist-removal-and-adding.patch mm-swap-hold-a-reference-during-scan-and-cleanup-flag-usage.patch mm-swap-use-an-enum-to-define-all-cluster-flags-and-wrap-flags-changes.patch mm-swap-reduce-contention-on-device-lock.patch mm-swap-simplify-percpu-cluster-updating.patch mm-swap-introduce-a-helper-for-retrieving-cluster-from-offset.patch mm-swap-use-a-global-swap-cluster-for-non-rotation-devices.patch mm-swap_slots-remove-slot-cache-for-freeing-path.patch