From nobody Sat Nov 23 20:22:07 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D01511BC9F7; Mon, 11 Nov 2024 18:02:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731348171; cv=none; b=hVlnIypmsAxKK7hyIJmAsst6VJ0/NkI/O1CteNz39Dm6a/AzNtQVj0TMK2exQVdLMZStlNni5zeF0Qm9NL5XyU06UuR55d1WQQOfBrp7ca8o2CYZrDg3xw7aP0nT99VW5qH1WCjzVM4bFjLzH929p72YyXRezHtMTwI3LImu7PY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731348171; c=relaxed/simple; bh=proCbUkTdFmH0IZ/EmgCIAZUp0dOvtqdeSuQWiYy3tQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IxjWRhhmrxLlWMQ2kNQZtM545oomBccz2nsSGSVSNHrT2vn4qDoL/xLzCQR0qfP9v58qK1ourgnB0+j4SjQgJUgOSds8NZ2FgJtNTmpH4ZA+sjVDQhh7Nrqpkcwboe0N8lCICsiR93BhIVdkZ7RyVMYlwMOYBCXHVeyFaNzNmm4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LL2iDez3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LL2iDez3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19B31C4CECF; Mon, 11 Nov 2024 18:02:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731348171; bh=proCbUkTdFmH0IZ/EmgCIAZUp0dOvtqdeSuQWiYy3tQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LL2iDez358oJOVu5/TGTsf5lTvLB1Sl8lm+P6KhNY/OrPiM++/gss6SEB6/VOgWtv quPX351BC+j4tcs+0hNumqgf6PP6uAXGlvOuYRXHmaRHfLPHwkgeG/1LcR3P6oz89s Gq2A/MqMb8BYjpbu623PFEkR5+I+ZXjcyMVPNY7zTyAoaTxxQyBSOC7Jlni25wzwO3 PpsgkDV2qDx0XAnd9xFJc5LVYLRcB7GNiMV8v8Rn9B2tlMOpgT4HeeTmOyAFqZBMiJ YMTZubqutD4hOJm+7uFWSWjPrhsnlAUD2tFtja9jUM1o7vsgXRlSXc0+TrB4Zu/6VS sbaA0CVe49+pQ== From: Daniel Wagner Date: Mon, 11 Nov 2024 19:02:14 +0100 Subject: [PATCH v2 6/6] blk-mq: remove unused queue mapping helpers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241111-refactor-blk-affinity-helpers-v2-6-f360ddad231a@kernel.org> References: <20241111-refactor-blk-affinity-helpers-v2-0-f360ddad231a@kernel.org> In-Reply-To: <20241111-refactor-blk-affinity-helpers-v2-0-f360ddad231a@kernel.org> To: Jens Axboe , Bjorn Helgaas , "Michael S. Tsirkin" , Jason Wang , "Martin K. Petersen" , Keith Busch , Christoph Hellwig , Sagi Grimberg Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, virtualization@lists.linux.dev, linux-scsi@vger.kernel.org, megaraidlinux.pdl@broadcom.com, mpi3mr-linuxdrv.pdl@broadcom.com, MPT-FusionLinux.pdl@broadcom.com, storagedev@microchip.com, linux-nvme@lists.infradead.org, Daniel Wagner , Daniel Wagner X-Mailer: b4 0.14.2 There are no users left of the pci and virtio queue mapping helpers. Thus remove them. Signed-off-by: Daniel Wagner Reviewed-by: Christoph Hellwig --- block/Makefile | 2 -- block/blk-mq-pci.c | 46 ---------------------------------------= ---- block/blk-mq-virtio.c | 46 ---------------------------------------= ---- include/linux/blk-mq-pci.h | 11 ----------- include/linux/blk-mq-virtio.h | 11 ----------- 5 files changed, 116 deletions(-) diff --git a/block/Makefile b/block/Makefile index ddfd21c1a9ffc9c4f49efca9875bd8a1cbf81e4d..33748123710b368a1a3a7b099bb= d90d27b24c69b 100644 --- a/block/Makefile +++ b/block/Makefile @@ -27,8 +27,6 @@ bfq-y :=3D bfq-iosched.o bfq-wf2q.o bfq-cgroup.o obj-$(CONFIG_IOSCHED_BFQ) +=3D bfq.o =20 obj-$(CONFIG_BLK_DEV_INTEGRITY) +=3D bio-integrity.o blk-integrity.o t10-p= i.o -obj-$(CONFIG_BLK_MQ_PCI) +=3D blk-mq-pci.o -obj-$(CONFIG_BLK_MQ_VIRTIO) +=3D blk-mq-virtio.o obj-$(CONFIG_BLK_DEV_ZONED) +=3D blk-zoned.o obj-$(CONFIG_BLK_WBT) +=3D blk-wbt.o obj-$(CONFIG_BLK_DEBUG_FS) +=3D blk-mq-debugfs.o diff --git a/block/blk-mq-pci.c b/block/blk-mq-pci.c deleted file mode 100644 index d47b5c73c9eb715be7627a2952ad0ef921dd5bc6..000000000000000000000000000= 0000000000000 --- a/block/blk-mq-pci.c +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2016 Christoph Hellwig. - */ -#include -#include -#include -#include -#include - -#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 availab= le - * interrupt vectors as @set has queues. It will then query the vector - * corresponding to each queue for it's affinity mask and built queue mapp= ing - * that maps a queue to the CPUs that have irq affinity for the correspond= ing - * 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 =3D 0; queue < qmap->nr_queues; queue++) { - mask =3D pci_irq_get_affinity(pdev, queue + offset); - if (!mask) - goto fallback; - - for_each_cpu(cpu, mask) - qmap->mq_map[cpu] =3D 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); diff --git a/block/blk-mq-virtio.c b/block/blk-mq-virtio.c deleted file mode 100644 index 68d0945c0b08a2be116125f46c3a56fcdb02aea8..000000000000000000000000000= 0000000000000 --- a/block/blk-mq-virtio.c +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (c) 2016 Christoph Hellwig. - */ -#include -#include -#include -#include -#include "blk-mq.h" - -/** - * blk_mq_virtio_map_queues - provide a default queue mapping for virtio d= evice - * @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 avai= lable - * interrupt vectors as @set has queues. It will then query the vector - * corresponding to each queue for it's affinity mask and built queue mapp= ing - * that maps a queue to the CPUs that have irq affinity for the correspond= ing - * 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 =3D 0; queue < qmap->nr_queues; queue++) { - mask =3D vdev->config->get_vq_affinity(vdev, first_vec + queue); - if (!mask) - goto fallback; - - for_each_cpu(cpu, mask) - qmap->mq_map[cpu] =3D qmap->queue_offset + queue; - } - - return; - -fallback: - blk_mq_map_queues(qmap); -} -EXPORT_SYMBOL_GPL(blk_mq_virtio_map_queues); diff --git a/include/linux/blk-mq-pci.h b/include/linux/blk-mq-pci.h deleted file mode 100644 index ca544e1d3508f34ab6e198b0bb17efe88de4d14d..000000000000000000000000000= 0000000000000 --- a/include/linux/blk-mq-pci.h +++ /dev/null @@ -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 */ diff --git a/include/linux/blk-mq-virtio.h b/include/linux/blk-mq-virtio.h deleted file mode 100644 index 13226e9b22dd53e4289d506d49c52671de036ee8..000000000000000000000000000= 0000000000000 --- a/include/linux/blk-mq-virtio.h +++ /dev/null @@ -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 */ --=20 2.47.0