Commit 68ad2095 authored Jan 09, 2026 by Linus Torvalds

linux

Pull io_uring fixes from Jens Axboe:
 "A single fix for a regression introduced in 6.15, where a failure to
  wake up idle io-wq workers at ring exit will wait for the timeout to
  expire.

  This isn't normally noticeable, as the exit is async.

  But if a parent task created a thread that sets up a ring and uses
  requests that cause io-wq threads to be created, and the parent task
  then waits for the thread to exit, then it can take 5 seconds for that
  pthread_join() to succeed as the child thread is waiting for its
  children to exit.

  On top of that, just a basic cleanup as well"

* tag 'io_uring-6.19-20260109' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring/io-wq: remove io_wq_for_each_worker() return value
  io_uring/io-wq: fix incorrect io_wq_for_each_worker() termination logic

parents e28ddd0b e4fdbca2

io_uring/io-wq.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -947,16 +947,13 @@ static bool io_acct_for_each_worker(struct io_wq_acct *acct,
		return ret;
		}

		static bool io_wq_for_each_worker(struct io_wq *wq,
		static void io_wq_for_each_worker(struct io_wq *wq,
		bool (func)(struct io_worker , void *),
		void *data)
		{
		for (int i = 0; i < IO_WQ_ACCT_NR; i++) {
		if (!io_acct_for_each_worker(&wq->acct[i], func, data))
		return false;
		}

		return true;
		for (int i = 0; i < IO_WQ_ACCT_NR; i++)
		if (io_acct_for_each_worker(&wq->acct[i], func, data))
		break;
		}

		static bool io_wq_worker_wake(struct io_worker worker, void data)