Skip to contentSkip to conversation

io_uring: fix min_wait wakeups for SQPOLL

PATCH Superseded Jens Axboe 1 participant 1 message Dec 9, 2025 io_uring

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jens Axboe

author maintainer
#0 lore raw

PATCH 1/1 io_uring: fix min_wait wakeups for SQPOLL

Using min_wait, two timeouts are given:

1) The min_wait timeout, within which up to 'wait_nr' events are waited for.
2) The overall long timeout, which is entered if no events are generated in the min_wait window.

If the min_wait has expired, any event being posted must wake the task. For SQPOLL, that isn't the case, as it won't trigger the io_has_work() condition, as it will have already processed the task_work that happened when an event was posted. This causes any event to trigger post the min_wait to not always cause the waiting application to wakeup, and instead it will wait until the overall timeout has expired. This can be shown in a test case that has a 1 second min_wait, with a 5 second overall wait, even if an event triggers after 1.5 seconds:

axboe@m2max-kvm /d/iouring-mre (master)> zig-out/bin/iouring
info: MIN_TIMEOUT supported: true, features: 0x3ffff
info: Testing: min_wait=1000ms, timeout=5s, wait_nr=4
info: 1 cqes in 5000.2ms

where the expected result should be:

axboe@m2max-kvm /d/iouring-mre (master)> zig-out/bin/iouring
info: MIN_TIMEOUT supported: true, features: 0x3ffff
info: Testing: min_wait=1000ms, timeout=5s, wait_nr=4
info: 1 cqes in 1500.3ms

When the min_wait timeout triggers, reset the number of completions needed to wake the task to the current number plus 1. This should ensure that any future events will wake the task, regardless of how many events it originally wanted to wait for.

Fixes 1100c4a2656d ("io_uring: add support for batch wait timeout")

---

io_uring/io_uring.c +2 -0
index 5d130c578435..1a1fe05367d8 100644
@@ -2538,6 +2538,8 @@ static enum hrtimer_restart io_cqring_min_timer_wakeup(struct hrtimer *timer)
 
 	hrtimer_update_function(&iowq->t, io_cqring_timer_wakeup);
 	hrtimer_set_expires(timer, iowq->timeout);
+	/* any generated CQE post now should wake us up */
+	iowq->cq_tail = READ_ONCE(ctx->rings->cq.head) + 1;
 	return HRTIMER_RESTART;
 out_wake:
 	return io_cqring_timer_wakeup(timer);
Signature · 1 line
Jens Axboe