leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

workqueue: keep track of the flushing task and pool manager

Browse Source 
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>
This commit is contained in:
Tejun Heo 2015-03-09 09:22:28 -04:00
parent e2dca7adff
commit 2607d7a6db
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/workqueue.c
View File

@ -159,6 +159,7 @@ struct worker_pool {
/* see manage_workers() for details on the two manager mutexes */ /* see manage_workers() for details on the two manager mutexes */
struct mutex manager_arb; /* manager arbitration */ struct mutex manager_arb; /* manager arbitration */
struct worker *manager; /* L: purely informational */
struct mutex attach_mutex; /* attach/detach exclusion */ struct mutex attach_mutex; /* attach/detach exclusion */
struct list_head workers; /* A: attached workers */ struct list_head workers; /* A: attached workers */
struct completion *detach_completion; /* all workers detached */ struct completion *detach_completion; /* all workers detached */
@ -1918,9 +1919,11 @@ static bool manage_workers(struct worker *worker)
*/ */
if (!mutex_trylock(&pool->manager_arb)) if (!mutex_trylock(&pool->manager_arb))
return false; return false;
pool->manager = worker;
maybe_create_worker(pool); maybe_create_worker(pool);
pool->manager = NULL;
mutex_unlock(&pool->manager_arb); mutex_unlock(&pool->manager_arb);
return true; return true;
} }
@ -2310,6 +2313,7 @@ repeat:
struct wq_barrier { struct wq_barrier {
struct work_struct work; struct work_struct work;
struct completion done; struct completion done;
struct task_struct *task; /* purely informational */
}; };
static void wq_barrier_func(struct work_struct *work) static void wq_barrier_func(struct work_struct *work)
@ -2358,6 +2362,7 @@ static void insert_wq_barrier(struct pool_workqueue *pwq,
INIT_WORK_ONSTACK(&barr->work, wq_barrier_func); INIT_WORK_ONSTACK(&barr->work, wq_barrier_func);
__set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(&barr->work)); __set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(&barr->work));
init_completion(&barr->done); init_completion(&barr->done);
barr->task = current;
/* /*
* If @target is currently being executed, schedule the * If @target is currently being executed, schedule the