From patchwork Tue Mar 25 00:46:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14027980 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 DE42F1862 for ; Tue, 25 Mar 2025 00:46:41 +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=1742863601; cv=none; b=u27+e5Vx+cx7NilWYtt/yZut3L2nb5kar2cnT7cMo7Y/DtfL3P+PlBccWrqUScoLY22FgADvEbvIXLRU1PnzlK+S9OrJeyMxhqKSlQtB/nLoQeNenynAfV3SkAnaKvkbXXVMhjCoPt9hjnsVByBw6F/hLZNDqFf4SzH9VO9aC8c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742863601; c=relaxed/simple; bh=JK17KLGNOaSpdNMeCJAqxBTwpxTcr1VYwFmTm1hLze8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MCJQvMDUKsPHFYG9l9yuTzMqefYD5+PMCIJOCI0w5O+4mjZpeFOjzvMRw6wPeAcuWEJF/68ntX0uu+IoztNxsONNighyLtqTz6K2wI2X2BAAajaZT826BSe4XRJm2Z66j4uYMmqpugfmX3PuULcAItwsdx7BsLbflhG4GVPTdSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VkOE5BBo; 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="VkOE5BBo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83583C4CEE9; Tue, 25 Mar 2025 00:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742863601; bh=JK17KLGNOaSpdNMeCJAqxBTwpxTcr1VYwFmTm1hLze8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VkOE5BBoYCXHtvLZrHtsv3Y3e+g2vz0jZRoZYxL5QRSV4b4xQlVkVkrEt899ZLuhT Yo3I20DClphWpMQo9KA/i4OF+2AJdqJw20xIHoR+6JJQrtxO2V7Cdk8oy8kyuCFR0b hmax4RwW1giQb2wBim3PB3059W2EYJ7HTId/ayGgqhBduFKg0NYyV8IfEFRiOTFv6g Yxt7B9TYxgHyvqF0/KRvFfASigFq/Px/9GkqpnurYPCofxO7GOoZzdVJhGSc+Fhsr7 Tl07QHZdvMZQZgdnTpxf5XDXJNQRdDWri1VXSSvEK8GwSaHtDfoVElHjOwUVNK6ZpH UCyLXkV47r1Jg== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH 1/4] SUNRPC: rpcbind should never reset the port to the value '0' Date: Mon, 24 Mar 2025 20:46:36 -0400 Message-ID: <8b9a709ef321aa246b9ef00a8bcfa71a77df4245.1742863168.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 If we already had a valid port number for the RPC service, then we should not allow the rpcbind client to set it to the invalid value '0'. Signed-off-by: Trond Myklebust --- net/sunrpc/rpcb_clnt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c index 102c3818bc54..53bcca365fb1 100644 --- a/net/sunrpc/rpcb_clnt.c +++ b/net/sunrpc/rpcb_clnt.c @@ -820,9 +820,10 @@ static void rpcb_getport_done(struct rpc_task *child, void *data) } trace_rpcb_setport(child, map->r_status, map->r_port); - xprt->ops->set_port(xprt, map->r_port); - if (map->r_port) + if (map->r_port) { + xprt->ops->set_port(xprt, map->r_port); xprt_set_bound(xprt); + } } /* From patchwork Tue Mar 25 00:46:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14027981 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 64DAF1494CC for ; Tue, 25 Mar 2025 00:46:42 +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=1742863602; cv=none; b=QdIUd1CRTppDd3vqWH4UoPvndaYkQJyS85I1jTP/gPpWFXob6iXAdWx6r5oNUMmzbCz08r0PzQfXu8lWaWnU67RP5ouw2hL/DWe3xWlhOIIyvtfFHaeKDhU6WCg0ffjuKovODn6cL06rFM2J9gQaPloh1c1WLxILUFmRcFNuTjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742863602; c=relaxed/simple; bh=0ipIHTqNE2uLpOqI2MNF1UddfnP4/ALLJpwTJxM299s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nNd/n7li8nxuXbj3h0iGKqLsLFtlIa8hMNOjQS6lzyElZyGmFkrMXqIQMdPetET6yqQ5Ehun8HsfVF8ZF5WGkrcYu9Ov+AlgZI2pD+a/0x1OnKVHEaMOZ3v1J/8bxSVR0z5g6KFGPytxVmA6ruYHv9QT8Cc+em58dZ3scvQLQ9E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=deiL/14r; 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="deiL/14r" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 077ADC4CEDD; Tue, 25 Mar 2025 00:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742863602; bh=0ipIHTqNE2uLpOqI2MNF1UddfnP4/ALLJpwTJxM299s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=deiL/14rDPdGx3nLiSmpG/rp8TCtNv66vo75jpkpHlf4L64ffUI7QUg/BBxP6Bywe uMZt1jaPkAeCH+SOnEwyZekMuyki5Kd0FeRUC4EO773S/7XhMLtYXpDHigYnqbTrWM uBiND7Rm2SrELPS1O9VTnvZKe6WLplWrWleDPmGankiclemCUEBYQMxgTKLsryxwDp sLFA0OZrv92LY+qDJTGq8k4DTUSflNBBMYGlsm/cI8a7D9VJdlypoSxTh5Hsesw8K7 tEqCgKsPURY4N55EM90aOlj1kcheVQCLv8HJB7Uw9D+E3ncByCtEV77ugIS4OdMuKn YKmQ21jiqAkhw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH 2/4] SUNRPC: rpc_clnt_set_transport() must not change the autobind setting Date: Mon, 24 Mar 2025 20:46:37 -0400 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 The autobind setting was supposed to be determined in rpc_create(), since commit c2866763b402 ("SUNRPC: use sockaddr + size when creating remote transport endpoints"). Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 1cfaf93ceec1..6f75862d9782 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -270,9 +270,6 @@ static struct rpc_xprt *rpc_clnt_set_transport(struct rpc_clnt *clnt, old = rcu_dereference_protected(clnt->cl_xprt, lockdep_is_held(&clnt->cl_lock)); - if (!xprt_bound(xprt)) - clnt->cl_autobind = 1; - clnt->cl_timeout = timeout; rcu_assign_pointer(clnt->cl_xprt, xprt); spin_unlock(&clnt->cl_lock); From patchwork Tue Mar 25 00:46:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14027983 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 0EC6E149C6F for ; Tue, 25 Mar 2025 00:46:43 +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=1742863603; cv=none; b=Zi/H3dh3A2iYWgOzE477CrVZ7IGJYNH5Vof3EOahpOSvVWFXob1jM4aji70U3+OASJ+mqnekJIPcWr9MDkn9Sy7h8ZE5FJYtFuItYPeokd2KLcIGwmDzZmgGBNcwGv1lsEEqme0fQSi8vstZJeyO7tIDzwAZYC1R54bTaPQsJy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742863603; c=relaxed/simple; bh=UFB3jUwcCxDUXVdknAFj4Uw6pT1TD0qSPXu/fNHud/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QdsYMPRNgNKGQ9Z+CuCF9JP0SCGPb3wc2EGP4a2ULNWCaWhbV20obg3/4eL//WPXUs981C5KptJCEqGBDRl9fOh9pYlJTwZcVMYMM0WPR14AIWPKWxBOCRe376tMwQC8ZrdJque/ld7QA/8zySwiu8lqvfyIZE0SV0V0v5QZG2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OByzaeD3; 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="OByzaeD3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97DBEC4CEED; Tue, 25 Mar 2025 00:46:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742863602; bh=UFB3jUwcCxDUXVdknAFj4Uw6pT1TD0qSPXu/fNHud/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OByzaeD30dSu668EhJGDCLwEIvtHzB2HXT0Onkp+Izmsi9vqeN1pMYHnOKnXX9r1g tXg4XGrCWjWJT2roHECf/XaxqfkeUEkJgaSA6WvFzN3F66OFNF5FzKWPrQ9gZi4qrM eSKjMPHRpxul5ZEzlIx6NDyEWL/A01SJwXjglKdZgGIBk9GahKUVWJPlx0GfzL3oew R2J8167bHweHvuZh2e19eVbS4IZol1FJfSJhq7o/3V0lynaEJMTo5Kw9clNplInNbC F2ViF/JdIepyC7Vzf1xqjqNowoBktWchJ95HZJ43ufGtD7aSkQwKUAeBmmL8hJYVcv HHOmmUkEkvZ7A== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH 3/4] NFSv4: clp->cl_cons_state < 0 signifies an invalid nfs_client Date: Mon, 24 Mar 2025 20:46:38 -0400 Message-ID: <56bc4d7e614a6d9d0aa520c71bd0ffb102e3ef08.1742863168.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 If someone calls nfs_mark_client_ready(clp, status) with a negative value for status, then that should signal that the nfs_client is no longer valid. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 542cdf71229f..738eb2789266 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1198,7 +1198,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) struct rpc_clnt *clnt = clp->cl_rpcclient; bool swapon = false; - if (clnt->cl_shutdown) + if (clnt->cl_shutdown || clp->cl_cons_state < 0) return; set_bit(NFS4CLNT_RUN_MANAGER, &clp->cl_state); @@ -1403,7 +1403,7 @@ int nfs4_schedule_stateid_recovery(const struct nfs_server *server, struct nfs4_ dprintk("%s: scheduling stateid recovery for server %s\n", __func__, clp->cl_hostname); nfs4_schedule_state_manager(clp); - return 0; + return clp->cl_cons_state < 0 ? clp->cl_cons_state : 0; } EXPORT_SYMBOL_GPL(nfs4_schedule_stateid_recovery); From patchwork Tue Mar 25 00:46:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14027984 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 9804E14EC46 for ; Tue, 25 Mar 2025 00:46:43 +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=1742863603; cv=none; b=NNdwxkKTPMM7ZFkUOKWWONLq1Pjc2lsTtsprWsECeZe3hXv7sicIeKwMnRDf349zUZqrTG5t016wiz0KC/1cKYA3coU3RVIU43rQRiDlvHvTugE9ytm0PUFSL2/IAh4rZ45UM0mFNLhiBmZiee9DeE6EZtuNIs9PdSmw+Wi7ZNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742863603; c=relaxed/simple; bh=Kfgauw/EnVYAo8cJqBMjHtRC4yvf+AskOEsKx0CG9X8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cmwzl98LqNZXHf+yjG+pGcaiAj0XJ44p3ny+W7VtmU6KbmXAjG5yoXVIS7L1s6ewEPEgCz0vrNvNgef4msy/P6QH+2sAZ2BcRDnEyqb1cB5MOGWL25gpWxVvMmwHCuMUbw7XQ1Eqnn6HbURWX42jnUra2XeuuCdT+NzA2FRT7wE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lSiZmkiF; 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="lSiZmkiF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C69BC4CEDD; Tue, 25 Mar 2025 00:46:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742863603; bh=Kfgauw/EnVYAo8cJqBMjHtRC4yvf+AskOEsKx0CG9X8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lSiZmkiFjViUoCCppJa13zPplDoF0MagWWzCOVgZcq0r3bL+22e4tFLpiwvU23YxR nNlN2BEbR7b/TK01K5bTr81S0HvjizuFUVfV5WsrvfgRaWImkHDoXFefirGEQ7HEF0 raup+DGdEwMKhepWMmCWnUXPhxJAUMpbTACINPTA/wrFv8ERuAclgjWzdWtbPLqcjC OYdrtlIEhR/JYzHTvx6y/NFmqDrb2OkJZO4Nb9lqXgZLrVQRQrrcDwQhW1mb8uGbjG 1f+yZzRj6Ar2FQTiX0QlRVR/jIs000/DZGxipxskERSmHCNl1fPRJJOFDqj7ARelcX D3FJNEMDVcDjw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH 4/4] NFSv4: Treat ENETUNREACH errors as fatal for state recovery Date: Mon, 24 Mar 2025 20:46:39 -0400 Message-ID: <4855d263e403a8b56738f2f630954348718d7cc5.1742863168.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 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. Signed-off-by: Trond Myklebust --- 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 738eb2789266..629578dd4a42 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -2739,7 +2739,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, status); + break; + default: + ssleep(1); + break; + } out_drain: memalloc_nofs_restore(memflags); nfs4_end_drain_session(clp);