Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <433f431a3684eb296a62f8f3cdbf34e185a5a84d.camel@kernel.org>
Subject: Re: [PATCH v2] nfsd: fix net-namespace logic in
 __nfsd_file_cache_purge
From:   Jeff Layton <jlayton@kernel.org>
To:     Petr Vorel <pvorel@suse.cz>,
        Chuck Lever III <chuck.lever@oracle.com>
Cc:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Date:   Mon, 31 Oct 2022 14:46:51 -0400
In-Reply-To: <Y2AXrMEim07Y0LLY@pevik>
References: <20221031154921.500620-1-jlayton@kernel.org>
         <BCEEEF05-11E3-4E31-BDE1-DDCA65A5AB6F@oracle.com> <Y2AXrMEim07Y0LLY@pevik>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2022-10-31 at 19:45 +0100, Petr Vorel wrote:
>=20
> > > On Oct 31, 2022, at 11:49 AM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> > > If the namespace doesn't match the one in "net", then we'll continue,
> > > but that doesn't cause another rhashtable_walk_next call, so it will
> > > loop infinitely.
>=20
> > > Fixes: ce502f81ba88 ("NFSD: Convert the filecache to use rhashtable")
> > > Reported-by: Petr Vorel <pvorel@suse.cz>
> > > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > > ---
> > > fs/nfsd/filecache.c | 5 ++---
> > > 1 file changed, 2 insertions(+), 3 deletions(-)
>=20
> > Thank you! Applied and pushed to for-rc. I'll send a PR in a few days.
>=20
> Thanks for a quick action!
>=20

No problem.=20

> What a shame you didn't put link to the report, which contains reproducer=
.
> https://lore.kernel.org/ltp/Y1%2FP8gDAcWC%2F+VR3@pevik/
>=20
> Kind regards,
> Petr
>=20

Chuck, could you add that link to the changelog when you merge it?

Thanks,
Jeff

> > > The v1 patch applies cleanly to v6.0, but not to Chuck's for-next
> > > branch. This one should be suitable there.
> > > diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
> > > index 98c6b5f51bc8..4a8aa7cd8354 100644
> > > --- a/fs/nfsd/filecache.c
> > > +++ b/fs/nfsd/filecache.c
> > > @@ -890,9 +890,8 @@ __nfsd_file_cache_purge(struct net *net)
>=20
> > > 		nf =3D rhashtable_walk_next(&iter);
> > > 		while (!IS_ERR_OR_NULL(nf)) {
> > > -			if (net && nf->nf_net !=3D net)
> > > -				continue;
> > > -			nfsd_file_unhash_and_dispose(nf, &dispose);
> > > +			if (!net || nf->nf_net =3D=3D net)
> > > +				nfsd_file_unhash_and_dispose(nf, &dispose);
> > > 			nf =3D rhashtable_walk_next(&iter);
> > > 		}
>=20
> > > --=20
> > > 2.38.1

--=20
Jeff Layton <jlayton@kernel.org>