From patchwork Mon Aug 26 15:06:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 13778010 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 53D481E892; Mon, 26 Aug 2024 15:07:35 +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=1724684856; cv=none; b=YzsCpf2j6c9RVgg3rqYOEBXsiCJqGIUByBqdXXGaXSoVF5z+rjtpxJfHvu09IT00qrjK0EX3T++ApLRQhFwNq1gfEIPyL/7mdO1xGs6FOlIUdPCWgJu/kPg42m0tR2EjocHlysYJ1+3iU6/xZmIPdPstMav6CIKz1se6SAchh7I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724684856; c=relaxed/simple; bh=ijcVwqetnG5Qham1hBri0B96ZvtMq4TXAL+dPQw8mTI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MjuR9BV++XTFPBfoJZGicSCwekuUefXSubc5+TsiPy5Eci8qCb8vqeB3lZZHcUMVfItjimJXipeus5VMdMhYPgczqgw7VYuGGuuDKakq51UFTao+zP7NqDiiTfHD2zXQxGmpLj8hI840BuLCw3e1Hx6ZttnatP6K2YNjfugovco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LX6WgkTR; 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="LX6WgkTR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C10DC4FF44; Mon, 26 Aug 2024 15:07:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724684855; bh=ijcVwqetnG5Qham1hBri0B96ZvtMq4TXAL+dPQw8mTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LX6WgkTRgHj4cHp13f6ALb6pkD9kJVH0Mn2A92kE9G4XehDt+pzIXsbxXOqzrYQnY xkRCPk2gc0Z8ajw1RFOLDalHobIuMpXA9wWDQEnfsZbNJt8pBXQYFZ7qJSL2PivWKs VNcyDsjdV9BXrX+KTWcwMyqWgcMUwy2tKlbQMy8vCQzW5YUlXH5DghtcrPV0hczZfY 6Gh7hGWKmzKKNP6faATGkC1j3pZuxdKl9Hf2835KVxSZsFxSzbg+YMfqpXdRjf1DeG qBpHuZtuWiyTmwDH7AmIeNdQ4DZ934Xe/svaIC0wnqEuoeqTuUJaHW8Srl2mZhbHgp 1oxoEJEUppKoQ== From: cel@kernel.org To: Cc: , lilingfeng3@huawei.com, NeilBrown , Jeff Layton Subject: [PATCH 6.1.y 3/7] NFSD: simplify error paths in nfsd_svc() Date: Mon, 26 Aug 2024 11:06:59 -0400 Message-ID: <20240826150703.13987-4-cel@kernel.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240826150703.13987-1-cel@kernel.org> References: <20240826150703.13987-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: NeilBrown [ Upstream commit bf32075256e9dd9c6b736859e2c5813981339908 ] The error paths in nfsd_svc() are needlessly complex and can result in a final call to svc_put() without nfsd_last_thread() being called. This results in the listening sockets not being closed properly. The per-netns setup provided by nfsd_startup_new() and removed by nfsd_shutdown_net() is needed precisely when there are running threads. So we don't need nfsd_up_before. We don't need to know if it *was* up. We only need to know if any threads are left. If none are, then we must call nfsd_shutdown_net(). But we don't need to do that explicitly as nfsd_last_thread() does that for us. So simply call nfsd_last_thread() before the last svc_put() if there are no running threads. That will always do the right thing. Also discard: pr_info("nfsd: last server has exited, flushing export cache\n"); It may not be true if an attempt to start the first server failed, and it isn't particularly helpful and it simply reports normal behaviour. Signed-off-by: NeilBrown Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/nfsd/nfssvc.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 4a86bfc31531..1d32fc985008 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -562,7 +562,6 @@ static void nfsd_last_thread(struct net *net) return; nfsd_shutdown_net(net); - pr_info("nfsd: last server has exited, flushing export cache\n"); nfsd_export_flush(net); } @@ -778,7 +777,6 @@ int nfsd_svc(int nrservs, struct net *net, const struct cred *cred) { int error; - bool nfsd_up_before; struct nfsd_net *nn = net_generic(net, nfsd_net_id); struct svc_serv *serv; @@ -798,8 +796,6 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred) error = nfsd_create_serv(net); if (error) goto out; - - nfsd_up_before = nn->nfsd_net_up; serv = nn->nfsd_serv; error = nfsd_startup_net(net, cred); @@ -807,17 +803,15 @@ nfsd_svc(int nrservs, struct net *net, const struct cred *cred) goto out_put; error = svc_set_num_threads(serv, NULL, nrservs); if (error) - goto out_shutdown; + goto out_put; error = serv->sv_nrthreads; - if (error == 0) - nfsd_last_thread(net); -out_shutdown: - if (error < 0 && !nfsd_up_before) - nfsd_shutdown_net(net); out_put: /* Threads now hold service active */ if (xchg(&nn->keep_active, 0)) svc_put(serv); + + if (serv->sv_nrthreads == 0) + nfsd_last_thread(net); svc_put(serv); out: mutex_unlock(&nfsd_mutex);