Commit 9a173346 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: fix short read retries for non-reg files 



Sockets and other non-regular files may actually expect short reads to
happen, don't retry reads for them. Because non-reg files don't set
FMODE_BUF_RASYNC and so it won't do second/retry do_read, we can filter
out those cases after first do_read() attempt with ret>0.

Cc: stable@vger.kernel.org # 5.9+
Suggested-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 607ec89e

fs/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -3552,7 +3552,7 @@ static int io_read(struct io_kiocb *req, bool force_nonblock, 


	/* read it all, or we did blocking attempt. no retry. */

	if (!iov_iter_count(iter) || !force_nonblock ||

	    (req->file->f_flags & O_NONBLOCK))

	    (req->file->f_flags & O_NONBLOCK) || !(req->flags & REQ_F_ISREG))

		goto done;



	io_size -= ret;