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 4E8EB228C92; Mon, 2 Jun 2025 15:04:26 +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=1748876666; cv=none; b=lb7KqUe2FDKzdzBznQAhEPSFPrVZX0eFKPEZO5yk5Ff/jNux+Wp5wCYbTB/+VK6ZPF87bIeZv6Wi6BLMjZHb/jvRx3XS7HXJUoVCf+mwusB9gRZwE47OSBCdMFsC2rZPIgALkR9eaW9k85wKwNmJb364oJRMuGViF/7aTilIzlw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748876666; c=relaxed/simple; bh=KNLlNJIXqvvWVV3mct2g1P18vFr0H0uomn5ToVVkRZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QO0/0igs69J7+7y707UkdlQ2SOOyqx1E/ZwobdIa0vjRAA4WfZA+NWs1yyhHdigdw8TQwUHeIlqStgnmhQPvEsNkYrLcvvqh/9H4w8VgvB6Fa5rA6W4r64x18ZV9UyyFDn+IV30FIn3cumYdCRhyCu528k8GXEk6RqedTAdxDso= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tjwKvbGH; 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="tjwKvbGH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7435C4CEF0; Mon, 2 Jun 2025 15:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748876666; bh=KNLlNJIXqvvWVV3mct2g1P18vFr0H0uomn5ToVVkRZ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tjwKvbGHch6RPtVSWetkWG+gQ9FZDsPynyWoHbWP+yNgPBQLKi2d13m7eONEVt73I X5uOyP58jlOjuuzOA31ZlEreD6SP+M8mHIlPzjaXc7FoKJJligPlW8B2QPPlXuZS79 gkjZ8Amdbqdvu1+eyCM87A1VPzjefZlQIRKCfDfg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeff Layton , Benjamin Coddington , Trond Myklebust , Sasha Levin Subject: [PATCH 6.1 035/325] NFSv4: Treat ENETUNREACH errors as fatal for state recovery Date: Mon, 2 Jun 2025 15:45:11 +0200 Message-ID: <20250602134321.179104159@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134319.723650984@linuxfoundation.org> References: <20250602134319.723650984@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Trond Myklebust [ Upstream commit 0af5fb5ed3d2fd9e110c6112271f022b744a849a ] If a containerised process is killed and causes an ENETUNREACH or ENETDOWN error to be propagated to the state manager, then mark the nfs_client as being dead so that we don't loop in functions that are expecting recovery to succeed. Reviewed-by: Jeff Layton Reviewed-by: Benjamin Coddington Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4state.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 48ea406604229..80a7c5bd7a476 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -2737,7 +2737,15 @@ static void nfs4_state_manager(struct nfs_client *clp) pr_warn_ratelimited("NFS: state manager%s%s failed on NFSv4 server %s" " with error %d\n", section_sep, section, clp->cl_hostname, -status); - ssleep(1); + switch (status) { + case -ENETDOWN: + case -ENETUNREACH: + nfs_mark_client_ready(clp, -EIO); + break; + default: + ssleep(1); + break; + } out_drain: memalloc_nofs_restore(memflags); nfs4_end_drain_session(clp); -- 2.39.5