diff options
| author | Tejun Heo <tj@kernel.org> | 2019-09-20 14:09:14 -0700 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2019-09-20 14:09:14 -0700 |
| commit | 30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1 (patch) | |
| tree | 812840e9780ecdcd519ba1304ad0919dc5f8bd7a /kernel/workqueue.c | |
| parent | 8efe1223d73c218ce7e8b2e0e9aadb974b582d7f (diff) | |
| download | lwn-30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1.tar.gz lwn-30ae2fc0a75eb5f1a38bbee7355d8e3bc823a6e1.zip | |
workqueue: Minor follow-ups to the rescuer destruction change
* Now that wq->rescuer may be cleared while rescuer is still there,
switch show_pwq() debug printout to test worker->rescue_wq to
identify rescuers intead of testing wq->rescuer.
* Update comment on ->rescuer locking.
Signed-off-by: Tejun Heo <tj@kernel.org>
Suggested-by: Lai Jiangshan <jiangshanlai@gmail.com>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3f067f1d72e3..7f7aa45dac37 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -248,7 +248,7 @@ struct workqueue_struct { struct list_head flusher_overflow; /* WQ: flush overflow list */ struct list_head maydays; /* MD: pwqs requesting rescue */ - struct worker *rescuer; /* I: rescue worker */ + struct worker *rescuer; /* MD: rescue worker */ int nr_drainers; /* WQ: drain in progress */ int saved_max_active; /* WQ: saved pwq max_active */ @@ -4672,7 +4672,7 @@ static void show_pwq(struct pool_workqueue *pwq) pr_cont("%s %d%s:%ps", comma ? "," : "", task_pid_nr(worker->task), - worker == pwq->wq->rescuer ? "(RESCUER)" : "", + worker->rescue_wq ? "(RESCUER)" : "", worker->current_func); list_for_each_entry(work, &worker->scheduled, entry) pr_cont_work(false, work); |