Commit f4ce1f33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'wq-for-6.14-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 

Pull workqueue update from Tejun Heo:
 "This contains a patch improve debug visibility.

  While it isn't a fix, the change carries virtually no risk and makes
  it substantially easier to chase down a class of problems"

* tag 'wq-for-6.14-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: Log additional details when rejecting work
parents e6d3c4e5 8221fd1a

kernel/workqueue.c

+3 −1
Original line number Diff line number Diff line
@@ -2254,8 +2254,10 @@ static void __queue_work(int cpu, struct workqueue_struct *wq, 
	 * queues a new work item to a wq after destroy_workqueue(wq).

	 */

	if (unlikely(wq->flags & (__WQ_DESTROYING | __WQ_DRAINING) &&

		     WARN_ON_ONCE(!is_chained_work(wq))))

		     WARN_ONCE(!is_chained_work(wq), "workqueue: cannot queue %ps on wq %s\n",

			       work->func, wq->name))) {

		return;

	}

	rcu_read_lock();

retry:

	/* pwq which will be used unless @work is executing elsewhere */