From: "tip-bot2 for Nitesh Narayan Lal" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Nitesh Narayan Lal <nitesh@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org
Subject: [tip: irq/core] scsi: mpt3sas: Use irq_set_affinity_and_hint()
Date: Fri, 10 Dec 2021 19:54:08 -0000 [thread overview]
Message-ID: <163916604872.23020.15587930198801556013.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210903152430.244937-6-nitesh@redhat.com>
The following commit has been merged into the irq/core branch of tip:
Commit-ID: fdb8ed13a77270c8e6e05b3ff9f4cb2f57e16d6a
Gitweb: https://git.kernel.org/tip/fdb8ed13a77270c8e6e05b3ff9f4cb2f57e16d6a
Author: Nitesh Narayan Lal <nitesh@redhat.com>
AuthorDate: Fri, 03 Sep 2021 11:24:21 -04:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 10 Dec 2021 20:47:38 +01:00
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: Nitesh Narayan Lal <nitesh@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Link: https://lore.kernel.org/r/20210903152430.244937-6-nitesh@redhat.com
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 81dab9b..511726f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -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 @@ out:
* @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);
}
}
next prev parent reply other threads:[~2021-12-10 19:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-03 15:24 [PATCH v6 00/14] genirq: Cleanup the abuse of irq_set_affinity_hint() Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 01/14] genirq: Provide new interfaces for affinity hints Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 02/14] iavf: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] iavf: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 03/14] i40e: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] i40e: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 04/14] scsi: megaraid_sas: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] scsi: megaraid_sas: Use irq_set_affinity_and_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 05/14] scsi: mpt3sas: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-12-10 19:54 ` tip-bot2 for Nitesh Narayan Lal [this message]
2021-09-03 15:24 ` [PATCH v6 06/14] RDMA/irdma: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] RDMA/irdma: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 07/14] enic: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] enic: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 08/14] be2net: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] be2net: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 09/14] ixgbe: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] ixgbe: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 10/14] mailbox: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] mailbox: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 11/14] scsi: lpfc: Use irq_set_affinity Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] scsi: lpfc: Use irq_set_affinity() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 12/14] hinic: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] hinic: Use irq_set_affinity_and_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 13/14] net/mlx5: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] net/mlx5: Use irq_set_affinity_and_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-03 15:24 ` [PATCH v6 14/14] net/mlx4: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-12-10 19:54 ` [tip: irq/core] net/mlx4: Use irq_update_affinity_hint() tip-bot2 for Nitesh Narayan Lal
2021-09-13 14:34 ` [PATCH v6 00/14] genirq: Cleanup the abuse of irq_set_affinity_hint() Nitesh Lal
2021-11-24 19:30 ` Thomas Gleixner
2021-11-24 22:16 ` Nitesh Lal
2021-12-10 13:51 ` Nitesh Lal
2021-12-10 18:44 ` Thomas Gleixner
2021-12-10 18:54 ` Nitesh Lal
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=163916604872.23020.15587930198801556013.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maz@kernel.org \
--cc=nitesh@redhat.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).