Commit 35525b79 authored by Andriy Skulysh's avatar Andriy Skulysh Committed by J. Bruce Fields

sunrpc: Fix lockd sleeping until timeout

There is a race in enqueueing thread to a pool and
waking up a thread.
lockd doesn't wake up on reception of lock granted callback
if svc_wake_up() is called before lockd's thread is added
to a pool.
Signed-off-by: default avatarAndriy Skulysh <Andriy_Skulysh@xyratex.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 624ab464
...@@ -50,6 +50,7 @@ struct svc_pool { ...@@ -50,6 +50,7 @@ struct svc_pool {
unsigned int sp_nrthreads; /* # of threads in pool */ unsigned int sp_nrthreads; /* # of threads in pool */
struct list_head sp_all_threads; /* all server threads */ struct list_head sp_all_threads; /* all server threads */
struct svc_pool_stats sp_stats; /* statistics on pool operation */ struct svc_pool_stats sp_stats; /* statistics on pool operation */
int sp_task_pending;/* has pending task */
} ____cacheline_aligned_in_smp; } ____cacheline_aligned_in_smp;
/* /*
......
...@@ -499,7 +499,8 @@ void svc_wake_up(struct svc_serv *serv) ...@@ -499,7 +499,8 @@ void svc_wake_up(struct svc_serv *serv)
rqstp->rq_xprt = NULL; rqstp->rq_xprt = NULL;
*/ */
wake_up(&rqstp->rq_wait); wake_up(&rqstp->rq_wait);
} } else
pool->sp_task_pending = 1;
spin_unlock_bh(&pool->sp_lock); spin_unlock_bh(&pool->sp_lock);
} }
} }
...@@ -634,7 +635,13 @@ struct svc_xprt *svc_get_next_xprt(struct svc_rqst *rqstp, long timeout) ...@@ -634,7 +635,13 @@ struct svc_xprt *svc_get_next_xprt(struct svc_rqst *rqstp, long timeout)
* long for cache updates. * long for cache updates.
*/ */
rqstp->rq_chandle.thread_wait = 1*HZ; rqstp->rq_chandle.thread_wait = 1*HZ;
pool->sp_task_pending = 0;
} else { } else {
if (pool->sp_task_pending) {
pool->sp_task_pending = 0;
spin_unlock_bh(&pool->sp_lock);
return ERR_PTR(-EAGAIN);
}
/* No data pending. Go to sleep */ /* No data pending. Go to sleep */
svc_thread_enqueue(pool, rqstp); svc_thread_enqueue(pool, rqstp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment