diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-04-01 20:30:06 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-04-01 20:46:22 +0300 |
| commit | bee1d5becdf5bf23d4ca0cd9c6b60bdf3c61d72b (patch) | |
| tree | 881094e3d6bcf21e6e708c9fe0b3bf59a8901e1e /io_uring | |
| parent | 2a975d426c82ff05ec1f0b773798d909fe4a3105 (diff) | |
| download | linux-bee1d5becdf5bf23d4ca0cd9c6b60bdf3c61d72b.tar.xz | |
io_uring: disable io-wq execution of multishot NOWAIT requests
Do the same check for direct io-wq execution for multishot requests that
commit 2a975d426c82 did for the inline execution, and disable multishot
mode (and revert to single shot) if the file type doesn't support NOWAIT,
and isn't opened in O_NONBLOCK mode. For multishot to work properly, it's
a requirement that nonblocking read attempts can be done.
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 5d4b448fdc50..8baf8afb79c2 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1982,10 +1982,15 @@ fail: err = -EBADFD; if (!io_file_can_poll(req)) goto fail; - err = -ECANCELED; - if (io_arm_poll_handler(req, issue_flags) != IO_APOLL_OK) - goto fail; - return; + if (req->file->f_flags & O_NONBLOCK || + req->file->f_mode & FMODE_NOWAIT) { + err = -ECANCELED; + if (io_arm_poll_handler(req, issue_flags) != IO_APOLL_OK) + goto fail; + return; + } else { + req->flags &= ~REQ_F_APOLL_MULTISHOT; + } } if (req->flags & REQ_F_FORCE_ASYNC) { |