From nobody Sat Jul 11 01:06:53 2026 X-Original-To: dev-commits-src-branches@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 4gxrBj2LQcz6kbTb for ; Sat, 11 Jul 2026 01:06:53 +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 4gxrBj1jhcz3FYd for ; Sat, 11 Jul 2026 01:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783732013; 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=UACY0Hf4YM7XmQQblTwJA/QZiwHou6eP3ZsCyeVuS7o=; b=Zt+nUGAwTlFV16AAaniV/lmB/WYcqjtLUw8N93QtTx0ui14GPr4bcIbLIzWjx4rV51S6Wd 4GFq8Ul2S94N3rKZEyIVWYzazkKzeGNXAJwnUCsR46O8ZmwzR91PIVH23i1F93VN4FOWa9 f5K9N2NDRdbwuakkg5JeeNRHafCHTvqocnEAvUiznsZUeFmNzBSOK3XLd30fKGZxtxk0OD OIOy325OiQIpBwWTW0b/boxGhK/D8u82sQ5rdiMSGj3l5CXpwdvsYo4k6PgPlml9+t9RXJ H/bLNaf828fUzbx1fmlrSLBumJpqQjtGswLr6sHMjU4zO41jOWlPJZHBvf3zzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783732013; a=rsa-sha256; cv=none; b=lJJDNUc1XpBvhPRooiOa3cJeilyZAZIgQl1ldHS9rO34M1W0BaSfyNS/kLFaWIw7S40d7W 98QK8EcTurDpAqAYK7A4mkAmLgE/NwrHPLGI1DtKWBSleo1CUtXrEKGBw7X78U2p41DCNV IQaLa0kfx4VH5/vYOZqX3xDPpFQKra/gZgYi09D332Q8reDSomalYtBTdzlmm3c5cQ7sxo FyBa9LAqs3KB1hHYIZcySMRXAPDFP9rNuwGYPb3U9I5C7qFMtAAbOrSqo8aB5L3I8e2AOF 1txjvK8CQNrXwVWAKJ6qiXOVsg8Zilrbv+wSNLRtPp8VNl08/VLETXpg7uSCeA== 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=1783732013; 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=UACY0Hf4YM7XmQQblTwJA/QZiwHou6eP3ZsCyeVuS7o=; b=gg6i7gvTVGlz/JWZ0qxcH2gdDH6PNqItuum8eMU/ZzuLSviwV5PNwsVH1zZeyiGcb2IEuo 6lbAGcIKd9sRSNTvt6Q4FpC4YFkeG+PTh0hpCDZW5e+Jxk4BEuRukezqjJUZAqoJeGIRG5 7KxsOqxiUaKBeW/07/jhSuKzkrPkEJuMXLhKMZki8aGGYIF77zU8NmzErg96yRwY4SE9j3 CH/axV0oqz3/iVqkpyDBvAKhF8rGd0Z4UBV4nibmsqdaqtjZFfAWVd6kDN3gwp4jXQGjXa atZZioD3CqasrBTJp8tODLKGGDrRV65ASTBnl3u0shDeeyXjjondwbMQbNvCDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gxrBj0TkPz4H1 for ; Sat, 11 Jul 2026 01:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20e31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Jul 2026 01:06:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: f28c41843a65 - stable/14 - nfs_clstate.c: Fix CB_RECALL handling for NFSv4.1/4.2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: f28c41843a65c8b70024bd650b8eb2c658e7d116 Auto-Submitted: auto-generated Date: Sat, 11 Jul 2026 01:06:53 +0000 Message-Id: <6a51972d.20e31.411fe205@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=f28c41843a65c8b70024bd650b8eb2c658e7d116 commit f28c41843a65c8b70024bd650b8eb2c658e7d116 Author: Rick Macklem AuthorDate: 2026-06-27 23:35:20 +0000 Commit: Rick Macklem CommitDate: 2026-07-11 01:05:29 +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 7d0d5e2120bb..624b782baf6e 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -3573,7 +3573,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; @@ -3584,6 +3584,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); @@ -3917,6 +3918,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) { @@ -4060,8 +4064,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) { @@ -5278,6 +5283,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)); }