History

workqueue: introduce system_highpri_wq

Commit 3270476a6c0ce322354df8679652f060d66526dc ('workqueue: reimplement WQ_HIGHPRI using a separate worker_pool') introduce separate worker pool for HIGHPRI. When we handle busyworkers for gcwq, it can be normal worker or highpri worker. But, we don't consider this difference in rebind_workers(), we use just system_wq for highpri worker. It makes mismatch between cwq->pool and worker->pool. It doesn't make error in current implementation, but possible in the future. Now, we introduce system_highpri_wq to use proper cwq for highpri workers in rebind_workers(). Following patch fix this issue properly. tj: Even apart from rebinding, having system_highpri_wq generally makes sense.

Joonsoo Kim committed 14 years ago

Commit 1aabe901 parent e42986d1 file · +6 −3Browse files

Showing the changes to kernel/workqueue.c (1 of 1 file). Show all

Unified · Split

kernel/workqueue.c+6−3
@@ -269,12 +269,14 @@ struct workqueue_struct { · 268 unmodified lines
269};269};
270 270
271struct workqueue_struct *system_wq __read_mostly;271struct workqueue_struct *system_wq __read_mostly;
272struct workqueue_struct *system_highpri_wq __read_mostly;
272struct workqueue_struct *system_long_wq __read_mostly;273struct workqueue_struct *system_long_wq __read_mostly;
273struct workqueue_struct *system_nrt_wq __read_mostly;274struct workqueue_struct *system_nrt_wq __read_mostly;
274struct workqueue_struct *system_unbound_wq __read_mostly;275struct workqueue_struct *system_unbound_wq __read_mostly;
275struct workqueue_struct *system_freezable_wq __read_mostly;276struct workqueue_struct *system_freezable_wq __read_mostly;
276struct workqueue_struct *system_nrt_freezable_wq __read_mostly;277struct workqueue_struct *system_nrt_freezable_wq __read_mostly;
277EXPORT_SYMBOL_GPL(system_wq);278EXPORT_SYMBOL_GPL(system_wq);
279EXPORT_SYMBOL_GPL(system_highpri_wq);
278EXPORT_SYMBOL_GPL(system_long_wq);280EXPORT_SYMBOL_GPL(system_long_wq);
279EXPORT_SYMBOL_GPL(system_nrt_wq);281EXPORT_SYMBOL_GPL(system_nrt_wq);
280EXPORT_SYMBOL_GPL(system_unbound_wq);282EXPORT_SYMBOL_GPL(system_unbound_wq);
@@ -3928,6 +3930,7 @@ static int __init init_workqueues(void) · 3647 unmodified lines
3928 }3930 }
3929 3931
3930 system_wq = alloc_workqueue("events", 0, 0);3932 system_wq = alloc_workqueue("events", 0, 0);
3933 system_highpri_wq = alloc_workqueue("events_highpri", WQ_HIGHPRI, 0);
3931 system_long_wq = alloc_workqueue("events_long", 0, 0);3934 system_long_wq = alloc_workqueue("events_long", 0, 0);
3932 system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0);3935 system_nrt_wq = alloc_workqueue("events_nrt", WQ_NON_REENTRANT, 0);
3933 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,3936 system_unbound_wq = alloc_workqueue("events_unbound", WQ_UNBOUND,
@@ -3936,9 +3939,9 @@ static int __init init_workqueues(void) · 2 unmodified lines
3936 WQ_FREEZABLE, 0);3939 WQ_FREEZABLE, 0);
3937 system_nrt_freezable_wq = alloc_workqueue("events_nrt_freezable",3940 system_nrt_freezable_wq = alloc_workqueue("events_nrt_freezable",
3938 WQ_NON_REENTRANT | WQ_FREEZABLE, 0);3941 WQ_NON_REENTRANT | WQ_FREEZABLE, 0);
3939 BUG_ON(!system_wq || !system_long_wq || !system_nrt_wq ||3942 BUG_ON(!system_wq || !system_highpri_wq || !system_long_wq ||
3940 !system_unbound_wq || !system_freezable_wq ||3943 !system_nrt_wq || !system_unbound_wq || !system_freezable_wq ||
3941 !system_nrt_freezable_wq);3944 !system_nrt_freezable_wq);
3942 return 0;3945 return 0;
3943}3946}
3944early_initcall(init_workqueues);3947early_initcall(init_workqueues);