Commit 975b26ab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 ca10d851 ("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()"
parents 7edfe0aa aac8a595

kernel/workqueue.c

+2 −6
Original line number Diff line number Diff line
@@ -5786,13 +5786,9 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask) 
	list_for_each_entry(wq, &workqueues, list) {

		if (!(wq->flags & WQ_UNBOUND))

			continue;



		/* creating multiple pwqs breaks ordering guarantee */

		if (!list_empty(&wq->pwqs)) {

			if (wq->flags & __WQ_ORDERED_EXPLICIT)

		if (wq->flags & __WQ_ORDERED)

			continue;

			wq->flags &= ~__WQ_ORDERED;

		}



		ctx = apply_wqattrs_prepare(wq, wq->unbound_attrs, unbound_cpumask);

		if (IS_ERR(ctx)) {