AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] SUNRPC: Fix potential deadlock in RPC code

Browse Source 
In rpc_wake_up() and rpc_wake_up_status(), it is possible for the call to
__rpc_wake_up_task() to fail if another thread happens to be calling
rpc_wake_up_task() on the same rpc_task.

Problem noticed by Bruno Faccini.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Trond Myklebust 2006-03-13 21:20:48 -08:00 committed by Linus Torvalds
parent c12e87f465
commit e6d83d5569
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/sunrpc/sched.c
View File

@ -515,16 +515,14 @@ struct rpc_task * rpc_wake_up_next(struct rpc_wait_queue *queue)
*/ */
void rpc_wake_up(struct rpc_wait_queue *queue) void rpc_wake_up(struct rpc_wait_queue *queue)
{ {
struct rpc_task *task; struct rpc_task *task, *next;
struct list_head *head; struct list_head *head;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
head = &queue->tasks[queue->maxpriority]; head = &queue->tasks[queue->maxpriority];
for (;;) { for (;;) {
while (!list_empty(head)) { list_for_each_entry_safe(task, next, head, u.tk_wait.list)
task = list_entry(head->next, struct rpc_task, u.tk_wait.list);
__rpc_wake_up_task(task); __rpc_wake_up_task(task);
}
if (head == &queue->tasks[0]) if (head == &queue->tasks[0])
break; break;
head--; head--;
@ -541,14 +539,13 @@ void rpc_wake_up(struct rpc_wait_queue *queue)
*/ */
void rpc_wake_up_status(struct rpc_wait_queue *queue, int status) void rpc_wake_up_status(struct rpc_wait_queue *queue, int status)
{ {
struct rpc_task *task, *next;
struct list_head *head; struct list_head *head;
struct rpc_task *task;
spin_lock_bh(&queue->lock); spin_lock_bh(&queue->lock);
head = &queue->tasks[queue->maxpriority]; head = &queue->tasks[queue->maxpriority];
for (;;) { for (;;) {
while (!list_empty(head)) { list_for_each_entry_safe(task, next, head, u.tk_wait.list) {
task = list_entry(head->next, struct rpc_task, u.tk_wait.list);
task->tk_status = status; task->tk_status = status;
__rpc_wake_up_task(task); __rpc_wake_up_task(task);
} }