workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
PATCH 1/1 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
Quoted 1 line
From
e141deffe6a30cfe7dd6ad97f21afa85b80ca3acMon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Sat, 13 Sep 2014 04:14:30 +0900
create_singlethread_workqueue() is a compat interface for singled threaded workqueue which maps to ordered workqueue w/ rescuer in the current implementation. create_singlethread_workqueue() currently implemented by invoking alloc_workqueue() w/ appropriate parameters.
8719dceae2f9 ("workqueue: reject adjusting max_active or applying attrs to ordered workqueues") introduced __WQ_ORDERED to protect ordered workqueues against dynamic attribute changes which can break ordering guarantees but forgot to apply it to create_singlethread_workqueue(). While this can be potentially dangerous, this isn't a problem in practice given the existing uses of dynamic attribute changes.
Let's make create_singlethread_workqueue() wrap alloc_ordered_workqueue() instead so that it inherits __WQ_ORDERED and can implicitly track future ordered_workqueue changes.
---
Applied to wq/for-3.18.
Thanks.
include/linux/workqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/workqueue.h +1 -1
@@ -419,7 +419,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,alloc_workqueue ("%s" ,WQ_FREEZABLE |WQ_UNBOUND |WQ_MEM_RECLAIM , \ 1, (name))#define create_singlethread_workqueue (name) \ - alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name)) + alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, name)extern void destroy_workqueue (struct workqueue_struct *wq);
Signature · 1 line
1.9.3
Quoted 17 lines · Tejun Heo
From
e141deffe6a30cfe7dd6ad97f21afa85b80ca3acMon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Sat, 13 Sep 2014 04:14:30 +0900
create_singlethread_workqueue()is a compat interface for singled threaded workqueue which maps to ordered workqueue w/ rescuer in the current implementation.create_singlethread_workqueue()currently implemented by invokingalloc_workqueue()w/ appropriate parameters.
8719dceae2f9("workqueue: reject adjustingmax_activeor applying attrs to ordered workqueues") introduced__WQ_ORDEREDto protect ordered workqueues against dynamic attribute changes which can break ordering guarantees but forgot to apply it tocreate_singlethread_workqueue(). While this can be potentially dangerous, this isn't a problem in practice given the existing uses of dynamic attribute changes.
Quoted 3 lines
Let's make
create_singlethread_workqueue()wrapalloc_ordered_workqueue()instead so that it inherits__WQ_ORDEREDand can implicitly track futureordered_workqueuechanges.
Oops, this is the right change but w/ wrong description and branch. W/o __WQ_ORDERED, create_singlethread_workqueue() is broken on NUMA setups. Will respin the patch.
Thanks.
Signature · 1 line
tejun
Tejun Heo
maintainerPATCH v2 1/1 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue()
In reply to Tejun HeoQuoted 1 line
From
e09c2c295468476a239d13324ce9042ec4de05ebMon Sep 17 00:00:00 2001
From: Tejun Heo <[email protected]>
Date: Sat, 13 Sep 2014 04:14:30 +0900
create_singlethread_workqueue() is a compat interface for single threaded workqueue which maps to ordered workqueue w/ rescuer in the current implementation. create_singlethread_workqueue() currently implemented by invoking alloc_workqueue() w/ appropriate parameters.
8719dceae2f9 ("workqueue: reject adjusting max_active or applying attrs to ordered workqueues") introduced __WQ_ORDERED to protect ordered workqueues against dynamic attribute changes which can break ordering guarantees but forgot to apply it to create_singlethread_workqueue(). This in itself is okay as nobody currently uses dynamic attribute change on workqueues created with create_singlethread_workqueue().
However, 4c16bd327c ("workqueue: implement NUMA affinity for unbound workqueues") broke singlethreaded guarantee for ordered workqueues through allocating a separate pool_workqueue on each NUMA node by default. A later change 8a2b75384444 ("workqueue: fix ordered workqueues in NUMA setups") fixed it by allocating only one global pool_workqueue if __WQ_ORDERED is set.
Combined, the __WQ_ORDERED omission in create_singlethread_workqueue() became critical breaking its single threadedness and ordering guarantee.
Let's make create_singlethread_workqueue() wrap alloc_ordered_workqueue() instead so that it inherits __WQ_ORDERED and can implicitly track future ordered_workqueue changes.
v2: I missed that __WQ_ORDERED now protects against pwq splitting
across NUMA nodes and incorrectly described the patch as a nice-to-have fix to protect against future dynamic attribute usages. Oleg pointed out that this is actually a critical breakage due to 8a2b75384444 ("workqueue: fix ordered workqueues in NUMA setups").
---
Applied to wq/for-3.17-fixes.
Thanks.
include/linux/workqueue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/workqueue.h +1 -1
@@ -419,7 +419,7 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,alloc_workqueue ("%s" ,WQ_FREEZABLE |WQ_UNBOUND |WQ_MEM_RECLAIM , \ 1, (name))#define create_singlethread_workqueue (name) \ - alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name)) + alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, name)extern void destroy_workqueue (struct workqueue_struct *wq);
Signature · 1 line
1.9.3