From nobody Mon Aug 3 01:10:43 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 4hCzBd0pdkz6mn0v for ; Mon, 03 Aug 2026 01:10:49 +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 4hCzBc5pbTz3HCk for ; Mon, 03 Aug 2026 01:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785719448; 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=p8ZPvyAfqDPTEjgklq0wEqyoLYB5ImajiYz7+Rjj2U0=; b=uz4pyZPm0elz/ELJTI4KWi65Z4Ft84SvBfq/KRhTbI9kjXysvcpbQI6P33Oudx7zRR+6lh CkuLCTasn4WX39kPGTOhJSfezOvel0ruyOjt+HNq4t08FRKvS9TXofFbes87X/cXomcupl Gs9XXvA3nTV7/jmTYxfdIITZHSxoTsl8Y7feBPACXUKNAJUJjIcD2N1ry/OJyGszObycnW qaRyKNloWG2Mk2ktdPs+Q0z17a70TF/hvlUd119FpSCadXY+vZ3Hy1b9+wJiS6JiBbxe8W E7nw4e2642bbq8l9J1j9AL/y1A5ahwKKKuGWj9AVI/eDLVEcn8NOlRlChwFjzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785719448; a=rsa-sha256; cv=none; b=MCJRBzvN2rfyTCp0zS4325CagdmTR6S9rUC2Zo4vDBuMttH4t78E6veG4mIntnTi9OfmVn ElSmGdbMPvkybK1uNtrJzErMZX1gQ88nnJ1R4u8g+gXHHNHhvtBmQqfkUHGkYjNAqYp/cd atPQ8trf80uAPfX0qQm+kqu98Mx6IT7cSBheo9Gwy3cqxr47a2h/X+MHfgcKCiGpvUKBiW l64LX+fS5L9ZyHkKhnFweq9+i6V/dKoLLdjKrh+Qvd5YJRX4PaUVTCUw9l/mrU7G0/GfZ8 4skRQAC1ATtfxKq5iH7ga63jiNxFpRXQLARk8b8KP6/R0n0xAU8ZpP3VGAsNhg== 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=1785719448; 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=p8ZPvyAfqDPTEjgklq0wEqyoLYB5ImajiYz7+Rjj2U0=; b=q9ZYD/dmSv8jiuB+nU8+s2vyQELZn55l3MUCz2lY5PtrO0PP24LI0h8BWNnjHpLynxHDos RHyHxOEHHnq+pKNiKFHf6cFNuwfpwIAeeCIlpKIuk/c8YEMat4O4sMqxk8qBp32LuJFcrS VZTCY8Mr/nj3dp1dCoqKyvsuSF06L35DB4nHg4h1AS2H7BOt1LO5JpvC59dNqj1L7KB/To 4085oBfWQ2blp+btGm16uxfrntr8cdoJykhxRomEjZ61ehTuWduvaNAnuEd4EflxKjsD1b IJGZCUeQbAodte6wHCe7Zyho34RPJmIWGYe6Ju63dWuif6zoMHT4xf3jfUFx7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hCzBc4m3Hzfhx for ; Mon, 03 Aug 2026 01:10:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2199d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 01:10:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3393002307ad - stable/14 - nfs_commonkrpc.c: Handle NFSERR_DELAY for Sequence correctly 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: 3393002307adefac3ad21482853c32a53d4a424c Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 01:10:43 +0000 Message-Id: <6a6fea93.2199d.50c41481@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3393002307adefac3ad21482853c32a53d4a424c commit 3393002307adefac3ad21482853c32a53d4a424c Author: Rick Macklem AuthorDate: 2026-07-27 14:16:29 +0000 Commit: Rick Macklem CommitDate: 2026-08-03 01:09:08 +0000 nfs_commonkrpc.c: Handle NFSERR_DELAY for Sequence correctly Unlike RFC5661 (the original NFSv4.1 RFC), RFC8881 specifies that a NFS4ERR_DELAY reply to the SEQUENCE operation requires a reply using the same slot/sequence#. This patch fixes handling of this case, so it conforms to RFC8881. (cherry picked from commit 6901cbbd5a2c00d378a7f87426b36d6ee6ce0aa2) --- sys/fs/nfs/nfs_commonkrpc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 7a256366de2e..28f83f460245 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1127,7 +1127,20 @@ tryagain: if ((nmp != NULL && i == NFSV4OP_SEQUENCE && j != 0) || (clp != NULL && i == NFSV4OP_CBSEQUENCE && j != 0)) { NFSCL_DEBUG(1, "failed seq=%d\n", j); - if (sep != NULL && i == NFSV4OP_SEQUENCE && + KASSERT(slot == -1, ("newnfs_request: slot not" + " -1")); + /* + * RFC8881 (unlike RFC5661) specifies that a + * NFSERR_DELAY reply to SEQUENCE is handled + * by a retry with same slot/sequence#. + * (Although not explicit, I will assume this + * applies to CB_SEQUENCE as well.) + */ + if (j == NFSERR_DELAY) { + nd->nd_repstat = + NFSERR_RETRYUNCACHEDREP; + } else if (sep != NULL && + i == NFSV4OP_SEQUENCE && j == NFSERR_SEQMISORDERED) { mtx_lock(&sep->nfsess_mtx); sep->nfsess_badslots |=