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

Commit 358aa5ce authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: Vxlan, move vxlan logic to core driver 



Move vxlan logic and objects to mlx5 core dirver.
Since it going to be used from different mlx5 interfaces.
e.g. mlx5e PF NIC netdev and mlx5e E-Switch representors.

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

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \ 
		fpga/ipsec.o fpga/tls.o



mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o vxlan.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o en/port.o

		en_tx.o en_rx.o en_dim.o en_txrx.o en/xdp.o en_stats.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o en/port.o lib/vxlan.o



mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o

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

+0 −2
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 
#include "wq.h"

#include "mlx5_core.h"

#include "en_stats.h"

#include "vxlan.h"



struct page_pool;
@@ -812,7 +811,6 @@ struct mlx5e_priv { 
	u32                        tx_rates[MLX5E_MAX_NUM_SQS];



	struct mlx5e_flow_steering fs;

	struct mlx5_vxlan          *vxlan;



	struct workqueue_struct    *wq;

	struct work_struct         update_carrier_work;

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

+9 −12
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include "en_accel/tls.h"

#include "accel/ipsec.h"

#include "accel/tls.h"

#include "vxlan.h"

#include "lib/vxlan.h"

#include "en/port.h"

#include "en/xdp.h"
@@ -2974,7 +2974,7 @@ int mlx5e_open(struct net_device *netdev) 
		mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_UP);

	mutex_unlock(&priv->state_lock);



	if (mlx5_vxlan_allowed(priv->vxlan))

	if (mlx5_vxlan_allowed(priv->mdev->vxlan))

		udp_tunnel_get_rx_info(netdev);



	return err;
@@ -3983,7 +3983,7 @@ static void mlx5e_vxlan_add_work(struct work_struct *work) 
	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5_vxlan_add_port(priv->vxlan, port);

	mlx5_vxlan_add_port(priv->mdev->vxlan, port);

	mutex_unlock(&priv->state_lock);



	kfree(vxlan_work);
@@ -3997,7 +3997,7 @@ static void mlx5e_vxlan_del_work(struct work_struct *work) 
	u16 port = vxlan_work->port;



	mutex_lock(&priv->state_lock);

	mlx5_vxlan_del_port(priv->vxlan, port);

	mlx5_vxlan_del_port(priv->mdev->vxlan, port);

	mutex_unlock(&priv->state_lock);

	kfree(vxlan_work);

}
@@ -4028,7 +4028,7 @@ static void mlx5e_add_vxlan_port(struct net_device *netdev, 
	if (ti->type != UDP_TUNNEL_TYPE_VXLAN)

		return;



	if (!mlx5_vxlan_allowed(priv->vxlan))

	if (!mlx5_vxlan_allowed(priv->mdev->vxlan))

		return;



	mlx5e_vxlan_queue_work(priv, be16_to_cpu(ti->port), 1);
@@ -4042,7 +4042,7 @@ static void mlx5e_del_vxlan_port(struct net_device *netdev, 
	if (ti->type != UDP_TUNNEL_TYPE_VXLAN)

		return;



	if (!mlx5_vxlan_allowed(priv->vxlan))

	if (!mlx5_vxlan_allowed(priv->mdev->vxlan))

		return;



	mlx5e_vxlan_queue_work(priv, be16_to_cpu(ti->port), 0);
@@ -4076,7 +4076,7 @@ static netdev_features_t mlx5e_tunnel_features_check(struct mlx5e_priv *priv, 
		port = be16_to_cpu(udph->dest);



		/* Verify if UDP port is being offloaded by HW */

		if (mlx5_vxlan_lookup_port(priv->vxlan, port))

		if (mlx5_vxlan_lookup_port(priv->mdev->vxlan, port))

			return features;

	}
@@ -4648,7 +4648,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_features      |= NETIF_F_HW_VLAN_STAG_TX;



	if (mlx5_vxlan_allowed(priv->vxlan) || MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {

	if (mlx5_vxlan_allowed(mdev->vxlan) || MLX5_CAP_ETH(mdev, tunnel_stateless_gre)) {

		netdev->hw_enc_features |= NETIF_F_IP_CSUM;

		netdev->hw_enc_features |= NETIF_F_IPV6_CSUM;

		netdev->hw_enc_features |= NETIF_F_TSO;
@@ -4656,7 +4656,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
		netdev->hw_enc_features |= NETIF_F_GSO_PARTIAL;

	}



	if (mlx5_vxlan_allowed(priv->vxlan)) {

	if (mlx5_vxlan_allowed(mdev->vxlan)) {

		netdev->hw_features     |= NETIF_F_GSO_UDP_TUNNEL |

					   NETIF_F_GSO_UDP_TUNNEL_CSUM;

		netdev->hw_enc_features |= NETIF_F_GSO_UDP_TUNNEL |
@@ -4758,8 +4758,6 @@ static void mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	struct mlx5e_priv *priv = netdev_priv(netdev);

	int err;



	priv->vxlan = mlx5_vxlan_create(mdev);



	mlx5e_build_nic_netdev_priv(mdev, netdev, profile, ppriv);

	err = mlx5e_ipsec_init(priv);

	if (err)
@@ -4773,7 +4771,6 @@ static void mlx5e_nic_init(struct mlx5_core_dev *mdev, 


static void mlx5e_nic_cleanup(struct mlx5e_priv *priv)

{

	mlx5_vxlan_destroy(priv->vxlan);

	mlx5e_tls_cleanup(priv);

	mlx5e_ipsec_cleanup(priv);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include "en_rep.h"

#include "en_tc.h"

#include "eswitch.h"

#include "vxlan.h"

#include "lib/vxlan.h"

#include "fs_core.h"

#include "en/port.h"
@@ -1133,7 +1133,7 @@ static int parse_tunnel_attr(struct mlx5e_priv *priv, 
		if (memchr_inv(&mask->dst, 0xff, sizeof(mask->dst)))

			goto vxlan_match_offload_err;



		if (mlx5_vxlan_lookup_port(up_priv->vxlan, be16_to_cpu(key->dst)) &&

		if (mlx5_vxlan_lookup_port(up_priv->mdev->vxlan, be16_to_cpu(key->dst)) &&

		    MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap))

			parse_vxlan_attr(spec, f);

		else {
@@ -2557,7 +2557,7 @@ static int mlx5e_attach_encap(struct mlx5e_priv *priv, 
		return -EOPNOTSUPP;

	}



	if (mlx5_vxlan_lookup_port(up_priv->vxlan, be16_to_cpu(key->tp_dst)) &&

	if (mlx5_vxlan_lookup_port(up_priv->mdev->vxlan, be16_to_cpu(key->tp_dst)) &&

	    MLX5_CAP_ESW(priv->mdev, vxlan_encap_decap)) {

		tunnel_type = MLX5_HEADER_TYPE_VXLAN;

	} else {