Commit 23bde065 authored by Lama Kayal's avatar Lama Kayal Committed by Saeed Mahameed
Browse files

net/mlx5e: Make mlx5e_tc_table private 



Move mlx5e_tc_table struct to en_tc.c thus make it private.
Introduce allocation and deallocation functions as part of the tc API
to allow this switch smoothly.

Convert mlx5e_nic_chain() macro to a function of en_tc.c.

Signed-off-by: default avatarLama Kayal <lkayal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 65f586c2

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

+0 −24
Original line number Diff line number Diff line
@@ -15,30 +15,6 @@ enum { 
	MLX5E_TC_MISS_LEVEL,

};



struct mlx5e_tc_table {

	/* Protects the dynamic assignment of the t parameter

	 * which is the nic tc root table.

	 */

	struct mutex			t_lock;

	struct mlx5e_priv		*priv;

	struct mlx5_flow_table		*t;

	struct mlx5_flow_table		*miss_t;

	struct mlx5_fs_chains           *chains;

	struct mlx5e_post_act		*post_act;



	struct rhashtable               ht;



	struct mod_hdr_tbl mod_hdr;

	struct mutex hairpin_tbl_lock; /* protects hairpin_tbl */

	DECLARE_HASHTABLE(hairpin_tbl, 8);



	struct notifier_block     netdevice_nb;

	struct netdev_net_notifier	netdevice_nn;



	struct mlx5_tc_ct_priv         *ct;

	struct mapping_ctx             *mapping;

};



struct mlx5e_flow_table {

	int num_groups;

	struct mlx5_flow_table *t;

drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ validate_goto_chain(struct mlx5e_priv *priv, 
	u32 max_chain;



	esw = priv->mdev->priv.eswitch;

	chains = is_esw ? esw_chains(esw) : mlx5e_nic_chains(priv);

	chains = is_esw ? esw_chains(esw) : mlx5e_nic_chains(priv->fs.tc);

	max_chain = mlx5_chains_get_chain_range(chains);

	reformat_and_fwd = is_esw ?

			   MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, reformat_and_fwd_to_table) :

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

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 


#define MLX5E_TC_MAX_SPLITS 1



#define mlx5e_nic_chains(priv) ((priv)->fs.tc->chains)



enum {

	MLX5E_TC_FLOW_FLAG_INGRESS               = MLX5E_TC_FLAG_INGRESS_BIT,
@@ -44,6 +43,8 @@ struct mlx5e_tc_flow_parse_attr { 
	struct mlx5e_tc_act_parse_state parse_state;

};



struct mlx5_fs_chains *mlx5e_nic_chains(struct mlx5e_tc_table *tc);



/* Helper struct for accessing a struct containing list_head array.

 * Containing struct

 *   |- Helper array

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

+6 −3
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/mlx5/mpfs.h>

#include "en.h"

#include "en_rep.h"

#include "en_tc.h"

#include "lib/mpfs.h"

#include "en/ptp.h"
@@ -1347,9 +1348,11 @@ int mlx5e_fs_init(struct mlx5e_priv *priv) 
	priv->fs.vlan = kvzalloc(sizeof(*priv->fs.vlan), GFP_KERNEL);

	if (!priv->fs.vlan)

		goto err;

	priv->fs.tc = kvzalloc(sizeof(*priv->fs.tc), GFP_KERNEL);

	if (!priv->fs.tc)



	priv->fs.tc = mlx5e_tc_table_alloc();

	if (IS_ERR(priv->fs.tc))

		goto err_free_vlan;



	return 0;

err_free_vlan:

	kvfree(priv->fs.vlan);
@@ -1360,7 +1363,7 @@ int mlx5e_fs_init(struct mlx5e_priv *priv) 


void mlx5e_fs_cleanup(struct mlx5e_priv *priv)

{

	kvfree(priv->fs.tc);

	mlx5e_tc_table_free(priv->fs.tc);

	kvfree(priv->fs.vlan);

	priv->fs.vlan = NULL;

}

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

+46 −3
Original line number Diff line number Diff line
@@ -71,6 +71,30 @@ 
#define MLX5E_TC_TABLE_NUM_GROUPS 4

#define MLX5E_TC_TABLE_MAX_GROUP_SIZE BIT(18)



struct mlx5e_tc_table {

	/* Protects the dynamic assignment of the t parameter

	 * which is the nic tc root table.

	 */

