Skip to content

Commit

Permalink
workqueue: keep track of the flushing task and pool manager
Browse files Browse the repository at this point in the history
Add wq_barrier->task and worker_pool->manager to keep track of the
flushing task and pool manager respectively.  These are purely
informational and will be used to implement sysrq dump of workqueues.

Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Tejun Heo committed Mar 9, 2015
1 parent e2dca7a commit 2607d7a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions kernel/workqueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ struct worker_pool {

/* see manage_workers() for details on the two manager mutexes */
struct mutex manager_arb; /* manager arbitration */
struct worker *manager; /* L: purely informational */
struct mutex attach_mutex; /* attach/detach exclusion */
struct list_head workers; /* A: attached workers */
struct completion *detach_completion; /* all workers detached */
Expand Down Expand Up @@ -1918,9 +1919,11 @@ static bool manage_workers(struct worker *worker)
*/
if (!mutex_trylock(&pool->manager_arb))
return false;
pool->manager = worker;

maybe_create_worker(pool);

pool->manager = NULL;
mutex_unlock(&pool->manager_arb);
return true;
}
Expand Down Expand Up @@ -2310,6 +2313,7 @@ static int rescuer_thread(void *__rescuer)
struct wq_barrier {
struct work_struct work;
struct completion done;
struct task_struct *task; /* purely informational */
};

static void wq_barrier_func(struct work_struct *work)
Expand Down Expand Up @@ -2358,6 +2362,7 @@ static void insert_wq_barrier(struct pool_workqueue *pwq,
INIT_WORK_ONSTACK(&barr->work, wq_barrier_func);
__set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(&barr->work));
init_completion(&barr->done);
barr->task = current;

/*
* If @target is currently being executed, schedule the
Expand Down

0 comments on commit 2607d7a

Please sign in to comment.