workqueue: don't alloc_percpu for single workqueue
PATCH 1/3 workqueue: don't alloc_percpu for single workqueue
allocating memory for every cpu for single workqueue is waste.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/workqueue.c +15 -5
@@ -99,7 +99,7 @@ staticstruct cpu_workqueue_struct *wq_per_cpu (struct workqueue_struct *wq,int cpu) {if (unlikely (is_wq_single_threaded (wq))) - cpu = singlethread_cpu; +return wq->cpu_wq;return per_cpu_ptr (wq->cpu_wq, cpu); }
@@ -417,7 +417,7 @@ void flush_workqueue(struct workqueue_struct *wq)lock_map_acquire (&wq->lockdep_map);lock_map_release (&wq->lockdep_map);for_each_cpu_mask_nr (cpu, *cpu_map) -flush_cpu_workqueue (per_cpu_ptr (wq->cpu_wq, cpu)); +flush_cpu_workqueue (wq_per_cpu (wq, cpu)); }EXPORT_SYMBOL_GPL (flush_workqueue);
@@ -548,7 +548,7 @@ static void wait_on_work(struct work_struct *work) cpu_map =wq_cpu_map (wq);for_each_cpu_mask_nr (cpu, *cpu_map) -wait_on_cpu_work (per_cpu_ptr (wq->cpu_wq, cpu), work); +wait_on_cpu_work (wq_per_cpu (wq, cpu), work); } static int __cancel_work_timer(struct work_struct *work,
@@ -755,7 +755,7 @@ int current_is_keventd(void)static struct cpu_workqueue_struct *init_cpu_workqueue (struct workqueue_struct *wq,int cpu) { -struct cpu_workqueue_struct *cwq =per_cpu_ptr (wq->cpu_wq, cpu); +struct cpu_workqueue_struct *cwq =wq_per_cpu (wq, cpu); cwq->wq = wq;spin_lock_init (&cwq->lock);
@@ -816,7 +816,10 @@ struct workqueue_struct *__create_workqueue_key(const char *name,if (!wq)return NULL ; - wq->cpu_wq = alloc_percpu(struct cpu_workqueue_struct); +if (singlethread) + wq->cpu_wq =kzalloc (sizeof (*cwq),GFP_KERNEL ); +else + wq->cpu_wq = alloc_percpu(struct cpu_workqueue_struct);if (!wq->cpu_wq) {kfree (wq);return NULL ;
@@ -906,6 +910,13 @@ void destroy_workqueue(struct workqueue_struct *wq)const struct cpumask *cpu_map =wq_cpu_map (wq);int cpu; +if (is_wq_single_threaded (wq)) { +cleanup_workqueue_thread (wq->cpu_wq); +kfree (wq->cpu_wq); +kfree (wq); +return ; + } +cpu_maps_update_begin ();spin_lock (&workqueue_lock);list_del (&wq->list);