Skip to content

Commit 2cd896a

Browse files
riteshharjaniaxboe
authored andcommitted
block: Set same_page to false in __bio_try_merge_page if ret is false
If we hit the UINT_MAX limit of bio->bi_iter.bi_size and so we are anyway not merging this page in this bio, then it make sense to make same_page also as false before returning. Without this patch, we hit below WARNING in iomap. This mostly happens with very large memory system and / or after tweaking vm dirty threshold params to delay writeback of dirty data. WARNING: CPU: 18 PID: 5130 at fs/iomap/buffered-io.c:74 iomap_page_release+0x120/0x150 CPU: 18 PID: 5130 Comm: fio Kdump: loaded Tainted: G W 5.8.0-rc3 #6 Call Trace: __remove_mapping+0x154/0x320 (unreliable) iomap_releasepage+0x80/0x180 try_to_release_page+0x94/0xe0 invalidate_inode_page+0xc8/0x110 invalidate_mapping_pages+0x1dc/0x540 generic_fadvise+0x3c8/0x450 xfs_file_fadvise+0x2c/0xe0 [xfs] vfs_fadvise+0x3c/0x60 ksys_fadvise64_64+0x68/0xe0 sys_fadvise64+0x28/0x40 system_call_exception+0xf8/0x1c0 system_call_common+0xf0/0x278 Fixes: cc90bc6 ("block: fix "check bi_size overflow before merge"") Reported-by: Shivaprasad G Bhat <[email protected]> Suggested-by: Christoph Hellwig <[email protected]> Signed-off-by: Anju T Sudhakar <[email protected]> Signed-off-by: Ritesh Harjani <[email protected]> Reviewed-by: Ming Lei <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent e8a8a18 commit 2cd896a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

block/bio.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,8 +879,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
879879
struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
880880

881881
if (page_is_mergeable(bv, page, len, off, same_page)) {
882-
if (bio->bi_iter.bi_size > UINT_MAX - len)
882+
if (bio->bi_iter.bi_size > UINT_MAX - len) {
883+
*same_page = false;
883884
return false;
885+
}
884886
bv->bv_len += len;
885887
bio->bi_iter.bi_size += len;
886888
return true;

0 commit comments

Comments
 (0)