Skip to content

Commit 4b3ddc6

Browse files
Nitesh Narayan LalKAGA-KOKO
authored andcommitted
net/mlx4: Use irq_update_affinity_hint()
The driver uses irq_set_affinity_hint() to update the affinity_hint mask that is consumed by the userspace to distribute the interrupts. However, under the hood irq_set_affinity_hint() also applies the provided cpumask (if not NULL) as the affinity for the given interrupt which 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_update_affinity_hint() that only updates the affinity_hint pointer. Signed-off-by: Nitesh Narayan Lal <nitesh@redhat.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Reviewed-by: Tariq Toukan <tariqt@nvidia.com> Link: https://lore.kernel.org/r/20210903152430.244937-15-nitesh@redhat.com
1 parent 7451e9e commit 4b3ddc6

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

  • drivers/net/ethernet/mellanox/mlx4

drivers/net/ethernet/mellanox/mlx4/eq.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ static void mlx4_set_eq_affinity_hint(struct mlx4_priv *priv, int vec)
244244
cpumask_empty(eq->affinity_mask))
245245
return;
246246

247-
hint_err = irq_set_affinity_hint(eq->irq, eq->affinity_mask);
247+
hint_err = irq_update_affinity_hint(eq->irq, eq->affinity_mask);
248248
if (hint_err)
249-
mlx4_warn(dev, "irq_set_affinity_hint failed, err %d\n", hint_err);
249+
mlx4_warn(dev, "irq_update_affinity_hint failed, err %d\n", hint_err);
250250
}
251251
#endif
252252

@@ -1123,9 +1123,7 @@ static void mlx4_free_irqs(struct mlx4_dev *dev)
11231123
for (i = 0; i < dev->caps.num_comp_vectors + 1; ++i)
11241124
if (eq_table->eq[i].have_irq) {
11251125
free_cpumask_var(eq_table->eq[i].affinity_mask);
1126-
#if defined(CONFIG_SMP)
1127-
irq_set_affinity_hint(eq_table->eq[i].irq, NULL);
1128-
#endif
1126+
irq_update_affinity_hint(eq_table->eq[i].irq, NULL);
11291127
free_irq(eq_table->eq[i].irq, eq_table->eq + i);
11301128
eq_table->eq[i].have_irq = 0;
11311129
}

0 commit comments

Comments
 (0)