| Message ID | 1530539150-9591-1-git-send-email-minwoo.im.dev@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Looks good,
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
On 7/2/18 7:45 AM, Minwoo Im wrote: > set->mq_map is now currently cleared if something goes wrong when > establishing a queue map in blk-mq-pci.c. It's also cleared before > updating a queue map in blk_mq_update_queue_map(). > > This patch provides an API to clear set->mq_map to make it clear. I'm fine with this change, but the declaration should go into block/blk-mq.h, it's not a driver API.
On Mon, 2018-07-02 at 08:31 -0600, Jens Axboe wrote: > On 7/2/18 7:45 AM, Minwoo Im wrote: > > > > set->mq_map is now currently cleared if something goes wrong when > > establishing a queue map in blk-mq-pci.c. It's also cleared before > > updating a queue map in blk_mq_update_queue_map(). > > > > This patch provides an API to clear set->mq_map to make it clear. > I'm fine with this change, but the declaration should go into > block/blk-mq.h, it's not a driver API. Hi Jens, Thanks for your kindly directives. I got your point. I'll make it up for V3 patch with place it into block/blk-mq.h instead include/linux/blk-mq.h. Thanks, really. Minwoo Im
diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c index e233996..ccb9d7e 100644 --- a/block/blk-mq-pci.c +++ b/block/blk-mq-pci.c @@ -48,8 +48,7 @@ int blk_mq_pci_map_queues(struct blk_mq_tag_set *set, struct pci_dev *pdev, fallback: WARN_ON_ONCE(set->nr_hw_queues > 1); - for_each_possible_cpu(cpu) - set->mq_map[cpu] = 0; + blk_mq_clear_mq_map(set); return 0; } EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues); diff --git a/block/blk-mq.c b/block/blk-mq.c index b429d51..c6bab3f 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2675,7 +2675,6 @@ static int blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) static int blk_mq_update_queue_map(struct blk_mq_tag_set *set) { if (set->ops->map_queues) { - int cpu; /* * transport .map_queues is usually done in the following * way: @@ -2690,8 +2689,7 @@ static int blk_mq_update_queue_map(struct blk_mq_tag_set *set) * killing stale mapping since one CPU may not be mapped * to any hw queue. */ - for_each_possible_cpu(cpu) - set->mq_map[cpu] = 0; + blk_mq_clear_mq_map(set); return set->ops->map_queues(set); } else diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index e3147eb..a8ac78f 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -237,6 +237,14 @@ enum { u32 blk_mq_unique_tag(struct request *rq); +static inline void blk_mq_clear_mq_map(struct blk_mq_tag_set *set) +{ + int cpu; + + for_each_possible_cpu(cpu) + set->mq_map[cpu] = 0; +} + static inline u16 blk_mq_unique_tag_to_hwq(u32 unique_tag) { return unique_tag >> BLK_MQ_UNIQUE_TAG_BITS;
set->mq_map is now currently cleared if something goes wrong when establishing a queue map in blk-mq-pci.c. It's also cleared before updating a queue map in blk_mq_update_queue_map(). This patch provides an API to clear set->mq_map to make it clear. Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com> --- block/blk-mq-pci.c | 3 +-- block/blk-mq.c | 4 +--- include/linux/blk-mq.h | 8 ++++++++ 3 files changed, 10 insertions(+), 5 deletions(-)