aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2018-12-18 05:43:41 -0800
committerAlistair Strachan <astrachan@google.com>2019-01-23 21:19:03 +0000
commit80fa62ba17e88da86d5a5d4761da963b79c6c6ed (patch)
tree09545ea2eb11d441235abda58745cb8130ce3bf2
parentf74ba31bd8e82360c4d85e5decd88e0b55e3d853 (diff)
UPSTREAM: dm: do not allow readahead to limit IO size
Update DM to set the bdi's io_pages. This fixes reads to be capped at the device's max request size (even if user's read IO exceeds the established readahead setting). Fixes: 9491ae4a ("mm: don't cap request size based on read-ahead setting") Cc: stable@vger.kernel.org Reviewed-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> Signed-off-by: Mike Snitzer <snitzer@redhat.com> (cherry picked from commit c6d6e9b0f6b4201c77f2cea3964dd122697e3543) Bug: 120757803 Link: https://patchwork.kernel.org/patch/10746255/ Change-Id: I876f4c5425253c2a0876d5ef7fefe36c4edcb46c
-rw-r--r--drivers/md/dm-table.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 0e79a435e8bd..b4775407ece8 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -1638,6 +1638,9 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
smp_mb();
if (dm_table_request_based(t))
queue_flag_set_unlocked(QUEUE_FLAG_STACKABLE, q);
+
+ /* io_pages is used for readahead */
+ q->backing_dev_info.io_pages = limits->max_sectors >> (PAGE_SHIFT - 9);
}
unsigned int dm_table_get_num_targets(struct dm_table *t)