Skip to content

Commit 82b1c07

Browse files
Ryan Robertsakpm00
authored andcommitted
mm: swap: fix race between free_swap_and_cache() and swapoff()
There was previously a theoretical window where swapoff() could run and teardown a swap_info_struct while a call to free_swap_and_cache() was running in another thread. This could cause, amongst other bad possibilities, swap_page_trans_huge_swapped() (called by free_swap_and_cache()) to access the freed memory for swap_map. This is a theoretical problem and I haven't been able to provoke it from a test case. But there has been agreement based on code review that this is possible (see link below). Fix it by using get_swap_device()/put_swap_device(), which will stall swapoff(). There was an extra check in _swap_info_get() to confirm that the swap entry was not free. This isn't present in get_swap_device() because it doesn't make sense in general due to the race between getting the reference and swapoff. So I've added an equivalent check directly in free_swap_and_cache(). Details of how to provoke one possible issue (thanks to David Hildenbrand for deriving this): --8<----- __swap_entry_free() might be the last user and result in "count == SWAP_HAS_CACHE". swapoff->try_to_unuse() will stop as soon as soon as si->inuse_pages==0. So the question is: could someone reclaim the folio and turn si->inuse_pages==0, before we completed swap_page_trans_huge_swapped(). Imagine the following: 2 MiB folio in the swapcache. Only 2 subpages are still references by swap entries. Process 1 still references subpage 0 via swap entry. Process 2 still references subpage 1 via swap entry. Process 1 quits. Calls free_swap_and_cache(). -> count == SWAP_HAS_CACHE [then, preempted in the hypervisor etc.] Process 2 quits. Calls free_swap_and_cache(). -> count == SWAP_HAS_CACHE Process 2 goes ahead, passes swap_page_trans_huge_swapped(), and calls __try_to_reclaim_swap(). __try_to_reclaim_swap()->folio_free_swap()->delete_from_swap_cache()-> put_swap_folio()->free_swap_slot()->swapcache_free_entries()-> swap_entry_free()->swap_range_free()-> ... WRITE_ONCE(si->inuse_pages, si->inuse_pages - nr_entries); What stops swapoff to succeed after process 2 reclaimed the swap cache but before process1 finished its call to swap_page_trans_huge_swapped()? --8<----- Link: https://lkml.kernel.org/r/[email protected] Fixes: 7c00baf ("mm/swap: free swap slots in batch") Closes: https://lore.kernel.org/linux-mm/[email protected]/ Signed-off-by: Ryan Roberts <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: "Huang, Ying" <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent c05995b commit 82b1c07

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

mm/swapfile.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1232,6 +1232,11 @@ static unsigned char __swap_entry_free_locked(struct swap_info_struct *p,
12321232
* with get_swap_device() and put_swap_device(), unless the swap
12331233
* functions call get/put_swap_device() by themselves.
12341234
*
1235+
* Note that when only holding the PTL, swapoff might succeed immediately
1236+
* after freeing a swap entry. Therefore, immediately after
1237+
* __swap_entry_free(), the swap info might become stale and should not
1238+
* be touched without a prior get_swap_device().
1239+
*
12351240
* Check whether swap entry is valid in the swap device. If so,
12361241
* return pointer to swap_info_struct, and keep the swap entry valid
12371242
* via preventing the swap device from being swapoff, until
@@ -1609,13 +1614,19 @@ int free_swap_and_cache(swp_entry_t entry)
16091614
if (non_swap_entry(entry))
16101615
return 1;
16111616

1612-
p = _swap_info_get(entry);
1617+
p = get_swap_device(entry);
16131618
if (p) {
1619+
if (WARN_ON(data_race(!p->swap_map[swp_offset(entry)]))) {
1620+
put_swap_device(p);
1621+
return 0;
1622+
}
1623+
16141624
count = __swap_entry_free(p, entry);
16151625
if (count == SWAP_HAS_CACHE &&
16161626
!swap_page_trans_huge_swapped(p, entry))
16171627
__try_to_reclaim_swap(p, swp_offset(entry),
16181628
TTRS_UNMAPPED | TTRS_FULL);
1629+
put_swap_device(p);
16191630
}
16201631
return p != NULL;
16211632
}

0 commit comments

Comments
 (0)