diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-10-24 21:16:11 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-07 21:45:00 +0100 |
| commit | 843477d4cc5c4bb4e346c561ecd3b9d0bd67e8c8 (patch) | |
| tree | 27787556ce50efa174296b61b688cfb52d4bdb2b /block/blk-mq-cpumap.c | |
| parent | blk-mq: improve plug list sorting (diff) | |
| download | linux-843477d4cc5c4bb4e346c561ecd3b9d0bd67e8c8.tar.xz linux-843477d4cc5c4bb4e346c561ecd3b9d0bd67e8c8.zip | |
blk-mq: initial support for multiple queue maps
Add a queue offset to the tag map. This enables users to map
iteratively, for each queue map type they support.
Bump maximum number of supported maps to 2, we're now fully
able to support more than 1 map.
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq-cpumap.c')
| -rw-r--r-- | block/blk-mq-cpumap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c index 6e6686c55984..03a534820271 100644 --- a/block/blk-mq-cpumap.c +++ b/block/blk-mq-cpumap.c @@ -14,9 +14,10 @@ #include "blk.h" #include "blk-mq.h" -static int cpu_to_queue_index(unsigned int nr_queues, const int cpu) +static int cpu_to_queue_index(struct blk_mq_queue_map *qmap, + unsigned int nr_queues, const int cpu) { - return cpu % nr_queues; + return qmap->queue_offset + (cpu % nr_queues); } static int get_first_sibling(unsigned int cpu) @@ -44,11 +45,11 @@ int blk_mq_map_queues(struct blk_mq_queue_map *qmap) * performace optimizations. */ if (cpu < nr_queues) { - map[cpu] = cpu_to_queue_index(nr_queues, cpu); + map[cpu] = cpu_to_queue_index(qmap, nr_queues, cpu); } else { first_sibling = get_first_sibling(cpu); if (first_sibling == cpu) - map[cpu] = cpu_to_queue_index(nr_queues, cpu); + map[cpu] = cpu_to_queue_index(qmap, nr_queues, cpu); else map[cpu] = map[first_sibling]; } |