Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: Add rdma affinity based queue mapping helper

Like pci and virtio, we add a rdma helper for affinity
spreading. This achieves optimal mq affinity assignments
according to the underlying rdma device affinity maps.

Reviewed-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Doug Ledford <dledford@redhat.com>

authored by

Sagi Grimberg and committed by
Doug Ledford
24c5dc66 40b24403

+68
+5
block/Kconfig
··· 206 206 depends on BLOCK && VIRTIO 207 207 default y 208 208 209 + config BLK_MQ_RDMA 210 + bool 211 + depends on BLOCK && INFINIBAND 212 + default y 213 + 209 214 source block/Kconfig.iosched
+1
block/Makefile
··· 29 29 obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o 30 30 obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o 31 31 obj-$(CONFIG_BLK_MQ_VIRTIO) += blk-mq-virtio.o 32 + obj-$(CONFIG_BLK_MQ_RDMA) += blk-mq-rdma.o 32 33 obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o 33 34 obj-$(CONFIG_BLK_WBT) += blk-wbt.o 34 35 obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
+52
block/blk-mq-rdma.c
··· 1 + /* 2 + * Copyright (c) 2017 Sagi Grimberg. 3 + * 4 + * This program is free software; you can redistribute it and/or modify it 5 + * under the terms and conditions of the GNU General Public License, 6 + * version 2, as published by the Free Software Foundation. 7 + * 8 + * This program is distributed in the hope it will be useful, but WITHOUT 9 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 11 + * more details. 12 + */ 13 + #include <linux/blk-mq.h> 14 + #include <linux/blk-mq-rdma.h> 15 + #include <rdma/ib_verbs.h> 16 + 17 + /** 18 + * blk_mq_rdma_map_queues - provide a default queue mapping for rdma device 19 + * @set: tagset to provide the mapping for 20 + * @dev: rdma device associated with @set. 21 + * @first_vec: first interrupt vectors to use for queues (usually 0) 22 + * 23 + * This function assumes the rdma device @dev has at least as many available 24 + * interrupt vetors as @set has queues. It will then query it's affinity mask 25 + * and built queue mapping that maps a queue to the CPUs that have irq affinity 26 + * for the corresponding vector. 27 + * 28 + * In case either the driver passed a @dev with less vectors than 29 + * @set->nr_hw_queues, or @dev does not provide an affinity mask for a 30 + * vector, we fallback to the naive mapping. 31 + */ 32 + int blk_mq_rdma_map_queues(struct blk_mq_tag_set *set, 33 + struct ib_device *dev, int first_vec) 34 + { 35 + const struct cpumask *mask; 36 + unsigned int queue, cpu; 37 + 38 + for (queue = 0; queue < set->nr_hw_queues; queue++) { 39 + mask = ib_get_vector_affinity(dev, first_vec + queue); 40 + if (!mask) 41 + goto fallback; 42 + 43 + for_each_cpu(cpu, mask) 44 + set->mq_map[cpu] = queue; 45 + } 46 + 47 + return 0; 48 + 49 + fallback: 50 + return blk_mq_map_queues(set); 51 + } 52 + EXPORT_SYMBOL_GPL(blk_mq_rdma_map_queues);
+10
include/linux/blk-mq-rdma.h
··· 1 + #ifndef _LINUX_BLK_MQ_RDMA_H 2 + #define _LINUX_BLK_MQ_RDMA_H 3 + 4 + struct blk_mq_tag_set; 5 + struct ib_device; 6 + 7 + int blk_mq_rdma_map_queues(struct blk_mq_tag_set *set, 8 + struct ib_device *dev, int first_vec); 9 + 10 + #endif /* _LINUX_BLK_MQ_RDMA_H */