Received-SPF: pass (google.com: domain of linux-nfs+bounces-879-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 3 Jan 2024 09:48:55 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Jeff Layton <jlayton@kernel.org>
Cc: Neil Brown <neilb@suse.de>, Olga Kornievskaia <kolga@netapp.com>,
        Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
        linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
        Zhi Li <yieli@redhat.com>
Subject: Re: [PATCH] nfsd: drop the nfsd_put helper
Message-ID: <ZZVz1wd/oTvBk3dU@tissot.1015granger.net>
References: <20240103-nfsd-fixes-v1-1-4f4f9d7edd0d@kernel.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240103-nfsd-fixes-v1-1-4f4f9d7edd0d@kernel.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?GGhM4AtheoxMiX7t6RA8SLGQBZmF2Pb70CNBDaDovJsXNa/NSfBV5Xcrj0WB?=
 =?us-ascii?Q?FDZb14f60OMRdq0Ss8h2qQO/gxYNz+vSeHXuaBqH6jvhDethRYQoui2WM4Km?=
 =?us-ascii?Q?2zzr0/8deQQm8WaAVZvabAGJ7cYeQ7vhKgIC9IPvU71hBUUYKLACTYLObf/I?=
 =?us-ascii?Q?XZxYGaAD2url2pewG58lda1Tyhl99tigKjdtTmB6XuzjK6lyugE0KZ2uY9uU?=
 =?us-ascii?Q?SqMAfSvLSR4/EcCQg7qgY43Rg3049gMscC9rHC2nIOrAifL4wpHbxs3iNYCM?=
 =?us-ascii?Q?doxUC5WjTD59ZdhKVfit1P3nmsHB3HfZBlq3ShoKzawSggqCXqGcLdeLkTEr?=
 =?us-ascii?Q?CRi1CBsW7m/3jYjF22U5mtZo3ae0bD2cP07wFEfg/u6DDrtjCBPW9BfDNk41?=
 =?us-ascii?Q?pmZtxYomgdgeghcU9R03ykp6R/vkKFTi77+lagdlBc5kzQFaIQEFZtmKWOtI?=
 =?us-ascii?Q?+5tRTG/QJ61c7d+xtKtXgYbf9uo3+SqsMKqss+cPOADmXz+lmDDkI+yZtpXZ?=
 =?us-ascii?Q?F9AOkzx7bH9rVXacco8UltIhSA5Z8KiGi4hYmcJxcQNZyecRiEZECxfCso+o?=
 =?us-ascii?Q?Ab+M2WjfQDcD7hwTvRmol80BFwGApBOPFXuq8SJoKSv7/LlQT4mWryRf0nSS?=
 =?us-ascii?Q?0bK/z7x0VCBpnT19ZHkOQ8efvtI14AjSh04DadrpWfkr2ZgOk+PEXtPumaAL?=
 =?us-ascii?Q?mp8uORKD8MkO0f8Mdj8XCJKQ7CgK4yKw2tHlTMP4BRSYelPaHeVrZ3P2AY+Z?=
 =?us-ascii?Q?NSrEmIJE2VNdjyUzUcmDR0wvblkx9h0CHkUxOTOqmk/Hbk88uOElTqxYg2Ea?=
 =?us-ascii?Q?/cxUNPop0OFusuBijpFYbLcArx9/WiFHurDJbpNlgPPO3VgtL1MRo14lTJQg?=
 =?us-ascii?Q?nJuWSxUP9Gv/NW8NrwQN4In+okF6iHQJS8u7xUpeC0ra6TSHkhiueJhYK/Gv?=
 =?us-ascii?Q?kiLPq3yj9R7eUxkcZ8kMrbkTU689uKagubIat2IWTX5YhF27SF4kykC6i7JY?=
 =?us-ascii?Q?TTCNcJI5aaC4D+42skV+s8YB+AMqUOrPo7YHqyMcfJDSJr6S/vDHh6q5yW7U?=
 =?us-ascii?Q?pYbXS9odGHV2RVlzC8IqRnml3J0NFkh5pxTpNsh/MRineAYO7YyfpiUeQplx?=
 =?us-ascii?Q?4xa2uBiGNT8XzE8KPX9suQ5I+z+Usl8NSyv2QajoES61lFD01uHVEr0niHm+?=
 =?us-ascii?Q?tYFaU9c7sEINIVFqx82SGA9Qt8o3OlyO5EGqsFw5fGZGmf4iiWrz6GBBt6Dd?=
 =?us-ascii?Q?lBMV+Q7/PskefqnhCkB2xyY3mZYCZ9yo5Kg4qqDLtgUubaWZCF7wAewi5h5f?=
 =?us-ascii?Q?O7pub/MsKbEAlJQ1cfwO3pFgEhWGNH3SJs3xuifXdPopvbuGj3vb65tppGPW?=
 =?us-ascii?Q?3PGaEX/fiP+JhIE8QGMGAk4BbSieC3MHPk/ATUzEGGsa1mVCmgsPMbMZH8Kg?=
 =?us-ascii?Q?PqKE1z2hT1llSnxdU3xDcXJrie5z47R44fSiZ76tImSJcvj2XOGRLGEfb5Hv?=
 =?us-ascii?Q?0e1K84MG66wKuI6kzjEhuZv+0pJTrwWJ5mEz/oeFe/TA6RXo+bLlckdlHk90?=
 =?us-ascii?Q?PeF0yHFPFSNiFqasKeZ1Vn9A1zprhMfwtaFs7aEo4iWUuFThAdtksG/fysjg?=
 =?us-ascii?Q?8g=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	eTZoqh0dwqmqCinqwe5Erk/EKb1beZsAdO9S5VFb16mfd8i/S2GWCkFMQqbhjc5VYJR2L9x7C4Ug0CALvRKwcNuCr0wAu95uSIHyEWvHBhaVcPhDc7gQDef+j+102wRvzUKapP3roGHOxA0Rd01p70SBUmU+jPNmi5RcrDexG+1ZQH1EfWOmjp9mZ5vEjuL3NX+RaRYJr5xCsh+qV1R8VlIu5hcIWVNNvkCF6IJJXgHZpMIr6gjnSrZO3zO8wL0NR7YNhwvEB18ytibAc2Lu3/lgwgF8suf+QeRTeGXTQ7JhoocEbIhARolo6KhlRDEq591GQa7P9DgPUsC0EikadaXfOdZqiBeH7lrZH0J8GTZXFBx1AouKTvWhKEo4a0lwtq6kdcL703Q0WhtzD+IhVIpJqKyxGJMbd7Ucqbgs9DG3kTFhRafMqkwNAbSy87QJdvQEUOLbxmXefvtXwniarkFoBk0Bri5Reb3DCc2YKk7RiClqubVc2OnW/wIdHm0JVfyy2Qf2rIh5iBYJ1Qqf2NP/sZcStRvzZ+cvxACCLpIOTv7Nm4PZ/Y6vjVQiiZTCDYfl/U7cbl31q3q8t9MbWlKlPXUN2hOGC8e4Z3iIEV4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fe48c016-d89c-4482-9df5-08dc0c6b1d89
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 14:48:57.7825
 (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: m3Vp0oMXwT8cm6Y2+ImOJljc88Q4gRRMn7ojCiWaPOZct0benGLEiKzEq6+e33sRjC7MKriZzw2WtwCW/VAfaA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4483
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-03_07,2024-01-03_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 malwarescore=0
 adultscore=0 suspectscore=0 mlxlogscore=794 phishscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401030121
X-Proofpoint-GUID: pUwzJTnlwEucC9xzvqLlFEzOdDy7wnml
X-Proofpoint-ORIG-GUID: pUwzJTnlwEucC9xzvqLlFEzOdDy7wnml

On Wed, Jan 03, 2024 at 08:36:52AM -0500, Jeff Layton wrote:
> It's not safe to call nfsd_put once nfsd_last_thread has been called, as
> that function will zero out the nn->nfsd_serv pointer.
> 
> Drop the nfsd_put helper altogether and open-code the svc_put in its
> callers instead. That allows us to not be reliant on the value of that
> pointer when handling an error.
> 
> Fixes: 2a501f55cd64 ("nfsd: call nfsd_last_thread() before final nfsd_put()")
> Reported-by: Zhi Li <yieli@redhat.com>
> Cc: NeilBrown <neilb@suse.de>
> Signed-off-by: Jeffrey Layton <jlayton@redhat.com>
> ---
> I know it's late, but it would be good to get this into v6.7 if
> possible. I think it's fairly straightforward.

How is Zhi finding these? Are there administrative API tests that
can be shared with the community (say, by adding them to kdevops)?


> ---
>  fs/nfsd/nfsctl.c | 31 +++++++++++++++++--------------
>  fs/nfsd/nfsd.h   |  7 -------
>  2 files changed, 17 insertions(+), 21 deletions(-)
> 
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 7cd513e59305..87fed75808ff 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -693,6 +693,7 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
>  	char *mesg = buf;
>  	int fd, err;
>  	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
> +	struct svc_serv *serv;
>  
>  	err = get_int(&mesg, &fd);
>  	if (err != 0 || fd < 0)
> @@ -703,15 +704,15 @@ static ssize_t __write_ports_addfd(char *buf, struct net *net, const struct cred
>  	if (err != 0)
>  		return err;
>  
> -	err = svc_addsock(nn->nfsd_serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
> +	serv = nn->nfsd_serv;
> +	err = svc_addsock(serv, net, fd, buf, SIMPLE_TRANSACTION_LIMIT, cred);
>  
> -	if (err < 0 && !nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
> +	if (err < 0 && !serv->sv_nrthreads && !nn->keep_active)
>  		nfsd_last_thread(net);
> -	else if (err >= 0 &&
> -		 !nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> -		svc_get(nn->nfsd_serv);
> +	else if (err >= 0 && !serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> +		svc_get(serv);
>  
> -	nfsd_put(net);
> +	svc_put(serv);
>  	return err;
>  }
>  
> @@ -725,6 +726,7 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
>  	struct svc_xprt *xprt;
>  	int port, err;
>  	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
> +	struct svc_serv *serv;
>  
>  	if (sscanf(buf, "%15s %5u", transport, &port) != 2)
>  		return -EINVAL;
> @@ -737,32 +739,33 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
>  	if (err != 0)
>  		return err;
>  
> -	err = svc_xprt_create(nn->nfsd_serv, transport, net,
> +	serv = nn->nfsd_serv;
> +	err = svc_xprt_create(serv, transport, net,
>  			      PF_INET, port, SVC_SOCK_ANONYMOUS, cred);
>  	if (err < 0)
>  		goto out_err;
>  
> -	err = svc_xprt_create(nn->nfsd_serv, transport, net,
> +	err = svc_xprt_create(serv, transport, net,
>  			      PF_INET6, port, SVC_SOCK_ANONYMOUS, cred);
>  	if (err < 0 && err != -EAFNOSUPPORT)
>  		goto out_close;
>  
> -	if (!nn->nfsd_serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> -		svc_get(nn->nfsd_serv);
> +	if (!serv->sv_nrthreads && !xchg(&nn->keep_active, 1))
> +		svc_get(serv);
>  
> -	nfsd_put(net);
> +	svc_put(serv);
>  	return 0;
>  out_close:
> -	xprt = svc_find_xprt(nn->nfsd_serv, transport, net, PF_INET, port);
> +	xprt = svc_find_xprt(serv, transport, net, PF_INET, port);
>  	if (xprt != NULL) {
>  		svc_xprt_close(xprt);
>  		svc_xprt_put(xprt);
>  	}
>  out_err:
> -	if (!nn->nfsd_serv->sv_nrthreads && !nn->keep_active)
> +	if (!serv->sv_nrthreads && !nn->keep_active)
>  		nfsd_last_thread(net);
>  
> -	nfsd_put(net);
> +	svc_put(serv);
>  	return err;
>  }
>  
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 3286ffacbc56..9ed0e08d16c2 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -113,13 +113,6 @@ int		nfsd_pool_stats_open(struct inode *, struct file *);
>  int		nfsd_pool_stats_release(struct inode *, struct file *);
>  void		nfsd_shutdown_threads(struct net *net);
>  
> -static inline void nfsd_put(struct net *net)
> -{
> -	struct nfsd_net *nn = net_generic(net, nfsd_net_id);
> -
> -	svc_put(nn->nfsd_serv);
> -}
> -
>  bool		i_am_nfsd(void);
>  
>  struct nfsdfs_client {
> 
> ---
> base-commit: 610a9b8f49fbcf1100716370d3b5f6f884a2835a
> change-id: 20240103-nfsd-fixes-1f1196134a11
> 
> Best regards,
> -- 
> Jeff Layton <jlayton@kernel.org>
> 

-- 
Chuck Lever