From nobody Wed Oct 14 01:14:46 2026 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 4j4Csz0MVmz6wFfc for ; Wed, 14 Oct 2026 01:14:47 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j4Csy6nYZz4xpc for ; Wed, 14 Oct 2026 01:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791940487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J37+lNfhid7aXQzz5GxbCWS17KLY+CU2ECNe/XkNFiQ=; b=lZjsflE01fBReJlPn4unC9LirojzwDqsvX8DBDTlgRehKRP1U7p48lnZ84X4YQ+p+yItLp ycp3t/IWDVjcTUF8VlPvQV0eO0xEQR+t+XWep5PBZ3c9KqWpm6wqTL1lLFjs00Mot8tt9P Pnn1Z/UpsTXZcIRDsenL7lHAcUzvG6JoDvyhxbAfiOYF/bO1TiQIvoBl3HYYAUSShmGioe YFNDFjdaluGkvM1HsiwSv1SzEXhHFopJi4JqboqfNfug492Ak0oTHRrCk1bOMeyhGe8L1E lGN0dCByVrbDUavzlcb2wDuKh8kqayCH+3HQoQ1TTx/5ppOrObVQonAbo9mS5A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791940487; b=OJrhWdxo950ApNQwS4Bo8trfMeJhMD5O3CoBQ/NgabJYyaPVMKkfq2JGJz6ekDH4ekrtM6 392AL2u1a8vem8O3M9m+xUww3HDRjwlu82WmPhDAvHtKqvvaIFK11ArSTPYPu5ayNjpkJ1 mA959MqJ2bBM+VCrhXTsE3R+QFgCW/+0O4heI6nxbfkNjP6CfPUzAuSlEN4rabDj+HXuca AOMEPK2JzIknPCEp+J/B/9r8fOblOOetuq/io1cLaQOsVPyjMuKj7G7zkBO57DmeCaa+Mb ZgO3+gFUQatyypzni04/xzZ9aPBnuvLb3gsYwC5j+QGw1riLY06tFiyYdXRwGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791940487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J37+lNfhid7aXQzz5GxbCWS17KLY+CU2ECNe/XkNFiQ=; b=wueIiqTJoZXgj/A34elOd1YZ6j1AoNHbVCHUPanTtnG+7c9U9LsIBHZ2dBKZtqj8Om1nvb RujsJ6zFq2AMQYAztkYMj3kfnPg74NGRvtjKnV0Pk//uDu7FYvjLGgbM4ghnRGOQTpj/vm kAa2vPn4gHJAQGat8X10E+5WX5HCOgMSoxF6+W3J6L/RHw1Rvd8sMHv0bUKZmQT/oSTAdQ HpiDmWWLupoSXDJF+XCgmkTg2PcOJIXqNOXmpzd5ptClMymxZrMB3LyUoXx7l8Bwz8uLeO HK/mW65JUv3TarH6EnlYKrcHpkO7SZhUof3KcAOWVMj7ApvcAmXd51WxSsqqPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j4Csy5rqWzh8y for ; Wed, 14 Oct 2026 01:14:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3daf9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Oct 2026 01:14:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: J. David From: Rick Macklem Subject: git: cfd0d2cd2ce1 - stable/15 - nfscl: Fix oddball cases for session slot release List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: cfd0d2cd2ce1ab4384863a5c80c4ded33f743c3d Auto-Submitted: auto-generated Date: Wed, 14 Oct 2026 01:14:46 +0000 Message-Id: <6aced786.3daf9.2c0ba8df@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cfd0d2cd2ce1ab4384863a5c80c4ded33f743c3d commit cfd0d2cd2ce1ab4384863a5c80c4ded33f743c3d Author: J. David AuthorDate: 2026-10-07 01:52:19 +0000 Commit: Rick Macklem CommitDate: 2026-10-14 01:11:51 +0000 nfscl: Fix oddball cases for session slot release We have identified some cases where silent slot loss can occur when operations on NFS mounts are aborted. We experience this when using NFSv4.2, but it likely also occurs with NFSv4.1. A slot is acquired for compound operations by nfsv4_setsequence() and freed by newnfs_request(). Any call path that abandons the compound before reaching newnfs_request() loses the slot permanently. We identified four call sites where this happens, one of which where it actually does happen for us in a semi-reproducible way, which allowed us to develop a candidate patch, attached. The patch adds one function, nfsv4_freeunsentslot(), to nfs_clcomsubs.c. It is called from each of the four call sites: nfsrpc_writerpc(), nfsrpc_writeds(), and two in nfsrpc_setextattr(). nfsv4_freeunsentslot() calls nfsv4_freeslot() with resetseq set to true because the aborted RPC will never be sent and therefore the slot sequence ID should not advance. With this patch and other diagnostics, we have confirmed that slot loss does not occur under the conditions that otherwise cause it in our environment. PR: 298416 (cherry picked from commit 77a7a48a1cb003831ff1d4342b1974fc7f79381e) --- sys/fs/nfs/nfs_var.h | 2 ++ sys/fs/nfsclient/nfs_clcomsubs.c | 18 ++++++++++++++++++ sys/fs/nfsclient/nfs_clrpcops.c | 4 ++++ 3 files changed, 24 insertions(+) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 3572cd386707..1bf2c9a91f87 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -383,6 +383,8 @@ int nfscl_wcc_data(struct nfsrv_descript *, vnode_t, int nfsm_loadattr(struct nfsrv_descript *, struct nfsvattr *); int nfscl_request(struct nfsrv_descript *, vnode_t, NFSPROC_T *, struct ucred *); +void nfsv4_freeunsentslot(struct nfsmount *, struct nfsclsession *, + struct nfsrv_descript *); /* nfs_nfsdsubs.c */ void nfsd_fhtovp(struct nfsrv_descript *, struct nfsrvfh *, int, diff --git a/sys/fs/nfsclient/nfs_clcomsubs.c b/sys/fs/nfsclient/nfs_clcomsubs.c index 2b48e257381e..fa814ea0b84d 100644 --- a/sys/fs/nfsclient/nfs_clcomsubs.c +++ b/sys/fs/nfsclient/nfs_clcomsubs.c @@ -445,3 +445,21 @@ nfscl_lockderef(struct nfsv4lock *lckp) } NFSUNLOCKCLSTATE(); } + +/* + * Free the session slot of a compound that was built but will not be sent + * to the server. + */ +void +nfsv4_freeunsentslot(struct nfsmount *nmp, struct nfsclsession *sep, + struct nfsrv_descript *nd) +{ + + if (nmp == NULL || (nd->nd_flag & (ND_NFSV41 | ND_HASSLOTID)) != + (ND_NFSV41 | ND_HASSLOTID)) + return; + if (sep == NULL) + sep = nfsmnt_mdssession(nmp); + if (sep != NULL) + nfsv4_freeslot(sep, nd->nd_slotid, true); +} diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index dc42170e0577..7afc8ce309c5 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2067,6 +2067,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, } error = nfsm_uiombuf(nd, uiop, len); if (error != 0) { + nfsv4_freeunsentslot(nmp, NULL, nd); m_freem(nd->nd_mreq); free(nd, M_TEMP); return (error); @@ -7215,6 +7216,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit, *tl = txdr_unsigned(len); error = nfsm_uiombuf(nd, uiop, len); if (error != 0) { + nfsv4_freeunsentslot(nmp, &dsp->nfsclds_sess, nd); m_freem(nd->nd_mreq); return (error); } @@ -9556,6 +9558,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct uio *uiop, NFSCL_REQSTART(nd, NFSPROC_SETEXTATTR, vp, cred); if (uiop->uio_resid > nd->nd_maxreq) { /* nd_maxreq is set by NFSCL_REQSTART(). */ + nfsv4_freeunsentslot(VFSTONFS(vp->v_mount), NULL, nd); m_freem(nd->nd_mreq); return (EINVAL); } @@ -9566,6 +9569,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct uio *uiop, *tl = txdr_unsigned(uiop->uio_resid); error = nfsm_uiombuf(nd, uiop, uiop->uio_resid); if (error != 0) { + nfsv4_freeunsentslot(VFSTONFS(vp->v_mount), NULL, nd); m_freem(nd->nd_mreq); return (error); }