From nobody Fri Apr 8 21:00:38 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A6ABE1A91565; Fri, 8 Apr 2022 21:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KZrHp4H0Sz4mh6; Fri, 8 Apr 2022 21:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649451638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS6zIPP2NJ7g8Z49+5sBT6yJxl+Mb5gWcheNOPzEhww=; b=W+A1sc/hYNZ4Q7pCSxogvaRvbn+/Qn+30rTsbWe9BLSNr07xbbw/+DSHTRc/OT+wB319ev sTAQS213GfjCb2wuxfmEcSTMhd6s8qWto/c1tbQVxXgozBlM/FtQWqsl1ztcZkdF2Y79Sv NISJ3ImywdLsmNWOlM7ASIuneUtnLCFI5Zu4kwC4aF+AXhFPsGZG1ZO5FE0xr8F3BkqhC9 7qgu4pCuIbtWnrbq3I1KAbqLVqRbdpJepd2mWAEQkxtHBi8xPkHok18ytKxXLHohifEqgj 1sgoWZ62iu4BqCLlOIkNhdAIze06H41PyJJEmHWIQWW5tLarJRfa5u9k74WsQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 728AF4596; Fri, 8 Apr 2022 21:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 238L0cLT083961; Fri, 8 Apr 2022 21:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 238L0cC0083960; Fri, 8 Apr 2022 21:00:38 GMT (envelope-from git) Date: Fri, 8 Apr 2022 21:00:38 GMT Message-Id: <202204082100.238L0cC0083960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 21de450aa1a7 - main - nfscl: Add support for a NFSv4 AppendWrite RPC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21de450aa1a7ca226908e7421b93ca979ff42db7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649451638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS6zIPP2NJ7g8Z49+5sBT6yJxl+Mb5gWcheNOPzEhww=; b=Zf178Aw0FRG0bsaoxKwSqgUtAAEl8bVQIha43vlvZ8Y3K8kLa1mRZexV5SwHWsa/FQcKQV 4x3p/quWbmvkZFUT7e0JJkPET8F+imP6gUyL9+Gu7mtoucDAH4FDlGTVgrvDZxz1fKH+CD z13+D04fmM0LUVfSuwgKNMWBIdUZb6H8eygWrdO1QCTNv4WTalLF8mx/TsN3OhZ7N8DLnP CDFhxtLymE7sMiZY/1vsU2heKURlfOTlNcHXUgM7RW+0pEPhbGOXxHvWLy4CkQX5tIu7Yg +29LcFyYNGvyVwHzI6MHlQ8A8/s/1tKJw2qHmASHnUSwS9WVXDdeww8N98nxvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649451638; a=rsa-sha256; cv=none; b=KTunNDEsw4iMgoH20zvG8jzaYsB9ydJZB6wJzcgfzmGMsvpg5wVvkA581gvl/sgMqApzRu Rr8jYcQBHEsWDN8QeKar5EdCL/n4Hk7GNEzs2FNieFDye6MfiLAVj2wpFwwdBOUc2XYg/J LcOh7B7l+waKdLZtA2ep8ZleMmKkWdm/ZLGFbk14u00ORbJu2BLFig6rw9VdlCNPXIG7g+ zqpJGQKDwkOtcRMfvWA1QMNaObteQ66ikDTdJo8qNXfV1EAblVYzOz7HcK4raaEjCS4Da/ qyh0006R1xkBP3R2t4/8apmtGe+ZQXlS2zPDC1dbHPy01ualXn3Uu+LurlZtsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=21de450aa1a7ca226908e7421b93ca979ff42db7 commit 21de450aa1a7ca226908e7421b93ca979ff42db7 Author: Rick Macklem AuthorDate: 2022-04-08 20:59:05 +0000 Commit: Rick Macklem CommitDate: 2022-04-08 20:59:05 +0000 nfscl: Add support for a NFSv4 AppendWrite RPC For IO_APPEND VOP_WRITE()s, the code first does a Getattr RPC to acquire the file's size, before it can do the Write RPC. Although NFS does not have an append write operation, an NFSv4 compound can use a Verify operation to check that the client's notion of the file's size is correct, followed by the Write operation. This patch modifies nfscl_wcc_data() to optionally acquire the file's size, for use with an AppendWrite. Although the "stuff" arguments are always NULL (these were used for the Mac OSX port and should be cleared out someday), make the argument to nfscl_wcc_data() explicitly NULL for clarity. This patch does not cause any semantics change until the AppendWrite is added in a future commit. --- sys/fs/nfs/nfs_commonsubs.c | 4 ++++ sys/fs/nfs/nfs_var.h | 2 +- sys/fs/nfsclient/nfs_clport.c | 6 ++++-- sys/fs/nfsclient/nfs_clrpcops.c | 35 +++++++++++++++++------------------ 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index d3c329a3abc7..0a601553fa40 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -441,6 +441,10 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, NFSGETATTR_ATTRBIT(&attrbits); else { NFSWCCATTR_ATTRBIT(&attrbits); + /* For AppendWrite, get the size. */ + if (procnum == NFSPROC_APPENDWRITE) + NFSSETBIT_ATTRBIT(&attrbits, + NFSATTRBIT_SIZE); nd->nd_flag |= ND_V4WCCATTR; } (void) nfsrv_putattrbit(nd, &attrbits); diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index c0ddb8441a7c..0af1daa429cf 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -376,7 +376,7 @@ int nfscl_mtofh(struct nfsrv_descript *, struct nfsfh **, int nfscl_postop_attr(struct nfsrv_descript *, struct nfsvattr *, int *, void *); int nfscl_wcc_data(struct nfsrv_descript *, vnode_t, - struct nfsvattr *, int *, int *, void *); + struct nfsvattr *, int *, int *, uint64_t *); int nfsm_loadattr(struct nfsrv_descript *, struct nfsvattr *); int nfscl_request(struct nfsrv_descript *, vnode_t, NFSPROC_T *, struct ucred *, void *); diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 5c79e3ac6960..e9deb7bb7f88 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -781,7 +781,7 @@ nfscl_start_renewthread(struct nfsclclient *clp) */ int nfscl_wcc_data(struct nfsrv_descript *nd, struct vnode *vp, - struct nfsvattr *nap, int *flagp, int *wccflagp, void *stuff) + struct nfsvattr *nap, int *flagp, int *wccflagp, uint64_t *repsizep) { u_int32_t *tl; struct nfsnode *np = VTONFS(vp); @@ -804,7 +804,7 @@ nfscl_wcc_data(struct nfsrv_descript *nd, struct vnode *vp, NFSUNLOCKNODE(np); } } - error = nfscl_postop_attr(nd, nap, flagp, stuff); + error = nfscl_postop_attr(nd, nap, flagp, NULL); if (wccflagp != NULL && *flagp == 0) *wccflagp = 0; } else if ((nd->nd_flag & (ND_NOMOREDATA | ND_NFSV4 | ND_V4WCCATTR)) @@ -820,6 +820,8 @@ nfscl_wcc_data(struct nfsrv_descript *nd, struct vnode *vp, NFSM_DISSECT(tl, u_int32_t *, 2 * NFSX_UNSIGNED); if (*++tl) nd->nd_flag |= ND_NOMOREDATA; + if (repsizep != NULL) + *repsizep = nfsva.na_size; if (wccflagp != NULL && nfsva.na_vattr.va_mtime.tv_sec != 0) { NFSLOCKNODE(np); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index cc4899af1c90..3029875df986 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -1378,7 +1378,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap, if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) - error = nfscl_wcc_data(nd, vp, rnap, attrflagp, NULL, stuff); + error = nfscl_wcc_data(nd, vp, rnap, attrflagp, NULL, NULL); if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4 && !error) error = nfsrv_getattrbits(nd, &attrbits, NULL, NULL); if (!(nd->nd_flag & ND_NFSV3) && !nd->nd_repstat && !error) @@ -2035,7 +2035,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, } if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) { error = nfscl_wcc_data(nd, vp, nap, attrflagp, - &wccflag, stuff); + &wccflag, NULL); if (error) goto nfsmout; } @@ -2199,7 +2199,7 @@ nfsrpc_deallocaterpc(vnode_t vp, off_t offs, off_t len, if (error != 0) return (error); wccflag = 0; - error = nfscl_wcc_data(nd, vp, nap, attrflagp, &wccflag, stuff); + error = nfscl_wcc_data(nd, vp, nap, attrflagp, &wccflag, NULL); if (error != 0) goto nfsmout; if (nd->nd_repstat == 0) { @@ -2276,7 +2276,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (error) return (error); if (nd->nd_flag & ND_NFSV4) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (!nd->nd_repstat) { if (nd->nd_flag & ND_NFSV4) { NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED); @@ -2289,7 +2289,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap, goto nfsmout; } if (nd->nd_flag & ND_NFSV3) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (!error && nd->nd_repstat) error = nd->nd_repstat; nfsmout: @@ -2413,7 +2413,7 @@ nfsrpc_createv23(vnode_t dvp, char *name, int namelen, struct vattr *vap, goto nfsmout; } if (nd->nd_flag & ND_NFSV3) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (nd->nd_repstat != 0 && error == 0) error = nd->nd_repstat; nfsmout: @@ -2736,7 +2736,7 @@ tryagain: nd->nd_flag |= ND_NOMOREDATA; } } - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); } if (nd->nd_repstat && !error) error = nd->nd_repstat; @@ -2883,8 +2883,7 @@ tryagain: if (*(tl + 1)) nd->nd_flag |= ND_NOMOREDATA; } - error = nfscl_wcc_data(nd, fdvp, fnap, fattrflagp, NULL, - fstuff); + error = nfscl_wcc_data(nd, fdvp, fnap, fattrflagp, NULL, NULL); /* and the second wcc attribute reply. */ if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4 && !error) { @@ -2894,7 +2893,7 @@ tryagain: } if (!error) error = nfscl_wcc_data(nd, tdvp, tnap, tattrflagp, - NULL, tstuff); + NULL, NULL); } if (nd->nd_repstat && !error) error = nd->nd_repstat; @@ -2944,7 +2943,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, error = nfscl_postop_attr(nd, nap, attrflagp, dstuff); if (!error) error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, - NULL, dstuff); + NULL, NULL); } else if ((nd->nd_flag & (ND_NFSV4 | ND_NOMOREDATA)) == ND_NFSV4) { /* * First, parse out the PutFH and Getattr result. @@ -2957,7 +2956,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, /* * Get the pre-op attributes. */ - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); } if (nd->nd_repstat && !error) error = nd->nd_repstat; @@ -3004,13 +3003,13 @@ nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target, if (error) return (error); if (nd->nd_flag & ND_NFSV4) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if ((nd->nd_flag & ND_NFSV3) && !error) { if (!nd->nd_repstat) error = nfscl_mtofh(nd, nfhpp, nnap, attrflagp); if (!error) error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, - NULL, dstuff); + NULL, NULL); } if (nd->nd_repstat && !error) error = nd->nd_repstat; @@ -3074,7 +3073,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, if (error) return (error); if (nd->nd_flag & ND_NFSV4) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (!nd->nd_repstat && !error) { if (nd->nd_flag & ND_NFSV4) { NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED); @@ -3092,7 +3091,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, } } if ((nd->nd_flag & ND_NFSV3) && !error) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (nd->nd_repstat && !error) error = nd->nd_repstat; nfsmout: @@ -3128,7 +3127,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred, if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) - error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, dstuff); + error = nfscl_wcc_data(nd, dvp, dnap, dattrflagp, NULL, NULL); if (nd->nd_repstat && !error) error = nd->nd_repstat; m_freem(nd->nd_mrep); @@ -4178,7 +4177,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred, error = nfscl_request(nd, vp, p, cred, stuff); if (error) return (error); - error = nfscl_wcc_data(nd, vp, nap, attrflagp, NULL, stuff); + error = nfscl_wcc_data(nd, vp, nap, attrflagp, NULL, NULL); if (!error && !nd->nd_repstat) { NFSM_DISSECT(tl, u_int32_t *, NFSX_VERF); NFSLOCKMNT(nmp);