diff options
| author | Ming Lei <ming.lei@redhat.com> | 2019-11-08 11:15:27 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-08 14:59:49 +0100 |
| commit | 59db8ba2f6528a9c39668f9ed8c81eac1dff3b38 (patch) | |
| tree | 64b81003abbb0d0cb0005cabd7cc11606a1b4dcb /block/blk-merge.c | |
| parent | blk-cgroup: separate out blkg_rwstat under CONFIG_BLK_CGROUP_RWSTAT (diff) | |
| download | linux-59db8ba2f6528a9c39668f9ed8c81eac1dff3b38.tar.xz linux-59db8ba2f6528a9c39668f9ed8c81eac1dff3b38.zip | |
block: still try to split bio if the bvec crosses pages
Some device may set segment boundary as PAGE_SIZE - 1. If the bvec
crosses pages, and meantime its length is <= PAGE_SIZE, we still need
to split the bvec into 2 segments.
Fixes this issue by still splitting bio if the single bvec crosses
pages.
Reported-by: kernel test robot <lkp@intel.com>
Fixes: fa5322872187 (block: avoid blk_bio_segment_split for small I/O operations)
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index f22cb6251d06..d783bdc4559b 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -319,7 +319,8 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio, */ if (!q->limits.chunk_sectors && (*bio)->bi_vcnt == 1 && - (*bio)->bi_io_vec[0].bv_len <= PAGE_SIZE) { + ((*bio)->bi_io_vec[0].bv_len + + (*bio)->bi_io_vec[0].bv_offset) <= PAGE_SIZE) { *nr_segs = 1; break; } |