Received-SPF: pass (google.com: domain of linux-kernel+bounces-54247-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240205110959.4021-1-ryncsn@gmail.com> <871q9q1imi.fsf@yhuang6-desk2.ccr.corp.intel.com>
In-Reply-To: <871q9q1imi.fsf@yhuang6-desk2.ccr.corp.intel.com>
From: Kairui Song <ryncsn@gmail.com>
Date: Tue, 6 Feb 2024 11:21:51 +0800
Message-ID: <CAMgjq7BC-GaZiTOBurCZRObtmqW46dt7fJW5OuQKHtvkgtztuw@mail.gmail.com>
Subject: Re: [PATCH] mm/swap: fix race condition in direct swapin path
To: "Huang, Ying" <ying.huang@intel.com>
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>, 
	Chris Li <chrisl@kernel.org>, Minchan Kim <minchan@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>, Yu Zhao <yuzhao@google.com>, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Feb 6, 2024 at 9:35=E2=80=AFAM Huang, Ying <ying.huang@intel.com> w=
rote:
>
> Kairui Song <ryncsn@gmail.com> writes:
>
> > From: Kairui Song <kasong@tencent.com>
> >
> > In the direct swapin path, when two or more threads swapin the same ent=
ry
> > at the same time, they get different pages (A, B) because swap cache is
> > skipped. 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 modify and swap-out the page again, using the
> > same entry. It break the pte_same check because PTE value is unchanged,
> > causing ABA problem. Then thread (T0) will then install the stalled pag=
e
> > (A) into the PTE so new data in page (B) is lost, one possible callstac=
k
> > 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_readpage() <- read to page A   swap_readpage() <- read to page B
> > <slow on later locks or interrupt>  <finished swapin first>
> > ...                                 set_pte_at()
> >                                     swap_free() <- Now the entry is fre=
ed.
> >                                     <write to page B, now page A stalle=
d>
> >                                     <swap out page B using same swap en=
try>
> > 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!
> >
> > To fix this, reuse swapcache_prepare which will pin the swap entry usin=
g
> > 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 the
> > cached swapin path, two swapin path being used at the same time
> > 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 b=
y
> > 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 synchronou=
s device")
> > Link: https://github.com/ryncsn/emm-test-project/tree/master/swap-stres=
s-race [1]
> > Signed-off-by: Kairui Song <kasong@tencent.com>
>
> Reported-by: "Huang, Ying" <ying.huang@intel.com>

Of course :), wasn't sure about how to add your credit, will add this to V2=
.

> > ---
> > Huge thanks to Huang Ying and Chris Li for help finding this issue!
> >
> >  mm/memory.c   | 19 +++++++++++++++++++
> >  mm/swap.h     |  5 +++++
> >  mm/swapfile.c | 16 ++++++++++++++++
> >  3 files changed, 40 insertions(+)
> >
> > diff --git a/mm/memory.c b/mm/memory.c
> > index 7e1f4849463a..fd7c55a292f1 100644
> > --- a/mm/memory.c
> > +++ b/mm/memory.c
> > @@ -3867,6 +3867,20 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
> >       if (!folio) {
> >               if (data_race(si->flags & SWP_SYNCHRONOUS_IO) &&
> >                   __swap_count(entry) =3D=3D 1) {
> > +                     /*
> > +                      * With swap count =3D=3D 1, after we read the en=
try,
> > +                      * other threads could finish swapin first, free
> > +                      * the entry, then swapout the modified page usin=
g
> > +                      * the same entry. Now the content we just read i=
s
> > +                      * stalled, and it's undetectable as pte_same()
> > +                      * returns true due to entry reuse.
> > +                      *
> > +                      * So pin the swap entry using the cache flag eve=
n
>
> "pin" doesn't sound intuitive here.  I know that the swap entry will not
> be freed with this.  But now, the parallel swap in will busy waiting.
> So, I suggest to say,
>
> Prevent parallel swapin from proceeding with the cache flag.  Otherwise,
> it may swapin first, free the entry, then swapout the modified page
> using the same entry ...

Good suggestion.

>
> > +                      * cache is not used.
> > +                      */
> > +                     if (swapcache_prepare(entry))
> > +                             goto out;
> > +
> >                       /* skip swapcache */
> >                       folio =3D vma_alloc_folio(GFP_HIGHUSER_MOVABLE, 0=
,
> >                                               vma, vmf->address, false)=
;
> > @@ -4116,6 +4130,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 +4141,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);
> > diff --git a/mm/swap.h b/mm/swap.h
> > index 758c46ca671e..fc2f6ade7f80 100644
> > --- a/mm/swap.h
> > +++ b/mm/swap.h
> > @@ -41,6 +41,7 @@ void __delete_from_swap_cache(struct folio *folio,
> >  void delete_from_swap_cache(struct folio *folio);
> >  void clear_shadow_from_swap_cache(int type, unsigned long begin,
> >                                 unsigned long end);
> > +void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry);
> >  struct folio *swap_cache_get_folio(swp_entry_t entry,
> >               struct vm_area_struct *vma, unsigned long addr);
> >  struct folio *filemap_get_incore_folio(struct address_space *mapping,
> > @@ -97,6 +98,10 @@ static inline int swap_writepage(struct page *p, str=
uct writeback_control *wbc)
> >       return 0;
> >  }
> >
> > +static inline void swapcache_clear(struct swap_info_struct *si, swp_en=
try_t entry)
> > +{
> > +}
> > +
> >  static inline struct folio *swap_cache_get_folio(swp_entry_t entry,
> >               struct vm_area_struct *vma, unsigned long addr)
> >  {
> > diff --git a/mm/swapfile.c b/mm/swapfile.c
> > index 556ff7347d5f..f7d4ad152a7f 100644
> > --- a/mm/swapfile.c
> > +++ b/mm/swapfile.c
> > @@ -3365,6 +3365,22 @@ int swapcache_prepare(swp_entry_t entry)
> >       return __swap_duplicate(entry, SWAP_HAS_CACHE);
> >  }
> >
> > +/*
> > + * Clear the cache flag and release pinned entry.
>
> Even if we will keep "pin" in above comments, this is hard to be
> understood for reader.  Need a little more explanation like "release
> pinned entry for device with SWP_SYNCHRONOUS_IO.
>
> Or, just remove the comments.  We have comments in calling site already.

Then I prefer to remove this, there is only one caller, it should be
easy to understand.

> > + */
> > +void swapcache_clear(struct swap_info_struct *si, swp_entry_t entry)
> > +{
> > +     struct swap_cluster_info *ci;
> > +     unsigned long offset =3D swp_offset(entry);
> > +     unsigned char usage;
> > +
> > +     ci =3D lock_cluster_or_swap_info(si, offset);
> > +     usage =3D __swap_entry_free_locked(si, offset, SWAP_HAS_CACHE);
> > +     unlock_cluster_or_swap_info(si, ci);
> > +     if (!usage)
> > +             free_swap_slot(entry);
> > +}
> > +
> >  struct swap_info_struct *swp_swap_info(swp_entry_t entry)
> >  {
> >       return swap_type_to_swap_info(swp_type(entry));
>
> Otherwise it looks good for me, Thanks!
>
> Reviewed-by: "Huang, Ying" <ying.huang@intel.com>

Thanks for the review.