diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-02-01 09:22:49 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-02-03 17:27:47 -0700 |
| commit | 3e69426da2599677ebbe76e2d97a606c4797bd74 (patch) | |
| tree | 74c3ba56ba6dcd4ed8bb684b837820d4b325d215 /fs/io_uring.c | |
| parent | io_uring: fix sporadic double CQE entry for close (diff) | |
| download | linux-dev-3e69426da2599677ebbe76e2d97a606c4797bd74.tar.xz linux-dev-3e69426da2599677ebbe76e2d97a606c4797bd74.zip | |
io_uring: punt even fadvise() WILLNEED to async context
Andres correctly points out that read-ahead can block, if it needs to
read in meta data (or even just through the page cache page allocations).
Play it safe for now and just ensure WILLNEED is also punted to async
context.
While in there, allow the file settings hints from non-blocking
context. They don't need to start/do IO, and we can safely do them
inline.
Fixes: 4840e418c2fc ("io_uring: add IORING_OP_FADVISE")
Reported-by: Andres Freund <andres@anarazel.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to '')
| -rw-r--r-- | fs/io_uring.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index b9c9e04cc1cb..1580f1e7ba1c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -2730,9 +2730,16 @@ static int io_fadvise(struct io_kiocb *req, struct io_kiocb **nxt, struct io_fadvise *fa = &req->fadvise; int ret; - /* DONTNEED may block, others _should_ not */ - if (fa->advice == POSIX_FADV_DONTNEED && force_nonblock) - return -EAGAIN; + if (force_nonblock) { + switch (fa->advice) { + case POSIX_FADV_NORMAL: + case POSIX_FADV_RANDOM: + case POSIX_FADV_SEQUENTIAL: + break; + default: + return -EAGAIN; + } + } ret = vfs_fadvise(req->file, fa->offset, fa->len, fa->advice); if (ret < 0) |