linux-kernel - Re: [syzbot] [mm?] WARNING in zswap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMgjq7ACohT_uerSz8E_994ZZCv709Zor+43hdmesW_59W1BWw@mail.gmail.com>
Date: Wed, 4 Sep 2024 02:50:55 +0800
From: Kairui Song <ryncsn@...il.com>
To: Yosry Ahmed <yosryahmed@...gle.com>
Cc: Barry Song <21cnbao@...il.com>, akpm@...ux-foundation.org, chengming.zhou@...ux.dev, 
	chrisl@...nel.org, hannes@...xchg.org, linux-kernel@...r.kernel.org, 
	linux-mm@...ck.org, nphamcs@...il.com, ryan.roberts@....com, 
	syzbot+ce6029250d7fd4d0476d@...kaller.appspotmail.com, 
	syzkaller-bugs@...glegroups.com, ying.huang@...el.com
Subject: Re: [syzbot] [mm?] WARNING in zswap_swapoff

On Wed, Sep 4, 2024 at 2:22 AM Yosry Ahmed <yosryahmed@...gle.com> wrote:
>

Hi Yosry,

> > > > diff --git a/mm/swapfile.c b/mm/swapfile.c
> > > > index c1638a009113..8ff58be40544 100644
> > > > --- a/mm/swapfile.c
> > > > +++ b/mm/swapfile.c
> > > > @@ -1514,6 +1514,8 @@ static bool __swap_entries_free(struct swap_info_struct *si,
> > > >         unlock_cluster_or_swap_info(si, ci);
> > > >
> > > >         if (!has_cache) {
> > > > +               for (i = 0; i < nr; i++)
> > > > +                       zswap_invalidate(swp_entry(si->type, offset + i));
> > > >                 spin_lock(&si->lock);
> > > >                 swap_entry_range_free(si, entry, nr);
> > > >                 spin_unlock(&si->lock);
> > > >

This fix from Barry have been applied for mm-unstable and it's looking
good so far.

> Kairui, Barry, any thoughts on this? Any preferences on how to make
> sure zswap_invalidate() is being called in all possible swap freeing
> paths?

I have a set of patched that removed the si->lock around
swap_entry_range_free, and the slot return cache is removed too. So we
can move zswap_invalidate into it as locking or caching is no longer
an issue, I will post it ASAP.