Skip to content

Commit da2c6c4

Browse files
committed
mm/swap: fix race when skipping swapcache
JIRA: https://issues.redhat.com/browse/RHEL-31646 CVE: CVE-2024-26759 This patch is a backport of the following upstream commit: commit 13ddaf2 Author: Kairui Song <kasong@tencent.com> Date: Wed Feb 7 02:25:59 2024 +0800 mm/swap: fix race when skipping swapcache When skipping swapcache for SWP_SYNCHRONOUS_IO, if two or more threads swapin the same entry at the same time, they get different pages (A, B). Before one thread (T0) finishes the swapin and installs page (A) to the PTE, another thread (T1) could finish swapin of page (B), swap_free the entry, then swap out the possibly modified page reusing the same entry. It breaks the pte_same check in (T0) because PTE value is unchanged, causing ABA problem. Thread (T0) will install a stalled page (A) into the PTE and cause data corruption. One possible callstack is like this: CPU0 CPU1 ---- ---- do_swap_page() do_swap_page() with same entry <direct swapin path> <direct swapin path> <alloc page A> <alloc page B> swap_read_folio() <- read to page A swap_read_folio() <- read to page B <slow on later locks or interrupt> <finished swapin first> ... set_pte_at() swap_free() <- entry is free <write to page B, now page A stalled> <swap out page B to same swap entry> pte_same() <- Check pass, PTE seems unchanged, but page A is stalled! swap_free() <- page B content lost! set_pte_at() <- staled page A installed! And besides, for ZRAM, swap_free() allows the swap device to discard the entry content, so even if page (B) is not modified, if swap_read_folio() on CPU0 happens later than swap_free() on CPU1, it may also cause data loss. To fix this, reuse swapcache_prepare which will pin the swap entry using the cache flag, and allow only one thread to swap it in, also prevent any parallel code from putting the entry in the cache. Release the pin after PT unlocked. Racers just loop and wait since it's a rare and very short event. A schedule_timeout_uninterruptible(1) call is added to avoid repeated page faults wasting too much CPU, causing livelock or adding too much noise to perf statistics. A similar livelock issue was described in commit 029c462 ("mm: swap: get rid of livelock in swapin readahead") Reproducer: This race issue can be triggered easily using a well constructed reproducer and patched brd (with a delay in read path) [1]: With latest 6.8 mainline, race caused data loss can be observed easily: $ gcc -g -lpthread test-thread-swap-race.c && ./a.out Polulating 32MB of memory region... Keep swapping out... Starting round 0... Spawning 65536 workers... 32746 workers spawned, wait for done... Round 0: Error on 0x5aa00, expected 32746, got 32743, 3 data loss! Round 0: Error on 0x395200, expected 32746, got 32743, 3 data loss! Round 0: Error on 0x3fd000, expected 32746, got 32737, 9 data loss! Round 0 Failed, 15 data loss! This reproducer spawns multiple threads sharing the same memory region using a small swap device. Every two threads updates mapped pages one by one in opposite direction trying to create a race, with one dedicated thread keep swapping out the data out using madvise. The reproducer created a reproduce rate of about once every 5 minutes, so the race should be totally possible in production. After this patch, I ran the reproducer for over a few hundred rounds and no data loss observed. Performance overhead is minimal, microbenchmark swapin 10G from 32G zram: Before: 10934698 us After: 11157121 us Cached: 13155355 us (Dropping SWP_SYNCHRONOUS_IO flag) [kasong@tencent.com: v4] Link: https://lkml.kernel.org/r/20240219082040.7495-1-ryncsn@gmail.com Link: https://lkml.kernel.org/r/20240206182559.32264-1-ryncsn@gmail.com Fixes: 0bcac06 ("mm, swap: skip swapcache for swapin of synchronous device") Reported-by: "Huang, Ying" <ying.huang@intel.com> Closes: https://lore.kernel.org/lkml/87bk92gqpx.fsf_-_@yhuang6-desk2.ccr.corp.intel.com/ Link: https://github.com/ryncsn/emm-test-project/tree/master/swap-stress-race [1] Signed-off-by: Kairui Song <kasong@tencent.com> Reviewed-by: "Huang, Ying" <ying.huang@intel.com> Acked-by: Yu Zhao <yuzhao@google.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: Chris Li <chrisl@kernel.org> Cc: Hugh Dickins <hughd@google.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Yosry Ahmed <yosryahmed@google.com> Cc: Yu Zhao <yuzhao@google.com> Cc: Barry Song <21cnbao@gmail.com> Cc: SeongJae Park <sj@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Rafael Aquini <aquini@redhat.com>
1 parent 5faf715 commit da2c6c4

