Skip to content

Commit a5cdbe9

Browse files
Kemeng Shiakpm00
authored andcommitted
mm: shmem: only remove inode from swaplist when it's swapped page count is 0
Even if we fail to allocate a swap entry, the inode might have previously allocated entry and we might take inode containing swap entry off swaplist. As a result, try_to_unuse() may enter a potential dead loop to repeatedly look for inode and clean it's swap entry. Only take inode off swaplist when it's swapped page count is 0 to fix the issue. Link: https://lkml.kernel.org/r/[email protected] Fixes: b487a2d ("mm, swap: simplify folio swap allocation") Signed-off-by: Kemeng Shi <[email protected]> Reviewed-by: Baolin Wang <[email protected]> Reviewed-by: Kairui Song <[email protected]> Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/oe-lkp/[email protected] Cc: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 3f778ab commit a5cdbe9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/shmem.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,8 +1651,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
16511651
BUG_ON(folio_mapped(folio));
16521652
return swap_writepage(&folio->page, wbc);
16531653
}
1654-
1655-
list_del_init(&info->swaplist);
1654+
if (!info->swapped)
1655+
list_del_init(&info->swaplist);
16561656
mutex_unlock(&shmem_swaplist_mutex);
16571657
if (nr_pages > 1)
16581658
goto try_split;

0 commit comments

Comments
 (0)