From: Greg Kroah-Hartman Date: Thu, 10 Aug 2017 16:27:54 +0000 (-0700) Subject: 3.18-stable patches X-Git-Tag: v4.12.6~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa6ef400b431c5a8263a33fa5d75fa830e711bb1;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: workqueue-implicit-ordered-attribute-should-be-overridable.patch --- diff --git a/queue-3.18/series b/queue-3.18/series index bbfa717530f..5c1e8f388e2 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -91,3 +91,4 @@ signal-protect-signal_unkillable-from-unintentional-clearing.patch mm-don-t-dereference-struct-page-fields-of-invalid-pages.patch ipv4-should-use-consistent-conditional-judgement-for-ip-fragment-in-__ip_append_data-and-ip_finish_output.patch net-phy-fix-phy-unbind-crash.patch +workqueue-implicit-ordered-attribute-should-be-overridable.patch diff --git a/queue-3.18/workqueue-implicit-ordered-attribute-should-be-overridable.patch b/queue-3.18/workqueue-implicit-ordered-attribute-should-be-overridable.patch new file mode 100644 index 00000000000..58125c1c818 --- /dev/null +++ b/queue-3.18/workqueue-implicit-ordered-attribute-should-be-overridable.patch @@ -0,0 +1,91 @@ +From 0a94efb5acbb6980d7c9ab604372d93cd507e4d8 Mon Sep 17 00:00:00 2001 +From: Tejun Heo +Date: Sun, 23 Jul 2017 08:36:15 -0400 +Subject: workqueue: implicit ordered attribute should be overridable + +From: Tejun Heo + +commit 0a94efb5acbb6980d7c9ab604372d93cd507e4d8 upstream. + +5c0338c68706 ("workqueue: restore WQ_UNBOUND/max_active==1 to be +ordered") automatically enabled ordered attribute for unbound +workqueues w/ max_active == 1. Because ordered workqueues reject +max_active and some attribute changes, this implicit ordered mode +broke cases where the user creates an unbound workqueue w/ max_active +== 1 and later explicitly changes the related attributes. + +This patch distinguishes explicit and implicit ordered setting and +overrides from attribute changes if implict. + +Signed-off-by: Tejun Heo +Fixes: 5c0338c68706 ("workqueue: restore WQ_UNBOUND/max_active==1 to be ordered") +Cc: Holger Hoffstätte +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/workqueue.h | 4 +++- + kernel/workqueue.c | 13 +++++++++---- + 2 files changed, 12 insertions(+), 5 deletions(-) + +--- a/include/linux/workqueue.h ++++ b/include/linux/workqueue.h +@@ -315,6 +315,7 @@ enum { + + __WQ_DRAINING = 1 << 16, /* internal: workqueue is draining */ + __WQ_ORDERED = 1 << 17, /* internal: workqueue is ordered */ ++ __WQ_ORDERED_EXPLICIT = 1 << 18, /* internal: alloc_ordered_workqueue() */ + + WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ + WQ_MAX_UNBOUND_PER_CPU = 4, /* 4 * #cpus for unbound wq */ +@@ -412,7 +413,8 @@ __alloc_workqueue_key(const char *fmt, u + * Pointer to the allocated workqueue on success, %NULL on failure. + */ + #define alloc_ordered_workqueue(fmt, flags, args...) \ +- alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args) ++ alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | \ ++ __WQ_ORDERED_EXPLICIT | (flags), 1, ##args) + + #define create_workqueue(name) \ + alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, (name)) +--- a/kernel/workqueue.c ++++ b/kernel/workqueue.c +@@ -3255,7 +3255,7 @@ int workqueue_sysfs_register(struct work + * attributes breaks ordering guarantee. Disallow exposing ordered + * workqueues. + */ +- if (WARN_ON(wq->flags & __WQ_ORDERED)) ++ if (WARN_ON(wq->flags & __WQ_ORDERED_EXPLICIT)) + return -EINVAL; + + wq->wq_dev = wq_dev = kzalloc(sizeof(*wq_dev), GFP_KERNEL); +@@ -3830,8 +3830,12 @@ int apply_workqueue_attrs(struct workque + return -EINVAL; + + /* creating multiple pwqs breaks ordering guarantee */ +- if (WARN_ON((wq->flags & __WQ_ORDERED) && !list_empty(&wq->pwqs))) +- return -EINVAL; ++ if (!list_empty(&wq->pwqs)) { ++ if (WARN_ON(wq->flags & __WQ_ORDERED_EXPLICIT)) ++ return -EINVAL; ++ ++ wq->flags &= ~__WQ_ORDERED; ++ } + + pwq_tbl = kzalloc(nr_node_ids * sizeof(pwq_tbl[0]), GFP_KERNEL); + new_attrs = alloc_workqueue_attrs(GFP_KERNEL); +@@ -4277,13 +4281,14 @@ void workqueue_set_max_active(struct wor + struct pool_workqueue *pwq; + + /* disallow meddling with max_active for ordered workqueues */ +- if (WARN_ON(wq->flags & __WQ_ORDERED)) ++ if (WARN_ON(wq->flags & __WQ_ORDERED_EXPLICIT)) + return; + + max_active = wq_clamp_max_active(max_active, wq->flags, wq->name); + + mutex_lock(&wq->mutex); + ++ wq->flags &= ~__WQ_ORDERED; + wq->saved_max_active = max_active; + + for_each_pwq(pwq, wq)