From: John Garry <john.garry@huawei.com>
To: <axboe@kernel.dk>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <don.brace@microsemi.com>,
<kashyap.desai@broadcom.com>, <sumit.saxena@broadcom.com>,
<ming.lei@redhat.com>, <bvanassche@acm.org>, <hare@suse.com>,
<hch@lst.de>, <shivasharan.srikanteshwara@broadcom.com>
Cc: <linux-block@vger.kernel.org>, <linux-scsi@vger.kernel.org>,
<esc.storagedev@microsemi.com>, <chenxiang66@hisilicon.com>,
<megaraidlinux.pdl@broadcom.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH RFC v7 10/12] megaraid_sas: switch fusion adapters to MQ
Date: Thu, 11 Jun 2020 01:29:17 +0800 [thread overview]
Message-ID: <1591810159-240929-11-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1591810159-240929-1-git-send-email-john.garry@huawei.com>
From: Hannes Reinecke <hare@suse.com>
Fusion adapters can steer completions to individual queues, and
we now have support for shared host-wide tags.
So we can enable multiqueue support for fusion adapters and
drop the hand-crafted interrupt affinity settings.
Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/megaraid/megaraid_sas.h | 1 -
drivers/scsi/megaraid/megaraid_sas_base.c | 59 +++++++--------------
drivers/scsi/megaraid/megaraid_sas_fusion.c | 24 +++++----
3 files changed, 32 insertions(+), 52 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index af2c7a2a9565..b27a34a5f5de 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -2261,7 +2261,6 @@ enum MR_PERF_MODE {
struct megasas_instance {
- unsigned int *reply_map;
__le32 *producer;
dma_addr_t producer_h;
__le32 *consumer;
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 00668335c2af..e6bb2a64d51c 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -37,6 +37,7 @@
#include <linux/poll.h>
#include <linux/vmalloc.h>
#include <linux/irq_poll.h>
+#include <linux/blk-mq-pci.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
@@ -3115,6 +3116,19 @@ megasas_bios_param(struct scsi_device *sdev, struct block_device *bdev,
return 0;
}
+static int megasas_map_queues(struct Scsi_Host *shost)
+{
+ struct megasas_instance *instance;
+
+ instance = (struct megasas_instance *)shost->hostdata;
+
+ if (!instance->smp_affinity_enable)
+ return 0;
+
+ return blk_mq_pci_map_queues(&shost->tag_set.map[HCTX_TYPE_DEFAULT],
+ instance->pdev, instance->low_latency_index_start);
+}
+
static void megasas_aen_polling(struct work_struct *work);
/**
@@ -3423,8 +3437,10 @@ static struct scsi_host_template megasas_template = {
.eh_timed_out = megasas_reset_timer,
.shost_attrs = megaraid_host_attrs,
.bios_param = megasas_bios_param,
+ .map_queues = megasas_map_queues,
.change_queue_depth = scsi_change_queue_depth,
.max_segment_size = 0xffffffff,
+ .host_tagset = 1,
};
/**
@@ -5708,34 +5724,6 @@ megasas_setup_jbod_map(struct megasas_instance *instance)
instance->use_seqnum_jbod_fp = false;
}
-static void megasas_setup_reply_map(struct megasas_instance *instance)
-{
- const struct cpumask *mask;
- unsigned int queue, cpu, low_latency_index_start;
-
- low_latency_index_start = instance->low_latency_index_start;
-
- for (queue = low_latency_index_start; queue < instance->msix_vectors; queue++) {
- mask = pci_irq_get_affinity(instance->pdev, queue);
- if (!mask)
- goto fallback;
-
- for_each_cpu(cpu, mask)
- instance->reply_map[cpu] = queue;
- }
- return;
-
-fallback:
- queue = low_latency_index_start;
- for_each_possible_cpu(cpu) {
- instance->reply_map[cpu] = queue;
- if (queue == (instance->msix_vectors - 1))
- queue = low_latency_index_start;
- else
- queue++;
- }
-}
-
/**
* megasas_get_device_list - Get the PD and LD device list from FW.
* @instance: Adapter soft state
@@ -6158,8 +6146,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
goto fail_init_adapter;
}
- megasas_setup_reply_map(instance);
-
dev_info(&instance->pdev->dev,
"current msix/online cpus\t: (%d/%d)\n",
instance->msix_vectors, (unsigned int)num_online_cpus());
@@ -6793,6 +6779,9 @@ static int megasas_io_attach(struct megasas_instance *instance)
host->max_id = MEGASAS_MAX_DEV_PER_CHANNEL;
host->max_lun = MEGASAS_MAX_LUN;
host->max_cmd_len = 16;
+ if (instance->adapter_type != MFI_SERIES && instance->msix_vectors > 0)
+ host->nr_hw_queues = instance->msix_vectors -
+ instance->low_latency_index_start;
/*
* Notify the mid-layer about the new controller
@@ -6960,11 +6949,6 @@ static inline int megasas_alloc_mfi_ctrl_mem(struct megasas_instance *instance)
*/
static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
{
- instance->reply_map = kcalloc(nr_cpu_ids, sizeof(unsigned int),
- GFP_KERNEL);
- if (!instance->reply_map)
- return -ENOMEM;
-
switch (instance->adapter_type) {
case MFI_SERIES:
if (megasas_alloc_mfi_ctrl_mem(instance))
@@ -6981,8 +6965,6 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
return 0;
fail:
- kfree(instance->reply_map);
- instance->reply_map = NULL;
return -ENOMEM;
}
@@ -6995,7 +6977,6 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
*/
static inline void megasas_free_ctrl_mem(struct megasas_instance *instance)
{
- kfree(instance->reply_map);
if (instance->adapter_type == MFI_SERIES) {
if (instance->producer)
dma_free_coherent(&instance->pdev->dev, sizeof(u32),
@@ -7683,8 +7664,6 @@ megasas_resume(struct pci_dev *pdev)
goto fail_reenable_msix;
}
- megasas_setup_reply_map(instance);
-
if (instance->adapter_type != MFI_SERIES) {
megasas_reset_reply_desc(instance);
if (megasas_ioc_init_fusion(instance)) {
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 319f241da4b6..8e25b700988e 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -373,24 +373,24 @@ megasas_get_msix_index(struct megasas_instance *instance,
{
int sdev_busy;
- /* nr_hw_queue = 1 for MegaRAID */
- struct blk_mq_hw_ctx *hctx =
- scmd->device->request_queue->queue_hw_ctx[0];
+ struct blk_mq_hw_ctx *hctx = scmd->request->mq_hctx;
sdev_busy = atomic_read(&hctx->nr_active);
if (instance->perf_mode == MR_BALANCED_PERF_MODE &&
- sdev_busy > (data_arms * MR_DEVICE_HIGH_IOPS_DEPTH))
+ sdev_busy > (data_arms * MR_DEVICE_HIGH_IOPS_DEPTH)) {
cmd->request_desc->SCSIIO.MSIxIndex =
mega_mod64((atomic64_add_return(1, &instance->high_iops_outstanding) /
MR_HIGH_IOPS_BATCH_COUNT), instance->low_latency_index_start);
- else if (instance->msix_load_balance)
+ } else if (instance->msix_load_balance) {
cmd->request_desc->SCSIIO.MSIxIndex =
(mega_mod64(atomic64_add_return(1, &instance->total_io_count),
instance->msix_vectors));
- else
- cmd->request_desc->SCSIIO.MSIxIndex =
- instance->reply_map[raw_smp_processor_id()];
+ } else {
+ u32 tag = blk_mq_unique_tag(scmd->request);
+
+ cmd->request_desc->SCSIIO.MSIxIndex = blk_mq_unique_tag_to_hwq(tag) + instance->low_latency_index_start;
+ }
}
/**
@@ -3326,7 +3326,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
{
struct megasas_cmd_fusion *cmd, *r1_cmd = NULL;
union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;
- u32 index;
+ u32 index, blk_tag, unique_tag;
if ((megasas_cmd_type(scmd) == READ_WRITE_LDIO) &&
instance->ldio_threshold &&
@@ -3342,7 +3342,9 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
return SCSI_MLQUEUE_HOST_BUSY;
}
- cmd = megasas_get_cmd_fusion(instance, scmd->request->tag);
+ unique_tag = blk_mq_unique_tag(scmd->request);
+ blk_tag = blk_mq_unique_tag_to_tag(unique_tag);
+ cmd = megasas_get_cmd_fusion(instance, blk_tag);
if (!cmd) {
atomic_dec(&instance->fw_outstanding);
@@ -3383,7 +3385,7 @@ megasas_build_and_issue_cmd_fusion(struct megasas_instance *instance,
*/
if (cmd->r1_alt_dev_handle != MR_DEVHANDLE_INVALID) {
r1_cmd = megasas_get_cmd_fusion(instance,
- (scmd->request->tag + instance->max_fw_cmds));
+ (blk_tag + instance->max_fw_cmds));
megasas_prepare_secondRaid1_IO(instance, cmd, r1_cmd);
}
--
2.26.2
next prev parent reply other threads:[~2020-06-10 17:33 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 17:29 [PATCH RFC v7 00/12] blk-mq/scsi: Provide hostwide shared tags for SCSI HBAs John Garry
2020-06-10 17:29 ` [PATCH RFC v7 01/12] blk-mq: rename BLK_MQ_F_TAG_SHARED as BLK_MQ_F_TAG_QUEUE_SHARED John Garry
2020-06-10 17:29 ` [PATCH RFC v7 02/12] blk-mq: rename blk_mq_update_tag_set_depth() John Garry
2020-06-11 2:57 ` Ming Lei
2020-06-11 8:26 ` John Garry
2020-06-23 11:25 ` John Garry
2020-06-23 14:23 ` Hannes Reinecke
2020-06-24 8:13 ` Kashyap Desai
2020-06-29 16:18 ` John Garry
2020-08-10 16:51 ` Kashyap Desai
2020-08-11 8:01 ` John Garry
2020-08-11 16:34 ` Kashyap Desai
2020-06-10 17:29 ` [PATCH RFC v7 03/12] blk-mq: Use pointers for blk_mq_tags bitmap tags John Garry
2020-06-10 17:29 ` [PATCH RFC v7 04/12] blk-mq: Facilitate a shared sbitmap per tagset John Garry
2020-06-11 3:37 ` Ming Lei
2020-06-11 10:09 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 05/12] blk-mq: Record nr_active_requests per queue for when using shared sbitmap John Garry
2020-06-11 4:04 ` Ming Lei
2020-06-11 10:22 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 06/12] blk-mq: Record active_queues_shared_sbitmap per tag_set " John Garry
2020-06-11 13:16 ` Hannes Reinecke
2020-06-11 14:22 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a " John Garry
2020-06-11 13:19 ` Hannes Reinecke
2020-06-11 14:33 ` John Garry
2020-06-12 6:06 ` Hannes Reinecke
2020-06-29 15:32 ` About sbitmap_bitmap_show() and cleared bits (was Re: [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a shared sbitmap) John Garry
2020-06-30 6:33 ` Hannes Reinecke
2020-06-30 7:30 ` John Garry
2020-06-30 11:36 ` John Garry
2020-06-30 14:55 ` Bart Van Assche
2020-07-13 9:41 ` [PATCH RFC v7 07/12] blk-mq: Add support in hctx_tags_bitmap_show() for a shared sbitmap John Garry
2020-07-13 12:20 ` Hannes Reinecke
2020-06-10 17:29 ` [PATCH RFC v7 08/12] scsi: Add template flag 'host_tagset' John Garry
2020-06-10 17:29 ` [PATCH RFC v7 09/12] scsi: hisi_sas: Switch v3 hw to MQ John Garry
2020-06-10 17:29 ` John Garry [this message]
2020-07-02 10:23 ` [PATCH RFC v7 10/12] megaraid_sas: switch fusion adapters " Kashyap Desai
2020-07-06 8:23 ` John Garry
2020-07-06 8:45 ` Hannes Reinecke
2020-07-06 9:26 ` John Garry
2020-07-06 9:40 ` Hannes Reinecke
2020-07-06 19:19 ` Kashyap Desai
2020-07-07 7:58 ` John Garry
2020-07-07 14:45 ` Kashyap Desai
2020-07-07 16:17 ` John Garry
2020-07-09 19:01 ` Kashyap Desai
2020-07-10 8:10 ` John Garry
2020-07-13 7:55 ` Kashyap Desai
2020-07-13 8:42 ` John Garry
2020-07-19 19:07 ` Kashyap Desai
2020-07-20 7:23 ` Kashyap Desai
2020-07-20 9:18 ` John Garry
2020-07-21 1:13 ` Ming Lei
2020-07-21 6:53 ` Kashyap Desai
2020-07-22 4:12 ` Ming Lei
2020-07-22 5:30 ` Kashyap Desai
2020-07-22 8:04 ` Ming Lei
2020-07-22 9:32 ` John Garry
2020-07-23 14:07 ` Ming Lei
2020-07-23 17:29 ` John Garry
2020-07-24 2:47 ` Ming Lei
2020-07-28 7:54 ` John Garry
2020-07-28 8:45 ` Ming Lei
2020-07-29 5:25 ` Kashyap Desai
2020-07-29 15:36 ` Ming Lei
2020-07-29 18:31 ` Kashyap Desai
2020-08-04 8:36 ` Ming Lei
2020-08-04 9:27 ` Kashyap Desai
2020-08-05 8:40 ` Ming Lei
2020-08-06 10:25 ` Kashyap Desai
2020-08-06 13:38 ` Ming Lei
2020-08-06 14:37 ` Kashyap Desai
2020-08-06 15:29 ` Ming Lei
2020-08-08 19:05 ` Kashyap Desai
2020-08-09 2:16 ` Ming Lei
2020-08-10 16:38 ` Kashyap Desai
2020-08-11 8:09 ` John Garry
2020-08-04 17:00 ` John Garry
2020-08-05 2:56 ` Ming Lei
2020-07-28 8:01 ` Kashyap Desai
2020-07-08 11:31 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 11/12] smartpqi: enable host tagset John Garry
2020-07-14 13:16 ` John Garry
2020-07-14 13:31 ` John Garry
2020-07-14 18:16 ` Don.Brace
2020-07-15 7:28 ` John Garry
2020-07-14 14:02 ` Hannes Reinecke
2020-08-18 8:33 ` John Garry
2020-06-10 17:29 ` [PATCH RFC v7 12/12] hpsa: enable host_tagset and switch to MQ John Garry
2020-07-14 7:37 ` John Garry
2020-07-14 7:41 ` Hannes Reinecke
2020-07-14 7:52 ` John Garry
2020-07-14 8:06 ` Ming Lei
2020-07-14 9:53 ` John Garry
2020-07-14 10:14 ` Ming Lei
2020-07-14 10:43 ` Hannes Reinecke
2020-07-14 10:19 ` Hannes Reinecke
2020-07-14 10:35 ` John Garry
2020-07-14 10:44 ` Ming Lei
2020-07-14 10:52 ` John Garry
2020-07-14 12:04 ` Ming Lei
2020-08-03 20:39 ` Don.Brace
2020-08-04 9:27 ` John Garry
2020-08-04 15:18 ` Don.Brace
2020-08-05 11:21 ` John Garry
2020-08-14 21:04 ` Don.Brace
2020-08-17 8:00 ` John Garry
2020-08-17 18:39 ` Don.Brace
2020-08-18 7:14 ` Hannes Reinecke
2020-07-16 16:14 ` Don.Brace
2020-07-16 19:45 ` Don.Brace
2020-07-17 10:11 ` John Garry
2020-06-11 3:07 ` [PATCH RFC v7 00/12] blk-mq/scsi: Provide hostwide shared tags for SCSI HBAs Ming Lei
2020-06-11 9:35 ` John Garry
2020-06-12 18:47 ` Kashyap Desai
2020-06-15 2:13 ` Ming Lei
2020-06-15 6:57 ` Kashyap Desai
2020-06-16 1:00 ` Ming Lei
2020-06-17 11:26 ` Kashyap Desai
2020-06-22 6:24 ` Hannes Reinecke
2020-06-23 0:55 ` Ming Lei
2020-06-23 11:50 ` Kashyap Desai
2020-06-23 12:11 ` Kashyap Desai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1591810159-240929-11-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=chenxiang66@hisilicon.com \
--cc=don.brace@microsemi.com \
--cc=esc.storagedev@microsemi.com \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=kashyap.desai@broadcom.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=megaraidlinux.pdl@broadcom.com \
--cc=ming.lei@redhat.com \
--cc=shivasharan.srikanteshwara@broadcom.com \
--cc=sumit.saxena@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).