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

Commit dccea6bf authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: Vxlan, move netdev only logic to en_main.c 



Create a direct vxlan API to add and delete vxlan ports from HW.
+void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port);
+void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port);

And move vxlan_add/del_work to en_main.c since they are netdev only
logic.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
parent 0f647bfc

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

+51 −0
Original line number Diff line number Diff line
@@ -3969,6 +3969,57 @@ static int mlx5e_get_vf_stats(struct net_device *dev, 
}

#endif



struct mlx5e_vxlan_work {

	struct work_struct	work;

	struct mlx5e_priv	*priv;

	u16			port;

};



static void mlx5e_vxlan_add_work(struct work_struct *work)

{

	struct mlx5e_vxlan_work *vxlan_work =

		container_of(work, struct mlx5e_vxlan_work, work);

	struct mlx5e_priv *priv = vxlan_work->priv;

	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5e_vxlan_add_port(priv, port);

	mutex_unlock(&priv->state_lock);



	kfree(vxlan_work);

}



static void mlx5e_vxlan_del_work(struct work_struct *work)

{

	struct mlx5e_vxlan_work *vxlan_work =

		container_of(work, struct mlx5e_vxlan_work, work);

	struct mlx5e_priv *priv         = vxlan_work->priv;

	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5e_vxlan_del_port(priv, port);

	mutex_unlock(&priv->state_lock);

	kfree(vxlan_work);

}



static void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, u16 port, int add)

{

	struct mlx5e_vxlan_work *vxlan_work;



	vxlan_work = kmalloc(sizeof(*vxlan_work), GFP_ATOMIC);

	if (!vxlan_work)

		return;



	if (add)

		INIT_WORK(&vxlan_work->work, mlx5e_vxlan_add_work);

	else

		INIT_WORK(&vxlan_work->work, mlx5e_vxlan_del_work);



	vxlan_work->priv = priv;

	vxlan_work->port = port;

	queue_work(priv->wq, &vxlan_work->work);

}



static void mlx5e_add_vxlan_port(struct net_device *netdev,

				 struct udp_tunnel_info *ti)

{

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

+7 −48
Original line number Diff line number Diff line
@@ -36,7 +36,11 @@ 
#include "mlx5_core.h"

#include "vxlan.h"



static void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port);

struct mlx5e_vxlan {

	struct hlist_node hlist;

	atomic_t refcount;

	u16 udp_port;

};



void mlx5e_vxlan_init(struct mlx5e_priv *priv)

{
@@ -105,7 +109,7 @@ struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port) 
	return vxlan;

}



static void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)

void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port)

{

	struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;

	struct mlx5e_vxlan *vxlan;
@@ -144,21 +148,7 @@ static void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port) 
	mlx5e_vxlan_core_del_port_cmd(priv->mdev, port);

}



static void mlx5e_vxlan_add_work(struct work_struct *work)

{

	struct mlx5e_vxlan_work *vxlan_work =

		container_of(work, struct mlx5e_vxlan_work, work);

	struct mlx5e_priv *priv = vxlan_work->priv;

	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5e_vxlan_add_port(priv, port);

	mutex_unlock(&priv->state_lock);



	kfree(vxlan_work);

}



static void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)

void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port)

{

	struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;

	struct mlx5e_vxlan *vxlan;
@@ -185,37 +175,6 @@ static void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port) 
	}

}



static void mlx5e_vxlan_del_work(struct work_struct *work)

{

	struct mlx5e_vxlan_work *vxlan_work =

		container_of(work, struct mlx5e_vxlan_work, work);

	struct mlx5e_priv *priv         = vxlan_work->priv;

	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5e_vxlan_del_port(priv, port);

	mutex_unlock(&priv->state_lock);

	kfree(vxlan_work);

}



void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, u16 port, int add)

{

	struct mlx5e_vxlan_work *vxlan_work;



	vxlan_work = kmalloc(sizeof(*vxlan_work), GFP_ATOMIC);

	if (!vxlan_work)

		return;



	if (add)

		INIT_WORK(&vxlan_work->work, mlx5e_vxlan_add_work);

	else

		INIT_WORK(&vxlan_work->work, mlx5e_vxlan_del_work);



	vxlan_work->priv = priv;

	vxlan_work->port = port;

	queue_work(priv->wq, &vxlan_work->work);

}



void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv)

{

	struct mlx5e_vxlan_db *vxlan_db = &priv->vxlan;

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

+3 −13
Original line number Diff line number Diff line
@@ -35,17 +35,7 @@ 
#include <linux/mlx5/driver.h>

#include "en.h"



struct mlx5e_vxlan {

	struct hlist_node hlist;

	atomic_t refcount;

	u16 udp_port;

};



struct mlx5e_vxlan_work {

	struct work_struct	work;

	struct mlx5e_priv	*priv;

	u16			port;

};

struct mlx5e_vxlan;



static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev)

{
@@ -55,8 +45,8 @@ static inline bool mlx5e_vxlan_allowed(struct mlx5_core_dev *mdev) 


void mlx5e_vxlan_init(struct mlx5e_priv *priv);

void mlx5e_vxlan_cleanup(struct mlx5e_priv *priv);



void mlx5e_vxlan_queue_work(struct mlx5e_priv *priv, u16 port, int add);

void mlx5e_vxlan_add_port(struct mlx5e_priv *priv, u16 port);

void mlx5e_vxlan_del_port(struct mlx5e_priv *priv, u16 port);

struct mlx5e_vxlan *mlx5e_vxlan_lookup_port(struct mlx5e_priv *priv, u16 port);



#endif /* __MLX5_VXLAN_H__ */