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;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@kernel.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Petr Vorel <pvorel@suse.cz>
Subject: Re: [PATCH v2] nfsd: fix net-namespace logic in
 __nfsd_file_cache_purge
Thread-Topic: [PATCH v2] nfsd: fix net-namespace logic in
 __nfsd_file_cache_purge
Thread-Index: AQHY7UBdjy7EMWQZjE+yKRdZMx04Ya4ovM+A
Date:   Mon, 31 Oct 2022 17:10:21 +0000
Message-ID: <BCEEEF05-11E3-4E31-BDE1-DDCA65A5AB6F@oracle.com>
References: <20221031154921.500620-1-jlayton@kernel.org>
In-Reply-To: <20221031154921.500620-1-jlayton@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?FQXxzb6aEqyE0ELpM6m2fSRzHGymw1zTps0cF8Nz0FF4tefr2V8csNOFKcQw?=
 =?us-ascii?Q?z+IxRlvshnvlkJ7r6zAaSwTFvM78g7PXK2imcLNSg8G1b1dU218a1zxgLbG6?=
 =?us-ascii?Q?bC7lQPCW5LhXf5zWetqn2iMROQo7+o7QJ3DBJUdzuy2Ua7QOcLX5R6yNWkTA?=
 =?us-ascii?Q?ICGiqa7nHBC/4wpTfJ4R9mbuSVR3P+D83uw2EuKqSy/D87m8z+Xz2m3uAl6t?=
 =?us-ascii?Q?WT15G2v+Y+CBnHeXbyvC4ASuKqNQ+hbfe0vO8qSeIdWKpOgKQ7grKjoxhc9s?=
 =?us-ascii?Q?q+OIppHvFcLPm9llMT/w6RccovVoC9BLKKwlEal4jsOgdRb8fPUYKrqpKrvp?=
 =?us-ascii?Q?Wa+c+qEWW7Qdq4rxuwI1RMxycLnAvXcxzNdx1wgR/FwRTiGkMrghemf5iedK?=
 =?us-ascii?Q?oQf1sQL+4nQJj9JW72rWUoHea+J7DqxvjHBY7JoFQfTQKWzrJO8nFEwEkteh?=
 =?us-ascii?Q?kq+01aXm5qJNPvdEE2BLYUFuuCa7MpaViJfgp0BRqXzfzIDx+l1zI4SkMlfy?=
 =?us-ascii?Q?z8z+euvu3qNhMXtog6fF2ZTTNgMD6O3nqd3yASIrpZ2dh/Y3KFBVDgeTQ66x?=
 =?us-ascii?Q?C6dU0NYcp++jlG3+uglJhGKrS4kiJZcbtCZLWScUTljfHU14tdg2jtYUqpl7?=
 =?us-ascii?Q?NnNT8ahUg5OTvNLviLmmAAMlZeQnlqZAVJKlEOceOpbMRTIQm4ShV+2SVZcf?=
 =?us-ascii?Q?9OpqwHFh6PTkzwaVu52NzCf41jtD51192GA0MVG3b59WlPsud+GRBRoLCvf7?=
 =?us-ascii?Q?/tAJFmNoBqiHLzqSoifPFietTCv16JaycTI6rp+GJbH+RtmNHClhqS0y8eBd?=
 =?us-ascii?Q?+ZS82OiB7Y+7JC+F7nXCTrpxqXSxPs/1lOmMXQB/tWO/jfeamicuM4qCx3Bf?=
 =?us-ascii?Q?gIVfAzELXdwNdzQTo+JZC/OQygtrZzHmoXGWOqKZWGmotjnkhFAcglD9JMph?=
 =?us-ascii?Q?32GOa/1AbzdeS4OCTuWC8o0wpa8S4Qpjp6cVWLGBoHJffjHcfc4a+V6x1D6e?=
 =?us-ascii?Q?Z5zSJ9ah1OiLczU7t7KKfIIXmKS1i/btqwqnaooxAoX3JcaMvnpP2JiGPjOX?=
 =?us-ascii?Q?4zDw6JigqUt9wrCOBvW5d5Ny4xdCkX5XTCTve7Qz6Fa1nvRhtiUmxM94LyKe?=
 =?us-ascii?Q?Fm2+xJDjOkRDmwtQnE/eft5v0CO6NziGAy6hpCchWzo2K10QFM5wLYOSG3yf?=
 =?us-ascii?Q?vch9NgcgVDsb3/Bgv+urnEvlw+A6VMhd8omloCMIS8SVm0HZOvoJVXe3+7Tw?=
 =?us-ascii?Q?S+S3d1HligeFFYlUMtvMhdYE523dEWhtYZaqYjKup1icWI5sIF7ckDivK/dD?=
 =?us-ascii?Q?JZ52dvXJDb90+pGeZuJsCLCkso1YlCiiEiy3uFP5QuvidJAEJyNu9oVFNqMP?=
 =?us-ascii?Q?a6HA8xOykP1PR5RowNzCVB0FO4tQUruEPnzdfkKodWyj48A2GTIwemZrkGc3?=
 =?us-ascii?Q?7QbO9s/A6uJOShKu31PXnBQDZv6/9q3x6J2lEAobD0DSIr3CjpWog7TNttzW?=
 =?us-ascii?Q?mATVv+IhMRM58sIw5pmQ2S/KaDR/QW4rZNH8uVX0hSAbUPys9i+/Ip5SU7EA?=
 =?us-ascii?Q?lXyszx4LG0gVfIUAPEWiKSZ/g0tUojER4ApUCi4nZOjwu2ObtEfybPijB97j?=
 =?us-ascii?Q?dw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <FC11F18D102261478DCCB1F2D8E47197@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 68726618-eafa-4bfb-e9ed-08dabb62cb5e
X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Oct 2022 17:10:21.9218
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 1mcpsqDQ2W13I6hSy+uBBwJJ1VuV7znW3KUsob4ubLRVHiPJS7GmDPrXcHShxYZdM1Hq2zC9iYT3aqPGwiftSA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB4950
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-31_19,2022-10-31_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0
 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2210310107
X-Proofpoint-GUID: K8937BROBIlkGV6ZzV7DxC0nQ86giQRh
X-Proofpoint-ORIG-GUID: K8937BROBIlkGV6ZzV7DxC0nQ86giQRh
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> 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(-)

Thank you! Applied and pushed to for-rc. I'll send a PR in a few days.


> 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

--
Chuck Lever