Revert Changes to kernel/workqueue.c
RFC PATCH 2/4 Revert Changes to kernel/workqueue.c
Signature · 6 lines
-- Gautham R Shenoy Linux Technology Center IBM India. "Freedom comes with a price tag of responsibility, which is still a bargain, because Freedom is priceless!"
This patch removes the per-subsystem hot-cpu mutex, workqueue_lock and reverts the implementation of workqueue.c to its older form.
kernel/workqueue.c +12 -21
@@ -68,7 +68,7 @@ struct workqueue_struct {/* All the per-cpu workqueues on the system, for hotplug cpu to add/remove threads to each one as cpus come/go. */ -static DEFINE_MUTEX (workqueue_mutex); +static DEFINE_SPINLOCK (workqueue_lock);static LIST_HEAD (workqueues);static int singlethread_cpu;
@@ -320,10 +320,10 @@ void fastcall flush_workqueue(struct wor }else {int cpu; -mutex_lock (&workqueue_mutex); +lock_cpu_hotplug ();for_each_online_cpu (cpu)flush_cpu_workqueue (per_cpu_ptr (wq->cpu_wq, cpu)); -mutex_unlock (&workqueue_mutex); +unlock_cpu_hotplug (); } }EXPORT_SYMBOL_GPL (flush_workqueue);
@@ -371,7 +371,8 @@ struct workqueue_struct *__create_workqu } wq->name = name; -mutex_lock (&workqueue_mutex); +/* We don't need the distraction of CPUs appearing and vanishing. */ +lock_cpu_hotplug ();if (singlethread) {INIT_LIST_HEAD (&wq->list); p =create_workqueue_thread (wq, singlethread_cpu);
@@ -380,7 +381,9 @@ struct workqueue_struct *__create_workquelse wake_up_process (p); }else { +spin_lock (&workqueue_lock);list_add (&wq->list, &workqueues); +spin_unlock (&workqueue_lock);for_each_online_cpu (cpu) { p =create_workqueue_thread (wq, cpu);if (p) {
@@ -390,7 +393,7 @@ struct workqueue_struct *__create_workqu destroy =1 ; } } -mutex_unlock (&workqueue_mutex); +unlock_cpu_hotplug ();/* * Was there any error during startup? If yes then clean up:
@@ -431,15 +434,17 @@ void destroy_workqueue(struct workqueue_flush_workqueue (wq);/* We don't need the distraction of CPUs appearing and vanishing. */ -mutex_lock (&workqueue_mutex); +lock_cpu_hotplug ();if (is_single_threaded (wq))cleanup_workqueue_thread (wq, singlethread_cpu);else {for_each_online_cpu (cpu)cleanup_workqueue_thread (wq, cpu); +spin_lock (&workqueue_lock);list_del (&wq->list); +spin_unlock (&workqueue_lock); } -mutex_unlock (&workqueue_mutex); +unlock_cpu_hotplug ();free_percpu (wq->cpu_wq);kfree (wq); }
@@ -510,13 +515,11 @@ int schedule_on_each_cpu(void (*func)(voif (!works)return -ENOMEM ; -mutex_lock (&workqueue_mutex);for_each_online_cpu (cpu) {INIT_WORK (per_cpu_ptr (works, cpu), func, info);__queue_work (per_cpu_ptr (keventd_wq->cpu_wq, cpu),per_cpu_ptr (works, cpu)); } -mutex_unlock (&workqueue_mutex);flush_workqueue (keventd_wq);free_percpu (works);return 0 ;
@@ -632,7 +635,6 @@ static int __devinit workqueue_cpu_callbswitch (action) {case CPU_UP_PREPARE : -mutex_lock (&workqueue_mutex);/* Create a new workqueue thread for it. */ list_for_each_entry (wq, &workqueues, list) {if (!create_workqueue_thread (wq, hotcpu)) {
@@ -651,7 +653,6 @@ static int __devinit workqueue_cpu_callbkthread_bind (cwq->thread, hotcpu);wake_up_process (cwq->thread); } -mutex_unlock (&workqueue_mutex);break ;case CPU_UP_CANCELED :
@@ -663,15 +664,6 @@ static int __devinit workqueue_cpu_callb any_online_cpu(cpu_online_map));cleanup_workqueue_thread (wq, hotcpu); } -mutex_unlock (&workqueue_mutex); -break ; - -case CPU_DOWN_PREPARE : -mutex_lock (&workqueue_mutex); -break ; - -case CPU_DOWN_FAILED : -mutex_unlock (&workqueue_mutex);break ;case CPU_DEAD :
@@ -679,7 +671,6 @@ static int __devinit workqueue_cpu_callbcleanup_workqueue_thread (wq, hotcpu);list_for_each_entry (wq, &workqueues, list)take_over_work (wq, hotcpu); -mutex_unlock (&workqueue_mutex);break ; }
Quoted 4 lines
kernel/workqueue.c +0
-0@@ -510,13 +515,11 @@ int schedule_on_each_cpu(void (*func)(voif (!works)return -ENOMEM ;
kernel/workqueue.c int schedule_on_each_cpu(void (*func)(vo · line 525
Quoted 10 lines
kernel/workqueue.c +0
-2-mutex_lock (&workqueue_mutex);for_each_online_cpu (cpu) {INIT_WORK (per_cpu_ptr (works, cpu), func, info);__queue_work (per_cpu_ptr (keventd_wq->cpu_wq, cpu),per_cpu_ptr (works, cpu)); } -mutex_unlock (&workqueue_mutex);flush_workqueue (keventd_wq);free_percpu (works);return 0 ;
Removing this lock without adding a lock/unlock_cpu_hotplug seems wrong, since this function is walking the cpu_online_map.
Quoted 4 lines · Heiko Carstens
Quoted 4 lines
kernel/workqueue.c +0
-0@@ -510,13 +515,11 @@ int schedule_on_each_cpu(void (*func)(voif (!works)return -ENOMEM ;
Quoted 13 lines
kernel/workqueue.c int schedule_on_each_cpu(void (*func)(vo · line 525
Quoted 10 lines
kernel/workqueue.c +0
-2-mutex_lock (&workqueue_mutex);for_each_online_cpu (cpu) {INIT_WORK (per_cpu_ptr (works, cpu), func, info);__queue_work (per_cpu_ptr (keventd_wq->cpu_wq, cpu),per_cpu_ptr (works, cpu)); } -mutex_unlock (&workqueue_mutex);flush_workqueue (keventd_wq);free_percpu (works);return 0 ;Removing this lock without adding a lock/unlock_cpu_hotplug seems wrong, since this function is walking the
cpu_online_map.
I had thought of it. But later decided to retain the same code as 2.6.18-rc4, where there was no lock_cpu_hotplug surrounding for_each_online_cpu.
Furthermore, it did not create any problems with the test run. So I thought *may-be* we don't need it.
But looks like I need to investigate further.
Thanks for pointing it out.
Regards
ego.
Signature · 5 lines
Gautham R Shenoy Linux Technology Center IBM India. "Freedom comes with a price tag of responsibility, which is still a bargain, because Freedom is priceless!"
Quoted 4 lines · Heiko Carstens
Quoted 4 lines
kernel/workqueue.c +0
-0@@ -510,13 +515,11 @@ int schedule_on_each_cpu(void (*func)(voif (!works)return -ENOMEM ;
Quoted 13 lines
kernel/workqueue.c int schedule_on_each_cpu(void (*func)(vo · line 525
Quoted 10 lines
kernel/workqueue.c +0
-2-mutex_lock (&workqueue_mutex);for_each_online_cpu (cpu) {INIT_WORK (per_cpu_ptr (works, cpu), func, info);__queue_work (per_cpu_ptr (keventd_wq->cpu_wq, cpu),per_cpu_ptr (works, cpu)); } -mutex_unlock (&workqueue_mutex);flush_workqueue (keventd_wq);free_percpu (works);return 0 ;Removing this lock without adding a lock/unlock_cpu_hotplug seems wrong, since this function is walking the
cpu_online_map.
As long as you disable preemption and don't block the critical section should be safe from cpu hotplug. There is no need to lock/unlock cpu hotplug.
Thanks
Dipankar
Quoted 19 lines · Dipankar Sarma
Quoted 4 lines · Heiko Carstens
Quoted 4 lines
kernel/workqueue.c +0
-0@@ -510,13 +515,11 @@ int schedule_on_each_cpu(void (*func)(voif (!works)return -ENOMEM ;Quoted 13 lines
kernel/workqueue.c int schedule_on_each_cpu(void (*func)(vo · line 525
Quoted 10 lines
kernel/workqueue.c +0
-2-mutex_lock (&workqueue_mutex);for_each_online_cpu (cpu) {INIT_WORK (per_cpu_ptr (works, cpu), func, info);__queue_work (per_cpu_ptr (keventd_wq->cpu_wq, cpu),per_cpu_ptr (works, cpu)); } -mutex_unlock (&workqueue_mutex);flush_workqueue (keventd_wq);free_percpu (works);return 0 ;Removing this lock without adding a lock/unlock_cpu_hotplug seems wrong, since this function is walking the
cpu_online_map.
Quoted 3 lines
As long as you disable preemption and don't block the critical section should be safe from cpu hotplug. There is no need to lock/unlock cpu hotplug.
What disables preemption here?
Ah.. you probably meant preempt_disable/enable instead of lock/unlock cpu hotplug would be sufficient. True.