Skip to content

Commit

Permalink
io_uring/rw: don't lose short results on io_setup_async_rw()
Browse files Browse the repository at this point in the history
commit c278d9f upstream.

If a retry io_setup_async_rw() fails we lose result from the first
io_iter_do_read(), which is a problem mostly for streams/sockets.

Cc: stable@vger.kernel.org
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0e8d20cebe5fc9c96ed268463c394237daabc384.1664235732.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
isilence authored and gregkh committed Oct 21, 2022
1 parent d2acb5c commit 70be076
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions io_uring/rw.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,12 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)
iov_iter_restore(&s->iter, &s->iter_state);

ret2 = io_setup_async_rw(req, iovec, s, true);
if (ret2)
return ret2;

iovec = NULL;
if (ret2) {
ret = ret > 0 ? ret : ret2;
goto done;
}

io = req->async_data;
s = &io->s;
/*
Expand Down

0 comments on commit 70be076

Please sign in to comment.