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:     Dai Ngo <dai.ngo@oracle.com>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 1/1] NFSD: register/unregister of nfsd-client shrinker at
 nfsd startup/shutdown time
Thread-Topic: [PATCH 1/1] NFSD: register/unregister of nfsd-client shrinker at
 nfsd startup/shutdown time
Thread-Index: AQHZJL7ZsLhGFEQ6jUSkrloWj+GNWK6XyJQA
Date:   Tue, 10 Jan 2023 15:34:32 +0000
Message-ID: <0628CACB-50EE-48B9-8871-A1F6B05DEBCC@oracle.com>
References: <1673332991-24406-1-git-send-email-dai.ngo@oracle.com>
In-Reply-To: <1673332991-24406-1-git-send-email-dai.ngo@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?pLto7l+ApDIUOzjGH1kFxERS8wi+EtuECBqAzpOZTQi86JJaaXQ2Op/XdnxP?=
 =?us-ascii?Q?rvvJbQ5dVbkueqg0C+bBgN8GCWRUInbLQ2Kqw7ijD/R2/sghxoYxVppFaVeS?=
 =?us-ascii?Q?PowF6zza1kaZzWeVFgRbuDUOPv1JgjGTiuKVcKC0srBGtrv7IMAEu4n91beP?=
 =?us-ascii?Q?9XVI8D1KOqM6qoHyr812crZw42VleEOH+HOSBa6xyCgeZwqNSOWbPHHu/D0V?=
 =?us-ascii?Q?sAUchf1rV3clzUw81NPY2L3YsZAHjR9Ck00gET4PRT1/dphkmDzCCurkIzvS?=
 =?us-ascii?Q?zRW5vnX9Mlo3uLQIiBXXIA6RkysTCPU2q0JfLWDROvgCiKLgyvfyUJEiUHJ5?=
 =?us-ascii?Q?w8ro6Mg3g0CxRmoOcxKtdDUQKR/fYkhxXvMPa7lwlGUz6q7F1Hr+0b3YDsuR?=
 =?us-ascii?Q?U3eHm656UaoqJ34/VYc4/LvWZXi4a3feTaOLNvgnxG088VhISyb9mkAviXHL?=
 =?us-ascii?Q?9tTUX3/1xVgBS3AjlJsULpE3CJFZtb882wFDvuHn/mz5d58uvMe1fmOKnWbr?=
 =?us-ascii?Q?HGl5LBHtBfIG2yrRnhEZAP4ATdVb64IBIXDgM+7UNDaBTu7F849FAFOSWubc?=
 =?us-ascii?Q?3xmVsZ4kyMFbqNosMZ+bNB9JrP2UEWwhEw3WKap/sDXQf87SbRP0B2Lh3yJV?=
 =?us-ascii?Q?ztadCyyCRhQsq3wdk/efS4m5lxHaTsvbeRhDsRWPefEy7xY/vIz9Ro4fidL9?=
 =?us-ascii?Q?/biwdjrQRTVHSBDlsperFqREzO+hCQkCab+KHk+aoaUVGu3Nm/OfOF2a9yJa?=
 =?us-ascii?Q?OijWCZ4VpUCVavV92K7/cWrX7cm2C8mxFlw/V5E9NOh0s8+iNqH1F3DRlVr7?=
 =?us-ascii?Q?U0oelWVelh1FcHQuZGjSNXI8csJK7ch37dfjHcfvPZHHJQSEj/4BNWAySln+?=
 =?us-ascii?Q?nFBlzDQx2Df05SlHXJw6qJ5xbrs7R2K4KQ81RE6R5AYsD3XhjgjAAt2A7LPj?=
 =?us-ascii?Q?ZiM4vxGxKgMQRVH6nKQVcO2HMgL2iyjmzwHN0tkLGGTQWwQfE8clVhKGmUSx?=
 =?us-ascii?Q?lK1hs+SMEw+u4/Dcylfc2paMDvIFm/yIg5SUU0Dgy8cl+9nzyuZTOqK53EvJ?=
 =?us-ascii?Q?OLRcEmV2cB+a7lyprWUO9e2s+/+TM9V004DZPruVsX+Jy+bSKSFOIwqW4MQR?=
 =?us-ascii?Q?V/F5E5zAfBme46/K2NOGQAeJMDd+riYS3NmXGO9M1pn28WcYYbZTeq13lIgn?=
 =?us-ascii?Q?kSA8aWL2xA5B2cbUFg4wd62hy8FaW/beJRP+Q2rSLYJzDW+x+/zk9b0gO6JC?=
 =?us-ascii?Q?+s4/vBCdVcTJaZc4OK9woiFWJKBQMscEiU25bqvaPW9rI/7+4GqvNZyocD9N?=
 =?us-ascii?Q?94/NfNI2P/kq/LwLwmUoEpKPnZd+YPm5okRKPfJD9tH7VxCKHJWHp/uo/n0t?=
 =?us-ascii?Q?FfXYUpNyzA/BADt+pLZPlT0o42+fc2UKbb7jBo1Nd7Hc+IkQQqRgbB++vPMK?=
 =?us-ascii?Q?hSXerBJ612jf06GJeAJUENnu6wZXMPP2ULk4vwhzqg3hrYKjkre55o/7pNmc?=
 =?us-ascii?Q?DiVBZXNOr1rRLJBHQIeohyBDEHQ0R6oIsQq6lHYeNpXqj2/RMeSBnld5ISi9?=
 =?us-ascii?Q?luS5RUaKyRIlq42Hc97JVtzqdX6yLUf1j9ivuCVRrDRviRiRpJV9/WomoZ30?=
 =?us-ascii?Q?Gw=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <84A64984E8329E41B78069CD6D7570C9@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RM4lDZ41b2L9uLqurlrfRjIqMjHjYgp5fPUUIqjRtqTwNk5aCICaaYmhkpDdzHrffdqdH/pvVl0zqYAJ2gG/RVyho+kRW5QATRDXPZmY08qQwSYIl6wAvVCZEZARr72Ac6T0hl0CLZSSezsbSltUiIbt7RYwkJl99GLCXiWwnvyjPxjmg/EktVkMRWdGhGrOJaRZbim00Urd4eBKD1YPOc9YET/UiiA9ENcHyPRj2yucKfu8qytVTIWWNaCZBM74z3UeVF47rsMP3FGG9rzxFxpoSUnZL2nJY0UAKhv7BpAQNLpBxAFZjIWnl0jQdnys5xsG5FAR/2GeQc+Fxr16vh/BMqZAjB9tGSAr5oLwOHlax7SLRkMCChsjKK44o+zbkxppsJkpxWJeChFoxkuFsB5iBglqzS7vc5hJ/NbCeyk3WV2Ig+9wrfHrZfVdEGFMLVm+FhrCZSvg+6aWGljz1xZ784ynrB6+h4kxLrmeS5ARuIdqRNJBhXMDqLT+uSWIKVQepcxppIZXlHcIaQV2bupqkZkhlIxp83akSFRN/wrA/13rfWcpHGU3BuB5ogAjbGkxRjOEgdWHcOd1G8m6guO49GQfnqAeNHm2jxSbXWlM0xs1LLzBKfG/kqqo6tG+iPTplrz/cpYzLcARaTOFfs7qQvB0Ev8h6tw8IA4sWLzqg/gg4T01NSvg2Rpz30LsF8JdUbj9RdxPaZGk+FuljWCJPlAo2SfCyFBPukpksX6AbVu3H7In968bRZQnBhX3RE9ywpfYTihtuZvotYVk0Q==
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: fe221ab1-8c07-4679-3022-08daf3202c19
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2023 15:34:33.0072
 (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: nJUnyrjC7e0jwAgE+wPtxj6hk4aT0ABWlrKExnnNg0Tr6+QnHB08wcY8apUUw4lfIaeeJOXiidctB/8dJqzGKA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6233
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-10_06,2023-01-10_03,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 suspectscore=0
 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301100096
X-Proofpoint-GUID: OKSriiHpC5lit_QrkQyW8uBNWXHP-H10
X-Proofpoint-ORIG-GUID: OKSriiHpC5lit_QrkQyW8uBNWXHP-H10
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 Jan 10, 2023, at 1:43 AM, Dai Ngo <dai.ngo@oracle.com> wrote:
>=20
> Currently the nfsd-client shrinker is registered and unregistered at
> the time the nfsd module is loaded and unloaded. This means after the
> nfsd service is shutdown, the nfsd-client shrinker is still registered
> in the system. This causes the nfsd-client shrinker to be called when
> memory is low even thought nfsd service is not running. This is also
> true for the nfsd_reply_cache_shrinker.
>=20
> This patch moves the register/unregister of nfsd-client shrinker from
> module load/unload time to nfsd startup/shutdown time.
>=20
> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>
> ---
> fs/nfsd/nfs4state.c | 18 ++++++------------
> fs/nfsd/nfsctl.c    |  7 +------
> fs/nfsd/nfsd.h      |  6 ++----
> 3 files changed, 9 insertions(+), 22 deletions(-)
>=20
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 7b2ee535ade8..ee56c9466304 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -4421,7 +4421,7 @@ nfsd4_state_shrinker_scan(struct shrinker *shrink, =
struct shrink_control *sc)
> 	return SHRINK_STOP;
> }
>=20
> -int
> +void
> nfsd4_init_leases_net(struct nfsd_net *nn)
> {
> 	struct sysinfo si;
> @@ -4443,16 +4443,6 @@ nfsd4_init_leases_net(struct nfsd_net *nn)
> 	nn->nfs4_max_clients =3D max_t(int, max_clients, NFS4_CLIENTS_PER_GB);
>=20
> 	atomic_set(&nn->nfsd_courtesy_clients, 0);
> -	nn->nfsd_client_shrinker.scan_objects =3D nfsd4_state_shrinker_scan;
> -	nn->nfsd_client_shrinker.count_objects =3D nfsd4_state_shrinker_count;
> -	nn->nfsd_client_shrinker.seeks =3D DEFAULT_SEEKS;
> -	return register_shrinker(&nn->nfsd_client_shrinker, "nfsd-client");
> -}
> -
> -void
> -nfsd4_leases_net_shutdown(struct nfsd_net *nn)
> -{
> -	unregister_shrinker(&nn->nfsd_client_shrinker);
> }
>=20
> static void init_nfs4_replay(struct nfs4_replay *rp)
> @@ -8077,7 +8067,10 @@ static int nfs4_state_create_net(struct net *net)
> 	INIT_DELAYED_WORK(&nn->nfsd_shrinker_work, nfsd4_state_shrinker_worker);
> 	get_net(net);
>=20
> -	return 0;
> +	nn->nfsd_client_shrinker.scan_objects =3D nfsd4_state_shrinker_scan;
> +	nn->nfsd_client_shrinker.count_objects =3D nfsd4_state_shrinker_count;
> +	nn->nfsd_client_shrinker.seeks =3D DEFAULT_SEEKS;
> +	return register_shrinker(&nn->nfsd_client_shrinker, "nfsd-client");
>=20
> err_sessionid:
> 	kfree(nn->unconf_id_hashtbl);
> @@ -8171,6 +8164,7 @@ nfs4_state_shutdown_net(struct net *net)
> 	struct list_head *pos, *next, reaplist;
> 	struct nfsd_net *nn =3D net_generic(net, nfsd_net_id);
>=20
> +	unregister_shrinker(&nn->nfsd_client_shrinker);
> 	cancel_delayed_work_sync(&nn->laundromat_work);
> 	locks_end_grace(&nn->nfsd4_manager);
>=20
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index d1e581a60480..c2577ee7ffb2 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -1457,9 +1457,7 @@ static __net_init int nfsd_init_net(struct net *net=
)
> 		goto out_idmap_error;
> 	nn->nfsd_versions =3D NULL;
> 	nn->nfsd4_minorversions =3D NULL;
> -	retval =3D nfsd4_init_leases_net(nn);
> -	if (retval)
> -		goto out_drc_error;
> +	nfsd4_init_leases_net(nn);
> 	retval =3D nfsd_reply_cache_init(nn);
> 	if (retval)
> 		goto out_cache_error;
> @@ -1469,8 +1467,6 @@ static __net_init int nfsd_init_net(struct net *net=
)
> 	return 0;
>=20
> out_cache_error:
> -	nfsd4_leases_net_shutdown(nn);
> -out_drc_error:
> 	nfsd_idmap_shutdown(net);
> out_idmap_error:
> 	nfsd_export_shutdown(net);
> @@ -1486,7 +1482,6 @@ static __net_exit void nfsd_exit_net(struct net *ne=
t)
> 	nfsd_idmap_shutdown(net);
> 	nfsd_export_shutdown(net);
> 	nfsd_netns_free_versions(net_generic(net, nfsd_net_id));
> -	nfsd4_leases_net_shutdown(nn);
> }
>=20
> static struct pernet_operations nfsd_net_ops =3D {
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 93b42ef9ed91..fa0144a74267 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -504,8 +504,7 @@ extern void unregister_cld_notifier(void);
> extern void nfsd4_ssc_init_umount_work(struct nfsd_net *nn);
> #endif
>=20
> -extern int nfsd4_init_leases_net(struct nfsd_net *nn);
> -extern void nfsd4_leases_net_shutdown(struct nfsd_net *nn);
> +extern void nfsd4_init_leases_net(struct nfsd_net *nn);
>=20
> #else /* CONFIG_NFSD_V4 */
> static inline int nfsd4_is_junction(struct dentry *dentry)
> @@ -513,8 +512,7 @@ static inline int nfsd4_is_junction(struct dentry *de=
ntry)
> 	return 0;
> }
>=20
> -static inline int nfsd4_init_leases_net(struct nfsd_net *nn) { return 0;=
 };
> -static inline void nfsd4_leases_net_shutdown(struct nfsd_net *nn) {};
> +static inline void nfsd4_init_leases_net(struct nfsd_net *nn) { };
>=20
> #define register_cld_notifier() 0
> #define unregister_cld_notifier() do { } while(0)
> --=20
> 2.9.5
>=20

Applied this one to nfsd's for-next. Thanks!

The other patch (once the review comments are addressed) is
to be applied to nfsd's for-rc, I'm assuming.


--
Chuck Lever