]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit - mm/filemap.c
io_uring: fix async buffered reads when readahead is disabled
authorHao Xu <haoxu@linux.alibaba.com>
Tue, 29 Sep 2020 12:00:45 +0000 (20:00 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 29 Sep 2020 13:54:00 +0000 (07:54 -0600)
commitc8d317aa1887b40b188ec3aaa6e9e524333caed1
treeae6e8870004473d388c5f3275ad7888b6f74ec01
parentfad8e0de4426a776c9bcb060555e7c09e2d08db6
io_uring: fix async buffered reads when readahead is disabled

The async buffered reads feature is not working when readahead is
turned off. There are two things to concern:

- when doing retry in io_read, not only the IOCB_WAITQ flag but also
  the IOCB_NOWAIT flag is still set, which makes it goes to would_block
  phase in generic_file_buffered_read() and then return -EAGAIN. After
  that, the io-wq thread work is queued, and later doing the async
  reads in the old way.

- even if we remove IOCB_NOWAIT when doing retry, the feature is still
  not running properly, since in generic_file_buffered_read() it goes to
  lock_page_killable() after calling mapping->a_ops->readpage() to do
  IO, and thus causing process to sleep.

Fixes: 1a0a7853b901 ("mm: support async buffered reads in generic_file_buffered_read()")
Fixes: 3b2a4439e0ae ("io_uring: get rid of kiocb_wait_page_queue_init()")
Signed-off-by: Hao Xu <haoxu@linux.alibaba.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c
mm/filemap.c