1 files changed, 10 insertions, 0 deletions

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index a86688fabc55..abe4a4971c24 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -3929,6 +3929,16 @@ struct workqueue_struct *__alloc_workqueue_key(const char *fmt,
         struct workqueue_struct *wq;
         struct pool_workqueue *pwq;
 
+        /*
+         * Unbound && max_active == 1 used to imply ordered, which is no
+         * longer the case on NUMA machines due to per-node pools.  While
+         * alloc_ordered_workqueue() is the right way to create an ordered
+         * workqueue, keep the previous behavior to avoid subtle breakages
+         * on NUMA.
+         */
+        if ((flags & WQ_UNBOUND) && max_active == 1)
+                flags |= __WQ_ORDERED;
+
         /* see the comment above the definition of WQ_POWER_EFFICIENT */
         if ((flags & WQ_POWER_EFFICIENT) && wq_power_efficient)
                 flags |= WQ_UNBOUND;