From nobody Mon Aug 3 01:05:02 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 4hCz3z2vP0z6mmSj for ; Mon, 03 Aug 2026 01:05:03 +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 4hCz3z0MStz3GgF for ; Mon, 03 Aug 2026 01:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785719103; 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=YAVMRKYnxQl8UarTKrMld1g70pGw45q42hoPoZdCGRM=; b=wUNZV9Jhq+YZeMX+kPTYwCNZO6Ki7nuyjGbI1QfHvaGkI9a9wpF5Kf1D06tdQSk1ufCWY3 ziEZ/PriIhTk7S3xLRiak3riuWDCiAeLS/ugSmXw2JxNqLdAZo/NCcxZ7TDsqfPsyYLPDG 30xJd3MUtEyfv2hD7CFNXsN5HcqKatGiq8rQiyYNZ9JqbExPZV6e/WHSPwBC9NQOd9SLHO clUhfsx55RFPpVLtaaGcjOzzgbgdX/lHS7DE+HXZL4Im8CHaW9uQjIlY3SMHV+s11LFTFM K/oqeM7bxZlO2xnROh3hsYzSL9MM5yJmbqZyF+Fdm2LmmJ2w8sdacEcAjTdYqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785719103; a=rsa-sha256; cv=none; b=gzTnXIOzMcExmTkFxkZxaYYZBMwgGFuORZoKHAbyho7IvCka0rmUrho0FoDESdAT+AkWbE TpMuGw+yKYVhXjdToNl/l4g1OQoXMHf3IF6HwCnq7k2cYjB4Y6Eb3ayT6k3WPks/faw1uW vZmF44NaaeKDLE6zLaKurn/5skg/Izzl4BE8ULw6TvTruajiQjGbyHivqK1uD3bOIVBAvu oeXJ3fjdnWVlz/Fu+0EwZNb1XJtFCw+Nb+Zta1NqIzcG0Jhbv/2VuSl2OjV9v5m9R7n1PR hRgBazv5lAFbq1R51XasiQxpJzK0/y0FPR0rmn4Q9bGsUTHlGlUBzu64smmzbw== 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=1785719103; 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=YAVMRKYnxQl8UarTKrMld1g70pGw45q42hoPoZdCGRM=; b=vVvTvtzo7VbE3O9jXdxBr3D7+JFdU2X2a4BNWvSWs/4wXnNYuvy08yCn4/o+OoLK5PAHPz KnBdC+01drOZMnYVxDb8cAu0VdvbmEeA1E5AzY/mjcg/XO/JN/ChJhs+MPnaHmDcftY+Q8 BEzhduyGsR+Xqhs/2HMA8nN4ZPr5xk6kds+iG2rNNlEiPARtLiuKq+2pX2nQLRW2m4qRyr cA4EqHeHW7Gf3rP8fYIbDhVREt3B5+zJpNqAhFsEpPlUuHxBVzw9sjooUH8ovsquiiqiVk Pv/jJnS4hQrx1mr6hk1t4kGmbETQq9KUvi33KMg91HGoJimbjHN/j2p3Fc4Wwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hCz3y6JfRzfxB for ; Mon, 03 Aug 2026 01:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f9ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 03 Aug 2026 01:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 25d1f68e513b - stable/15 - nfs_commonkrpc.c: Handle NFSERR_DELAY for Sequence correctly 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: 25d1f68e513bb567497de26cb65840f434f227ee Auto-Submitted: auto-generated Date: Mon, 03 Aug 2026 01:05:02 +0000 Message-Id: <6a6fe93e.1f9ca.28e6bb60@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=25d1f68e513bb567497de26cb65840f434f227ee commit 25d1f68e513bb567497de26cb65840f434f227ee Author: Rick Macklem AuthorDate: 2026-07-27 14:16:29 +0000 Commit: Rick Macklem CommitDate: 2026-08-03 01:01:39 +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 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 |=