History

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.

Hao Xu committed 6 years ago

Commit c8d317a1 parent fad8e0d2 files · +7 −1Browse files

Unified · Split

2 files
  1. fs/io_uring.c +2 −0
  2. mm/filemap.c +5 −1
fs/io_uring.c+2−0
@@ -3049,6 +3049,7 @@ static int io_async_buf_func(struct wait_queue_entry *wait, unsigned mode, · 3048 unmodified lines
30493049 if (!wake_page_match(wpq, key))
30503050 return 0;
30513051
3052+ req->rw.kiocb.ki_flags &= ~IOCB_WAITQ;
30523053 list_del_init(&wait->entry);
30533054
30543055 init_task_work(&req->task_work, io_req_task_submit);
@@ -3106,6 +3107,7 @@ static bool io_rw_should_retry(struct io_kiocb *req) · 51 unmodified lines
31063107 wait->wait.flags = 0;
31073108 INIT_LIST_HEAD(&wait->wait.entry);
31083109 kiocb->ki_flags |= IOCB_WAITQ;
3110+ kiocb->ki_flags &= ~IOCB_NOWAIT;
31093111 kiocb->ki_waitq = wait;
31103112
31113113 io_get_req_task(req);
mm/filemap.c+5−1
@@ -2267,7 +2267,11 @@ readpage: · 2266 unmodified lines
22672267 }
22682268
22692269 if (!PageUptodate(page)) {
2270− error = lock_page_killable(page);
2270+ if (iocb->ki_flags & IOCB_WAITQ)
2271+ error = lock_page_async(page, iocb->ki_waitq);
2272+ else
2273+ error = lock_page_killable(page);
2274+
22712275 if (unlikely(error))
22722276 goto readpage_error;
22732277 if (!PageUptodate(page)) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t