Commit 2b73d207 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue fixes from Tejun Heo:
 "Two workqueue fixes.  One for an unlikely but possible critical bug
  during kworker shutdown and the other to make lockdep names a bit more
  descriptive"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: ensure @task is valid across kthread_stop()
  workqueue: add args to workqueue lockdep name
parents d4964961 5bdfff96
...@@ -419,10 +419,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, ...@@ -419,10 +419,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
static struct lock_class_key __key; \ static struct lock_class_key __key; \
const char *__lock_name; \ const char *__lock_name; \
\ \
if (__builtin_constant_p(fmt)) \ __lock_name = #fmt#args; \
__lock_name = (fmt); \
else \
__lock_name = #fmt; \
\ \
__alloc_workqueue_key((fmt), (flags), (max_active), \ __alloc_workqueue_key((fmt), (flags), (max_active), \
&__key, __lock_name, ##args); \ &__key, __lock_name, ##args); \
......
...@@ -1851,6 +1851,12 @@ static void destroy_worker(struct worker *worker) ...@@ -1851,6 +1851,12 @@ static void destroy_worker(struct worker *worker)
if (worker->flags & WORKER_IDLE) if (worker->flags & WORKER_IDLE)
pool->nr_idle--; pool->nr_idle--;
/*
* Once WORKER_DIE is set, the kworker may destroy itself at any
* point. Pin to ensure the task stays until we're done with it.
*/
get_task_struct(worker->task);
list_del_init(&worker->entry); list_del_init(&worker->entry);
worker->flags |= WORKER_DIE; worker->flags |= WORKER_DIE;
...@@ -1859,6 +1865,7 @@ static void destroy_worker(struct worker *worker) ...@@ -1859,6 +1865,7 @@ static void destroy_worker(struct worker *worker)
spin_unlock_irq(&pool->lock); spin_unlock_irq(&pool->lock);
kthread_stop(worker->task); kthread_stop(worker->task);
put_task_struct(worker->task);
kfree(worker); kfree(worker);
spin_lock_irq(&pool->lock); spin_lock_irq(&pool->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment