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

Commit aaa553a6 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Leon Romanovsky
Browse files

net/mlx5: EQ, Remove redundant completion EQ list lock 



Completion EQs list is only modified on driver load/unload, locking is
not required, remove it.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 2883f352

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

+0 −2
Original line number Diff line number Diff line
@@ -810,8 +810,6 @@ int mlx5_eq_init(struct mlx5_core_dev *dev) 
{

	int err;



	spin_lock_init(&dev->priv.eq_table.lock);



	err = mlx5_eq_debugfs_init(dev);



	return err;

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

+3 −14
Original line number Diff line number Diff line
@@ -704,7 +704,6 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, 
	int err = -ENOENT;

	int i = 0;



	spin_lock(&table->lock);

	list_for_each_entry_safe(eq, n, &table->comp_eqs_list, list) {

		if (i++ == vector) {

			*eqn = eq->eqn;
@@ -713,7 +712,6 @@ int mlx5_vector2eqn(struct mlx5_core_dev *dev, int vector, int *eqn, 
			break;

		}

	}

	spin_unlock(&table->lock);



	return err;

}
@@ -724,14 +722,11 @@ struct mlx5_eq *mlx5_eqn2eq(struct mlx5_core_dev *dev, int eqn) 
	struct mlx5_eq_table *table = &dev->priv.eq_table;

	struct mlx5_eq *eq;



	spin_lock(&table->lock);

	list_for_each_entry(eq, &table->comp_eqs_list, list)

		if (eq->eqn == eqn) {

			spin_unlock(&table->lock);

	list_for_each_entry(eq, &table->comp_eqs_list, list) {

		if (eq->eqn == eqn)

			return eq;

	}



	spin_unlock(&table->lock);



	return ERR_PTR(-ENOENT);

}
@@ -747,17 +742,13 @@ static void free_comp_eqs(struct mlx5_core_dev *dev) 
		dev->rmap = NULL;

	}

#endif

	spin_lock(&table->lock);

	list_for_each_entry_safe(eq, n, &table->comp_eqs_list, list) {

		list_del(&eq->list);

		spin_unlock(&table->lock);

		if (mlx5_destroy_unmap_eq(dev, eq))

			mlx5_core_warn(dev, "failed to destroy EQ 0x%x\n",

				       eq->eqn);

		kfree(eq);

		spin_lock(&table->lock);

	}

	spin_unlock(&table->lock);

}



static int alloc_comp_eqs(struct mlx5_core_dev *dev)
@@ -798,9 +789,7 @@ static int alloc_comp_eqs(struct mlx5_core_dev *dev) 
			goto clean;

		}

		mlx5_core_dbg(dev, "allocated completion EQN %d\n", eq->eqn);

		spin_lock(&table->lock);

		list_add_tail(&eq->list, &table->comp_eqs_list);

		spin_unlock(&table->lock);

	}



	return 0;

include/linux/mlx5/driver.h

+0 −3
Original line number Diff line number Diff line
@@ -484,9 +484,6 @@ struct mlx5_eq_table { 
	struct mlx5_eq		pfault_eq;

#endif

	int			num_comp_vectors;

	/* protect EQs list

	 */

	spinlock_t		lock;

};



struct mlx5_uars_page {