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:     Neil Brown <neilb@suse.de>
CC:     Al Viro <viro@zeniv.linux.org.uk>, Daire Byrne <daire@dneg.com>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 12/12] nfsd: discard fh_locked flag and fh_lock/fh_unlock
Thread-Topic: [PATCH 12/12] nfsd: discard fh_locked flag and fh_lock/fh_unlock
Thread-Index: AQHYf3xis0/2f05McUa/bAXcSwIyY61espsA
Date:   Fri, 24 Jun 2022 14:43:39 +0000
Message-ID: <EC3027E3-04AA-4157-9B7B-3A3D623FDD7B@oracle.com>
References: <165516173293.21248.14587048046993234326.stgit@noble.brown>
 <165516230204.21248.4630581281540290265.stgit@noble.brown>
In-Reply-To: <165516230204.21248.4630581281540290265.stgit@noble.brown>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?NBs9KOwNOSosfniAWpoFhenHCD7NdqyuzEWIrcA1Yeh6vC1YILg0uZxku3cB?=
 =?us-ascii?Q?aE8Rowus+1TMjH4c1pf6fUvFS5LeOD2HjpYcoZXkuW25MHLpd/DxwUKUyGQ3?=
 =?us-ascii?Q?tcAOjDXzm4poD6vwXkbGjVDB/BfcrWI/3IDRPEesjF3maQ/BmNbd/yXZ1k7+?=
 =?us-ascii?Q?Rjfr3nSJRHPgkcj0sB3zXjAjrXmNzI0nEZJEFc5MprbtCZogjm/5P3xrSjQf?=
 =?us-ascii?Q?Ih+Nw3VaZ2tfJaBabyc7ZTy409dxkU878R75nMh82SQ22ueelovYPGtdmvEI?=
 =?us-ascii?Q?ix6azRuO0rJyJbnjCc2Skoh5BK7XHLzHWUcuh6wlgkK1WGX4d7+6WgnLDQ5k?=
 =?us-ascii?Q?TS1jW2JI49ojAWiZOkxTYjlNaAcRhd4eevAwmOxQcv0iuAcU02MTg41/lv+n?=
 =?us-ascii?Q?X4n0zp5kvxm1WRpEmXJKBkW1sbmCsqOmfhXti41FM6alddAkCRlhbowViyKq?=
 =?us-ascii?Q?YRiklNdNymntGLqp8nSVnxPc8EDeBfGqB8wwQHEag2TeITQy5azEJlt8wqPw?=
 =?us-ascii?Q?xawGkWcap3koJXAn+eWU+FhIDGzvZ/GvMZZ8nw9ea9m8daz+hvQXJPGVXHIh?=
 =?us-ascii?Q?kUJEzd6NEhEQb2NmhI/bdaPoYJ0Ay1wFPgLWlXHgjww3ZnQsWHiVilDBn/XP?=
 =?us-ascii?Q?tm8COqCwbv43Vn/OCGY0mQ26HPrOfnjBCTSpaoHN36E13MaGn+2hUWy/0YVd?=
 =?us-ascii?Q?J+0Las8OrAvgNRMjAyfPlarZYXqIYXIYGBwgYauYJ7nqcuKcne9bQuMxg9Fo?=
 =?us-ascii?Q?DZd9ybXgHE3QGA5BbAGMaiLxkSSWRBmNtYK+P9SI2s3heLr6g3bQAzo7i1WR?=
 =?us-ascii?Q?BVeZctAUmrPQh/TIEmXD2uxVJPMVV98w5q8YgpzqTbxLB+idbBCX2/bvH55B?=
 =?us-ascii?Q?xVT97+RevLBaS3ufBo4ms8bVB8wFwHVwRx9T2LI+Xpmhl/BeBo2aLKvGugR/?=
 =?us-ascii?Q?viUYa+4IRfLlJMDfLu4/9KxETnLPt0lNlku/oipOwCof9YqCntjvblb8rEWB?=
 =?us-ascii?Q?GStVS8dwI5NgWA4Tg19qmASePRxtbPmKmbgPkqLV7cHS1JYGzP5suZysPRbM?=
 =?us-ascii?Q?mWqbcpIjeFlSXfDhGkWNE/Oe17ke9tcZJObiwz5QGiKhWkqhSzLIGSam8LiQ?=
 =?us-ascii?Q?xQNiajowcbwBD6XByySmYXqUWnQC5c6p0boTYcNavLZki8NKDIWbwr7XevQH?=
 =?us-ascii?Q?VbYMW4/iPaVeGvSGXxCtkBnhLjKJ/0G6pWgfJMgT3jEvgeq1sziX95NP+mSR?=
 =?us-ascii?Q?9Br4yTF1sy0FUCuB0wN34Vf7P9fYmbOWH25TQCSSHVSL5Y33r/SQUMLjVuSN?=
 =?us-ascii?Q?DMvokNQmDJLlsuUHV7b2z3HhStBy9A178GvnCBuXykTM0S1F3UQKFjmFPsOS?=
 =?us-ascii?Q?m9/NGUwdh8rNnndVSnPNJxu7j/4M7NFAFxevWAv4VBM/Pg3Xcdb12bQ+CBvV?=
 =?us-ascii?Q?YKUEvPW6hBiDrM5ZronENWal3E7SzfjROFO4MTnGLTDp8woLKVYrzkNtsh3a?=
 =?us-ascii?Q?+fM+JHGZ5POAtoWJ2MBoejLOvqx0yStxdQ/wix2E/lYJmE/W7Xq26lhC8epD?=
 =?us-ascii?Q?O7A3uV1PqoM/1T+GGLk2L8gsifEjicoK3OSG169+s9pBJlixF0bix8xbGm9U?=
 =?us-ascii?Q?Qg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <6D7D7C78724285409AAE392083455E3B@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: 3b9211f9-d285-4eab-d368-08da55efed2b
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jun 2022 14:43:39.0807
 (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: 5XRNxu5s/jntYXIq05D5f6KyY4qbPJ3lvvV2jwvWuGP9osC139nntfBEqlidAHGJ7JwcCgyYhBPAxGAK10XEzw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4236
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-24_07:2022-06-23,2022-06-24 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206240057
X-Proofpoint-ORIG-GUID: 1Jt6NxIVcJxokht2eM1gzZNdEylL9ejX
X-Proofpoint-GUID: 1Jt6NxIVcJxokht2eM1gzZNdEylL9ejX
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,T_SCC_BODY_TEXT_LINE
        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 Jun 13, 2022, at 7:18 PM, NeilBrown <neilb@suse.de> wrote:
>=20
> fh_lock() and fh_unlock() are no longer used, so discard them.
> They are the only real users of ->fh_locked, so discard that too.
>=20
> Signed-off-by: NeilBrown <neilb@suse.de>

Reviewed-by: Chuck Lever <chuck.lever@oracle.com>


> ---
> fs/nfsd/nfsfh.c |    2 +-
> fs/nfsd/nfsfh.h |   48 ++++--------------------------------------------
> fs/nfsd/vfs.c   |    4 ----
> 3 files changed, 5 insertions(+), 49 deletions(-)
>=20
> diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c
> index ae270e4f921f..a3dbe9f34c0e 100644
> --- a/fs/nfsd/nfsfh.c
> +++ b/fs/nfsd/nfsfh.c
> @@ -548,7 +548,7 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp=
, struct dentry *dentry,
> 	if (ref_fh =3D=3D fhp)
> 		fh_put(ref_fh);
>=20
> -	if (fhp->fh_locked || fhp->fh_dentry) {
> +	if (fhp->fh_dentry) {
> 		printk(KERN_ERR "fh_compose: fh %pd2 not initialized!\n",
> 		       dentry);
> 	}
> diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h
> index c5061cdb1016..559912b1d794 100644
> --- a/fs/nfsd/nfsfh.h
> +++ b/fs/nfsd/nfsfh.h
> @@ -81,7 +81,6 @@ typedef struct svc_fh {
> 	struct dentry *		fh_dentry;	/* validated dentry */
> 	struct svc_export *	fh_export;	/* export pointer */
>=20
> -	bool			fh_locked;	/* inode locked by us */
> 	bool			fh_want_write;	/* remount protection taken */
> 	bool			fh_no_wcc;	/* no wcc data needed */
> 	bool			fh_no_atomic_attr;
> @@ -93,7 +92,7 @@ typedef struct svc_fh {
> 	bool			fh_post_saved;	/* post-op attrs saved */
> 	bool			fh_pre_saved;	/* pre-op attrs saved */
>=20
> -	/* Pre-op attributes saved during fh_lock */
> +	/* Pre-op attributes saved when inode exclusively locked */
> 	__u64			fh_pre_size;	/* size before operation */
> 	struct timespec64	fh_pre_mtime;	/* mtime before oper */
> 	struct timespec64	fh_pre_ctime;	/* ctime before oper */
> @@ -103,7 +102,7 @@ typedef struct svc_fh {
> 	 */
> 	u64			fh_pre_change;
>=20
> -	/* Post-op attributes saved in fh_unlock */
> +	/* Post-op attributes saved in fh_fill_post_attrs() */
> 	struct kstat		fh_post_attr;	/* full attrs after operation */
> 	u64			fh_post_change; /* nfsv4 change; see above */
> } svc_fh;
> @@ -223,8 +222,8 @@ void	fh_put(struct svc_fh *);
> static __inline__ struct svc_fh *
> fh_copy(struct svc_fh *dst, struct svc_fh *src)
> {
> -	WARN_ON(src->fh_dentry || src->fh_locked);
> -		=09
> +	WARN_ON(src->fh_dentry);
> +
> 	*dst =3D *src;
> 	return dst;
> }
> @@ -323,43 +322,4 @@ static inline u64 nfsd4_change_attribute(struct ksta=
t *stat,
> extern void fh_fill_pre_attrs(struct svc_fh *fhp, bool atomic);
> extern void fh_fill_post_attrs(struct svc_fh *fhp);
>=20
> -static inline void
> -fh_lock_nested(struct svc_fh *fhp, unsigned int subclass)
> -{
> -	struct dentry	*dentry =3D fhp->fh_dentry;
> -	struct inode	*inode;
> -
> -	BUG_ON(!dentry);
> -
> -	if (fhp->fh_locked) {
> -		printk(KERN_WARNING "fh_lock: %pd2 already locked!\n",
> -			dentry);
> -		return;
> -	}
> -
> -	inode =3D d_inode(dentry);
> -	inode_lock_nested(inode, subclass);
> -	fh_fill_pre_attrs(fhp, true);
> -	fhp->fh_locked =3D true;
> -}
> -
> -static inline void
> -fh_lock(struct svc_fh *fhp)
> -{
> -	fh_lock_nested(fhp, I_MUTEX_NORMAL);
> -}
> -
> -/*
> - * Unlock a file handle/inode
> - */
> -static inline void
> -fh_unlock(struct svc_fh *fhp)
> -{
> -	if (fhp->fh_locked) {
> -		fh_fill_post_attrs(fhp);
> -		inode_unlock(d_inode(fhp->fh_dentry));
> -		fhp->fh_locked =3D false;
> -	}
> -}
> -
> #endif /* _LINUX_NFSD_NFSFH_H */
> diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
> index f2f4868618bb..0e07b19a0289 100644
> --- a/fs/nfsd/vfs.c
> +++ b/fs/nfsd/vfs.c
> @@ -1623,14 +1623,11 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh=
 *ffhp, char *fname, int flen,
> 		goto out;
> 	}
>=20
> -	/* cannot use fh_lock as we need deadlock protective ordering
> -	 * so do it by hand */
> 	trap =3D lock_rename_lookup_one(tdentry, fdentry, &ndentry, &odentry,
> 				      tname, tlen, fname, flen, 0, 0, &wq);
> 	host_err =3D PTR_ERR(trap);
> 	if (IS_ERR(trap))
> 		goto out_nfserr;
> -	ffhp->fh_locked =3D tfhp->fh_locked =3D true;
> 	fh_fill_pre_attrs(ffhp, (ndentry->d_flags & DCACHE_PAR_UPDATE) =3D=3D 0)=
;
> 	fh_fill_pre_attrs(tfhp, (ndentry->d_flags & DCACHE_PAR_UPDATE) =3D=3D 0)=
;
>=20
> @@ -1678,7 +1675,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *=
ffhp, char *fname, int flen,
> 	}
>  out_unlock:
> 	unlock_rename_lookup(tdentry, fdentry, ndentry, odentry);
> -	ffhp->fh_locked =3D tfhp->fh_locked =3D false;
>  out_nfserr:
> 	err =3D nfserrno(host_err);
> 	fh_drop_write(ffhp);
>=20
>=20

--
Chuck Lever