From nobody Wed Dec 15 01:43:15 2021 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 C462418E269E; Wed, 15 Dec 2021 01:43:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JDJ0z3nnqz3wQv; Wed, 15 Dec 2021 01:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 63DF41361B; Wed, 15 Dec 2021 01:43:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BF1hF1Y017686; Wed, 15 Dec 2021 01:43:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BF1hFmY017685; Wed, 15 Dec 2021 01:43:15 GMT (envelope-from git) Date: Wed, 15 Dec 2021 01:43:15 GMT Message-Id: <202112150143.1BF1hFmY017685@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 3a2be1fb9906 - stable/12 - nfsd: Do not try to cache a reply for NFSERR_BADSLOT 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/12 X-Git-Reftype: branch X-Git-Commit: 3a2be1fb9906a78841ab5266b9d75128569a2ca5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639532595; 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=OdYz46CTIRMfVVZvuxdeR67bZqJLOngiq++zVT90duY=; b=E8yknxE6A/AGze5Dn1YHUehQRf6e1IdVSiV0prz4jkiSzfMBuZ3rD4118hVLy/Vaf7Ew5i e7+rAXZBDIIAO+O9DCgC/p8D/1URGMy3ELku3y4TugOQieE+gBQEvNnvJOB8++ApDddy1D XIWQTfVVHxaNFre5E2J7Tz0saR3hopUwWx7ds4eB1YRzlPkkb9C1krMkSSfKLAhDEzNWBE T7ueTnoHSCe4dSFovN+WcHgaV8FIjjKT0TZT9xgXS+3QfeLC5uinYpo4zxQI5T14pRid2l rKj4HvqKt47UgeIljf5sEvEoHbt6SgAcljR3XUeHnigv26BS6S28of7ypKSZBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639532595; a=rsa-sha256; cv=none; b=sxzcHRAlVR2MPXk5Ma+aMtmd7ndDl0ee5Tb7MMOx3iOxqZPeKARRAhK7Lw6mAAf01NHVPm 1pW3BSnNFnMxXo4s7CNaWzevbi47ZY4SVf2T3r0W2uUirBtMPQHGl9VS2893uPQnjBUD2h XqsI75FnPgT6HN/Zatv7NPgjexEdlCnAYqzyliYgsmddBZoiKSPnj2bkQkUDl27GWrhaaD QNluWQb5bYDt7GxZR6rXFkO5BMiiQPacL8LRULlcY6p22de5kxhwRt+loaDyQX5lJD4RAa BYQ69c52VFY7kZS0a0fp2VbIE8fVi3g/VkhwLz0kSxKXBWhH43yOQGSnsFjpIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3a2be1fb9906a78841ab5266b9d75128569a2ca5 commit 3a2be1fb9906a78841ab5266b9d75128569a2ca5 Author: Rick Macklem AuthorDate: 2021-12-01 21:46:41 +0000 Commit: Rick Macklem CommitDate: 2021-12-15 01:40:12 +0000 nfsd: Do not try to cache a reply for NFSERR_BADSLOT When nfsrv_checksequence() replies NFSERR_BADSLOT, the value of nd_slotid is not valid. As such, the reply cannot be cached in the session. Do not set ND_HASSEQUENCE for this case. PR: 260076 (cherry picked from commit 33d0be8a923a840ec0724d50815890c5ffe0e884) --- sys/fs/nfsserver/nfs_nfsdserv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index a7f7debc11a6..afa13b7c8b1a 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -4294,9 +4294,10 @@ nfsrvd_sequence(struct nfsrv_descript *nd, __unused int isdgram, cache_this = 1; else cache_this = 0; - nd->nd_flag |= ND_HASSEQUENCE; nd->nd_repstat = nfsrv_checksequence(nd, sequenceid, &highest_slotid, &target_highest_slotid, cache_this, &sflags, p); + if (nd->nd_repstat != NFSERR_BADSLOT) + nd->nd_flag |= ND_HASSEQUENCE; if (nd->nd_repstat == 0) { NFSM_BUILD(tl, uint32_t *, NFSX_V4SESSIONID); NFSBCOPY(nd->nd_sessionid, tl, NFSX_V4SESSIONID);