	struct mutex			t_lock;

	struct mlx5e_priv		*priv;

	struct mlx5_flow_table		*t;

	struct mlx5_flow_table		*miss_t;

	struct mlx5_fs_chains           *chains;

	struct mlx5e_post_act		*post_act;



	struct rhashtable               ht;



	struct mod_hdr_tbl mod_hdr;

	struct mutex hairpin_tbl_lock; /* protects hairpin_tbl */

	DECLARE_HASHTABLE(hairpin_tbl, 8);



	struct notifier_block     netdevice_nb;

	struct netdev_net_notifier	netdevice_nn;



	struct mlx5_tc_ct_priv         *ct;

	struct mapping_ctx             *mapping;

};



struct mlx5e_tc_attr_to_reg_mapping mlx5e_tc_attr_to_reg_mappings[] = {

	[CHAIN_TO_REG] = {

		.mfield = MLX5_ACTION_IN_FIELD_METADATA_REG_C_0,
@@ -108,6 +132,24 @@ struct mlx5e_tc_attr_to_reg_mapping mlx5e_tc_attr_to_reg_mappings[] = { 
	[PACKET_COLOR_TO_REG] = packet_color_to_reg,

};



struct mlx5e_tc_table *mlx5e_tc_table_alloc(void)

{

	struct mlx5e_tc_table *tc;



	tc = kvzalloc(sizeof(*tc), GFP_KERNEL);

	return tc ? tc : ERR_PTR(-ENOMEM);

}



void mlx5e_tc_table_free(struct mlx5e_tc_table *tc)

{

	kvfree(tc);

}



struct mlx5_fs_chains *mlx5e_nic_chains(struct mlx5e_tc_table *tc)

{

	return tc->chains;

}



/* To avoid false lock dependency warning set the tc_ht lock

 * class different than the lock class of the ht being used when deleting

 * last flow from a group and then deleting a group, we get into del_sw_flow_group()
@@ -1084,10 +1126,10 @@ mlx5e_add_offloaded_nic_rule(struct mlx5e_priv *priv, 
			     struct mlx5_flow_attr *attr)

{

	struct mlx5_flow_context *flow_context = &spec->flow_context;

	struct mlx5_fs_chains *nic_chains = mlx5e_nic_chains(priv);

	struct mlx5_nic_flow_attr *nic_attr = attr->nic_attr;

	struct mlx5e_tc_table *tc = priv->fs.tc;

	struct mlx5_flow_destination dest[2] = {};

	struct mlx5_fs_chains *nic_chains;

	struct mlx5_flow_act flow_act = {

		.action = attr->action,

		.flags    = FLOW_ACT_NO_APPEND,
@@ -1096,6 +1138,7 @@ mlx5e_add_offloaded_nic_rule(struct mlx5e_priv *priv, 
	struct mlx5_flow_table *ft;

	int dest_ix = 0;



	nic_chains = mlx5e_nic_chains(tc);

	flow_context->flags |= FLOW_CONTEXT_HAS_TAG;

	flow_context->flow_tag = nic_attr->flow_tag;
@@ -1250,7 +1293,7 @@ void mlx5e_del_offloaded_nic_rule(struct mlx5e_priv *priv, 
				  struct mlx5_flow_handle *rule,

				  struct mlx5_flow_attr *attr)

{

	struct mlx5_fs_chains *nic_chains = mlx5e_nic_chains(priv);

	struct mlx5_fs_chains *nic_chains = mlx5e_nic_chains(priv->fs.tc);



	mlx5_del_flow_rules(rule);
@@ -1282,7 +1325,7 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv, 
	mutex_lock(&priv->fs.tc->t_lock);

	if (!mlx5e_tc_num_filters(priv, MLX5_TC_FLAG(NIC_OFFLOAD)) &&

	    !IS_ERR_OR_NULL(tc->t)) {

		mlx5_chains_put_table(mlx5e_nic_chains(priv), 0, 1, MLX5E_TC_FT_LEVEL);

		mlx5_chains_put_table(mlx5e_nic_chains(tc), 0, 1, MLX5E_TC_FT_LEVEL);

		priv->fs.tc->t = NULL;

	}

	mutex_unlock(&priv->fs.tc->t_lock);