diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-01-03 15:29:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-04 13:13:48 -0800 |
| commit | b685a7350ae76bc0f388e24b36d06a63776c68ee (patch) | |
| tree | 237770a434c3029f5ba5157de2f8b35176e5649e | |
| parent | d499480cc435ff153bf7e2e7ee6ab6ac44306c28 (diff) | |
| download | linux-stable-b685a7350ae76bc0f388e24b36d06a63776c68ee.tar.gz linux-stable-b685a7350ae76bc0f388e24b36d06a63776c68ee.tar.bz2 linux-stable-b685a7350ae76bc0f388e24b36d06a63776c68ee.zip | |
mm/page_io.c: fix polled swap page in
swap_readpage() wants to do polling to bring in pages if asked to, but
it doesn't mark the bio as being polled. Additionally, the looping
around the blk_poll() check isn't correct - if we get a zero return, we
should call io_schedule(), we can't just assume that the bio has
completed. The regular bio->bi_private check should be used for that.
Link: http://lkml.kernel.org/r/e15243a8-2cdf-c32c-ecee-f289377c8ef9@kernel.dk
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | mm/page_io.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/page_io.c b/mm/page_io.c index d975fa3f02aa..2e8019d0e048 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -401,6 +401,8 @@ int swap_readpage(struct page *page, bool synchronous) get_task_struct(current); bio->bi_private = current; bio_set_op_attrs(bio, REQ_OP_READ, 0); + if (synchronous) + bio->bi_opf |= REQ_HIPRI; count_vm_event(PSWPIN); bio_get(bio); qc = submit_bio(bio); @@ -410,7 +412,7 @@ int swap_readpage(struct page *page, bool synchronous) break; if (!blk_poll(disk->queue, qc, true)) - break; + io_schedule(); } __set_current_state(TASK_RUNNING); bio_put(bio); |