From patchwork Fri Sep 13 07:42:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 13803052 Received: from mail.nearlyone.de (mail.nearlyone.de [49.12.199.46]) (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 A14001BD507; Fri, 13 Sep 2024 07:42:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.199.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726213355; cv=none; b=e52yoJ2VvsQb+9++pTs7QDdWonePBfxWPc+26nhxzNwlBMt/Au90YdQtWbhKjspHSlMGfKEViaSgEL9D2HGU8OTU0KG1f0BCk42FkoKDDcC+rjjInV5EEWB30sTuQKWFt48L0iQHcH/4F/HLO7ePDDIrS9Ouq6KHGmKx/Is627A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726213355; c=relaxed/simple; bh=fU88kdy4+JEtA0C+xG+fLnYG28pMjSL7clb0lruDjx4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mvDgSgNyNpJ3T9SuHQCks/zp8E8SG6SfWPJgwiZFqeiDDpB2qwjd+EZfv0OsechxOVDNLpduzMatWicCOg2tsVGKoTEJOOGLtU6LYImL1BWMWF3fxWomprygGq9Zem5/w9vFx+Nn/dieoEToBcDX42RNBBWQH62S1OBfC/M0xGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=monom.org; dkim=pass (2048-bit key) header.d=monom.org header.i=@monom.org header.b=QYcoD5lO; arc=none smtp.client-ip=49.12.199.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=monom.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=monom.org header.i=@monom.org header.b="QYcoD5lO" Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 962A4DAD40; Fri, 13 Sep 2024 09:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monom.org; s=dkim; t=1726213351; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=UreZcli4Fx6w8I8yVByocuzW2gBfgkNOof6cJpvayfg=; b=QYcoD5lOq5miIjgASYtgJ1k9mSIbUv1+n/ykip9v56vX/uP8M1YiAmy7ar1hfq3JJ8+ql5 CYcgvU3Khw9bKSHwcHpuow+L4sp4ZTodwoSx3KX5jJXgNcrcSTAkATudG2irqfsHBIMhhG h3BvGGVYpHTMG1jhgIvrfdY1gum/CiyTu4oFkZxATZ0Ur64opPf4NABoDEeuiJ2QahTiEn Ga3FzGegiuN8Oehw+0CA4RNJU4GqYiyyuw67yryPzPD+IWJ2f9imH3MB7o9rlNyNLl1qHm 37TMwuvez5SbilXeVfImp0QN9eUTykoU0rUhYnywP0KOHEEziY9dsJS/PMXIfQ== From: Daniel Wagner Date: Fri, 13 Sep 2024 09:42:02 +0200 Subject: [PATCH 4/6] nvme: replace blk_mq_pci_map_queues with blk_mq_hctx_map_queues Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240913-refactor-blk-affinity-helpers-v1-4-8e058f77af12@suse.de> References: <20240913-refactor-blk-affinity-helpers-v1-0-8e058f77af12@suse.de> In-Reply-To: <20240913-refactor-blk-affinity-helpers-v1-0-8e058f77af12@suse.de> 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 , 20240912-do-not-overwrite-pci-mapping-v1-1-85724b6cec49@suse.de X-Mailer: b4 0.14.0 X-Last-TLS-Session-Version: TLSv1.3 From: Daniel Wagner Replace all users of blk_mq_pci_map_queues with the more generic blk_mq_hctx_map_queues. This in preparation to retire blk_mq_pci_map_queues. Reviewed-by: Christoph Hellwig Signed-off-by: Daniel Wagner --- drivers/nvme/host/fc.c | 1 - drivers/nvme/host/pci.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index b81af7919e94..094be164ffdc 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -16,7 +16,6 @@ #include #include "fc.h" #include -#include /* *************************** Data Structures/Defines ****************** */ diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 6cd9395ba9ec..4af6931af19f 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -457,7 +456,8 @@ static void nvme_pci_map_queues(struct blk_mq_tag_set *set) */ map->queue_offset = qoff; if (i != HCTX_TYPE_POLL && offset) - blk_mq_pci_map_queues(map, to_pci_dev(dev->dev), offset); + blk_mq_hctx_map_queues(map, to_pci_dev(dev->dev), offset, + pci_get_blk_mq_affinity); else blk_mq_map_queues(map); qoff += map->nr_queues;