diff options
| author | Junichi Nomura <j-nomura@ce.jp.nec.com> | 2015-12-22 18:23:44 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-22 18:26:53 +0100 |
| commit | 23688bf4f830a89866fd0ed3501e342a7360fe4f (patch) | |
| tree | 39614e2d840c745b28d09adb14f3761082beb75b /block | |
| parent | NVMe: IO ending fixes on surprise removal (diff) | |
| download | linux-23688bf4f830a89866fd0ed3501e342a7360fe4f.tar.xz linux-23688bf4f830a89866fd0ed3501e342a7360fe4f.zip | |
block: ensure to split after potentially bouncing a bio
blk_queue_bio() does split then bounce, which makes the segment
counting based on pages before bouncing and could go wrong. Move
the split to after bouncing, like we do for blk-mq, and the we
fix the issue of having the bio count for segments be wrong.
Fixes: 54efd50bfd87 ("block: make generic_make_request handle arbitrarily sized bios")
Cc: stable@vger.kernel.org
Tested-by: Artem S. Tashkinov <t.artem@lycos.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 3636be469fa2..c487b94c59e3 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1689,8 +1689,6 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) struct request *req; unsigned int request_count = 0; - blk_queue_split(q, &bio, q->bio_split); - /* * low level driver can indicate that it wants pages above a * certain limit bounced to low memory (ie for highmem, or even @@ -1698,6 +1696,8 @@ static blk_qc_t blk_queue_bio(struct request_queue *q, struct bio *bio) */ blk_queue_bounce(q, &bio); + blk_queue_split(q, &bio, q->bio_split); + if (bio_integrity_enabled(bio) && bio_integrity_prep(bio)) { bio->bi_error = -EIO; bio_endio(bio); |