SUNRPC: Should wake up the privileged task firstly.
When find a task from wait queue to wake up, a non-privileged task may be found out, rather than the privileged. This maybe lead a deadlock same as commitdfe1fe75e0
("NFSv4: Fix deadlock between nfs4_evict_inode() and nfs4_opendata_get_inode()"): Privileged delegreturn task is queued to privileged list because all the slots are assigned. If there has no enough slot to wake up the non-privileged batch tasks(session less than 8 slot), then the privileged delegreturn task maybe lost waked up because the found out task can't get slot since the session is on draining. So we should treate the privileged task as the emergency task, and execute it as for as we can. Reported-by: Hulk Robot <hulkci@huawei.com> Fixes:5fcdfacc01
("NFSv4: Return delegations synchronously in evict_inode") Cc: stable@vger.kernel.org Signed-off-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Родитель
fcb170a9d8
Коммит
5483b904bf
|
@ -591,6 +591,15 @@ static struct rpc_task *__rpc_find_next_queued_priority(struct rpc_wait_queue *q
|
||||||
struct list_head *q;
|
struct list_head *q;
|
||||||
struct rpc_task *task;
|
struct rpc_task *task;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Service the privileged queue.
|
||||||
|
*/
|
||||||
|
q = &queue->tasks[RPC_NR_PRIORITY - 1];
|
||||||
|
if (queue->maxpriority > RPC_PRIORITY_PRIVILEGED && !list_empty(q)) {
|
||||||
|
task = list_first_entry(q, struct rpc_task, u.tk_wait.list);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Service a batch of tasks from a single owner.
|
* Service a batch of tasks from a single owner.
|
||||||
*/
|
*/
|
||||||
|
|
Загрузка…
Ссылка в новой задаче