Skip to content

Commit

Permalink
SUNRPC: Ensure that we free the rpc_task after cleanups are done
Browse files Browse the repository at this point in the history
This patch ensures that we free the rpc_task after the cleanup callbacks
are done in order to avoid a deadlock problem that can be triggered if
the callback needs to wait for another workqueue item to complete.

Signed-off-by: Trond Myklebust <[email protected]>
Cc: Weston Andros Adamson <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Bruce Fields <[email protected]>
Cc: [email protected]
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Jan 4, 2013
1 parent e25fbe3 commit c6567ed
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions net/sunrpc/sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -934,16 +934,35 @@ struct rpc_task *rpc_new_task(const struct rpc_task_setup *setup_data)
return task;
}

/*
* rpc_free_task - release rpc task and perform cleanups
*
* Note that we free up the rpc_task _after_ rpc_release_calldata()
* in order to work around a workqueue dependency issue.
*
* Tejun Heo states:
* "Workqueue currently considers two work items to be the same if they're
* on the same address and won't execute them concurrently - ie. it
* makes a work item which is queued again while being executed wait
* for the previous execution to complete.
*
* If a work function frees the work item, and then waits for an event
* which should be performed by another work item and *that* work item
* recycles the freed work item, it can create a false dependency loop.
* There really is no reliable way to detect this short of verifying
* every memory free."
*
*/
static void rpc_free_task(struct rpc_task *task)
{
const struct rpc_call_ops *tk_ops = task->tk_ops;
void *calldata = task->tk_calldata;
unsigned short tk_flags = task->tk_flags;

rpc_release_calldata(task->tk_ops, task->tk_calldata);

if (task->tk_flags & RPC_TASK_DYNAMIC) {
if (tk_flags & RPC_TASK_DYNAMIC) {
dprintk("RPC: %5u freeing task\n", task->tk_pid);
mempool_free(task, rpc_task_mempool);
}
rpc_release_calldata(tk_ops, calldata);
}

static void rpc_async_release(struct work_struct *work)
Expand Down

0 comments on commit c6567ed

Please sign in to comment.