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

Commit c297e881 authored by Yuval Avnery's avatar Yuval Avnery Committed by Greg Kroah-Hartman
Browse files

net/mlx5e: Add a lock on tir list 



[ Upstream commit 80a2a9026b24c6bd34b8d58256973e22270bedec ]

Refresh tirs is looping over a global list of tirs while netdevs are
adding and removing tirs from that list. That is why a lock is
required.

Fixes: 724b2aa1 ("net/mlx5e: TIRs management refactoring")
Signed-off-by: default avatarYuval Avnery <yuvalav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 94413175

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

+7 −0
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev, 
	if (err)

		return err;



	mutex_lock(&mdev->mlx5e_res.td.list_lock);

	list_add(&tir->list, &mdev->mlx5e_res.td.tirs_list);

	mutex_unlock(&mdev->mlx5e_res.td.list_lock);



	return 0;

}
@@ -53,8 +55,10 @@ int mlx5e_create_tir(struct mlx5_core_dev *mdev, 
void mlx5e_destroy_tir(struct mlx5_core_dev *mdev,

		       struct mlx5e_tir *tir)

{

	mutex_lock(&mdev->mlx5e_res.td.list_lock);

	mlx5_core_destroy_tir(mdev, tir->tirn);

	list_del(&tir->list);

	mutex_unlock(&mdev->mlx5e_res.td.list_lock);

}



static int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn,
@@ -114,6 +118,7 @@ int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev) 
	}



	INIT_LIST_HEAD(&mdev->mlx5e_res.td.tirs_list);

	mutex_init(&mdev->mlx5e_res.td.list_lock);



	return 0;
@@ -159,6 +164,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb) 


	MLX5_SET(modify_tir_in, in, bitmask.self_lb_en, 1);



	mutex_lock(&mdev->mlx5e_res.td.list_lock);

	list_for_each_entry(tir, &mdev->mlx5e_res.td.tirs_list, list) {

		tirn = tir->tirn;

		err = mlx5_core_modify_tir(mdev, tirn, in, inlen);
@@ -170,6 +176,7 @@ int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb) 
	kvfree(in);

	if (err)

		netdev_err(priv->netdev, "refresh tir(0x%x) failed, %d\n", tirn, err);

	mutex_unlock(&mdev->mlx5e_res.td.list_lock);



	return err;

}

include/linux/mlx5/driver.h

+2 −0
Original line number Diff line number Diff line
@@ -776,6 +776,8 @@ struct mlx5_pagefault { 
};



struct mlx5_td {

	/* protects tirs list changes while tirs refresh */

	struct mutex     list_lock;

	struct list_head tirs_list;

	u32              tdn;

};