block: cover another queue enter recursion via BIO_QUEUE_ENTERED
authorMing Lei <ming.lei@redhat.com>
Tue, 22 Jan 2019 08:20:17 +0000 (16:20 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 22 Jan 2019 17:24:08 +0000 (10:24 -0700)
commit698cef173983b086977e633e46476e0f925ca01e
tree57caf7c7c9ce231ce193c53ae663ac49bbe999c6
parent8b9433eb4de3c26a9226c981c283f9f4896ae030
block: cover another queue enter recursion via BIO_QUEUE_ENTERED

Except for blk_queue_split(), bio_split() is used for splitting bio too,
then the remained bio is often resubmit to queue via generic_make_request().
So the same queue enter recursion exits in this case too. Unfortunatley
commit cd4a4ae4683dc2 doesn't help this case.

This patch covers the above case by setting BIO_QUEUE_ENTERED before calling
q->make_request_fn.

In theory the per-bio flag is used to simulate one stack variable, it is
just fine to clear it after q->make_request_fn is returned. Especially
the same bio can't be submitted from another context.

Fixes: cd4a4ae4683dc2 ("block: don't use blocking queue entered for recursive bio submits")
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: NeilBrown <neilb@suse.com>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c
block/blk-merge.c