diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-09 16:46:07 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-10 09:45:57 -0700 |
| commit | 9af177ee3ef14c17ef10893c257fa4e2008a3d74 (patch) | |
| tree | b1fb630dc31f45bfce11595af171c49576288d8b /fs | |
| parent | adc8682ec69012b68d5ab7123e246d2ad9a6f94b (diff) | |
io_uring: retry early for reads if we can poll
Most of the logic in io_read() deals with regular files, and in some ways
it would make sense to split the handling into S_IFREG and others. But
at least for retry, we don't need to bother setting up a bunch of state
just to abort in the loop later. In particular, don't bother forcing
setup of async data for a normal non-vectored read when we don't need it.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/io_uring.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 3d30f7b07677..4d8366bc226f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -3773,6 +3773,9 @@ static int io_read(struct io_kiocb *req, unsigned int issue_flags) if (ret == -EAGAIN || (req->flags & REQ_F_REISSUE)) { req->flags &= ~REQ_F_REISSUE; + /* if we can poll, just do that */ + if (req->opcode == IORING_OP_READ && file_can_poll(req->file)) + return -EAGAIN; /* IOPOLL retry should happen for io-wq threads */ if (!force_nonblock && !(req->ctx->flags & IORING_SETUP_IOPOLL)) goto done; |