File tree

4 files changed

+43
-0
lines changed

4 files changed

+43
-0
lines changed

include/linux/swap.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,11 @@ static inline int swap_duplicate(swp_entry_t swp)
572572
return 0;
573573
}
574574

575+
static inline int swapcache_prepare(swp_entry_t swp)
576+
{
577+
return 0;
578+
}
579+
575580
static inline void swap_free(swp_entry_t swp)
576581
{
577582
}

mm/memory.c

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3737,6 +3737,7 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
37373737
struct page *page;
37383738
struct swap_info_struct *si = NULL;
37393739
rmap_t rmap_flags = RMAP_NONE;
3740+
bool need_clear_cache = false;
37403741
bool exclusive = false;
37413742
swp_entry_t entry;
37423743
pte_t pte;
@@ -3795,6 +3796,20 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
37953796
if (!folio) {
37963797
if (data_race(si->flags & SWP_SYNCHRONOUS_IO) &&
37973798
__swap_count(entry) == 1) {
3799+
/*
3800+
* Prevent parallel swapin from proceeding with
3801+
* the cache flag. Otherwise, another thread may
3802+
* finish swapin first, free the entry, and swapout
3803+
* reusing the same entry. It's undetectable as
3804+
* pte_same() returns true due to entry reuse.
3805+
*/
3806+
if (swapcache_prepare(entry)) {
3807+
/* Relax a bit to prevent rapid repeated page faults */
3808+
schedule_timeout_uninterruptible(1);
3809+
goto out;
3810+
}
3811+
need_clear_cache = true;
3812+
37983813
/* skip swapcache */
37993814
folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0,
38003815
vma, vmf->address, false);
@@ -4038,6 +4053,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
40384053
if (vmf->pte)
40394054
pte_unmap_unlock(vmf->pte, vmf->ptl);
40404055
out:
4056+
/* Clear the swap cache pin for direct swapin after PTL unlock */
4057+
if (need_clear_cache)
4058+
swapcache_clear(si, entry);
40414059
if (si)
40424060
put_swap_device(si);
40434061
return ret;
@@ -4052,6 +4070,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
40524070
folio_unlock(swapcache);
40534071
folio_put(swapcache);
40544072
}
4073+
if (need_clear_cache)
4074+
swapcache_clear(si, entry);
40554075
if (si)
40564076
put_swap_device(si);
40574077
return ret;

mm/swap.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ void __delete_from_swap_cache(struct folio *folio,
3838
void delete_from_swap_cache(struct folio *folio);
3939
void clear_shadow_from_swap_cache(int type, unsigned long begin,
4040
unsigned long end);
41+
void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry);
4142
struct folio *swap_cache_get_folio(swp_entry_t entry,
4243
struct vm_area_struct *vma, unsigned long addr);
4344
struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index);
@@ -96,6 +97,10 @@ static inline int swap_writepage(struct page *p, struct writeback_control *wbc)
9697
return 0;
9798
}
9899

100+
static inline void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry)
101+
{
102+
}
103+
99104
static inline struct folio *swap_cache_get_folio(swp_entry_t entry,
100105
struct vm_area_struct *vma, unsigned long addr)
101106
{

mm/swapfile.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3374,6 +3374,19 @@ int swapcache_prepare(swp_entry_t entry)
33743374
return __swap_duplicate(entry, SWAP_HAS_CACHE);
33753375
}
33763376

3377+
void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry)
3378+
{
3379+
struct swap_cluster_info *ci;
3380+
unsigned long offset = swp_offset(entry);
3381+
unsigned char usage;
3382+
3383+
ci = lock_cluster_or_swap_info(si, offset);
3384+
usage = __swap_entry_free_locked(si, offset, SWAP_HAS_CACHE);
3385+
unlock_cluster_or_swap_info(si, ci);
3386+
if (!usage)
3387+
free_swap_slot(entry);
3388+
}
3389+
33773390
struct swap_info_struct *swp_swap_info(swp_entry_t entry)
33783391
{
33793392
return swap_type_to_swap_info(swp_type(entry));

0 commit comments

Comments
 (0)