From a1fbf0ead865403b2ab2b180fdbd837f4da74546 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 9 May 2021 11:41:06 -0700 Subject: [PATCH] Revert "BACKPORT: bio: limit bio max size" Revert most of commit 25a6f60b717d ("BACKPORT: bio: limit bio max size") because it has been reported to cause data corruption and because it has been reverted upstream. See also https://lore.kernel.org/linux-block/1620571445.2k94orj8ee.none@localhost/T/#t Cc: Changheun Lee Cc: Jaegeuk Kim Bug: 182716953 Change-Id: I79bf39d1d1a0c13cb30ff4b0f1da2b43e1c817f0 Signed-off-by: Bart Van Assche --- block/bio.c | 15 ++------------- block/blk-settings.c | 6 ------ include/linux/bio.h | 4 +--- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/block/bio.c b/block/bio.c index 9620daf1d7b8..9c931df2d986 100644 --- a/block/bio.c +++ b/block/bio.c @@ -287,15 +287,6 @@ void bio_init(struct bio *bio, struct bio_vec *table, } EXPORT_SYMBOL(bio_init); -unsigned int bio_max_size(struct bio *bio) -{ - struct gendisk *disk = bio->bi_disk; - - /* bio_map_kern() allocates a bio but does not set bio->bi_disk. */ - return disk ? disk->queue->limits.bio_max_bytes : UINT_MAX; -} -EXPORT_SYMBOL(bio_max_size); - /** * bio_reset - reinitialize a bio * @bio: bio to reset @@ -886,7 +877,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; if (page_is_mergeable(bv, page, len, off, same_page)) { - if (bio->bi_iter.bi_size > bio_max_size(bio) - len) { + if (bio->bi_iter.bi_size > UINT_MAX - len) { *same_page = false; return false; } @@ -1003,7 +994,6 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) { unsigned short nr_pages = bio->bi_max_vecs - bio->bi_vcnt; unsigned short entries_left = bio->bi_max_vecs - bio->bi_vcnt; - unsigned int bytes_left = bio_max_size(bio) - bio->bi_iter.bi_size; struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt; struct page **pages = (struct page **)bv; bool same_page = false; @@ -1019,8 +1009,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) BUILD_BUG_ON(PAGE_PTRS_PER_BVEC < 2); pages += entries_left * (PAGE_PTRS_PER_BVEC - 1); - size = iov_iter_get_pages(iter, pages, bytes_left, nr_pages, - &offset); + size = iov_iter_get_pages(iter, pages, LONG_MAX, nr_pages, &offset); if (unlikely(size <= 0)) return size ? size : -EFAULT; diff --git a/block/blk-settings.c b/block/blk-settings.c index 5140f62202dc..c3aa7f8ee388 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -37,7 +37,6 @@ EXPORT_SYMBOL_GPL(blk_queue_rq_timeout); */ void blk_set_default_limits(struct queue_limits *lim) { - lim->bio_max_bytes = UINT_MAX; lim->max_segments = BLK_MAX_SEGMENTS; lim->max_discard_segments = 1; lim->max_integrity_segments = 0; @@ -162,11 +161,6 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto max_sectors = min_not_zero(max_hw_sectors, limits->max_dev_sectors); max_sectors = min_t(unsigned int, max_sectors, BLK_DEF_MAX_SECTORS); limits->max_sectors = max_sectors; - - if (check_shl_overflow(max_sectors, SECTOR_SHIFT, - &limits->bio_max_bytes)) - limits->bio_max_bytes = UINT_MAX; - q->backing_dev_info->io_pages = max_sectors >> (PAGE_SHIFT - 9); } EXPORT_SYMBOL(blk_queue_max_hw_sectors); diff --git a/include/linux/bio.h b/include/linux/bio.h index 243c0f8eca38..c6d765382926 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -100,8 +100,6 @@ static inline void *bio_data(struct bio *bio) return NULL; } -extern unsigned int bio_max_size(struct bio *bio); - /** * bio_full - check if the bio is full * @bio: bio to check @@ -115,7 +113,7 @@ static inline bool bio_full(struct bio *bio, unsigned len) if (bio->bi_vcnt >= bio->bi_max_vecs) return true; - if (bio->bi_iter.bi_size > bio_max_size(bio) - len) + if (bio->bi_iter.bi_size > UINT_MAX - len) return true; return false;