]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
block: account for bi_bvec_done in bio_may_need_split()
authorMing Lei <ming.lei@redhat.com>
Sat, 10 Jan 2026 13:42:36 +0000 (21:42 +0800)
committerJens Axboe <axboe@kernel.dk>
Sat, 10 Jan 2026 17:22:54 +0000 (10:22 -0700)
commitf7ba87dfa8e42642d43faf29a71cee338086218b
treeebe626be177fbfff3aa109f7d99bcdaaad938448
parenta31bde687b10b1a3db9c61eba5abb662dda15277
block: account for bi_bvec_done in bio_may_need_split()

When checking if a bio fits in a single segment, bio_may_need_split()
compares bi_size against the current bvec's bv_len. However, for
partially consumed bvecs (bi_bvec_done > 0), such as in cloned or
split bios, the remaining bytes in the current bvec is actually
(bv_len - bi_bvec_done), not bv_len.

This could cause bio_may_need_split() to incorrectly return false,
leading to nr_phys_segments being set to 1 when the bio actually
spans multiple segments. This triggers the WARN_ON in __blk_rq_map_sg()
when the actual mapped segments exceed the expected count.

Fix by subtracting bi_bvec_done from bv_len in the comparison.

Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Close: https://lore.kernel.org/linux-block/9687cf2b-1f32-44e1-b58d-2492dc6e7185@linux.ibm.com/
Repored-and-bisected-by: Christoph Hellwig <hch@infradead.org>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Tested-by: Christoph Hellwig <hch@infradead.org>
Fixes: ee623c892aa5 ("block: use bvec iterator helper for bio_may_need_split()")
Cc: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk.h