From nobody Sat Jul 11 01:02:16 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 4gxr5P2kdcz6kbL1 for ; Sat, 11 Jul 2026 01:02:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gxr5N6h11z3Djb for ; Sat, 11 Jul 2026 01:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783731737; 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=HN6elW7BwMINptoorHhV2v9tJl2x6LXqBZZNPOmTldc=; b=OjZEppD3fOvBM53F9XKgrtUEiEm2K79tQMUrskaramkDCZJBmkjrM5orlQbQxnhgXozBkS btPVfBmCATyB6oalIENJDg+VT/NyzfdGOpQd3ZUbYnMqoMKCEcbIeEZRYm+F5F1XVvu5tS q12qxgoF+bbEldJn96UqM4uPnZAsNEUi6TYHZl4XQbdGdg99cSVkdyParBDJ97o0U5t6VE LKGd14y6Yp7/0/OlFu+oyLuBatUzoeKhE67zFy8TmnirvnzqSX/i/6oxpcFVKtZXx1SkNy m6tDdVC0qpdR0hKkIeERpCRb1Df3Ikg0UYN9SmQKCFgBsSwclLD+Lr+4OrggxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783731737; a=rsa-sha256; cv=none; b=w3M58hlzLUdhn+fXkinxtaKhlCo4w1XqXFF8WrWeWrHfTQ6HwnAwHCHNmswuyd9y2NuKY/ p+tzXHGAw8vu62W2naS8X+tho6BkVLEATjUmjGtPHgnkoWR7duxoA3yl6r6teryeDjBPjM 1eHnyjfVj035+LVPDkMWe4cuP6cjoOhOhiubzZvEhOXECqHyHsMD85wUK7wEL17qdGf9yl 4ThoktpG4NkKOUDkEc+g9ceVOX3yZFU9pPgXigukRCy7tGa+xFE0Qu2l1zG+fanu7hGsNO E5nR/56BWaJkN+RBsf7tmcFJ/jzHYNH/sVHpV64q/BnEzV67LDOuSXoMtv7/xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783731737; 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=HN6elW7BwMINptoorHhV2v9tJl2x6LXqBZZNPOmTldc=; b=aLEWOVSvIZu5mUx2wHRL+CU2JqklTCAkq9QuH+ut6AEKeGkEO0gPTrLqA9S3kSgoAm399F YITgvT2SdQjWgdtx4jPeRmzw/jIKERekcJQW8yRIycX6qRhUObLVMddwyuaV24JL5lDk2p XCBbfAb+eBvaH8ev9DnTMXaohM70PEjRWhEG2Cq/4FG6cCg0QFZLWBw9PMFfBbX+8kYHTg NctfuK86/L6m+SmpnpAynPjLQ0QdfNr3MAFKg1fR29wMhpe51VV7npH5261GBGrXoP592a ne3zIAUpLM6dxEPadisV4C1TcHq2BY9ahjufQnztgTb9/a+t9xgaHcN37lbD0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxr5N5QXjz4Gn for ; Sat, 11 Jul 2026 01:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20dc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Jul 2026 01:02:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: d2b2fac918a4 - stable/15 - nfs_clstate.c: Fix CB_RECALL handling for NFSv4.1/4.2 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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: d2b2fac918a447ea04a3321c10ffe1f0efe19261 Auto-Submitted: auto-generated Date: Sat, 11 Jul 2026 01:02:16 +0000 Message-Id: <6a519618.20dc6.102d812@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=d2b2fac918a447ea04a3321c10ffe1f0efe19261 commit d2b2fac918a447ea04a3321c10ffe1f0efe19261 Author: Rick Macklem AuthorDate: 2026-06-27 23:35:20 +0000 Commit: Rick Macklem CommitDate: 2026-07-11 01:00:18 +0000 nfs_clstate.c: Fix CB_RECALL handling for NFSv4.1/4.2 Recent testing with a modified NFSv4.1/4.2 client that sometimes ignored CB_RECALL callbacks, identified a few problems when handling the unusual case of CB_RECALL not be performed by the client. - The csa_cachethis argument to CB_SEQUENCE was being ignored. - The CB_SEQUENCE operation would reply NFSERR_DELAY after the first CB_RECALL attempt, making retries ineffective. - The code could return NFSERR_RESOURCE, which is a NFSv4.0 specific error code. This patch fixes the above three problems. The patch only affects the NFSv4.1/4.2 client when delegations are being issued and the client somehow fails to handle a CB_RECALL callback of a delegation, which is an unusual case. (cherry picked from commit 9e1bbfb88e986b209709ea765189a3ebb6581bcd) --- sys/fs/nfsclient/nfs_clstate.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index a511c31d5202..93e543197265 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3585,7 +3585,7 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) mount_t mp; nfsattrbit_t attrbits, rattrbits; nfsv4stateid_t stateid; - uint32_t seqid, slotid = 0, highslot, cachethis __unused; + uint32_t seqid, slotid = 0, highslot, cachethis; uint8_t sessionid[NFSX_V4SESSIONID]; struct mbuf *rep; struct nfscllayout *lyp; @@ -3596,6 +3596,7 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) struct nfsclsession *tsep; gotseq_ok = 0; + cachethis = 0; nfsrvd_rephead(nd); NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED); taglen = fxdr_unsigned(int, *tl); @@ -3922,6 +3923,9 @@ nfscl_docb(struct nfsrv_descript *nd, NFSPROC_T *p) error = nfsv4_seqsession(seqid, slotid, highslot, tsep->nfsess_cbslots, &rep, tsep->nfsess_backslots); + /* For callbacks, do not reply NFSERR_DELAY. */ + if (error == NFSERR_DELAY) + error = 0; } NFSUNLOCKCLSTATE(); if (error == 0 || error == NFSERR_REPLYFROMCACHE) { @@ -4065,8 +4069,9 @@ nfsmout: } *nd->nd_errp = nfscl_errmap(nd, minorvers); out: - if (gotseq_ok != 0) { + if (gotseq_ok != 0 && cachethis != 0) { rep = m_copym(nd->nd_mreq, 0, M_COPYALL, M_WAITOK); + NFSCL_DEBUG(4, "Got reply for cbcache=%p\n", rep); NFSLOCKCLSTATE(); clp = nfscl_getclntsess(sessionid); if (clp != NULL) { @@ -5283,6 +5288,8 @@ nfscl_errmap(struct nfsrv_descript *nd, u_int32_t minorvers) while (*++errp) if (*errp == (short)nd->nd_repstat) return (txdr_unsigned(nd->nd_repstat)); + if (minorvers > NFSV4_MINORVERSION && *defaulterrp == NFSERR_RESOURCE) + return (txdr_unsigned(NFSERR_SERVERFAULT)); return (txdr_unsigned(*defaulterrp)); }