Skip to content

Commit

Permalink
Merge tag 'io_uring-6.4-2023-05-26' of git://git.kernel.dk/linux
Browse files Browse the repository at this point in the history
Pull io_uring fix from Jens Axboe:
 "Just a single fix for the conditional schedule with the SQPOLL thread,
  dropping the uring_lock if we do need to reschedule"

* tag 'io_uring-6.4-2023-05-26' of git://git.kernel.dk/linux:
  io_uring: unlock sqd->lock before sq thread release CPU
  • Loading branch information
torvalds committed May 26, 2023
2 parents 77af1f2 + 533ab73 commit 6fae912
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion io_uring/sqpoll.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,13 @@ static int io_sq_thread(void *data)
sqt_spin = true;

if (sqt_spin || !time_after(jiffies, timeout)) {
cond_resched();
if (sqt_spin)
timeout = jiffies + sqd->sq_thread_idle;
if (unlikely(need_resched())) {
mutex_unlock(&sqd->lock);
cond_resched();
mutex_lock(&sqd->lock);
}
continue;
}

Expand Down

0 comments on commit 6fae912

Please sign in to comment.