From patchwork Tue Mar 25 16:17:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14029264 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 9B5D925D523 for ; Tue, 25 Mar 2025 16:17:46 +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=1742919466; cv=none; b=p8sACDLG+bRUYlk9iUMTope6PxtNWMTKjfMCsjlWRTFddCwI9SRz0ZcvOv3fBW5JVKx+NLIzbrKrL+r/gZNOvQ9Kdg9W42rxQ6qwPGgKVno453Jp//N7Fs+XG/Nov+4WnJ55D+dghAZ9sP9JsfZrB0kLhFDl8lXec/2AIusWy/4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742919466; c=relaxed/simple; bh=JK17KLGNOaSpdNMeCJAqxBTwpxTcr1VYwFmTm1hLze8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mJFSpxlvsR96IoF4EtCzPE8fq4jIoVKJDuwJPdXJq41PyOy8IevvLiFe1rD4uf1eGOPMv5gbPcftbAVu5Y82r4SKREeJWnBJmnx638qTGxCwg6mSub4IoT1eaSKhW1MJ7me616UuFp+YG/Dxt/L6AYLcVT5PY8OG+yIzkW45S8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T0jZYoCI; 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="T0jZYoCI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E567FC4CEF2; Tue, 25 Mar 2025 16:17:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742919466; bh=JK17KLGNOaSpdNMeCJAqxBTwpxTcr1VYwFmTm1hLze8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T0jZYoCI7MZQQ0VKX2ADtJQ3DduHsgHwoWSbdJD4IgGPPtldWCEF+bU3GDe9GKQo9 vw5UF1NTJ6HFCGcRe1T5LZb4fB/6ddT4gdCue3GqJ4hLf+eegLYNOVus5CRKm8YvC9 0VVRN2kNpsaIq6LRiarQIQ7S334RnoM+f21j1WdQoID0y8V8LhV0tifAlYxZ+gX87T Tlv/TqIUQZsATOfTGY9bMv798uxN9Fxv0YHbEoRPqxH2q82hURwnsJlcwvpDwIA635 IDJrVW+M9IXW/0iQZhQKzGQPE2PY9qXp3T+FxxKRHl4fQgL53GoLsdBamF+FXGSnHH PCpET/tPijv4Q== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH v2 1/4] SUNRPC: rpcbind should never reset the port to the value '0' Date: Tue, 25 Mar 2025 12:17:41 -0400 Message-ID: <8b9a709ef321aa246b9ef00a8bcfa71a77df4245.1742919341.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 Reviewed-by: Jeff Layton --- 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 16:17:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14029265 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 BC9F51B392B for ; Tue, 25 Mar 2025 16:17:46 +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=1742919467; cv=none; b=qqCGPEUROdEWgp4vTbUC9p9ETJJUwPeM3h/z0PRqU8BHgxJC4c8TJBRQsLWpx3/rMHv80gvqzVta9+1VIfAueqjWBN+JpIyfceUJIXYh8xGTh4Q9JZYIxg75q9mQMXB5fL8RpG5GeauNZaxwMYyi3ARtspHOTvBptAzy0SbGAw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742919467; c=relaxed/simple; bh=0ipIHTqNE2uLpOqI2MNF1UddfnP4/ALLJpwTJxM299s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GzbBXcQatE6t+l1CotVg0B5HQJc9MosiL15PtuGfNaU6+tHOLo30Y3PYIyC+XXk+IksjOoh9KbiH94u8JYd7CV7emZ6LEhqz4OPLaocfPaa+8EDuktK8WL6HIvwOM7kg53x78Sy8YxK0vOv8JWJa6L6HsMcc6ykozd9VF4JVPk0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZKetCrdF; 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="ZKetCrdF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B02BC4CEE4; Tue, 25 Mar 2025 16:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742919466; bh=0ipIHTqNE2uLpOqI2MNF1UddfnP4/ALLJpwTJxM299s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZKetCrdFCS+MIX5jkgRyepUd2CoO78BGR2SuNFZABuxnVFc2OkXUyk8TGzVBBKdWo nlbr0iR+BRMUgxvXT6aE6/VVSLBGwh5gF7B3ZdjkNNOBLmnMDZcY1adCkaNAnWsVVH R0U72mGPLbDN5uDk/z2akzbVbQ6HIc4Vw1PIUbg0j0WNV4MEMkI7WZaUL8Xz+3tK7c 3iCEh8qsAwlk4t41N9Gzo9JyF8MPR2T1KvgVC7iGWbtoWOEvulmDZjLvFXh00zTkPT Y4Zi/oh8dTYNGCnsZKKvcrClfGLmgx3l4Y8D6Y0FM/+kaNQteJ91+Br/bXvjSZyp4N 47MnCqz1+MSHg== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH v2 2/4] SUNRPC: rpc_clnt_set_transport() must not change the autobind setting Date: Tue, 25 Mar 2025 12:17:42 -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 Reviewed-by: Jeff Layton --- 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 16:17:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14029266 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 BCA6425A631 for ; Tue, 25 Mar 2025 16:17:47 +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=1742919467; cv=none; b=LlZIxXa/dGr80YMCzmjUfQK9r+lLmKeNYizBrWHKXqj743mI4rPfY1mrk5x+WrgSLGY+Ynr4L+DQTwoYEsckdlG9Z3++ohMmUz1WnrDxM57/w4hZL4/ZpPpyM6Tubrc0qJyUG+OdNj5y8Eh7lgCHl42Ry4/wEzqFVNOh0x5+faM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742919467; c=relaxed/simple; bh=UFB3jUwcCxDUXVdknAFj4Uw6pT1TD0qSPXu/fNHud/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=obqFsRdcpJEUhg1jwW6+9aIcHcprlOyIRGq2Aa9yHdXq2ySSy4DeZ5BcwaNvn/9w2TotUFRd1v5dEbOblrphpyJLdDzHN3Sml/OE4B+PWgdw3tDVdt20EO/C50o5iwyCt6mLpp4cOEOq2MILFEHUJaVCzwAuXiHH4Ju73MT3Os0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=timsKRwQ; 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="timsKRwQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2344C4CEF3; Tue, 25 Mar 2025 16:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742919467; bh=UFB3jUwcCxDUXVdknAFj4Uw6pT1TD0qSPXu/fNHud/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=timsKRwQH9epFFWjDrQrZi7SZh8MBGENUL8C9T3ECNd6JHSndw9pBXcN0iqkPx4r4 ToJcEOx172s2ZB+Z+SfTrsfN8Z1RndCxCr2yUvW1dkXAg4EKHXh6uPAU96mpWVbz54 mIaWLxdxlskMAz5sBa7PRUJEwtmEohP1joRtVSVTBDoVNhRHiBVBi0/wcl/YR2N+DI KgLy79MwA5FDYV4G6rogGfnIuXbR7g3Yu+iDr4XNulq0SgTGQK4JKIEr/Nm6KKXU1V uSTL/EqGMHcp6iZZ5VguuSHId6MY7SikvcepmJC9hAcbGjNAk+PNtz3WaBjEtcnwQL JYz7Vu8ihH9pw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH v2 3/4] NFSv4: clp->cl_cons_state < 0 signifies an invalid nfs_client Date: Tue, 25 Mar 2025 12:17:43 -0400 Message-ID: <56bc4d7e614a6d9d0aa520c71bd0ffb102e3ef08.1742919341.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 16:17:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 14029267 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 5FCB81B392B for ; Tue, 25 Mar 2025 16:17:48 +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=1742919468; cv=none; b=uYYVgDnY9XtBfMUVJ4SE29e7SNSvfMl4ouWhseAbKyw3+JdHjPmyr3O7/T600jWhP+NQwYbVLvzkPPbwmFRu1E1wsiBvZvHUYsWzUO26wMfYZOQwEX+XInaG9ExvxyCwiuHC/Iiw6uZgMdBw3eRyLTroRAtHKNXPl03O55sxV10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742919468; c=relaxed/simple; bh=8JCxl4LWyqCt+F5GlZBDc7rXaOPF4L2wNED+Yh7B7u8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KKj3S1BI+iM0aVprWHN4bzQOxqZcsTLduw1ss3SQPJqxd1lhNSpm6Tnir7VjiFzKk9YJOCJGJFkFf+9GcLqwGbCxji1jexQomS2uG8SdCCxh8y0k2SV/grqP8cXUCj81Q/QKfhqdd0kACJNHIw3Xb55Fm6aUpLVK8R8q/kOaCxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NaBSJ6et; 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="NaBSJ6et" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7EBCAC4CEEA; Tue, 25 Mar 2025 16:17:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742919467; bh=8JCxl4LWyqCt+F5GlZBDc7rXaOPF4L2wNED+Yh7B7u8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NaBSJ6etwLxtkhlcTAGW1g8sA9MPIU76mVdWkAtlomQ3yrsnlZbGkTRmufLjBz2VN 3kSD+WJbDBRidAKD5Ar12DH6nzKXx7dpk2X7ICd62yaYJoG5Ql9GLixt0YK6B9Aj+z nAaKFMoSG78ICW+HqSji1BxAFX8DQH9ecD7wKYNnO7hStvqg4uBNssvEK9jRvkVO2A FFbwJJmQKO5z51X5wZ/uK0vbZacdbU5CWWB80RDCKhjXO9FidqZKwLPVIWyKqyiLZ+ HVwAUAFLD9DaNCxWThQcAwS0LsoJ2FmQIRQ33hcx4Y5Xa7XfbMasETWAa3r3ZBYVDu GIAkOQZZCNsfw== From: trondmy@kernel.org To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Josef Bacik Subject: [PATCH v2 4/4] NFSv4: Treat ENETUNREACH errors as fatal for state recovery Date: Tue, 25 Mar 2025 12:17:44 -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 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 Reviewed-by: Jeff Layton --- 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..14ba3f96e6fc 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, -EIO); + break; + default: + ssleep(1); + break; + } out_drain: memalloc_nofs_restore(memflags); nfs4_end_drain_session(clp);