Skip to content

Commit

Permalink
Merge tag 'io_uring-6.14-20250306' of git://git.kernel.dk/linux
Browse files Browse the repository at this point in the history
Pull io_uring fix from Jens Axboe:
 "A single fix for a regression introduced in the 6.14 merge window,
  causing stalls/hangs with IOPOLL reads or writes"

* tag 'io_uring-6.14-20250306' of git://git.kernel.dk/linux:
  io_uring/rw: ensure reissue path is correctly handled for IOPOLL
  • Loading branch information
Linus Torvalds committed Mar 7, 2025
2 parents 1c5183a + bcb0fda commit d53276d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions io_uring/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,10 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb, long res)
if (kiocb->ki_flags & IOCB_WRITE)
io_req_end_write(req);
if (unlikely(res != req->cqe.res)) {
if (res == -EAGAIN && io_rw_should_reissue(req)) {
if (res == -EAGAIN && io_rw_should_reissue(req))
req->flags |= REQ_F_REISSUE | REQ_F_BL_NO_RECYCLE;
return;
}
req->cqe.res = res;
else
req->cqe.res = res;
}

/* order with io_iopoll_complete() checking ->iopoll_completed */
Expand Down

0 comments on commit d53276d

Please sign in to comment.