Skip to content

Commit 975b26a

Browse files
committed
Merge tag 'wq-for-6.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fix from Tejun Heo: "Just one patch to revert commit ca10d85 ("workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()"). This commit could break ordering guarantees for ordered workqueues. The problem that the commit tried to resolve partially - making ordered workqueues follow unbound cpumask - is fully solved in wq/for-6.9 branch" * tag 'wq-for-6.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: Revert "workqueue: Override implicit ordered attribute in workqueue_apply_unbound_cpumask()"
2 parents 7edfe0a + aac8a59 commit 975b26a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

kernel/workqueue.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5786,13 +5786,9 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask)
57865786
list_for_each_entry(wq, &workqueues, list) {
57875787
if (!(wq->flags & WQ_UNBOUND))
57885788
continue;
5789-
57905789
/* creating multiple pwqs breaks ordering guarantee */
5791-
if (!list_empty(&wq->pwqs)) {
5792-
if (wq->flags & __WQ_ORDERED_EXPLICIT)
5793-
continue;
5794-
wq->flags &= ~__WQ_ORDERED;
5795-
}
5790+
if (wq->flags & __WQ_ORDERED)
5791+
continue;
57965792

57975793
ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);
57985794
if (IS_ERR(ctx)) {

0 commit comments

Comments
 (0)