On 15.02.24 19:49, Kairui Song wrote:
> On Thu, Feb 15, 2024 at 11:36 PM David Hildenbrand <[email protected]> wrote:
>> On 06.02.24 19:25, Kairui Song wrote:
>>> From: Kairui Song <[email protected]>
>>>
>>> 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 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" <[email protected]>
>>> Closes: https://lore.kernel.org/lkml/[email protected]/
>>> Link: https://github.com/ryncsn/emm-test-project/tree/master/swap-stress-race [1]
>>> Signed-off-by: Kairui Song <[email protected]>
>>> Reviewed-by: "Huang, Ying" <[email protected]>
>>> Acked-by: Yu Zhao <[email protected]>
>>>
>>> ---
>>> 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;
>>> +
>>
>> Is there anything that guarantees that the following won't
>> happen concurrently, and if it would happen, could it be a problem?
>>
>> Other thread MADV_DONTNEED's the swap entry, swap slot is freed.
>> Some other page gets swapped out, reuses that swap slot.
>
> Hi David,
>
> Thanks for adding more comments and sharing your thoughts!
>
> I'm not sure what you mean by "reuses that swap slot" here, I think
> you just mean reuse that swap entry (and the actual content on swap
> device)?
I tried to be precise but I think that caused more confusion :)
entry = device + offset into swap_map
I called a "swap slot" the metadata that is identified by device +
offset (swap_map).
I recall that's what we used to call these things [1], e.g., "Allocating
swap slots ... All page sized slots are tracked by the array
swap_info_struct→swap_map."
[1] https://www.kernel.org/doc/gorman/html/understand/understand014.html
Anyhow, you got what I mean :)
>
>> We call swapcache_prepare() on that slot that is being reused
>> elsewhere. (possibly some other thread in the context of the reuses
>> swap slot might do the same!)
>
> I think this kind of swapcache_prepare() or false swapin read is
> already happening quite frequently by swap readaheads. I've seen swap
> cluster readahead mess up working set activation and memory policy
> already. Swap cluster readahead simply read in nearby entries of
> target entry, regardless of whether they are owned by the reader or
> not.
Okay, thanks for the confirmation!
>
> For this patch, similar issues also exist, I think it only hurts the
> performance, but that's a really rare thing to happen, so should not
> be a problem.
Okay, good.
>
>>
>> We would detect later, that the PTE changed, but we would temporarily
>> mess with that swap slot that we might no longer "own".
>>
>> I was thinking about alternatives, it's tricky because of the concurrent
>> MADV_DONTNEED possibility. Something with another fake-swap entry type
>> (similar to migration entries) might work, but would require more changes.
>
> Yeah, in the long term I also think more work is needed for the swap subsystem.
>
> In my opinion, for this particular issue, or, for cache bypassed
> swapin, a new swap map value similar to SWAP_MAP_BAD/SWAP_MAP_SHMEM
> might be needed, that may even help to simplify the swap count release
> routine for cache bypassed swapin, and improve the performance.
The question is if we really want to track that in the swapcache and not
rather in the page table.
Imagine the following:
(1) allocate the folio and lock it (we do that already)
(2) take the page table lock. If the PTE is still the same, insert a new
"swapin_in_process" fake swp entry that references the locked folio.
(3) read the folio from swap. This will unlock the folio IIUC. (we do
that already)
(4) relock the folio. (we do that already, might not want to fail)
(4) take the PTE lock. If the PTE did not change, turn it into a present
PTE entry. Otherwise, cleanup.
Any concurrent swap-in users would spot the new "swapin_in_process" fake
swp entry and wait for the page lock (just like we do with migration
entries).
Zap code would mostly only clear the "swapin_in_process" fake swp entry
and leave the cleanup to (4) above. Fortunately, concurrent fork() is
impossible as that cannot race with page faults.
There might be one minor thing to optimize with the folio lock above.
But in essence, it would work just like migration entries, just that
they are installed only while we actually do read the content from disk etc.
--
Cheers,
David / dhildenb
Hi David,
On Thu, Feb 15, 2024 at 09:03:28PM +0100, David Hildenbrand wrote:
< snip >
> > >
> > > We would detect later, that the PTE changed, but we would temporarily
> > > mess with that swap slot that we might no longer "own".
> > >
> > > I was thinking about alternatives, it's tricky because of the concurrent
> > > MADV_DONTNEED possibility. Something with another fake-swap entry type
> > > (similar to migration entries) might work, but would require more changes.
> >
> > Yeah, in the long term I also think more work is needed for the swap subsystem.
> >
> > In my opinion, for this particular issue, or, for cache bypassed
> > swapin, a new swap map value similar to SWAP_MAP_BAD/SWAP_MAP_SHMEM
> > might be needed, that may even help to simplify the swap count release
> > routine for cache bypassed swapin, and improve the performance.
>
> The question is if we really want to track that in the swapcache and not
> rather in the page table.
>
> Imagine the following:
>
> (1) allocate the folio and lock it (we do that already)
>
> (2) take the page table lock. If the PTE is still the same, insert a new
> "swapin_in_process" fake swp entry that references the locked folio.
>
> (3) read the folio from swap. This will unlock the folio IIUC. (we do that
> already)
>
> (4) relock the folio. (we do that already, might not want to fail)
>
> (4) take the PTE lock. If the PTE did not change, turn it into a present PTE
> entry. Otherwise, cleanup.
>
>
> Any concurrent swap-in users would spot the new "swapin_in_process" fake swp
> entry and wait for the page lock (just like we do with migration entries).
>
> Zap code would mostly only clear the "swapin_in_process" fake swp entry and
> leave the cleanup to (4) above. Fortunately, concurrent fork() is impossible
> as that cannot race with page faults.
>
> There might be one minor thing to optimize with the folio lock above. But in
> essence, it would work just like migration entries, just that they are
> installed only while we actually do read the content from disk etc.
That's a great idea. I was thinking to have the synchronization in the
page table but couldn't reach to the other non_swap_entry idea.
Only concern of the approach is that it would be harder to have the fix
in the stable tree. If there isn't strong objection, I prefer the
Kairui's orginal solution(with some tweak of scheduler if it's
necessary) first and then pursue your idea on latest tree.