Commit e2394a61 authored by Vlad Buslov's avatar Vlad Buslov Committed by Saeed Mahameed
Browse files

net/mlx5e: Move TC-specific code from en_main.c to en_tc.c 



As a preparation for introducing new kconfig option that controls
compilation of all TC offloads code in mlx5, extract TC-specific code from
en_main.c to en_tc.c. This allows easily compiling out the code by
only including new source in make file when corresponding kconfig is
enabled instead of adding multiple ifdef blocks to en_main.

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 549c243e

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

+0 −37
Original line number Diff line number Diff line
@@ -3539,41 +3539,6 @@ out: 
	return err;

}



#ifdef CONFIG_MLX5_ESWITCH

static int mlx5e_setup_tc_cls_flower(struct mlx5e_priv *priv,

				     struct flow_cls_offload *cls_flower,

				     unsigned long flags)

{

	switch (cls_flower->command) {

	case FLOW_CLS_REPLACE:

		return mlx5e_configure_flower(priv->netdev, priv, cls_flower,

					      flags);

	case FLOW_CLS_DESTROY:

		return mlx5e_delete_flower(priv->netdev, priv, cls_flower,

					   flags);

	case FLOW_CLS_STATS:

		return mlx5e_stats_flower(priv->netdev, priv, cls_flower,

					  flags);

	default:

		return -EOPNOTSUPP;

	}

}



static int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data,

				   void *cb_priv)

{

	unsigned long flags = MLX5_TC_FLAG(INGRESS) | MLX5_TC_FLAG(NIC_OFFLOAD);

	struct mlx5e_priv *priv = cb_priv;



	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return mlx5e_setup_tc_cls_flower(priv, type_data, flags);

	default:

		return -EOPNOTSUPP;

	}

}

#endif



static LIST_HEAD(mlx5e_block_cb_list);



static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type,
@@ -3582,7 +3547,6 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	struct mlx5e_priv *priv = netdev_priv(dev);



	switch (type) {

#ifdef CONFIG_MLX5_ESWITCH

	case TC_SETUP_BLOCK: {

		struct flow_block_offload *f = type_data;
@@ -3592,7 +3556,6 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
						  mlx5e_setup_tc_block_cb,

						  priv, priv, true);

	}

#endif

	case TC_SETUP_QDISC_MQPRIO:

		return mlx5e_setup_tc_mqprio(priv, type_data);

	default:

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

+35 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include <net/flow_dissector.h>

#include <net/flow_offload.h>

#include <net/sch_generic.h>

#include <net/pkt_cls.h>

#include <net/tc_act/tc_gact.h>
@@ -50,6 +51,7 @@ 
#include "en.h"

#include "en_rep.h"

#include "en/rep/tc.h"

#include "en/rep/neigh.h"

#include "en_tc.h"

#include "eswitch.h"

#include "esw/chains.h"
@@ -4777,3 +4779,36 @@ void mlx5e_tc_reoffload_flows_work(struct work_struct *work) 
	}

	mutex_unlock(&rpriv->unready_flows_lock);

}



static int mlx5e_setup_tc_cls_flower(struct mlx5e_priv *priv,

				     struct flow_cls_offload *cls_flower,

				     unsigned long flags)

{

	switch (cls_flower->command) {

	case FLOW_CLS_REPLACE:

		return mlx5e_configure_flower(priv->netdev, priv, cls_flower,

					      flags);

	case FLOW_CLS_DESTROY:

		return mlx5e_delete_flower(priv->netdev, priv, cls_flower,

					   flags);

	case FLOW_CLS_STATS:

		return mlx5e_stats_flower(priv->netdev, priv, cls_flower,

					  flags);

	default:

		return -EOPNOTSUPP;

	}

}



int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data,

			    void *cb_priv)

{

	unsigned long flags = MLX5_TC_FLAG(INGRESS) | MLX5_TC_FLAG(NIC_OFFLOAD);

	struct mlx5e_priv *priv = cb_priv;



	switch (type) {

	case TC_SETUP_CLSFLOWER:

		return mlx5e_setup_tc_cls_flower(priv, type_data, flags);

	default:

		return -EOPNOTSUPP;

	}

}

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

+7 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ void dealloc_mod_hdr_actions(struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts); 
struct mlx5e_tc_flow;

u32 mlx5e_tc_get_flow_tun_id(struct mlx5e_tc_flow *flow);



int mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data,

			    void *cb_priv);



#else /* CONFIG_MLX5_ESWITCH */

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

static inline void mlx5e_tc_nic_cleanup(struct mlx5e_priv *priv) {}
@@ -181,6 +184,10 @@ static inline int mlx5e_tc_num_filters(struct mlx5e_priv *priv, 
{

	return 0;

}



static inline int

mlx5e_setup_tc_block_cb(enum tc_setup_type type, void *type_data, void *cb_priv)

{ return -EOPNOTSUPP; }

#endif



#endif /* __MLX5_EN_TC_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE