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

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

net/mlx5: Add CONFIG_MLX5_ESWITCH Kconfig 



Allow to selectively build the driver with or without sriov eswitch, VF
representors and TC offloads.

Also remove the need of two ndo ops structures (sriov & basic)
and keep only one unified ndo ops, compile out VF SRIOV ndos when not
needed (MLX5_ESWITCH=n), and for VF netdev calling those ndos will result
in returning -EPERM.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Cc: Jes Sorensen <jsorensen@fb.com>
Cc: kernel-team@fb.com
parent eeb66cdb

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -44,6 +44,17 @@ config MLX5_MPFS 
          is enabled to allow passing user configured unicast MAC addresses to the

          requesting PF.



config MLX5_ESWITCH

	bool "Mellanox Technologies MLX5 SRIOV E-Switch support"

	depends on MLX5_CORE_EN

	default y

	---help---

	  Mellanox Technologies Ethernet SRIOV E-Switch support in ConnectX NIC.

          E-Switch provides internal SRIOV packet steering and switching for the

          enabled VFs and PF in two available modes:

                Legacy SRIOV mode (L2 mac vlan steering based).

                Switchdev mode (eswitch offloads).



config MLX5_CORE_EN_DCB

	bool "Data Center Bridging (DCB) Support"

	default y

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

+5 −4
Original line number Diff line number Diff line
@@ -11,13 +11,14 @@ mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o 
mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \

		fpga/ipsec.o



mlx5_core-$(CONFIG_MLX5_CORE_EN) += eswitch.o eswitch_offloads.o \

		en_main.o en_common.o en_fs.o en_ethtool.o en_tx.o \

		en_rx.o en_rx_am.o en_txrx.o en_clock.o vxlan.o \

		en_tc.o en_arfs.o en_rep.o en_fs_ethtool.o en_selftest.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_rx_am.o en_txrx.o en_clock.o vxlan.o \

		en_arfs.o en_fs_ethtool.o en_selftest.o



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



mlx5_core-$(CONFIG_MLX5_ESWITCH) += eswitch.o eswitch_offloads.o en_rep.o en_tc.o



mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o



mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o

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

+16 −37
Original line number Diff line number Diff line
@@ -3025,6 +3025,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, 
			      u32 chain_index, __be16 proto,

			      struct tc_to_netdev *tc)

{

#ifdef CONFIG_MLX5_ESWITCH

	struct mlx5e_priv *priv = netdev_priv(dev);



	if (TC_H_MAJ(handle) != TC_H_MAJ(TC_H_INGRESS))
@@ -3048,6 +3049,7 @@ static int mlx5e_ndo_setup_tc(struct net_device *dev, u32 handle, 
	}



mqprio:

#endif

	if (tc->type != TC_SETUP_MQPRIO)

		return -EINVAL;
@@ -3350,6 +3352,7 @@ static int mlx5e_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	}

}



#ifdef CONFIG_MLX5_ESWITCH

static int mlx5e_set_vf_mac(struct net_device *dev, int vf, u8 *mac)

{

	struct mlx5e_priv *priv = netdev_priv(dev);
@@ -3452,6 +3455,7 @@ static int mlx5e_get_vf_stats(struct net_device *dev, 
	return mlx5_eswitch_get_vport_stats(mdev->priv.eswitch, vf + 1,

					    vf_stats);

}

#endif



static void mlx5e_add_vxlan_port(struct net_device *netdev,

				 struct udp_tunnel_info *ti)
@@ -3685,35 +3689,7 @@ static void mlx5e_netpoll(struct net_device *dev) 
}

#endif



static const struct net_device_ops mlx5e_netdev_ops_basic = {

	.ndo_open                = mlx5e_open,

	.ndo_stop                = mlx5e_close,

	.ndo_start_xmit          = mlx5e_xmit,

	.ndo_setup_tc            = mlx5e_ndo_setup_tc,

	.ndo_select_queue        = mlx5e_select_queue,

	.ndo_get_stats64         = mlx5e_get_stats,

	.ndo_set_rx_mode         = mlx5e_set_rx_mode,

	.ndo_set_mac_address     = mlx5e_set_mac,

	.ndo_vlan_rx_add_vid     = mlx5e_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid    = mlx5e_vlan_rx_kill_vid,

	.ndo_set_features        = mlx5e_set_features,

	.ndo_change_mtu          = mlx5e_change_mtu,

	.ndo_do_ioctl            = mlx5e_ioctl,

	.ndo_set_tx_maxrate      = mlx5e_set_tx_maxrate,

	.ndo_udp_tunnel_add      = mlx5e_add_vxlan_port,

	.ndo_udp_tunnel_del      = mlx5e_del_vxlan_port,

	.ndo_features_check      = mlx5e_features_check,

#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer	 = mlx5e_rx_flow_steer,

#endif

	.ndo_tx_timeout          = mlx5e_tx_timeout,

	.ndo_xdp		 = mlx5e_xdp,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller     = mlx5e_netpoll,

#endif

};



