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

net/mlx5e: Rename some encap-specific API to generic names 



Some of the encap-specific functions and fields will also be used by route
update infrastructure in following patches. Rename them to generic names.

Signed-off-by: default avatarVlad Buslov <vladbu@nvidia.com>
Signed-off-by: default avatarDmytro Linkin <dlinkin@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent c7b9038d

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void mlx5e_rep_update_flows(struct mlx5e_priv *priv, 
	}

unlock:

	mutex_unlock(&esw->offloads.encap_tbl_lock);

	mlx5e_put_encap_flow_list(priv, &flow_list);

	mlx5e_put_flow_list(priv, &flow_list);

}



static int

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct mlx5e_tc_flow { 
				   * due to missing route)

				   */

	struct net_device *orig_dev; /* netdev adding flow first */

	int tmp_efi_index;

	int tmp_entry_index;

	struct list_head tmp_list; /* temporary flow list used by neigh update */

	refcount_t refcnt;

	struct rcu_head rcu_head;

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c

+5 −5
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ void mlx5e_tc_encap_flows_add(struct mlx5e_priv *priv, 
		esw_attr = attr->esw_attr;

		spec = &attr->parse_attr->spec;



		esw_attr->dests[flow->tmp_efi_index].pkt_reformat = e->pkt_reformat;

		esw_attr->dests[flow->tmp_efi_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;

		esw_attr->dests[flow->tmp_entry_index].pkt_reformat = e->pkt_reformat;

		esw_attr->dests[flow->tmp_entry_index].flags |= MLX5_ESW_DEST_ENCAP_VALID;

		/* Flow can be associated with multiple encap entries.

		 * Before offloading the flow verify that all of them have

		 * a valid neighbour.
@@ -161,7 +161,7 @@ void mlx5e_tc_encap_flows_del(struct mlx5e_priv *priv, 
		/* update from encap rule to slow path rule */

		rule = mlx5e_tc_offload_to_slow_path(esw, flow, spec);

		/* mark the flow's encap dest as non-valid */

		esw_attr->dests[flow->tmp_efi_index].flags &= ~MLX5_ESW_DEST_ENCAP_VALID;

		esw_attr->dests[flow->tmp_entry_index].flags &= ~MLX5_ESW_DEST_ENCAP_VALID;



		if (IS_ERR(rule)) {

			err = PTR_ERR(rule);
@@ -195,7 +195,7 @@ void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry *e, struct list_head *f 
			continue;

		wait_for_completion(&flow->init_done);



		flow->tmp_efi_index = efi->index;

		flow->tmp_entry_index = efi->index;

		list_add(&flow->tmp_list, flow_list);

	}

}
@@ -294,7 +294,7 @@ void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe) 
		}

		mutex_unlock(&esw->offloads.encap_tbl_lock);



		mlx5e_put_encap_flow_list(priv, &flow_list);

		mlx5e_put_flow_list(priv, &flow_list);

		if (neigh_used) {

			/* release current encap before breaking the loop */

			mlx5e_encap_put(priv, e);

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

+1 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,7 @@ struct mlx5_fc *mlx5e_tc_get_counter(struct mlx5e_tc_flow *flow) 
}



/* Iterate over tmp_list of flows attached to flow_list head. */

void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list)

void mlx5e_put_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list)

{

	struct mlx5e_tc_flow *flow, *tmp;

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ bool mlx5e_encap_take(struct mlx5e_encap_entry *e); 
void mlx5e_encap_put(struct mlx5e_priv *priv, struct mlx5e_encap_entry *e);



void mlx5e_take_all_encap_flows(struct mlx5e_encap_entry *e, struct list_head *flow_list);

void mlx5e_put_encap_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list);

void mlx5e_put_flow_list(struct mlx5e_priv *priv, struct list_head *flow_list);



struct mlx5e_neigh_hash_entry;

void mlx5e_tc_update_neigh_used_value(struct mlx5e_neigh_hash_entry *nhe);