The patch titled
Subject: mm-dont-skip-swap-entry-even-if-zap_details-specified-v5
has been added to the -mm tree. Its filename is
mm-dont-skip-swap-entry-even-if-zap_details-specified-v5.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/mm-dont-skip-swap-entry-even-if-zap_details-specified-v5.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/mm-dont-skip-swap-entry-even-if-zap_details-specified-v5.patch
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 and is updated
there every 3-4 working days
------------------------------------------------------
From: Peter Xu <peterx@xxxxxxxxxx>
Subject: mm-dont-skip-swap-entry-even-if-zap_details-specified-v5
comment tweaks
Link: https://lkml.kernel.org/r/20220217060746.71256-2-peterx@xxxxxxxxxx
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Peter Xu <peterx@xxxxxxxxxx>
Reviewed-by: John Hubbard <jhubbard@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
--- a/mm/memory.c~mm-dont-skip-swap-entry-even-if-zap_details-specified-v5
+++ a/mm/memory.c
@@ -1335,7 +1335,7 @@ zap_skip_check_mapping(struct zap_detail
if (should_zap_cows(details))
return false;
- /* E.g. zero page */
+ /* E.g. the caller passes NULL for the case of a zero page */
if (!page)
return false;
@@ -1421,11 +1421,7 @@ again:
}
if (!non_swap_entry(entry)) {
- /*
- * If this is a genuine swap entry, then it must be an
- * private anon page. If the caller wants to skip
- * COWed pages, ignore it.
- */
+ /* Genuine swap entry, hence a private anon page */
if (!should_zap_cows(details))
continue;
rss[MM_SWAPENTS]--;
@@ -1437,7 +1433,6 @@ again:
continue;
rss[mm_counter(page)]--;
} else if (is_hwpoison_entry(entry)) {
- /* If the caller wants to skip COWed pages, ignore it */
if (!should_zap_cows(details))
continue;
} else {
_
Patches currently in -mm which might be from peterx@xxxxxxxxxx are
mm-fix-invalid-page-pointer-returned-with-foll_pin-gups.patch
mm-dont-skip-swap-entry-even-if-zap_details-specified.patch
mm-dont-skip-swap-entry-even-if-zap_details-specified-v5.patch
mm-rename-zap_skip_check_mapping-to-should_zap_page.patch
mm-change-zap_detailszap_mapping-into-even_cows.patch
mm-rework-swap-handling-of-zap_pte_range.patch
