Received-SPF: pass (google.com: domain of linux-nfs+bounces-1969-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Thu, 15 Feb 2024 14:13:19 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Dai Ngo <dai.ngo@oracle.com>
Cc: jlayton@kernel.org, linux-nfs@vger.kernel.org
Subject: Re: [PATCH v2 2/2] NFSD: handle GETATTR conflict with write
 delegation
Message-ID: <Zc5iT7ib+49fVZME@tissot.1015granger.net>
References: <1708021604-28321-1-git-send-email-dai.ngo@oracle.com>
 <1708021604-28321-3-git-send-email-dai.ngo@oracle.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1708021604-28321-3-git-send-email-dai.ngo@oracle.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?a86TDfNhByNXm+ZIxMtE+AMyL1SrAkFRd1kuw5bkdqI9OVE0CfjgaJdHnYa4?=
 =?us-ascii?Q?U65XZhorfu0RQKN0DWFpOknoX1gc/aO2sue7QypP3BZPsw4197f+pjhGjTXK?=
 =?us-ascii?Q?1WaUBJR4RsYKd+mCrk4Oyp3N+ZiF3176EFtZxvGhWJrC6XhTqQTS8IO3H427?=
 =?us-ascii?Q?0i2IRogauLyi5cqZZaMUzGxJ8f5SqQjg0/CjnnXaCe/g4wX1xLd50YrcIjLY?=
 =?us-ascii?Q?lUuaREBEGISy8WITlK1+f6b43odotuvo54b8ac85Iaj3IzXxsZJXVwdldY5D?=
 =?us-ascii?Q?f9VRGWN+gu74P1QUaicepSuqrNh33hqEb0VeGNbYanEGfYYdw2qtBMpmL+A6?=
 =?us-ascii?Q?5a/SX2RrvpaihIbOkX5FglPoa6n6sltw6g3ZgcAXeVoTj+jWh+/Sxq8/MFE8?=
 =?us-ascii?Q?huy9Qlk7gWy+1pfALCckYhbI8HqWq3Y9MPSwG5DnKQAW3jgJmO1Am2G81JLW?=
 =?us-ascii?Q?yxrKCgX3OIQ9biP550n1lWljiB44BosDrnASbzV0EUIM9hbduVHEhExJYKzV?=
 =?us-ascii?Q?XQQ/zqgnQx9guPXreZmdZe+w8kUxD+4C7u9RW+PzVcW6O7bu9RWEESvd+Diq?=
 =?us-ascii?Q?CybAfR5sT5JEHUNh60/kYib9wiP24srN26fQxorAkW2ZbFz19KKrqxlYEsjR?=
 =?us-ascii?Q?QhFAIrQWh1PIwiTG5nHLSCH76xzJu2OGE1BNJYJlyoHJSgxMilsy/6Nxtu9S?=
 =?us-ascii?Q?uodjqTNHF8f3MfeQQJfkZb65Vk01fq/T134xwMld6SnRaROr6v5k4sYSdnPj?=
 =?us-ascii?Q?xD7daHnIke0YdSUXetDP3L0A69vfMvjRUWO9fTpRzz07wOzE52alCwHsJCJn?=
 =?us-ascii?Q?16zOLytdEjbxhqZCPcN7noS8YGHazR9X1WA6PG+NqWr3sKRVGWxgRDuMvxvx?=
 =?us-ascii?Q?H4bisbOErcdQSun0YciwfmOKSdnCvNcsLvLp1bNYpcomlMSGx6BmXBHgf7GN?=
 =?us-ascii?Q?0Jww6Vy+xRv2sFGrOteccLw1qgxgujRmBCdmYutlyi9q8PyGyFOXLrZ5Yqi+?=
 =?us-ascii?Q?JIEf7HfAbE7sL2Ls1c7i+8ogTVLZm7ZA5YUIx0rkR62gD3j4Knmmk48Ggx18?=
 =?us-ascii?Q?nXd8D0s5lhAkdztaZc4f33HdaEsrCHGi9maSgvMNWN0Ur7cA/8/PHiIBQ+98?=
 =?us-ascii?Q?2rcPpsL7kqcJArxIzxOGt9ajD8PQMHUxFRIk6bYh8R5+sagxF15pRaKSZtUG?=
 =?us-ascii?Q?ugyX5uZRPYDcrJyLCDhbCiMa+dEjCSYc/TFrs2Iv1t91v8AccBoldJsSqY2l?=
 =?us-ascii?Q?BFWjJF65kCQVU90IQfzvZ90ja6zwS6QmT/rwqsVVpoqEmBKAzuqmS72HddN/?=
 =?us-ascii?Q?TkzuDrwLE6HGWgsxf7I1501wJTgpo6jnMgl55EPkm3lJgOHr07yS/wLPraMz?=
 =?us-ascii?Q?GLv0ckvYhhll65Il816vAe397bx+rTGhRKTHRwUffS0MzUZlxNm4BwKf7ven?=
 =?us-ascii?Q?jn8Bp3rWIGun49WkieF306MBdwuV9SI/GF1HusuOzehpTXU5pbz0YOeVCOA8?=
 =?us-ascii?Q?H/nwbcOvdk1Un+gWbuQhMOLqlcROFD34c9NQPlhIt0UiJ1g+wD0IYSHWZnP6?=
 =?us-ascii?Q?7pR85Gxet4kFmeDfpYIQLMQ7euTilEiFjQy6GXcNMBH5Bz5PqO7jX4HqTFH1?=
 =?us-ascii?Q?FQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	qhHKEwaZjfXpJIltsW5KnIy+0TQzgK4wxP6F8BI3OziaR2/BhErpE7nWPoMQWJ1Q0YdpL4KYK7JtuWeAWUsd9jXKZ3VyGQEmZuWSb1T00cymS4E3k2g8qVjESatrSvO+SACVCcwi8bqGdGRaksDd0BilW92lS0cM/bBYCzWi3JI8AIHNMEcxXGYUCV0JgTil5evmZx3WMHe3dwGtMiM66x7ySFKqG24yF1dOCyEq7iy0Eg9VVdLhyckvMshn/AANbgZ6gGeNpJPQq+DbQ4FnU+DnLFPGMDMRlTbHv2kzhnmsNJ8qNIRZ8fPf8rtEgycdrAQMm2vEdL4qvCHJ3aGMxsyfC7nBeWLDJEGGHyqqRQnQewXTOD4YSsci6BXBQXP9NAoQ2oJBKsl0p2tIT2ILml6HuuCb2UrDcdVzX1/zgOEQZ2R4DQe6d1E2rxPfQSDuziA67L0RJVmQyJ7uWmQ98LVbWFJjbW8AbYo/HvQDgs5TUCuPK799R8ea7GK0ajik6doUPSvvZQAOBftY3bg1M0LDlIpvwNv4ggg5WyHdykbuFNhfNP/3NA+Gk1jQ2F8JifMaAc+Ar94qPuUPbz75VMGu9Qbc4oCzlcIFScDjnnk=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: af6ff791-2711-4cf5-621d-08dc2e5a2d22
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2024 19:13:22.0645
 (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: ka34/8PKlcgpC8BHNVj/VDF1pOzdZ2x6cS/bZf6g3RDGvCP4SbWUk42WQhzawzN7V6bN8LYsBjesZLz0745IkQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5614
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-15_18,2024-02-14_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 phishscore=0 mlxscore=0
 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2402150154
X-Proofpoint-GUID: RrwgGUWHO9ofCsSqIvcl0GzXouT3XAXe
X-Proofpoint-ORIG-GUID: RrwgGUWHO9ofCsSqIvcl0GzXouT3XAXe

On Thu, Feb 15, 2024 at 10:26:44AM -0800, Dai Ngo wrote:
> If the GETATTR request on a file that has write delegation in effect
> and the request attributes include the change info and size attribute
> then the request is handled as below:
> 
> Server sends CB_GETATTR to client to get the latest change info and file
> size. If these values are the same as the server's cached values then
> the GETATTR proceeds as normal.
> 
> If either the change info or file size is different from the server's
> cached values, or the file was already marked as modified, then:
> 
>     . update time_modify and time_metadata into file's metadata
>       with current time
> 
>     . encode GETATTR as normal except the file size is encoded with
>       the value returned from CB_GETATTR
> 
>     . mark the file as modified
> 
> If the CB_GETATTR fails for any reasons, the delegation is recalled
> and NFS4ERR_DELAY is returned for the GETATTR.
> 
> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>

Hey Dai -

2/2 doesn't apply cleanly to nfsd-next. Can you rebase and send me
a v3 of this series?


> ---
>  fs/nfsd/nfs4state.c | 116 ++++++++++++++++++++++++++++++++++++++++----
>  fs/nfsd/nfs4xdr.c   |  10 +++-
>  fs/nfsd/nfsd.h      |   1 +
>  fs/nfsd/state.h     |  10 +++-
>  4 files changed, 124 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 2fa54cfd4882..a1ce38f9b936 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -127,6 +127,7 @@ static void free_session(struct nfsd4_session *);
>  
>  static const struct nfsd4_callback_ops nfsd4_cb_recall_ops;
>  static const struct nfsd4_callback_ops nfsd4_cb_notify_lock_ops;
> +static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops;
>  
>  static struct workqueue_struct *laundry_wq;
>  
> @@ -1189,6 +1190,10 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp,
>  	dp->dl_recalled = false;
>  	nfsd4_init_cb(&dp->dl_recall, dp->dl_stid.sc_client,
>  		      &nfsd4_cb_recall_ops, NFSPROC4_CLNT_CB_RECALL);
> +	nfsd4_init_cb(&dp->dl_cb_fattr.ncf_getattr, dp->dl_stid.sc_client,
> +			&nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR);
> +	dp->dl_cb_fattr.ncf_file_modified = false;
> +	dp->dl_cb_fattr.ncf_cb_bmap[0] = FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE;
>  	get_nfs4_file(fp);
>  	dp->dl_stid.sc_file = fp;
>  	return dp;
> @@ -2896,11 +2901,59 @@ nfsd4_cb_recall_any_release(struct nfsd4_callback *cb)
>  	spin_unlock(&nn->client_lock);
>  }
>  
> +static int
> +nfsd4_cb_getattr_done(struct nfsd4_callback *cb, struct rpc_task *task)
> +{
> +	struct nfs4_cb_fattr *ncf =
> +			container_of(cb, struct nfs4_cb_fattr, ncf_getattr);
> +
> +	ncf->ncf_cb_status = task->tk_status;
> +	switch (task->tk_status) {
> +	case -NFS4ERR_DELAY:
> +		rpc_delay(task, 2 * HZ);
> +		return 0;
> +	default:
> +		return 1;
> +	}
> +}
> +
> +static void
> +nfsd4_cb_getattr_release(struct nfsd4_callback *cb)
> +{
> +	struct nfs4_cb_fattr *ncf =
> +			container_of(cb, struct nfs4_cb_fattr, ncf_getattr);
> +	struct nfs4_delegation *dp =
> +			container_of(ncf, struct nfs4_delegation, dl_cb_fattr);
> +
> +	nfs4_put_stid(&dp->dl_stid);
> +	clear_bit(CB_GETATTR_BUSY, &ncf->ncf_cb_flags);
> +	wake_up_bit(&ncf->ncf_cb_flags, CB_GETATTR_BUSY);
> +}
> +
>  static const struct nfsd4_callback_ops nfsd4_cb_recall_any_ops = {
>  	.done		= nfsd4_cb_recall_any_done,
>  	.release	= nfsd4_cb_recall_any_release,
>  };
>  
> +static const struct nfsd4_callback_ops nfsd4_cb_getattr_ops = {
> +	.done		= nfsd4_cb_getattr_done,
> +	.release	= nfsd4_cb_getattr_release,
> +};
> +
> +static void nfs4_cb_getattr(struct nfs4_cb_fattr *ncf)
> +{
> +	struct nfs4_delegation *dp =
> +			container_of(ncf, struct nfs4_delegation, dl_cb_fattr);
> +
> +	if (test_and_set_bit(CB_GETATTR_BUSY, &ncf->ncf_cb_flags))
> +		return;
> +	/* set to proper status when nfsd4_cb_getattr_done runs */
> +	ncf->ncf_cb_status = NFS4ERR_IO;
> +
> +	refcount_inc(&dp->dl_stid.sc_count);
> +	nfsd4_run_cb(&ncf->ncf_getattr);
> +}
> +
>  static struct nfs4_client *create_client(struct xdr_netobj name,
>  		struct svc_rqst *rqstp, nfs4_verifier *verf)
>  {
> @@ -5635,6 +5688,8 @@ nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
>  	struct svc_fh *parent = NULL;
>  	int cb_up;
>  	int status = 0;
> +	struct kstat stat;
> +	struct path path;
>  
>  	cb_up = nfsd4_cb_channel_good(oo->oo_owner.so_client);
>  	open->op_recall = false;
> @@ -5672,6 +5727,18 @@ nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp,
>  	if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE) {
>  		open->op_delegate_type = NFS4_OPEN_DELEGATE_WRITE;
>  		trace_nfsd_deleg_write(&dp->dl_stid.sc_stateid);
> +		path.mnt = currentfh->fh_export->ex_path.mnt;
> +		path.dentry = currentfh->fh_dentry;
> +		if (vfs_getattr(&path, &stat,
> +				(STATX_SIZE | STATX_CTIME | STATX_CHANGE_COOKIE),
> +				AT_STATX_SYNC_AS_STAT)) {
> +			nfs4_put_stid(&dp->dl_stid);
> +			destroy_delegation(dp);
> +			goto out_no_deleg;
> +		}
> +		dp->dl_cb_fattr.ncf_cur_fsize = stat.size;
> +		dp->dl_cb_fattr.ncf_initial_cinfo =
> +			nfsd4_change_attribute(&stat, d_inode(currentfh->fh_dentry));
>  	} else {
>  		open->op_delegate_type = NFS4_OPEN_DELEGATE_READ;
>  		trace_nfsd_deleg_read(&dp->dl_stid.sc_stateid);
> @@ -8428,6 +8495,8 @@ nfsd4_get_writestateid(struct nfsd4_compound_state *cstate,
>   * nfsd4_deleg_getattr_conflict - Recall if GETATTR causes conflict
>   * @rqstp: RPC transaction context
>   * @inode: file to be checked for a conflict
> + * @modified: return true if file was modified
> + * @size: new size of file if modified is true
>   *
>   * This function is called when there is a conflict between a write
>   * delegation and a change/size GETATTR from another client. The server
> @@ -8436,21 +8505,21 @@ nfsd4_get_writestateid(struct nfsd4_compound_state *cstate,
>   * delegation before replying to the GETATTR. See RFC 8881 section
>   * 18.7.4.
>   *
> - * The current implementation does not support CB_GETATTR yet. However
> - * this can avoid recalling the delegation could be added in follow up
> - * work.
> - *
>   * Returns 0 if there is no conflict; otherwise an nfs_stat
>   * code is returned.
>   */
>  __be32
> -nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)
> +nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode,
> +				bool *modified, u64 *size)
>  {
>  	__be32 status;
>  	struct file_lock_context *ctx;
>  	struct file_lock *fl;
>  	struct nfs4_delegation *dp;
> +	struct iattr attrs;
> +	struct nfs4_cb_fattr *ncf;
>  
> +	*modified = false;
>  	ctx = locks_inode_context(inode);
>  	if (!ctx)
>  		return 0;
> @@ -8475,12 +8544,39 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct inode *inode)
>  				return 0;
>  			}
>  break_lease:
> -			spin_unlock(&ctx->flc_lock);
>  			nfsd_stats_wdeleg_getattr_inc();
> -			status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
> -			if (status != nfserr_jukebox ||
> -					!nfsd_wait_for_delegreturn(rqstp, inode))
> -				return status;
> +
> +			dp = fl->fl_owner;
> +			ncf = &dp->dl_cb_fattr;
> +			nfs4_cb_getattr(&dp->dl_cb_fattr);
> +			spin_unlock(&ctx->flc_lock);
> +			wait_on_bit_timeout(&ncf->ncf_cb_flags, CB_GETATTR_BUSY,
> +					TASK_INTERRUPTIBLE, NFSD_CB_GETATTR_TIMEOUT);
> +			if (ncf->ncf_cb_status) {
> +				/* Recall delegation only if client didn't respond */
> +				status = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
> +				if (status != nfserr_jukebox ||
> +						!nfsd_wait_for_delegreturn(rqstp, inode))
> +					return status;
> +			}
> +			if (!ncf->ncf_file_modified &&
> +					(ncf->ncf_initial_cinfo != ncf->ncf_cb_change ||
> +					ncf->ncf_cur_fsize != ncf->ncf_cb_fsize))
> +				ncf->ncf_file_modified = true;
> +			if (ncf->ncf_file_modified) {
> +				/*
> +				 * Per section 10.4.3 of RFC 8881, the server would
> +				 * not update the file's metadata with the client's
> +				 * modified size
> +				 */
> +				attrs.ia_mtime = attrs.ia_ctime = current_time(inode);
> +				attrs.ia_valid = ATTR_MTIME | ATTR_CTIME;
> +				setattr_copy(&nop_mnt_idmap, inode, &attrs);
> +				mark_inode_dirty(inode);
> +				ncf->ncf_cur_fsize = ncf->ncf_cb_fsize;
> +				*size = ncf->ncf_cur_fsize;
> +				*modified = true;
> +			}
>  			return 0;
>  		}
>  		break;
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index c719c475a068..7f68277fbfa5 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -3507,6 +3507,8 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
>  		unsigned long	mask[2];
>  	} u;
>  	unsigned long bit;
> +	bool file_modified = false;
> +	u64 size = 0;
>  
>  	WARN_ON_ONCE(bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1);
>  	WARN_ON_ONCE(!nfsd_attrs_supported(minorversion, bmval));
> @@ -3533,7 +3535,8 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
>  	}
>  	args.size = 0;
>  	if (u.attrmask[0] & (FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE)) {
> -		status = nfsd4_deleg_getattr_conflict(rqstp, d_inode(dentry));
> +		status = nfsd4_deleg_getattr_conflict(rqstp, d_inode(dentry),
> +					&file_modified, &size);
>  		if (status)
>  			goto out;
>  	}
> @@ -3543,7 +3546,10 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr,
>  			  AT_STATX_SYNC_AS_STAT);
>  	if (err)
>  		goto out_nfserr;
> -	args.size = args.stat.size;
> +	if (file_modified)
> +		args.size = size;
> +	else
> +		args.size = args.stat.size;
>  
>  	if (!(args.stat.result_mask & STATX_BTIME))
>  		/* underlying FS does not offer btime so we can't share it */
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 304e9728b929..908eb7e47842 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -365,6 +365,7 @@ void		nfsd_lockd_shutdown(void);
>  #define	NFSD_CLIENT_MAX_TRIM_PER_RUN	128
>  #define	NFS4_CLIENTS_PER_GB		1024
>  #define NFSD_DELEGRETURN_TIMEOUT	(HZ / 34)	/* 30ms */
> +#define	NFSD_CB_GETATTR_TIMEOUT		NFSD_DELEGRETURN_TIMEOUT
>  
>  /*
>   * The following attributes are currently not supported by the NFSv4 server:
> diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
> index 0bbbe57e027d..f894ba6c9a69 100644
> --- a/fs/nfsd/state.h
> +++ b/fs/nfsd/state.h
> @@ -125,8 +125,16 @@ struct nfs4_cb_fattr {
>  	/* from CB_GETATTR reply */
>  	u64 ncf_cb_change;
>  	u64 ncf_cb_fsize;
> +
> +	unsigned long ncf_cb_flags;
> +	bool ncf_file_modified;
> +	u64 ncf_initial_cinfo;
> +	u64 ncf_cur_fsize;
>  };
>  
> +/* bits for ncf_cb_flags */
> +#define	CB_GETATTR_BUSY		0
> +
>  /*
>   * Represents a delegation stateid. The nfs4_client holds references to these
>   * and they are put when it is being destroyed or when the delegation is
> @@ -746,5 +754,5 @@ static inline bool try_to_expire_client(struct nfs4_client *clp)
>  }
>  
>  extern __be32 nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp,
> -				struct inode *inode);
> +		struct inode *inode, bool *file_modified, u64 *size);
>  #endif   /* NFSD4_STATE_H */
> -- 
> 2.39.3
> 

-- 
Chuck Lever