Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-01 10:43:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

blk-mq: split tag ->rqs[] into two

Browse Source 
This is in preparation for having two sets of tags available. For
that we need a static index, and a dynamically assignable one.

Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
This commit is contained in:
Jens Axboe 2017-01-13 14:39:30 -07:00
parent fd2d332677
commit 2af8cbe305
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-mq-tag.c
View File

@ -290,11 +290,11 @@ int blk_mq_reinit_tagset(struct blk_mq_tag_set *set)
struct blk_mq_tags *tags = set->tags[i]; struct blk_mq_tags *tags = set->tags[i];
for (j = 0; j < tags->nr_tags; j++) { for (j = 0; j < tags->nr_tags; j++) {
if (!tags->rqs[j]) if (!tags->static_rqs[j])
continue; continue;
ret = set->ops->reinit_request(set->driver_data, ret = set->ops->reinit_request(set->driver_data,
tags->rqs[j]); tags->static_rqs[j]);
if (ret) if (ret)
goto out; goto out;
} }

1
block/blk-mq-tag.h
View File

@ -16,6 +16,7 @@ struct blk_mq_tags {
struct sbitmap_queue breserved_tags; struct sbitmap_queue breserved_tags;
struct request **rqs; struct request **rqs;
struct request **static_rqs;
struct list_head page_list; struct list_head page_list;
}; };

30
block/blk-mq.c
View File

@ -223,7 +223,7 @@ struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data,
tag = blk_mq_get_tag(data); tag = blk_mq_get_tag(data);
if (tag != BLK_MQ_TAG_FAIL) { if (tag != BLK_MQ_TAG_FAIL) {
rq = data->hctx->tags->rqs[tag]; rq = data->hctx->tags->static_rqs[tag];
if (blk_mq_tag_busy(data->hctx)) { if (blk_mq_tag_busy(data->hctx)) {
rq->rq_flags = RQF_MQ_INFLIGHT; rq->rq_flags = RQF_MQ_INFLIGHT;
@ -231,6 +231,7 @@ struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data,
} }
rq->tag = tag; rq->tag = tag;
data->hctx->tags->rqs[tag] = rq;
blk_mq_rq_ctx_init(data->q, data->ctx, rq, op); blk_mq_rq_ctx_init(data->q, data->ctx, rq, op);
return rq; return rq;
} }
@ -1567,11 +1568,13 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,
int i; int i;
for (i = 0; i < tags->nr_tags; i++) { for (i = 0; i < tags->nr_tags; i++) {
if (!tags->rqs[i]) struct request *rq = tags->static_rqs[i];
if (!rq)
continue; continue;
set->ops->exit_request(set->driver_data, tags->rqs[i], set->ops->exit_request(set->driver_data, rq,
hctx_idx, i); hctx_idx, i);
tags->rqs[i] = NULL; tags->static_rqs[i] = NULL;
} }
} }
@ -1591,6 +1594,8 @@ void blk_mq_free_rq_map(struct blk_mq_tags *tags)
{ {
kfree(tags->rqs); kfree(tags->rqs);
tags->rqs = NULL; tags->rqs = NULL;
kfree(tags->static_rqs);
tags->static_rqs = NULL;
blk_mq_free_tags(tags); blk_mq_free_tags(tags);
} }
@ -1616,6 +1621,15 @@ struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set,
return NULL; return NULL;
} }
tags->static_rqs = kzalloc_node(nr_tags * sizeof(struct request *),
GFP_NOIO | __GFP_NOWARN | __GFP_NORETRY,
set->numa_node);
if (!tags->static_rqs) {
kfree(tags->rqs);
blk_mq_free_tags(tags);
return NULL;
}
return tags; return tags;
} }
@ -1677,12 +1691,14 @@ int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,
to_do = min(entries_per_page, depth - i); to_do = min(entries_per_page, depth - i);
left -= to_do * rq_size; left -= to_do * rq_size;
for (j = 0; j < to_do; j++) { for (j = 0; j < to_do; j++) {
tags->rqs[i] = p; struct request *rq = p;
tags->static_rqs[i] = rq;
if (set->ops->init_request) { if (set->ops->init_request) {
if (set->ops->init_request(set->driver_data, if (set->ops->init_request(set->driver_data,
tags->rqs[i], hctx_idx, i, rq, hctx_idx, i,
set->numa_node)) { set->numa_node)) {
tags->rqs[i] = NULL; tags->static_rqs[i] = NULL;
goto fail; goto fail;
} }
} }