Commit 14df4eb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ce825345 e15cb220

io_uring/io_uring.c

+3 −0
Original line number Diff line number Diff line
@@ -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;