From owner-svn-src-projects@freebsd.org Mon Aug 5 02:52:58 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 108FDB8274 for ; Mon, 5 Aug 2019 02:52:58 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4622Pj6fsgz48Kv; Mon, 5 Aug 2019 02:52:57 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DFC4AD50F; Mon, 5 Aug 2019 02:52:57 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x752qvWP062901; Mon, 5 Aug 2019 02:52:57 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x752qvp1062899; Mon, 5 Aug 2019 02:52:57 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <201908050252.x752qvp1062899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 5 Aug 2019 02:52:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r350580 - projects/nfsv42/sys/fs/nfsclient X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfsv42/sys/fs/nfsclient X-SVN-Commit-Revision: 350580 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2019 02:52:58 -0000 Author: rmacklem Date: Mon Aug 5 02:52:57 2019 New Revision: 350580 URL: https://svnweb.freebsd.org/changeset/base/350580 Log: Fix the NFSv4.2 client Copy operation's handling of a stale write verifier. Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clrpcops.c projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv42/sys/fs/nfsclient/nfs_clrpcops.c Mon Aug 5 02:44:04 2019 (r350579) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clrpcops.c Mon Aug 5 02:52:57 2019 (r350580) @@ -8108,6 +8108,9 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outv if (!NFSHASWRITEVERF(nmp)) { NFSBCOPY(tl, nmp->nm_verf, NFSX_VERF); NFSSETWRITEVERF(nmp); + } else if (NFSBCMP(tl, nmp->nm_verf, NFSX_VERF)) { + NFSBCOPY(tl, nmp->nm_verf, NFSX_VERF); + nd->nd_repstat = NFSERR_STALEWRITEVERF; } NFSUNLOCKMNT(nmp); tl += (NFSX_VERF / NFSX_UNSIGNED); Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c ============================================================================== --- projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Mon Aug 5 02:44:04 2019 (r350579) +++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c Mon Aug 5 02:52:57 2019 (r350580) @@ -3574,6 +3574,7 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a io.uio_offset = *ap->a_outoffp; io.uio_resid = *ap->a_lenp; error = vn_rlimit_fsize(outvp, &io, ap->a_fsizetd); + /* Do the actual NFSv4.2 RPC. */ len = *ap->a_lenp; mtx_lock(&nmp->nm_mtx); @@ -3585,9 +3586,9 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a inoff = *ap->a_inoffp; outoff = *ap->a_outoffp; tryoutcred = true; + must_commit = false; while (len > 0 && error == 0) { inattrflag = outattrflag = 0; - must_commit = false; len2 = len; if (tryoutcred) error = nfsrpc_copy_file_range(invp, ap->a_inoffp, @@ -3622,6 +3623,9 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a error = NFSERR_OFFLOADNOREQS; } len -= len2; + if (len == 0 && must_commit && error == 0) + error = ncl_commit(outvp, outoff, *ap->a_lenp, + ap->a_outcred, curthread); } else if (error == NFSERR_OFFLOADNOREQS && consecutive) { /* * Try consecutive == false, which is ok only if all @@ -3634,10 +3638,17 @@ nfs_copy_file_range(struct vop_copy_file_range_args *a tryoutcred = false; error = 0; } + if (error == NFSERR_STALEWRITEVERF) { + /* + * Server rebooted, so do it all again. + */ + *ap->a_inoffp = inoff; + *ap->a_outoffp = outoff; + len = *ap->a_lenp; + must_commit = false; + error = 0; + } } - if (must_commit && error == 0) - error = ncl_commit(outvp, outoff, *ap->a_lenp, ap->a_outcred, - curthread); VOP_UNLOCK(invp, 0); VOP_UNLOCK(outvp, 0); if (mp != NULL)