mm-filter-out-swapin-error-entry-in-shmem-mapping.patch removed from -mm tree
The quilt patch titled
Subject: mm: filter out swapin error entry in shmem mapping
has been removed from the -mm tree. Its filename was
mm-filter-out-swapin-error-entry-in-shmem-mapping.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Miaohe Lin <[email protected]>
Subject: mm: filter out swapin error entry in shmem mapping
Date: Thu, 19 May 2022 20:50:30 +0800
There might be swapin error entries in shmem mapping. Filter them out to avoid "Bad swap file entry" complaint.
Signed-off-by Miaohe Lin <[email protected]>
Reviewed-by Naoya Horiguchi <[email protected]>
Cc Alistair Popple <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc David Howells <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc NeilBrown <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ralph Campbell <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Vlastimil Babka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/madvise.c | 5 ++++- mm/swap_state.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-)
mm/madvise.c renamed from mm/madvise.c~mm-filter-out-swapin-error-entry-in-shmem-mapping +4 -1
@@ -248,10 +248,13 @@ static void force_shm_swapin_readahead(sif (!xa_is_value (page))continue ; + swap =radix_to_swp_entry (page); +/* There might be swapin error entries in shmem mapping. */ +if (non_swap_entry (swap)) +continue ;xas_pause (&xas);rcu_read_unlock (); - swap =radix_to_swp_entry (page); page =read_swap_cache_async (swap,GFP_HIGHUSER_MOVABLE ,NULL ,0 , false, &splug);if (page)
mm/swap_state.c renamed from mm/swap_state.c~mm-filter-out-swapin-error-entry-in-shmem-mapping +3 -0
@@ -410,6 +410,9 @@ struct page *find_get_incore_page(structreturn NULL ; swp =radix_to_swp_entry (page); +/* There might be swapin error entries in shmem mapping. */ +if (non_swap_entry (swp)) +return NULL ;/* Prevent swapoff from happening to us */ si =get_swap_device (swp);if (!si)
_
Patches currently in -mm which might be from [email protected] are