Commit 50d6a093 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by sanglipeng
Browse files

SUNRPC: Fix a server shutdown leak 

stable inclusion
from stable-v5.10.175
commit ce7dd61e004002bc1c48d1ca47c887f3f3cc7370
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8711T

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ce7dd61e004002bc1c48d1ca47c887f3f3cc7370



--------------------------------

[ Upstream commit 9ca6705d ]

Fix a race where kthread_stop() may prevent the threadfn from ever getting
called.  If that happens the svc_rqst will not be cleaned up.

Fixes: ed6473dd ("NFSv4: Fix callback server shutdown")
Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent d8ea07c7

net/sunrpc/svc.c

+5 −1
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ EXPORT_SYMBOL_GPL(svc_set_num_threads); 
static int

svc_stop_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)

{

	struct svc_rqst	*rqstp;

	struct task_struct *task;

	unsigned int state = serv->sv_nrthreads-1;
@@ -808,7 +809,10 @@ svc_stop_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) 
		task = choose_victim(serv, pool, &state);

		if (task == NULL)

			break;

		kthread_stop(task);

		rqstp = kthread_data(task);

		/* Did we lose a race to svo_function threadfn? */

		if (kthread_stop(task) == -EINTR)

			svc_exit_thread(rqstp);

		nrservs++;

	} while (nrservs < 0);

	return 0;