From d22fe9eaa4471855d068627bef0f88bc61d6f3a8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 19 May 2025 15:46:11 +0000 Subject: [PATCH] Revert "blk-mq: introduce blk_mq_map_hw_queues" This reverts commit fe2bdefe86440c8e7897dfc75aa0b3c663e66962 which is commit 1452e9b470c903fc4137a448e9f5767e92d68229 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: If3c20ff7c3c9cf9ba53bb387eb59f3d564d12666 Signed-off-by: Greg Kroah-Hartman --- block/blk-mq-cpumap.c | 37 ------------------------------------- include/linux/blk-mq.h | 2 -- 2 files changed, 39 deletions(-) diff --git a/block/blk-mq-cpumap.c b/block/blk-mq-cpumap.c index ad8d6a363f24..9638b25fd521 100644 --- a/block/blk-mq-cpumap.c +++ b/block/blk-mq-cpumap.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "blk.h" #include "blk-mq.h" @@ -55,39 +54,3 @@ int blk_mq_hw_queue_to_node(struct blk_mq_queue_map *qmap, unsigned int index) return NUMA_NO_NODE; } - -/** - * blk_mq_map_hw_queues - Create CPU to hardware queue mapping - * @qmap: CPU to hardware queue map - * @dev: The device to map queues - * @offset: Queue offset to use for the device - * - * Create a CPU to hardware queue mapping in @qmap. The struct bus_type - * irq_get_affinity callback will be used to retrieve the affinity. - */ -void blk_mq_map_hw_queues(struct blk_mq_queue_map *qmap, - struct device *dev, unsigned int offset) - -{ - const struct cpumask *mask; - unsigned int queue, cpu; - - if (!dev->bus->irq_get_affinity) - goto fallback; - - for (queue = 0; queue < qmap->nr_queues; queue++) { - mask = dev->bus->irq_get_affinity(dev, 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_map_hw_queues); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 29f86ee1492c..374e8639539a 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -957,8 +957,6 @@ void blk_mq_unfreeze_queue_non_owner(struct request_queue *q); void blk_freeze_queue_start_non_owner(struct request_queue *q); void blk_mq_map_queues(struct blk_mq_queue_map *qmap); -void blk_mq_map_hw_queues(struct blk_mq_queue_map *qmap, - struct device *dev, unsigned int offset); void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues); void blk_mq_quiesce_queue_nowait(struct request_queue *q);