mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 01:02:08 +00:00
blk-mq: remove unused queue mapping helpers
There are no users left of the pci and virtio queue mapping helpers. Thus remove them. Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: John Garry <john.g.garry@oracle.com> Signed-off-by: Daniel Wagner <wagi@kernel.org> Link: https://lore.kernel.org/r/20241202-refactor-blk-affinity-helpers-v6-8-27211e9c2cd5@kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Daniel Wagner
Jens Axboe
parent
5a1c502960
commit
737371e839
@ -27,8 +27,6 @@ bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
|
|||||||
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o
|
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o
|
||||||
|
|
||||||
obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
|
obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
|
||||||
obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o
|
|
||||||
obj-$(CONFIG_BLK_MQ_VIRTIO) += blk-mq-virtio.o
|
|
||||||
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
|
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
|
||||||
obj-$(CONFIG_BLK_WBT) += blk-wbt.o
|
obj-$(CONFIG_BLK_WBT) += blk-wbt.o
|
||||||
obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
|
obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o
|
||||||
|
|||||||
@ -1,46 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2016 Christoph Hellwig.
|
|
||||||
*/
|
|
||||||
#include <linux/kobject.h>
|
|
||||||
#include <linux/blkdev.h>
|
|
||||||
#include <linux/blk-mq-pci.h>
|
|
||||||
#include <linux/pci.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
|
|
||||||
#include "blk-mq.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* blk_mq_pci_map_queues - provide a default queue mapping for PCI device
|
|
||||||
* @qmap: CPU to hardware queue map.
|
|
||||||
* @pdev: PCI device associated with @set.
|
|
||||||
* @offset: Offset to use for the pci irq vector
|
|
||||||
*
|
|
||||||
* This function assumes the PCI device @pdev has at least as many available
|
|
||||||
* interrupt vectors as @set has queues. It will then query the vector
|
|
||||||
* corresponding to each queue for it's affinity mask and built queue mapping
|
|
||||||
* that maps a queue to the CPUs that have irq affinity for the corresponding
|
|
||||||
* vector.
|
|
||||||
*/
|
|
||||||
void blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev,
|
|
||||||
int offset)
|
|
||||||
{
|
|
||||||
const struct cpumask *mask;
|
|
||||||
unsigned int queue, cpu;
|
|
||||||
|
|
||||||
for (queue = 0; queue < qmap->nr_queues; queue++) {
|
|
||||||
mask = pci_irq_get_affinity(pdev, queue + offset);
|
|
||||||
if (!mask)
|
|
||||||
goto fallback;
|
|
||||||
|
|
||||||
for_each_cpu(cpu, mask)
|
|
||||||
qmap->mq_map[cpu] = qmap->queue_offset + queue;
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
fallback:
|
|
||||||
WARN_ON_ONCE(qmap->nr_queues > 1);
|
|
||||||
blk_mq_clear_mq_map(qmap);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(blk_mq_pci_map_queues);
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0
|
|
||||||
/*
|
|
||||||
* Copyright (c) 2016 Christoph Hellwig.
|
|
||||||
*/
|
|
||||||
#include <linux/device.h>
|
|
||||||
#include <linux/blk-mq-virtio.h>
|
|
||||||
#include <linux/virtio_config.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include "blk-mq.h"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* blk_mq_virtio_map_queues - provide a default queue mapping for virtio device
|
|
||||||
* @qmap: CPU to hardware queue map.
|
|
||||||
* @vdev: virtio device to provide a mapping for.
|
|
||||||
* @first_vec: first interrupt vectors to use for queues (usually 0)
|
|
||||||
*
|
|
||||||
* This function assumes the virtio device @vdev has at least as many available
|
|
||||||
* interrupt vectors as @set has queues. It will then query the vector
|
|
||||||
* corresponding to each queue for it's affinity mask and built queue mapping
|
|
||||||
* that maps a queue to the CPUs that have irq affinity for the corresponding
|
|
||||||
* vector.
|
|
||||||
*/
|
|
||||||
void blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,
|
|
||||||
struct virtio_device *vdev, int first_vec)
|
|
||||||
{
|
|
||||||
const struct cpumask *mask;
|
|
||||||
unsigned int queue, cpu;
|
|
||||||
|
|
||||||
if (!vdev->config->get_vq_affinity)
|
|
||||||
goto fallback;
|
|
||||||
|
|
||||||
for (queue = 0; queue < qmap->nr_queues; queue++) {
|
|
||||||
mask = vdev->config->get_vq_affinity(vdev, first_vec + queue);
|
|
||||||
if (!mask)
|
|
||||||
goto fallback;
|
|
||||||
|
|
||||||
for_each_cpu(cpu, mask)
|
|
||||||
qmap->mq_map[cpu] = qmap->queue_offset + queue;
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
|
|
||||||
fallback:
|
|
||||||
blk_mq_map_queues(qmap);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues);
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _LINUX_BLK_MQ_PCI_H
|
|
||||||
#define _LINUX_BLK_MQ_PCI_H
|
|
||||||
|
|
||||||
struct blk_mq_queue_map;
|
|
||||||
struct pci_dev;
|
|
||||||
|
|
||||||
void blk_mq_pci_map_queues(struct blk_mq_queue_map *qmap, struct pci_dev *pdev,
|
|
||||||
int offset);
|
|
||||||
|
|
||||||
#endif /* _LINUX_BLK_MQ_PCI_H */
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _LINUX_BLK_MQ_VIRTIO_H
|
|
||||||
#define _LINUX_BLK_MQ_VIRTIO_H
|
|
||||||
|
|
||||||
struct blk_mq_queue_map;
|
|
||||||
struct virtio_device;
|
|
||||||
|
|
||||||
void blk_mq_virtio_map_queues(struct blk_mq_queue_map *qmap,
|
|
||||||
struct virtio_device *vdev, int first_vec);
|
|
||||||
|
|
||||||
#endif /* _LINUX_BLK_MQ_VIRTIO_H */
|
|
||||||
Loading…
Reference in New Issue
Block a user