The patch titled
Subject: mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3
has been added to the -mm mm-unstable branch. Its filename is
mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Barry Song <21cnbao@xxxxxxxxx>
Subject: mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3
Date: Wed, 21 Aug 2024 17:49:21 +1200
add missing zswap_invalidate()
Link: https://lkml.kernel.org/r/20240821054921.43468-1-21cnbao@xxxxxxxxx
Signed-off-by: Barry Song <21cnbao@xxxxxxxxx>
Cc: Chris Li <chrisl@xxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kairui Song <kasong@xxxxxxxxxxx>
Cc: Kalesh Singh <kaleshsingh@xxxxxxxxxx>
Cc: Ryan Roberts <ryan.roberts@xxxxxxx>
Cc: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/swapfile.c~mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3
+++ a/mm/swapfile.c
@@ -1514,6 +1514,8 @@ static bool __swap_entries_free(struct s
unlock_cluster_or_swap_info(si, ci);
if (!has_cache) {
+ for (i = 0; i < nr; i++)
+ zswap_invalidate(swp_entry(si->type, offset + i));
spin_lock(&si->lock);
swap_entry_range_free(si, entry, nr);
spin_unlock(&si->lock);
_
Patches currently in -mm which might be from 21cnbao@xxxxxxxxx are
mm-swap-allow-cache-reclaim-to-skip-slot-cache-fix.patch
mm-attempt-to-batch-free-swap-entries-for-zap_pte_range-fix-3.patch
