From: Daniel Wagner <[email protected]> Ensure that IRQ affinity setup also respects the queue-to-CPU mapping constraints provided by the block layer. This allows the SCSI drivers to avoid assigning interrupts to CPUs that the block layer has excluded (e.g., isolated CPUs).
Only convert drivers which are already using the pci_alloc_irq_vectors_affinity with the PCI_IRQ_AFFINITY flag set. Because these drivers are enabled to let the IRQ core code to set the affinity. Also don't update qla2xxx because the nvme-fabrics code is not ready yet. Signed-off-by: Daniel Wagner <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> --- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + drivers/scsi/megaraid/megaraid_sas_base.c | 5 ++++- drivers/scsi/mpi3mr/mpi3mr_fw.c | 6 +++++- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 ++++- drivers/scsi/pm8001/pm8001_init.c | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index f69efc6494b8..d1f689224e7b 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -2605,6 +2605,7 @@ static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) struct pci_dev *pdev = hisi_hba->pci_dev; struct irq_affinity desc = { .pre_vectors = BASE_VECTORS_V3_HW, + .mask = blk_mq_online_queue_affinity(), }; min_msi = MIN_AFFINE_VECTORS_V3_HW; diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index ac71ea4898b2..7e2a3c187ee0 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -5925,7 +5925,10 @@ static int __megasas_alloc_irq_vectors(struct megasas_instance *instance) { int i, irq_flags; - struct irq_affinity desc = { .pre_vectors = instance->low_latency_index_start }; + struct irq_affinity desc = { + .pre_vectors = instance->low_latency_index_start, + .mask = blk_mq_online_queue_affinity(), + }; struct irq_affinity *descp = &desc; irq_flags = PCI_IRQ_MSIX; diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index c744210cc901..f9b8b3639c64 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -830,7 +830,11 @@ static int mpi3mr_setup_isr(struct mpi3mr_ioc *mrioc, u8 setup_one) int max_vectors, min_vec; int retval; int i; - struct irq_affinity desc = { .pre_vectors = 1, .post_vectors = 1 }; + struct irq_affinity desc = { + .pre_vectors = 1, + .post_vectors = 1, + .mask = blk_mq_online_queue_affinity(), + }; if (mrioc->is_intr_info_set) return 0; diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index 79052f2accbd..91e1622b5b77 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3370,7 +3370,10 @@ static int _base_alloc_irq_vectors(struct MPT3SAS_ADAPTER *ioc) { int i, irq_flags = PCI_IRQ_MSIX; - struct irq_affinity desc = { .pre_vectors = ioc->high_iops_queues }; + struct irq_affinity desc = { + .pre_vectors = ioc->high_iops_queues, + .mask = blk_mq_online_queue_affinity(), + }; struct irq_affinity *descp = &desc; /* * Don't allocate msix vectors for poll_queues. diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index e93ea76b565e..6360fa95bcf4 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -978,6 +978,7 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) */ struct irq_affinity desc = { .pre_vectors = 1, + .mask = blk_mq_online_queue_affinity(), }; rc = pci_alloc_irq_vectors_affinity( pm8001_ha->pdev, 2, PM8001_MAX_MSIX_VEC, -- 2.51.0
