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

Commit 0c1cc8b2 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Prevent possible races in VXLAN control flow 



When calling add/remove VXLAN port, a lock must be held in order to
prevent race scenarios when more than one add/remove happens at the
same time.
Fix by holding our state_lock (mutex) as done by all other parts of the
driver.
Note that the spinlock protecting the radix-tree is still needed in
order to synchronize radix-tree access from softirq context.

Fixes: b3f63c3d ("net/mlx5e: Add netdev support for VXLAN tunneling")
Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 23f4cc2c

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

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ static void mlx5e_vxlan_add_port(struct work_struct *work) 
	struct mlx5e_vxlan *vxlan;

	int err;



	mutex_lock(&priv->state_lock);

	vxlan = mlx5e_vxlan_lookup_port(priv, port);

	if (vxlan) {

		atomic_inc(&vxlan->refcount);
@@ -117,6 +118,7 @@ static void mlx5e_vxlan_add_port(struct work_struct *work) 
err_delete_port:

	mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);

free_work:

	mutex_unlock(&priv->state_lock);

	kfree(vxlan_work);

}
@@ -130,6 +132,7 @@ static void mlx5e_vxlan_del_port(struct work_struct *work) 
	struct mlx5e_vxlan *vxlan;

	bool remove = false;



	mutex_lock(&priv->state_lock);

	spin_lock_bh(&vxlan_db->lock);

	vxlan = radix_tree_lookup(&vxlan_db->tree, port);

	if (!vxlan)
@@ -147,6 +150,7 @@ static void mlx5e_vxlan_del_port(struct work_struct *work) 
		mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);

		kfree(vxlan);

	}

	mutex_unlock(&priv->state_lock);

	kfree(vxlan_work);

}