From: Nitesh Narayan Lal <nitesh@redhat.com>
To: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org,
linux-api@vger.kernel.org, linux-pci@vger.kernel.org,
tglx@linutronix.de, jesse.brandeburg@intel.com,
robin.murphy@arm.com, mtosatti@redhat.com, mingo@kernel.org,
jbrandeb@kernel.org, frederic@kernel.org, juri.lelli@redhat.com,
abelits@marvell.com, bhelgaas@google.com, rostedt@goodmis.org,
peterz@infradead.org, davem@davemloft.net,
akpm@linux-foundation.org, sfr@canb.auug.org.au,
stephen@networkplumber.org, rppt@linux.vnet.ibm.com,
chris.friesen@windriver.com, maz@kernel.org,
nhorman@tuxdriver.com, pjwaskiewicz@gmail.com,
sassmann@redhat.com, thenzl@redhat.com,
kashyap.desai@broadcom.com, sumit.saxena@broadcom.com,
shivasharan.srikanteshwara@broadcom.com,
sathya.prakash@broadcom.com, sreekanth.reddy@broadcom.com,
suganath-prabu.subramani@broadcom.com, james.smart@broadcom.com,
dick.kennedy@broadcom.com, jkc@redhat.com,
faisal.latif@intel.com, shiraz.saleem@intel.com,
tariqt@nvidia.com, ahleihel@redhat.com, kheib@redhat.com,
borisp@nvidia.com, saeedm@nvidia.com, benve@cisco.com,
govind@gmx.com, jassisinghbrar@gmail.com,
ajit.khaparde@broadcom.com, sriharsha.basavapatna@broadcom.com,
somnath.kotur@broadcom.com, nilal@redhat.com,
tatyana.e.nikolova@intel.com, mustafa.ismail@intel.com,
ahs3@redhat.com, leonro@nvidia.com,
chandrakanth.patil@broadcom.com, bjorn.andersson@linaro.org,
chunkuang.hu@kernel.org, yongqiang.niu@mediatek.com,
baolin.wang7@gmail.com, poros@redhat.com, minlei@redhat.com,
emilne@redhat.com, jejb@linux.ibm.com,
martin.petersen@oracle.com, _govind@gmx.com,
ley.foon.tan@intel.com, kabel@kernel.org,
viresh.kumar@linaro.org, Tushar.Khandelwal@arm.com,
luobin9@huawei.com
Subject: [PATCH v4 04/14] scsi: megaraid_sas: Use irq_set_affinity_and_hint
Date: Mon, 19 Jul 2021 14:07:36 -0400 [thread overview]
Message-ID: <20210719180746.1008665-5-nitesh@redhat.com> (raw)
In-Reply-To: <20210719180746.1008665-1-nitesh@redhat.com>
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 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.
Change the megasas_set_high_iops_queue_affinity_hint function name to
megasas_set_high_iops_queue_affinity_and_hint to clearly indicate that the
function is setting both affinity and affinity_hint.
Signed-off-by: Nitesh Narayan Lal <nitesh@redhat.com>
---
drivers/scsi/megaraid/megaraid_sas_base.c | 27 +++++++++++++----------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index ec10b2497310..836a1b13f71b 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5718,7 +5718,7 @@ megasas_setup_irqs_msix(struct megasas_instance *instance, u8 is_probe)
"Failed to register IRQ for vector %d.\n", i);
for (j = 0; j < i; j++) {
if (j < instance->low_latency_index_start)
- irq_set_affinity_hint(
+ irq_update_affinity_hint(
pci_irq_vector(pdev, j), NULL);
free_irq(pci_irq_vector(pdev, j),
&instance->irq_context[j]);
@@ -5761,7 +5761,7 @@ megasas_destroy_irqs(struct megasas_instance *instance) {
if (instance->msix_vectors)
for (i = 0; i < instance->msix_vectors; i++) {
if (i < instance->low_latency_index_start)
- irq_set_affinity_hint(
+ irq_update_affinity_hint(
pci_irq_vector(instance->pdev, i), NULL);
free_irq(pci_irq_vector(instance->pdev, i),
&instance->irq_context[i]);
@@ -5892,22 +5892,25 @@ int megasas_get_device_list(struct megasas_instance *instance)
}
/**
- * megasas_set_high_iops_queue_affinity_hint - Set affinity hint for high IOPS queues
- * @instance: Adapter soft state
- * return: void
+ * megasas_set_high_iops_queue_affinity_and_hint - Set affinity and hint
+ * for high IOPS queues
+ * @instance: Adapter soft state
+ * return: void
*/
static inline void
-megasas_set_high_iops_queue_affinity_hint(struct megasas_instance *instance)
+megasas_set_high_iops_queue_affinity_and_hint(struct megasas_instance *instance)
{
int i;
- int local_numa_node;
+ unsigned int irq;
+ const struct cpumask *mask;
if (instance->perf_mode == MR_BALANCED_PERF_MODE) {
- local_numa_node = dev_to_node(&instance->pdev->dev);
+ mask = cpumask_of_node(dev_to_node(&instance->pdev->dev));
- for (i = 0; i < instance->low_latency_index_start; i++)
- irq_set_affinity_hint(pci_irq_vector(instance->pdev, i),
- cpumask_of_node(local_numa_node));
+ for (i = 0; i < instance->low_latency_index_start; i++) {
+ irq = pci_irq_vector(instance->pdev, i);
+ irq_set_affinity_and_hint(irq, mask);
+ }
}
}
@@ -5996,7 +5999,7 @@ megasas_alloc_irq_vectors(struct megasas_instance *instance)
instance->msix_vectors = 0;
if (instance->smp_affinity_enable)
- megasas_set_high_iops_queue_affinity_hint(instance);
+ megasas_set_high_iops_queue_affinity_and_hint(instance);
}
/**
--
2.27.0
next prev parent reply other threads:[~2021-07-19 18:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 18:07 [PATCH v4 00/14] genirq: Cleanup the usage of irq_set_affinity_hint Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 01/14] genirq: Provide new interfaces for affinity hints Nitesh Narayan Lal
2021-07-20 10:57 ` Jakub Kicinski
2021-07-19 18:07 ` [PATCH v4 02/14] iavf: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 03/14] i40e: " Nitesh Narayan Lal
2021-07-19 18:07 ` Nitesh Narayan Lal [this message]
2021-07-19 18:07 ` [PATCH v4 05/14] scsi: mpt3sas: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 06/14] RDMA/irdma: Use irq_update_affinity_hint Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 07/14] enic: " Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 08/14] be2net: " Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 09/14] ixgbe: " Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 10/14] mailbox: " Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 11/14] scsi: lpfc: Use irq_set_affinity Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 12/14] hinic: Use irq_set_affinity_and_hint Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 13/14] net/mlx5: " Nitesh Narayan Lal
2021-07-19 18:07 ` [PATCH v4 14/14] net/mlx4: Use irq_update_affinity_hint Nitesh Narayan 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=20210719180746.1008665-5-nitesh@redhat.com \
--to=nitesh@redhat.com \
--cc=Tushar.Khandelwal@arm.com \
--cc=_govind@gmx.com \
--cc=abelits@marvell.com \
--cc=ahleihel@redhat.com \
--cc=ahs3@redhat.com \
--cc=ajit.khaparde@broadcom.com \
--cc=akpm@linux-foundation.org \
--cc=baolin.wang7@gmail.com \
--cc=benve@cisco.com \
--cc=bhelgaas@google.com \
--cc=bjorn.andersson@linaro.org \
--cc=borisp@nvidia.com \
--cc=chandrakanth.patil@broadcom.com \
--cc=chris.friesen@windriver.com \
--cc=chunkuang.hu@kernel.org \
--cc=davem@davemloft.net \
--cc=dick.kennedy@broadcom.com \
--cc=emilne@redhat.com \
--cc=faisal.latif@intel.com \
--cc=frederic@kernel.org \
--cc=govind@gmx.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=james.smart@broadcom.com \
--cc=jassisinghbrar@gmail.com \
--cc=jbrandeb@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jesse.brandeburg@intel.com \
--cc=jkc@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=kabel@kernel.org \
--cc=kashyap.desai@broadcom.com \
--cc=kheib@redhat.com \
--cc=leonro@nvidia.com \
--cc=ley.foon.tan@intel.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=luobin9@huawei.com \
--cc=martin.petersen@oracle.com \
--cc=maz@kernel.org \
--cc=mingo@kernel.org \
--cc=minlei@redhat.com \
--cc=mtosatti@redhat.com \
--cc=mustafa.ismail@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.com \
--cc=nilal@redhat.com \
--cc=peterz@infradead.org \
--cc=pjwaskiewicz@gmail.com \
--cc=poros@redhat.com \
--cc=robin.murphy@arm.com \
--cc=rostedt@goodmis.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=saeedm@nvidia.com \
--cc=sassmann@redhat.com \
--cc=sathya.prakash@broadcom.com \
--cc=sfr@canb.auug.org.au \
--cc=shiraz.saleem@intel.com \
--cc=shivasharan.srikanteshwara@broadcom.com \
--cc=somnath.kotur@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=sriharsha.basavapatna@broadcom.com \
--cc=stephen@networkplumber.org \
--cc=suganath-prabu.subramani@broadcom.com \
--cc=sumit.saxena@broadcom.com \
--cc=tariqt@nvidia.com \
--cc=tatyana.e.nikolova@intel.com \
--cc=tglx@linutronix.de \
--cc=thenzl@redhat.com \
--cc=viresh.kumar@linaro.org \
--cc=yongqiang.niu@mediatek.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).