kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blk-mq: initialize request on allocation

Browse source 
If we want to share tag and request allocation between queues we cannot
initialize the request at init/free time, but need to initialize it
at allocation time as it might get used for different queues over its
lifetime.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2014-04-14 10:30:10 +02:00 committed by Jens Axboe
parent e9b267d91f
commit ed44832dea
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block/blk-mq.c
View file

@ -82,6 +82,7 @@ static struct request *__blk_mq_alloc_request(struct blk_mq_hw_ctx *hctx,
tag = blk_mq_get_tag(hctx->tags, gfp, reserved); tag = blk_mq_get_tag(hctx->tags, gfp, reserved);
if (tag != BLK_MQ_TAG_FAIL) { if (tag != BLK_MQ_TAG_FAIL) {
rq = hctx->rqs[tag]; rq = hctx->rqs[tag];
blk_rq_init(hctx->queue, rq);
rq->tag = tag; rq->tag = tag;
return rq; return rq;
@ -257,9 +258,7 @@ static void __blk_mq_free_request(struct blk_mq_hw_ctx *hctx,
const int tag = rq->tag; const int tag = rq->tag;
struct request_queue *q = rq->q; struct request_queue *q = rq->q;
blk_rq_init(hctx->queue, rq);
blk_mq_put_tag(hctx->tags, tag); blk_mq_put_tag(hctx->tags, tag);
blk_mq_queue_exit(q); blk_mq_queue_exit(q);
} }
@ -1122,7 +1121,6 @@ static int blk_mq_init_rq_map(struct blk_mq_hw_ctx *hctx,
left -= to_do * rq_size; left -= to_do * rq_size;
for (j = 0; j < to_do; j++) { for (j = 0; j < to_do; j++) {
hctx->rqs[i] = p; hctx->rqs[i] = p;
blk_rq_init(hctx->queue, hctx->rqs[i]);
if (reg->ops->init_request) { if (reg->ops->init_request) {
error = reg->ops->init_request(driver_data, error = reg->ops->init_request(driver_data,
hctx, hctx->rqs[i], i); hctx, hctx->rqs[i], i);