Merge tag 'io_uring-6.19-20251211' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux

14df4eb7 · Linus Torvalds <[email protected]> · 2025-12-12 22:01:32 +12:00

Pull io_uring fix from Jens Axboe:
 "Single fix for io_uring headed to stable, fixing an issue introduced
  with the min_wait support earlier this year, where SQPOLL didn't get
  correctly woken if an event arrived once the event waiting has
  finished the min_wait portion.

  As we already have regression tests for this added and people
  reporting new failures there, let's get this one flushed out
  so it can bubble back down to stable as well"

* tag 'io_uring-6.19-20251211' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring: fix min_wait wakeups for SQPOLL

Commit: 14df4eb7e7faeecec1eaa88febb6a27308a470f5
Parents: ce825345 · e15cb220

Merge commit. Changes below are compared with the first parent: ce825345.

Changes

1 files changed · +3 −0

File	Status	Add	Del	Content
io_uring/io_uring.c	modified	+3	−0	View file

io_uring/io_uring.c

View file

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5d130c5..6cb24cd 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2536,6 +2536,9 @@ static enum hrtimer_restart io_cqring_min_timer_wakeup(struct hrtimer *timer)
 			goto out_wake;
 	}
 
+	/* any generated CQE posted past this time should wake us up */
+	iowq->cq_tail = iowq->cq_min_tail;
+
 	hrtimer_update_function(&iowq->t, io_cqring_timer_wakeup);
 	hrtimer_set_expires(timer, iowq->timeout);
 	return HRTIMER_RESTART;