All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Benjamin Coddington <bcodding@redhat.com>,
	Chuck Lever <chuck.lever@oracle.com>,
	Sasha Levin <sashal@kernel.org>,
	bfields@fieldses.org, linux-nfs@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 09/11] NFSD: Keep existing listeners on portlist error
Date: Tue, 12 Oct 2021 20:55:29 -0400	[thread overview]
Message-ID: <20211013005532.700190-9-sashal@kernel.org> (raw)
In-Reply-To: <20211013005532.700190-1-sashal@kernel.org>

From: Benjamin Coddington <bcodding@redhat.com>

[ Upstream commit c20106944eb679fa3ab7e686fe5f6ba30fbc51e5 ]

If nfsd has existing listening sockets without any processes, then an error
returned from svc_create_xprt() for an additional transport will remove
those existing listeners.  We're seeing this in practice when userspace
attempts to create rpcrdma transports without having the rpcrdma modules
present before creating nfsd kernel processes.  Fix this by checking for
existing sockets before calling nfsd_destroy().

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/nfsd/nfsctl.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 0759e589ab52..506da1c77bea 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -792,7 +792,10 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net, const struct cr
 		svc_xprt_put(xprt);
 	}
 out_err:
-	nfsd_destroy(net);
+	if (!list_empty(&nn->nfsd_serv->sv_permsocks))
+		nn->nfsd_serv->sv_nrthreads--;
+	 else
+		nfsd_destroy(net);
 	return err;
 }
 
-- 
2.33.0


  parent reply	other threads:[~2021-10-13  0:56 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-13  0:55 [PATCH AUTOSEL 5.10 01/11] arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address Sasha Levin
2021-10-13  0:55 ` Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 02/11] ARM: config: mutli v7: Reenable FB dependency Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 03/11] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 04/11] block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 05/11] xen/x86: prevent PVH type from getting clobbered Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 06/11] drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 07/11] xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 08/11] xtensa: xtfpga: Try software restart before simulating CPU reset Sasha Levin
2021-10-13  0:55 ` Sasha Levin [this message]
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 10/11] powerpc/security: Add a helper to query stf_barrier type Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  0:55 ` [PATCH AUTOSEL 5.10 11/11] firmware: include drivers/firmware/Kconfig unconditionally Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  0:55   ` Sasha Levin
2021-10-13  5:58   ` Greg KH
2021-10-13  5:58     ` Greg KH
2021-10-13  5:58     ` Greg KH
2021-10-13  5:58     ` Greg KH
2021-10-13  8:38     ` Arnd Bergmann
2021-10-13  8:38       ` Arnd Bergmann
2021-10-13  8:38       ` Arnd Bergmann
2021-10-13  8:38       ` Arnd Bergmann
2021-10-13  8:45       ` Uwe Kleine-König
2021-10-13  8:45         ` Uwe Kleine-König
2021-10-13  8:45         ` Uwe Kleine-König
2021-10-13  8:45         ` Uwe Kleine-König
2021-10-13  8:50         ` Arnd Bergmann
2021-10-13  8:50           ` Arnd Bergmann
2021-10-13  8:50           ` Arnd Bergmann
2021-10-13  8:50           ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211013005532.700190-9-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=bcodding@redhat.com \
    --cc=bfields@fieldses.org \
    --cc=chuck.lever@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.