From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D828527F4F3; Tue, 8 Apr 2025 12:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744117194; cv=none; b=on+Qw5NK/sUaAace0cieFaMruswYqbQvKj11jcFq919fukUhszhAkkIa2TU5Ee5yWzsDO/bT4afy69SykEiFjmwVS2bg6HC3EZWNocpJo+HNaCPBAJrC8ibjnKcju5aMmdITpgNkHF4iZ21C3mXoJ7V5RtzfbXW/LhbPNBLMdZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744117194; c=relaxed/simple; bh=rY5jkUM5nCKnCafggQoSyP+Vl3RxeBH5Xo9rdCmQnKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MhtGXaujaD6/w7ukASKlSmmEtM56atFchs6owgn4ekfvuKAJBsY092gzTMS+rvZ/2XyDrTfBAdWPW42udygd5NGhA9seRB/56SFLoLyhmRGAiZ8JFrpUfO/Fv+tZxK1N84g7MyV2j85psGDbaNIM6rfQy8xRzto/wxy92X50dKQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k3Uv5wRO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="k3Uv5wRO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68DDEC4CEE5; Tue, 8 Apr 2025 12:59:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744117194; bh=rY5jkUM5nCKnCafggQoSyP+Vl3RxeBH5Xo9rdCmQnKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k3Uv5wROJPWqI0ZdF02M1Avwo0HJb4kLIODfWWq00BUewMGWllcEZfMiv+P7OL9b9 LZvbQA9AQs4Nu4oQW5LbAvNmaKV1FTr8sO9Muu837S7qd4zAKIh3bqEJaRfqG54iBy 0L9UAm97YfvNLpEhZkqE4yjkNlvTnkz9+C3ypOeA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Layton , Chuck Lever Subject: [PATCH 6.12 418/423] nfsd: allow SC_STATUS_FREEABLE when searching via nfs4_lookup_stateid() Date: Tue, 8 Apr 2025 12:52:24 +0200 Message-ID: <20250408104855.664727527@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104845.675475678@linuxfoundation.org> References: <20250408104845.675475678@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Layton commit d1bc15b147d35b4cb7ca99a9a7d79d41ca342c13 upstream. The pynfs DELEG8 test fails when run against nfsd. It acquires a delegation and then lets the lease time out. It then tries to use the deleg stateid and expects to see NFS4ERR_DELEG_REVOKED, but it gets bad NFS4ERR_BAD_STATEID instead. When a delegation is revoked, it's initially marked with SC_STATUS_REVOKED, or SC_STATUS_ADMIN_REVOKED and later, it's marked with the SC_STATUS_FREEABLE flag, which denotes that it is waiting for s FREE_STATEID call. nfs4_lookup_stateid() accepts a statusmask that includes the status flags that a found stateid is allowed to have. Currently, that mask never includes SC_STATUS_FREEABLE, which means that revoked delegations are (almost) never found. Add SC_STATUS_FREEABLE to the always-allowed status flags, and remove it from nfsd4_delegreturn() since it's now always implied. Fixes: 8dd91e8d31fe ("nfsd: fix race between laundromat and free_stateid") Cc: stable@vger.kernel.org Signed-off-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4state.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6880,7 +6880,7 @@ nfsd4_lookup_stateid(struct nfsd4_compou */ statusmask |= SC_STATUS_REVOKED; - statusmask |= SC_STATUS_ADMIN_REVOKED; + statusmask |= SC_STATUS_ADMIN_REVOKED | SC_STATUS_FREEABLE; if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || CLOSE_STATEID(stateid)) @@ -7535,9 +7535,7 @@ nfsd4_delegreturn(struct svc_rqst *rqstp if ((status = fh_verify(rqstp, &cstate->current_fh, S_IFREG, 0))) return status; - status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, - SC_STATUS_REVOKED | SC_STATUS_FREEABLE, - &s, nn); + status = nfsd4_lookup_stateid(cstate, stateid, SC_TYPE_DELEG, SC_STATUS_REVOKED, &s, nn); if (status) goto out; dp = delegstateid(s);