Skip to content
Permalink
Browse files
MM: reclaim mustn't enter FS for SWP_FS_OPS swap-space
If swap-out is using filesystem operations (SWP_FS_OPS), then it is not
safe to enter the FS for reclaim.
So only down-grade the requirement for swap pages to __GFP_IO after
checking that SWP_FS_OPS are not being used.

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
neilbrown authored and intel-lab-lkp committed Dec 16, 2021
1 parent afb8b6c commit a8e1b1ffec6ade1545df519d254eae0400b7ec37
Showing 1 changed file with 18 additions and 3 deletions.
@@ -1465,6 +1465,21 @@ static unsigned int demote_page_list(struct list_head *demote_pages,
return nr_succeeded;
}

static bool test_may_enter_fs(struct page *page, gfp_t gfp_mask)
{
if (gfp_mask & __GFP_FS)
return true;
if (!PageSwapCache(page) || !(gfp_mask & __GFP_IO))
return false;
/* We can "enter_fs" for swap-cache with only __GFP_IO
* providing this isn't SWP_FS_OPS.
* ->flags can be updated non-atomicially (scan_swap_map_slots),
* but that will never affect SWP_FS_OPS, so the data_race
* is safe.
*/
return !data_race(page_swap_info(page)->flags & SWP_FS_OPS);
}

/*
* shrink_page_list() returns the number of reclaimed pages
*/
@@ -1514,8 +1529,7 @@ static unsigned int shrink_page_list(struct list_head *page_list,
if (!sc->may_unmap && page_mapped(page))
goto keep_locked;

may_enter_fs = (sc->gfp_mask & __GFP_FS) ||
(PageSwapCache(page) && (sc->gfp_mask & __GFP_IO));
may_enter_fs = test_may_enter_fs(page, sc->gfp_mask);

/*
* The number of dirty pages determines if a node is marked
@@ -1683,7 +1697,8 @@ static unsigned int shrink_page_list(struct list_head *page_list,
goto activate_locked_split;
}

may_enter_fs = true;
may_enter_fs = test_may_enter_fs(page,
sc->gfp_mask);

/* Adding to swap updated mapping */
mapping = page_mapping(page);

0 comments on commit a8e1b1f

Please sign in to comment.