diff options
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index e66ee1016568..e602ab2049a7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5681,21 +5681,23 @@ out_unlock: static int alloc_and_link_percpu_pwqs(struct workqueue_struct *wq) { + struct pool_workqueue *pwq; int cpu; for_each_possible_cpu(cpu) { - struct pool_workqueue **pwq_p = per_cpu_ptr(wq->cpu_pwq, cpu); struct worker_pool *pool = get_percpu_pool(wq, cpu); - *pwq_p = kmem_cache_alloc_node(pwq_cache, GFP_KERNEL, pool->node); - if (!*pwq_p) + pwq = kmem_cache_alloc_node(pwq_cache, GFP_KERNEL, pool->node); + if (!pwq) return -ENOMEM; - init_pwq(*pwq_p, wq, pool); + init_pwq(pwq, wq, pool); mutex_lock(&wq->mutex); - link_pwq(*pwq_p); + link_pwq(pwq); mutex_unlock(&wq->mutex); + + rcu_assign_pointer(*per_cpu_ptr(wq->cpu_pwq, cpu), pwq); } return 0; @@ -5708,7 +5710,7 @@ static int alloc_and_link_pwqs(struct workqueue_struct *wq) lockdep_assert_held(&wq_pool_mutex); - wq->cpu_pwq = alloc_percpu(struct pool_workqueue *); + wq->cpu_pwq = alloc_percpu(struct pool_workqueue __rcu *); if (!wq->cpu_pwq) goto enomem; @@ -5734,8 +5736,11 @@ static int alloc_and_link_pwqs(struct workqueue_struct *wq) enomem: if (wq->cpu_pwq) { for_each_possible_cpu(cpu) { - struct pool_workqueue *pwq = *per_cpu_ptr(wq->cpu_pwq, cpu); + struct pool_workqueue __rcu **slot; + struct pool_workqueue *pwq; + slot = per_cpu_ptr(wq->cpu_pwq, cpu); + pwq = rcu_access_pointer(*slot); if (pwq) { /* * Unlink pwq from wq->pwqs since link_pwq() |