block: don't let passthrough IO go into .make_request_fn()
authorMing Lei <ming.lei@redhat.com>
Mon, 18 Dec 2017 07:40:43 +0000 (15:40 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Dec 2017 20:55:43 +0000 (13:55 -0700)
commit14cb0dc6479dc5ebc63b3a459a5d89a2f1b39fed
treedb336ec3ba6267370615b5bc60c104f03f924bef
parenta9fa99146ab4fc029ba5551a1a3a0102fae7fddf
block: don't let passthrough IO go into .make_request_fn()

Commit a8821f3f3("block: Improvements to bounce-buffer handling") tries
to make sure that the bio to .make_request_fn won't exceed BIO_MAX_PAGES,
but ignores that passthrough I/O can use blk_queue_bounce() too.
Especially, passthrough IO may not be sector-aligned, and the check
of 'sectors < bio_sectors(*bio_orig)' inside __blk_queue_bounce() may
become true even though the max bvec number doesn't exceed BIO_MAX_PAGES,
then cause the bio splitted, and the original passthrough bio is submited
to generic_make_request().

This patch fixes this issue by checking if the bio is passthrough IO,
and use bio_kmalloc() to allocate the cloned passthrough bio.

Cc: NeilBrown <neilb@suse.com>
Fixes: a8821f3f3("block: Improvements to bounce-buffer handling")
Tested-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bounce.c
include/linux/blkdev.h