Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b665d98e authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5: Tolerate irq_set_affinity_hint() failures 



Add tolerance to failures of irq_set_affinity_hint().
Its role is to give hints that optimizes performance,
and should not block the driver load.

In non-SMP systems, functionality is not available as
there is a single core, and all these calls definitely
fail.  Hence, do not call the function and avoid the
warning prints.

Fixes: db058a18 ("net/mlx5_core: Set irq affinity hints")
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Cc: kernel-team@fb.com
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 73dd3a48

drivers/net/ethernet/mellanox/mlx5/core/main.c

+4 −11
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) 
	struct mlx5_priv *priv  = &mdev->priv;

	struct msix_entry *msix = priv->msix_arr;

	int irq                 = msix[i + MLX5_EQ_VEC_COMP_BASE].vector;

	int err;



	if (!zalloc_cpumask_var(&priv->irq_info[i].mask, GFP_KERNEL)) {

		mlx5_core_warn(mdev, "zalloc_cpumask_var failed");
@@ -622,18 +621,12 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) 
	cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node),

			priv->irq_info[i].mask);



	err = irq_set_affinity_hint(irq, priv->irq_info[i].mask);

	if (err) {

		mlx5_core_warn(mdev, "irq_set_affinity_hint failed,irq 0x%.4x",

			       irq);

		goto err_clear_mask;

	}

#ifdef CONFIG_SMP

	if (irq_set_affinity_hint(irq, priv->irq_info[i].mask))

		mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq);

#endif



	return 0;



err_clear_mask:

	free_cpumask_var(priv->irq_info[i].mask);

	return err;

}



static void mlx5_irq_clear_affinity_hint(struct mlx5_core_dev *mdev, int i)