Skip to content

Commit 14df4eb

Browse files
committed
Merge tag 'io_uring-6.19-20251211' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
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
2 parents ce82534 + e15cb22 commit 14df4eb

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

io_uring/io_uring.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2536,6 +2536,9 @@ static enum hrtimer_restart io_cqring_min_timer_wakeup(struct hrtimer *timer)
25362536
goto out_wake;
25372537
}
25382538

2539+
/* any generated CQE posted past this time should wake us up */
2540+
iowq->cq_tail = iowq->cq_min_tail;
2541+
25392542
hrtimer_update_function(&iowq->t, io_cqring_timer_wakeup);
25402543
hrtimer_set_expires(timer, iowq->timeout);
25412544
return HRTIMER_RESTART;

0 commit comments

Comments
 (0)