static const struct net_device_ops mlx5e_netdev_ops_sriov = {

static const struct net_device_ops mlx5e_netdev_ops = {

	.ndo_open                = mlx5e_open,

	.ndo_stop                = mlx5e_close,

	.ndo_start_xmit          = mlx5e_xmit,
@@ -3739,6 +3715,7 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = { 
#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller     = mlx5e_netpoll,

#endif

#ifdef CONFIG_MLX5_ESWITCH

	/* SRIOV E-Switch NDOs */

	.ndo_set_vf_mac          = mlx5e_set_vf_mac,

	.ndo_set_vf_vlan         = mlx5e_set_vf_vlan,
@@ -3750,6 +3727,7 @@ static const struct net_device_ops mlx5e_netdev_ops_sriov = { 
	.ndo_get_vf_stats        = mlx5e_get_vf_stats,

	.ndo_has_offload_stats	 = mlx5e_has_offload_stats,

	.ndo_get_offload_stats	 = mlx5e_get_offload_stats,

#endif

};



static int mlx5e_check_required_hca_cap(struct mlx5_core_dev *mdev)
@@ -3979,9 +3957,11 @@ static void mlx5e_set_netdev_dev_addr(struct net_device *netdev) 
	}

}



#if IS_ENABLED(CONFIG_NET_SWITCHDEV) && IS_ENABLED(CONFIG_MLX5_ESWITCH)

static const struct switchdev_ops mlx5e_switchdev_ops = {

	.switchdev_port_attr_get	= mlx5e_attr_get,

};

#endif



static void mlx5e_build_nic_netdev(struct net_device *netdev)

{
@@ -3992,15 +3972,12 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 


	SET_NETDEV_DEV(netdev, &mdev->pdev->dev);



	if (MLX5_CAP_GEN(mdev, vport_group_manager)) {

		netdev->netdev_ops = &mlx5e_netdev_ops_sriov;

	netdev->netdev_ops = &mlx5e_netdev_ops;



#ifdef CONFIG_MLX5_CORE_EN_DCB

		if (MLX5_CAP_GEN(mdev, qos))

	if (MLX5_CAP_GEN(mdev, vport_group_manager) && MLX5_CAP_GEN(mdev, qos))

		netdev->dcbnl_ops = &mlx5e_dcbnl_ops;

#endif

	} else {

		netdev->netdev_ops = &mlx5e_netdev_ops_basic;

	}



	netdev->watchdog_timeo    = 15 * HZ;
@@ -4072,7 +4049,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 


	mlx5e_set_netdev_dev_addr(netdev);



#ifdef CONFIG_NET_SWITCHDEV

#if IS_ENABLED(CONFIG_NET_SWITCHDEV) && IS_ENABLED(CONFIG_MLX5_ESWITCH)

	if (MLX5_VPORT_MANAGER(mdev))

		netdev->switchdev_ops = &mlx5e_switchdev_ops;

#endif
@@ -4431,6 +4408,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
	if (err)

		return NULL;



#ifdef CONFIG_MLX5_ESWITCH

	if (MLX5_VPORT_MANAGER(mdev)) {

		rpriv = mlx5e_alloc_nic_rep_priv(mdev);

		if (!rpriv) {
@@ -4438,6 +4416,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 
			return NULL;

		}

	}

#endif



	netdev = mlx5e_create_netdev(mdev, &mlx5e_nic_profile, rpriv);

	if (!netdev) {

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

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "eswitch.h"

#include "en.h"



#ifdef CONFIG_MLX5_ESWITCH

struct mlx5e_neigh_update_table {

	struct rhashtable       neigh_ht;

	/* Save the neigh hash entries in a list in addition to the hash table
@@ -142,5 +143,12 @@ void mlx5e_rep_encap_entry_detach(struct mlx5e_priv *priv, 
				  struct mlx5e_encap_entry *e);



void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv);

#else /* CONFIG_MLX5_ESWITCH */

static inline void mlx5e_register_vport_reps(struct mlx5e_priv *priv) {}

static inline void mlx5e_unregister_vport_reps(struct mlx5e_priv *priv) {}

static inline bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv) { return false; }

static inline int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv) { return 0; }

static inline void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv) {}

#endif



#endif /* __MLX5E_REP_H__ */

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

+2 −0
Original line number Diff line number Diff line
@@ -857,6 +857,7 @@ void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
		       &wqe->next.next_wqe_index);

}



#ifdef CONFIG_MLX5_ESWITCH

void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)

{

	struct net_device *netdev = rq->netdev;
@@ -901,6 +902,7 @@ void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
	mlx5_wq_ll_pop(&rq->wq, wqe_counter_be,

		       &wqe->next.next_wqe_index);

}

#endif



static inline void mlx5e_mpwqe_fill_rx_skb(struct mlx5e_rq *rq,

					   struct mlx5_cqe64 *cqe,