From nobody Mon Jul 27 14:18:13 2026 X-Original-To: dev-commits-src-main@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 4h810P2kcbz6n3Ln for ; Mon, 27 Jul 2026 14:18:13 +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 4h810P24dVz3nY9 for ; Mon, 27 Jul 2026 14:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785161893; 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=uMre8rE51noUZuzFD18aeZT/cQVC+Dh6rITIkHrw7vo=; b=kAZ9K3fhF6ZXfxdxC1ebfRSV57XMvirWMQEzRzBJu301FWa/Qzg0aEzlqWVFxf96RS833U eRzfIKsWAIYykBLfARUiw1YlLAjFneUJeFI7exdhycqbhViiuyt6bwHi7UbcyiSjhiQeRb ucJqXSz4xb4uChd42OUxgqmQYA+ry3ytWACMz/r5eRY86N3KFAdy5MZjE5lI/KdGxRAWCw v8CpVUiEB5dF/2eh1fVBRdtPi071ruvm8bLXiBSrIQrlzvYgkna5uK6oNM7huzmIcAGtIN i1MlTJwHXQ7SPIzzee7r6zIHfYcqaAtSg46e54acyrCzp/BJR/tVw+o7mPd1vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785161893; a=rsa-sha256; cv=none; b=lyO/JHy4kcf6ZXVWiFP+SanhU85t1pYhyq3PqYgeG+EAlHwIit0OsyrnwZTb0ge3Ez5y0m SM0j9iDoGQKfAUcpnLpZ0hCiyPnK3gIu05hj1gHmeiae/82OiNO1NaaIqN2RFjxDnkMDJ3 DgiqebhVm9C5dsQTGK6mTO26IUagKulj3XfLmKFkXiTmX3ppaElVN2WmOyvh9Ntepa9zIG al167QaqITgVIc7nFDW8NGZc8WS2h0rvs8tyDjVkiqeQ7L2cLvE2qdRjaZ+Ae451qip1w5 t4JcMmO845e/ZS/9BC/ujnBVz/YEdxOBEFBnEG5dHLIhW6nu8EBwkt8Follflg== 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=1785161893; 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=uMre8rE51noUZuzFD18aeZT/cQVC+Dh6rITIkHrw7vo=; b=VkDTvW7SKGvruwD56WWfZEINoIu0+pOF7XfHDrjOXumWBkfph1dAegJNNaIWh9MqpGzDZ7 V+B7zrFHB9ncQgF0Z6B92oseSX/721Qy5RNbrwBmdnd6HbKT9p2CrorVVfXSvhK+IaKkNQ AWC+/NFr2pCseYMaYX7rw4a3MtHdJmV2u5PNN96DTmef8A5z5Or4KrMKarvfTXk+CJtH/l sbqBpulAPErOZeX8Pmzyc+khwzI/3ngujdcQDv9esgRQLNd6RIV1FvjC0R1f/h60aEsnXJ yS2J3zcxAwOyXA/0nU05JoKU4BDr9Qwq5uHeBp/eRnijsUgnqibmV+jGS1/cgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h810P0zpRz1BK7 for ; Mon, 27 Jul 2026 14:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40820 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Jul 2026 14:18:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 6901cbbd5a2c - main - nfs_commonkrpc.c: Handle NFSERR_DELAY for Sequence correctly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6901cbbd5a2c00d378a7f87426b36d6ee6ce0aa2 Auto-Submitted: auto-generated Date: Mon, 27 Jul 2026 14:18:13 +0000 Message-Id: <6a6768a5.40820.29856e2e@gitrepo.freebsd.org> The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6901cbbd5a2c00d378a7f87426b36d6ee6ce0aa2 commit 6901cbbd5a2c00d378a7f87426b36d6ee6ce0aa2 Author: Rick Macklem AuthorDate: 2026-07-27 14:16:29 +0000 Commit: Rick Macklem CommitDate: 2026-07-27 14:16:29 +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. Reported by: J. David (j.david.lists@gmail.com) Tested by: J. David (j.david.lists@gmail.com) MFC after: 1 week --- 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 f30ae7cbffa2..dd189a4aa909 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1145,7 +1145,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 |=