Commit 1d15d909 authored by Shivasharan S's avatar Shivasharan S Committed by Martin K. Petersen

scsi: megaraid_sas: Load balance completions across all MSI-X

Driver will use "reply descriptor post queues" in round robin fashion when
the combined MSI-X mode is not enabled. With this IO completions are
distributed and load balanced across all the available reply descriptor
post queues equally.

This is enabled only if combined MSI-X mode is not enabled in firmware.
This improves performance and also fixes soft lockups.

When load balancing is enabled, IRQ affinity from driver needs to be
disabled.
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarShivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 62a04f81
...@@ -2262,6 +2262,7 @@ struct megasas_instance { ...@@ -2262,6 +2262,7 @@ struct megasas_instance {
u32 secure_jbod_support; u32 secure_jbod_support;
u32 support_morethan256jbod; /* FW support for more than 256 PD/JBOD */ u32 support_morethan256jbod; /* FW support for more than 256 PD/JBOD */
bool use_seqnum_jbod_fp; /* Added for PD sequence */ bool use_seqnum_jbod_fp; /* Added for PD sequence */
bool smp_affinity_enable;
spinlock_t crashdump_lock; spinlock_t crashdump_lock;
struct megasas_register_set __iomem *reg_set; struct megasas_register_set __iomem *reg_set;
...@@ -2279,6 +2280,7 @@ struct megasas_instance { ...@@ -2279,6 +2280,7 @@ struct megasas_instance {
u16 ldio_threshold; u16 ldio_threshold;
u16 cur_can_queue; u16 cur_can_queue;
u32 max_sectors_per_req; u32 max_sectors_per_req;
bool msix_load_balance;
struct megasas_aen_event *ev; struct megasas_aen_event *ev;
struct megasas_cmd **cmd_list; struct megasas_cmd **cmd_list;
...@@ -2316,6 +2318,7 @@ struct megasas_instance { ...@@ -2316,6 +2318,7 @@ struct megasas_instance {
atomic_t sge_holes_type1; atomic_t sge_holes_type1;
atomic_t sge_holes_type2; atomic_t sge_holes_type2;
atomic_t sge_holes_type3; atomic_t sge_holes_type3;
atomic64_t total_io_count;
struct megasas_instance_template *instancet; struct megasas_instance_template *instancet;
struct tasklet_struct isr_tasklet; struct tasklet_struct isr_tasklet;
......
...@@ -5349,6 +5349,7 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe) ...@@ -5349,6 +5349,7 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe)
&instance->irq_context[j]); &instance->irq_context[j]);
/* Retry irq register for IO_APIC*/ /* Retry irq register for IO_APIC*/
instance->msix_vectors = 0; instance->msix_vectors = 0;
instance->msix_load_balance = false;
if (is_probe) { if (is_probe) {
pci_free_irq_vectors(instance->pdev); pci_free_irq_vectors(instance->pdev);
return megasas_setup_irqs_ioapic(instance); return megasas_setup_irqs_ioapic(instance);
...@@ -5357,6 +5358,7 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe) ...@@ -5357,6 +5358,7 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe)
} }
} }
} }
return 0; return 0;
} }
...@@ -5660,6 +5662,12 @@ static int megasas_init_fw(struct megasas_instance *instance) ...@@ -5660,6 +5662,12 @@ static int megasas_init_fw(struct megasas_instance *instance)
if (rdpq_enable) if (rdpq_enable)
instance->is_rdpq = (scratch_pad_1 & MR_RDPQ_MODE_OFFSET) ? instance->is_rdpq = (scratch_pad_1 & MR_RDPQ_MODE_OFFSET) ?
1 : 0; 1 : 0;
if (!instance->msix_combined) {
instance->msix_load_balance = true;
instance->smp_affinity_enable = false;
}
fw_msix_count = instance->msix_vectors; fw_msix_count = instance->msix_vectors;
/* Save 1-15 reply post index address to local memory /* Save 1-15 reply post index address to local memory
* Index 0 is already saved from reg offset * Index 0 is already saved from reg offset
...@@ -5678,17 +5686,20 @@ static int megasas_init_fw(struct megasas_instance *instance) ...@@ -5678,17 +5686,20 @@ static int megasas_init_fw(struct megasas_instance *instance)
instance->msix_vectors); instance->msix_vectors);
} else /* MFI adapters */ } else /* MFI adapters */
instance->msix_vectors = 1; instance->msix_vectors = 1;
/* Don't bother allocating more MSI-X vectors than cpus */ /* Don't bother allocating more MSI-X vectors than cpus */
instance->msix_vectors = min(instance->msix_vectors, instance->msix_vectors = min(instance->msix_vectors,
(unsigned int)num_online_cpus()); (unsigned int)num_online_cpus());
if (smp_affinity_enable) if (instance->smp_affinity_enable)
irq_flags |= PCI_IRQ_AFFINITY; irq_flags |= PCI_IRQ_AFFINITY;
i = pci_alloc_irq_vectors(instance->pdev, 1, i = pci_alloc_irq_vectors(instance->pdev, 1,
instance->msix_vectors, irq_flags); instance->msix_vectors, irq_flags);
if (i > 0) if (i > 0) {
instance->msix_vectors = i; instance->msix_vectors = i;
else } else {
instance->msix_vectors = 0; instance->msix_vectors = 0;
instance->msix_load_balance = false;
}
} }
/* /*
* MSI-X host index 0 is common for all adapter. * MSI-X host index 0 is common for all adapter.
...@@ -6795,6 +6806,7 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance) ...@@ -6795,6 +6806,7 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
INIT_LIST_HEAD(&instance->internal_reset_pending_q); INIT_LIST_HEAD(&instance->internal_reset_pending_q);
atomic_set(&instance->fw_outstanding, 0); atomic_set(&instance->fw_outstanding, 0);
atomic64_set(&instance->total_io_count, 0);
init_waitqueue_head(&instance->int_cmd_wait_q); init_waitqueue_head(&instance->int_cmd_wait_q);
init_waitqueue_head(&instance->abort_cmd_wait_q); init_waitqueue_head(&instance->abort_cmd_wait_q);
...@@ -6817,6 +6829,8 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance) ...@@ -6817,6 +6829,8 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance)
instance->last_time = 0; instance->last_time = 0;
instance->disableOnlineCtrlReset = 1; instance->disableOnlineCtrlReset = 1;
instance->UnevenSpanSupport = 0; instance->UnevenSpanSupport = 0;
instance->smp_affinity_enable = smp_affinity_enable ? true : false;
instance->msix_load_balance = false;
if (instance->adapter_type != MFI_SERIES) if (instance->adapter_type != MFI_SERIES)
INIT_WORK(&instance->work_init, megasas_fusion_ocr_wq); INIT_WORK(&instance->work_init, megasas_fusion_ocr_wq);
...@@ -7180,7 +7194,7 @@ megasas_resume(struct pci_dev *pdev) ...@@ -7180,7 +7194,7 @@ megasas_resume(struct pci_dev *pdev)
/* Now re-enable MSI-X */ /* Now re-enable MSI-X */
if (instance->msix_vectors) { if (instance->msix_vectors) {
irq_flags = PCI_IRQ_MSIX; irq_flags = PCI_IRQ_MSIX;
if (smp_affinity_enable) if (instance->smp_affinity_enable)
irq_flags |= PCI_IRQ_AFFINITY; irq_flags |= PCI_IRQ_AFFINITY;
} }
rval = pci_alloc_irq_vectors(instance->pdev, 1, rval = pci_alloc_irq_vectors(instance->pdev, 1,
......
...@@ -2768,8 +2768,13 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, ...@@ -2768,8 +2768,13 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
fp_possible = (io_info.fpOkForIo > 0) ? true : false; fp_possible = (io_info.fpOkForIo > 0) ? true : false;
} }
cmd->request_desc->SCSIIO.MSIxIndex = if (instance->msix_load_balance)
instance->reply_map[raw_smp_processor_id()]; 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()];
if (instance->adapter_type >= VENTURA_SERIES) { if (instance->adapter_type >= VENTURA_SERIES) {
/* FP for Optimal raid level 1. /* FP for Optimal raid level 1.
...@@ -3082,8 +3087,13 @@ megasas_build_syspd_fusion(struct megasas_instance *instance, ...@@ -3082,8 +3087,13 @@ megasas_build_syspd_fusion(struct megasas_instance *instance,
cmd->request_desc->SCSIIO.DevHandle = io_request->DevHandle; cmd->request_desc->SCSIIO.DevHandle = io_request->DevHandle;
cmd->request_desc->SCSIIO.MSIxIndex = if (instance->msix_load_balance)
instance->reply_map[raw_smp_processor_id()]; 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()];
if (!fp_possible) { if (!fp_possible) {
/* system pd firmware path */ /* system pd firmware path */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment