diff options
| author | Dennis Zhou <dennis@kernel.org> | 2018-10-20 21:56:12 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-21 00:39:55 +0300 |
| commit | d459d853c2edc793135e4bfa4e345c758f1cc859 (patch) | |
| tree | bef29425e5ddb78a788cca764e926b4f5601f473 /block/blk-core.c | |
| parent | b2c3fa546705944e748666b474ffdaebaec0569f (diff) | |
| download | linux-d459d853c2edc793135e4bfa4e345c758f1cc859.tar.xz | |
blkcg: reassociate bios when make_request() is called recursively
When submitting a bio, multiple recursive calls to make_request() may
occur. This causes the initial associate done in blkcg_bio_issue_check()
to be incorrect and reference the prior request_queue. This introduces
a helper to do reassociation when make_request() is recursively called.
Fixes: a7b39b4e961c ("blkcg: always associate a bio with a blkg")
Reported-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Tested-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index cdfabc5646da..3ed60723e242 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2433,6 +2433,7 @@ blk_qc_t generic_make_request(struct bio *bio) if (q) blk_queue_exit(q); q = bio->bi_disk->queue; + bio_reassociate_blkg(q, bio); flags = 0; if (bio->bi_opf & REQ_NOWAIT) flags = BLK_MQ_REQ_NOWAIT; |