Commit fdb8ed13 authored by Nitesh Narayan Lal's avatar Nitesh Narayan Lal Committed by Thomas Gleixner
Browse files

scsi: mpt3sas: Use irq_set_affinity_and_hint() 



The driver uses irq_set_affinity_hint() specifically for the high IOPS
queue interrupts for two purposes:

 - To set the affinity_hint which is consumed by the userspace for
   distributing the interrupts

 - To apply an affinity that it provides

The driver enforces its own affinity to bind the high IOPS queue interrupts
to the local NUMA node. However, irq_set_affinity_hint() applying the
provided cpumask as an affinity (if not NULL) for the interrupt is an
undocumented side effect.

To remove this side effect irq_set_affinity_hint() has been marked
as deprecated and new interfaces have been introduced. Hence, replace the
irq_set_affinity_hint() with the new interface irq_set_affinity_and_hint()
where the provided mask needs to be applied as the affinity and
affinity_hint pointer needs to be set and replace with
irq_update_affinity_hint() where only affinity_hint needs to be updated.

Signed-off-by: default avatarNitesh Narayan Lal <nitesh@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Link: https://lore.kernel.org/r/20210903152430.244937-6-nitesh@redhat.com
parent 8049da6f

drivers/scsi/mpt3sas/mpt3sas_base.c

+10 −11
Original line number Diff line number Diff line
@@ -3086,6 +3086,7 @@ _base_check_enable_msix(struct MPT3SAS_ADAPTER *ioc) 
void

mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc)

{

	unsigned int irq;

	struct adapter_reply_queue *reply_q, *next;



	if (list_empty(&ioc->reply_queue_list))
@@ -3098,9 +3099,10 @@ mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc) 
			continue;

		}



		if (ioc->smp_affinity_enable)

			irq_set_affinity_hint(pci_irq_vector(ioc->pdev,

			    reply_q->msix_index), NULL);

		if (ioc->smp_affinity_enable) {

			irq = pci_irq_vector(ioc->pdev, reply_q->msix_index);

			irq_update_affinity_hint(irq, NULL);

		}

		free_irq(pci_irq_vector(ioc->pdev, reply_q->msix_index),

			 reply_q);

		kfree(reply_q);
@@ -3167,18 +3169,15 @@ _base_request_irq(struct MPT3SAS_ADAPTER *ioc, u8 index) 
 * @ioc: per adapter object

 *

 * The enduser would need to set the affinity via /proc/irq/#/smp_affinity

 *

 * It would nice if we could call irq_set_affinity, however it is not

 * an exported symbol

 */

static void

_base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc)

{

	unsigned int cpu, nr_cpus, nr_msix, index = 0;

	unsigned int cpu, nr_cpus, nr_msix, index = 0, irq;

	struct adapter_reply_queue *reply_q;

	int local_numa_node;

	int iopoll_q_count = ioc->reply_queue_count -

	    ioc->iopoll_q_start_index;

	const struct cpumask *mask;



	if (!_base_is_controller_msix_enabled(ioc))

		return;
@@ -3201,11 +3200,11 @@ _base_assign_reply_queues(struct MPT3SAS_ADAPTER *ioc) 
		 * corresponding to high iops queues.

		 */

		if (ioc->high_iops_queues) {

			local_numa_node = dev_to_node(&ioc->pdev->dev);

			mask = cpumask_of_node(dev_to_node(&ioc->pdev->dev));

			for (index = 0; index < ioc->high_iops_queues;

			    index++) {

				irq_set_affinity_hint(pci_irq_vector(ioc->pdev,

				    index), cpumask_of_node(local_numa_node));

				irq = pci_irq_vector(ioc->pdev, index);

				irq_set_affinity_and_hint(irq, mask);

			}

		}