Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4aa8054 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

SUNRPC: Fix broken kthread_should_stop test in svc_get_next_xprt 



We should definitely not be exiting svc_get_next_xprt() with the
thread enqueued. Fix this by ensuring that we fall through to
the dequeue.
Also move the test itself outside the spin lock protected section.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 983c6844

net/sunrpc/svc_xprt.c

+10 −21
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static struct svc_xprt *svc_get_next_xprt(struct svc_rqst *rqstp, long timeout) 
{

	struct svc_xprt *xprt;

	struct svc_pool		*pool = rqstp->rq_pool;

	long			time_left;

	long			time_left = 0;



	/* Normally we will wait up to 5 seconds for any required

	 * cache information to be provided.
@@ -665,22 +665,9 @@ static struct svc_xprt *svc_get_next_xprt(struct svc_rqst *rqstp, long timeout) 


		/* No data pending. Go to sleep */

		svc_thread_enqueue(pool, rqstp);



		/*

		 * checking kthread_should_stop() here allows us to avoid

		 * locking and signalling when stopping kthreads that call

		 * svc_recv. If the thread has already been woken up, then

		 * we can exit here without sleeping. If not, then it

		 * it'll be woken up quickly during the schedule_timeout

		 */

		if (kthread_should_stop()) {

			set_current_state(TASK_RUNNING);

			xprt = ERR_PTR(-EINTR);

			goto out;

		}



		spin_unlock_bh(&pool->sp_lock);



		if (!(signalled() || kthread_should_stop())) {

			time_left = schedule_timeout(timeout);

			__set_current_state(TASK_RUNNING);
@@ -689,6 +676,8 @@ static struct svc_xprt *svc_get_next_xprt(struct svc_rqst *rqstp, long timeout) 
			xprt = rqstp->rq_xprt;

			if (xprt != NULL)

				return xprt;

		} else

			__set_current_state(TASK_RUNNING);



		spin_lock_bh(&pool->sp_lock);

		if (!time_left)