From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25BD8C433EF for ; Wed, 13 Oct 2021 00:57:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FC3060E0C for ; Wed, 13 Oct 2021 00:57:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237186AbhJMA7p (ORCPT ); Tue, 12 Oct 2021 20:59:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:43418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236792AbhJMA66 (ORCPT ); Tue, 12 Oct 2021 20:58:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E0C3260F11; Wed, 13 Oct 2021 00:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634086616; bh=NcZM4RacsLIXs+WxdKcX21WzMATD3cTP2XcShS8y7Nc=; h=From:To:Cc:Subject:Date:From; b=EJDXEGrfBhIt81UYUMWIA+Gh15l4UCoSjFL4f62G2bmGuDUgdNwRH6sT18pQ5NI+q npWlxIL4KM9zyTuvdEqyfjv3nZ8MCwgaERDUNXPBq4zqF3IJGy2p0D2bwjQd0nnkVW r0sea0vEwsLiRWh2tzg1MvaHocBC9a69BV2mylc6IQuswaWE2mSuuUBNJqVrsf16As TCnWM2U1NIJ8TbrS3ACL+tKZveTZ75a0aYxl3gbKxwu2a5DAAoQY0uWI/3PLp28z5i 8B1zXOdV9W8ebsWZTNeXs3y6rVP6thcz4xlZGCXfh5/7QWITwALFCJoTCtpQGW7KRV vfP9HFyRip4ag== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Coddington , Chuck Lever , Sasha Levin , bfields@fieldses.org, linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 1/2] NFSD: Keep existing listeners on portlist error Date: Tue, 12 Oct 2021 20:56:53 -0400 Message-Id: <20211013005654.700769-1-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Benjamin Coddington [ 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 Signed-off-by: Chuck Lever Signed-off-by: Sasha Levin --- 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 0cd57db5c5af..dfd1949b31ea 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -768,7 +768,10 @@ static ssize_t __write_ports_addxprt(char *buf, struct net *net) 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