From patchwork Sun Apr 6 15:45:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14039406 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 D3C4713AD05 for ; Sun, 6 Apr 2025 15:46:00 +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=1743954360; cv=none; b=PcRDaaar1f5Hp+OmL/iCHcG+fkaRz/AJo1bv8+zwFBmKkNVELE8te62/pCZVvfv8qZ6D+m+0dXWGPM38YDgplp3cTXJ/B2dycA6nE6dsfQExwXdinAfQ7c1qVLK0JNbchlaiIrB4PMqJBdVG68YaB8mXtt31rxLZIr6Kl0UPUZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743954360; c=relaxed/simple; bh=KpOn2LYB3Dr6QIeHVQOZJ1JPb6pUecVCd6Kmkke8F6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXvsbfUeyDxkuxBqPAvUbmnKDn7/Tn5ySeubQE0w5TyRnVmNVQtv1Mp0V6xvKAhCpRBmqTqrijbcnQXZ3aFTcX2f0OA++at5zJQZ35yxeVgIe2Cx1B6KwEPfjJJ8G242DyTIODaVK8HvqG/Je69KtOsFoyVRcZhtI4qxVX5/nxI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O154CVqz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O154CVqz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2FBAC4CEE7; Sun, 6 Apr 2025 15:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743954360; bh=KpOn2LYB3Dr6QIeHVQOZJ1JPb6pUecVCd6Kmkke8F6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O154CVqzJE0GkxkxPyE/DZvnu/VAdo/4H7Qzdjk6CzBXbtM6mnb3sPpYyD/rO4ggU yuqEeoRQFqIOev5bYN2bmtaWzQ3ZZvbNYZf4aTNWv6urwG2fH9u6FfcO627S8n0GgM l5Rd63VtHM9yqqXGWI8Go5l1Nk9GaayYf6K7fXj28kAbom7PZLuKkiK0BVwABKoGH3 +XVjK7p62UrEoo/1P2XkfH7HprdhL1A3KQ6dkPPzNF+JvsbnW2JjFtQtKDgp9RUcH8 I6g3c1d7dG/StsEWj8iu4jSn2oun+m4AAVyEIEBp+k4GYNlEcihBxZZgnImrSrZYYQ swNrHJHktb5pw== From: trondmy@kernel.org To: Omar Sandoval Cc: Jeff Layton , Chris Mason , linux-nfs@vger.kernel.org Subject: [PATCH v2 1/2] NFSv4: Handle fatal ENETDOWN and ENETUNREACH errors Date: Sun, 6 Apr 2025 17:45:52 +0200 Message-ID: <2ed0d30380a95b8731f0afe433560d0545e65553.1743954240.git.trond.myklebust@hammerspace.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Trond Myklebust Ensure that the NFSv4 error handling code recognises the RPC_TASK_NETUNREACH_FATAL flag, and handles the ENETDOWN and ENETUNREACH errors accordingly. Signed-off-by: Trond Myklebust Reviewed-by: Jeff Layton --- fs/nfs/nfs4proc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index da97f87ecaa9..01417e3099e3 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -671,6 +671,15 @@ nfs4_async_handle_exception(struct rpc_task *task, struct nfs_server *server, struct nfs_client *clp = server->nfs_client; int ret; + if ((task->tk_rpc_status == -ENETDOWN || + task->tk_rpc_status == -ENETUNREACH) && + task->tk_flags & RPC_TASK_NETUNREACH_FATAL) { + exception->delay = 0; + exception->recovering = 0; + exception->retry = 0; + return -EIO; + } + ret = nfs4_do_handle_exception(server, errorcode, exception); if (exception->delay) { int ret2 = nfs4_exception_should_retrans(server, exception); From patchwork Sun Apr 6 15:45:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14039407 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 1E0BD13AD05 for ; Sun, 6 Apr 2025 15:46:02 +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=1743954363; cv=none; b=WnW47N3AOM/F77SxhiLMivPBWjA3GRmcKuo8TDBdXL6CfpkVafKfTwtBk2YehTZsmJWxQgkwiAhfzulQLLXRan7/ovxSQdjPNDY7S3kgBn+JFHYi3/+/sEQlwVRlbI9MT8gfMlKmKWrFATRJesZ6lsuoE7AnHLepzzrheJfYbEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743954363; c=relaxed/simple; bh=AOd/I5N+viIKkZqCR2/zYFgert0d7f4ZM5GENyALsIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iCpKF2zdnGXKDTUIMnFEEVx/hrRzBfumfUI0qyLwIc3YQlvuRX/H8EFWB8QxrOW+cXAj4Qe7v4QMW9GzvZciBhPIs1JgvGHRO/+godSQrKxk0SQF5It+s+EawqSXtvyAlpX2X832Tpe27wsCgBFp2Cw2r+FXJsmVK/HcxTDgmu4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MgaLKq3c; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MgaLKq3c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0000FC4CEEA; Sun, 6 Apr 2025 15:46:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743954362; bh=AOd/I5N+viIKkZqCR2/zYFgert0d7f4ZM5GENyALsIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MgaLKq3cC5LmoTXLpsbtSyRIAvwyw0AphmxazWZ7jg7gQcI/pIOM6Xo42qG86BGQx cjuaiDovWorvF7Tw0ZtCSkmPO0sDGSlIIW3miUzZMwRrZZVIyIGPhxR4M9DEMzjnbh utp73N5iX7CuDN+mQtJ6IDhtNaWDlBtTkxblN9lokqGxLUZgBORgBCwxlzbVn1YgjI wF7EJi3Jg3KVkWWZTej5U0EMdvFg1rc6ftpkssH/+oM7/fOP1GfUSbTHksk9GjTGxt h2z4+tzohr/UlPHmuGxDK8rVDkjNRq//P07b1cT90WdiXZKiKaykgkC+ADyCp/Fa3B sGFLPPRr1OOZQ== From: trondmy@kernel.org To: Omar Sandoval Cc: Jeff Layton , Chris Mason , linux-nfs@vger.kernel.org Subject: [PATCH v2 2/2] NFSv4/pnfs: Layoutreturn on close must handle fatal networking errors Date: Sun, 6 Apr 2025 17:45:53 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Trond Myklebust If we have a fatal ENETDOWN or ENETUNREACH error, then the layoutreturn on close code should also handle that as fatal, and free the layouts. Signed-off-by: Trond Myklebust Reviewed-by: Jeff Layton --- fs/nfs/pnfs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 5f582713bf05..10fdd065a61c 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1661,6 +1661,18 @@ int pnfs_roc_done(struct rpc_task *task, struct nfs4_layoutreturn_args **argpp, /* Was there an RPC level error? If not, retry */ if (task->tk_rpc_status == 0) break; + /* + * Is there a fatal network level error? + * If so release the layout, but flag the error. + */ + if ((task->tk_rpc_status == -ENETDOWN || + task->tk_rpc_status == -ENETUNREACH) && + task->tk_flags & RPC_TASK_NETUNREACH_FATAL) { + *ret = 0; + (*respp)->lrs_present = 0; + retval = -EIO; + break; + } /* If the call was not sent, let caller handle it */ if (!RPC_WAS_SENT(task)) return 0;