From: Minchan Kim <minchan@kernel.org>
To: Kairui Song <kasong@tencent.com>
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
"Huang, Ying" <ying.huang@intel.com>,
Chris Li <chrisl@kernel.org>, Yu Zhao <yuzhao@google.com>,
Barry Song <v-songbaohua@oppo.com>, SeongJae Park <sj@kernel.org>,
Hugh Dickins <hughd@google.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Matthew Wilcox <willy@infradead.org>,
Michal Hocko <mhocko@suse.com>,
Yosry Ahmed <yosryahmed@google.com>,
David Hildenbrand <david@redhat.com>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] mm/swap: fix race when skipping swapcache
Date: Tue, 6 Feb 2024 15:02:05 -0800 [thread overview]
Message-ID: <ZcK6bZpGEtgqBeZs@google.com> (raw)
In-Reply-To: <20240206182559.32264-1-ryncsn@gmail.com>
On Wed, Feb 07, 2024 at 02:25:59AM +0800, Kairui Song wrote:
> From: Kairui Song <kasong@tencent.com>
>
> 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
^^^
nit: From the recent code, I see swap_free is called earlier than set_pte_at
> <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.
Thanks for catching the issue, folks!
>
> To fix this, reuse swapcache_prepare which will pin the swap entry using
> the cache flag, and allow only one thread to pin it. Release the pin
> after PT unlocked. Racers will simply busy wait since it's a rare
> and very short event.
>
> Other methods like increasing the swap count don't seem to be a good
> idea after some tests, that will cause racers to fall back to use the
> swap cache again. Parallel swapin using different methods leads to
> a much more complex scenario.
>
> 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
> Non-direct: 13155355 us (Dropping SWP_SYNCHRONOUS_IO flag)
>
> Fixes: 0bcac06f27d7 ("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>
>
> ---
> Update from V1:
> - Add some words on ZRAM case, it will discard swap content on swap_free so the race window is a bit different but cure is the same. [Barry Song]
> - Update comments make it cleaner [Huang, Ying]
> - Add a function place holder to fix CONFIG_SWAP=n built [SeongJae Park]
> - Update the commit message and summary, refer to SWP_SYNCHRONOUS_IO instead of "direct swapin path" [Yu Zhao]
> - Update commit message.
> - Collect Review and Acks.
>
> include/linux/swap.h | 5 +++++
> mm/memory.c | 15 +++++++++++++++
> mm/swap.h | 5 +++++
> mm/swapfile.c | 13 +++++++++++++
> 4 files changed, 38 insertions(+)
>
> diff --git a/include/linux/swap.h b/include/linux/swap.h
> index 4db00ddad261..8d28f6091a32 100644
> --- a/include/linux/swap.h
> +++ b/include/linux/swap.h
> @@ -549,6 +549,11 @@ static inline int swap_duplicate(swp_entry_t swp)
> return 0;
> }
>
> +static inline int swapcache_prepare(swp_entry_t swp)
> +{
> + return 0;
> +}
> +
> static inline void swap_free(swp_entry_t swp)
> {
> }
> diff --git a/mm/memory.c b/mm/memory.c
> index 7e1f4849463a..1749c700823d 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -3867,6 +3867,16 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> if (!folio) {
> if (data_race(si->flags & SWP_SYNCHRONOUS_IO) &&
> __swap_count(entry) == 1) {
> + /*
> + * Prevent parallel swapin from proceeding with
> + * the cache flag. Otherwise, another thread may
> + * finish swapin first, free the entry, and swapout
> + * reusing the same entry. It's undetectable as
> + * pte_same() returns true due to entry reuse.
> + */
> + if (swapcache_prepare(entry))
> + goto out;
> +
> /* skip swapcache */
> folio = vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0,
> vma, vmf->address, false);
> @@ -4116,6 +4126,9 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> unlock:
> if (vmf->pte)
> pte_unmap_unlock(vmf->pte, vmf->ptl);
> + /* Clear the swap cache pin for direct swapin after PTL unlock */
> + if (folio && !swapcache)
> + swapcache_clear(si, entry);
> out:
> if (si)
> put_swap_device(si);
> @@ -4124,6 +4137,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> if (vmf->pte)
> pte_unmap_unlock(vmf->pte, vmf->ptl);
> out_page:
> + if (!swapcache)
> + swapcache_clear(si, entry);
> folio_unlock(folio);
> out_release:
> folio_put(folio);
What happens?
do_swap_page
..
swapcache_prepare() <- tured the cache flag on
folio = vma_alloc_folio <- failed to allocate the folio
page = &foio->page; <- crash but it's out of scope from this patch
..
if (!folio)
goto unlock;
..
unlock:
swapcache_clear(si, entry) <- it's skipped this time.
Can we simply introduce a boolean flag to state the special case and
clear the cache state based on the flag?
if (swapcache_prepare())
goto out;
need_clear_cache = true;
out_path:
if (need_clear_cache)
swapcache_clear
next prev parent reply other threads:[~2024-02-06 23:02 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 18:25 [PATCH v2] mm/swap: fix race when skipping swapcache Kairui Song
2024-02-06 18:30 ` kernel test robot
2024-02-06 18:44 ` SeongJae Park
2024-02-06 23:02 ` Minchan Kim [this message]
2024-02-07 3:22 ` Kairui Song
2024-02-06 23:10 ` Chris Li
2024-02-06 23:40 ` Barry Song
2024-02-07 2:03 ` Chris Li
2024-02-07 2:20 ` Kairui Song
2024-02-07 1:52 ` Barry Song
2024-02-07 3:21 ` Kairui Song
2024-02-07 4:01 ` Chris Li
2024-02-07 4:06 ` Kairui Song
2024-02-07 18:31 ` Minchan Kim
2024-02-08 6:04 ` Kairui Song
2024-02-08 6:34 ` Huang, Ying
2024-02-08 19:01 ` Kairui Song
2024-02-08 19:42 ` Chris Li
2024-02-09 5:30 ` Kairui Song
2024-02-12 19:53 ` Kairui Song
2024-02-15 0:44 ` Minchan Kim
2024-02-15 19:07 ` Kairui Song
2024-02-19 5:42 ` Huang, Ying
2024-02-08 7:16 ` Barry Song
2024-02-07 2:08 ` Huang, Ying
2024-02-07 2:28 ` Kairui Song
2024-02-07 3:44 ` Huang, Ying
2024-02-07 3:45 ` Barry Song
2024-02-07 4:16 ` Huang, Ying
2024-02-07 4:24 ` Barry Song
2024-02-15 15:36 ` David Hildenbrand
2024-02-15 18:49 ` Kairui Song
2024-02-15 20:03 ` David Hildenbrand
2024-02-15 20:55 ` Minchan Kim
2024-02-15 22:58 ` Andrew Morton
2024-02-16 0:54 ` Barry Song
2024-02-16 10:01 ` Kairui Song
2024-02-16 7:11 ` Kairui Song
2024-02-16 16:16 ` David Hildenbrand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZcK6bZpGEtgqBeZs@google.com \
--to=minchan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=david@redhat.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=kasong@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
--cc=v-songbaohua@oppo.com \
--cc=willy@infradead.org \
--cc=ying.huang@intel.com \
--cc=yosryahmed@google.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.