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

Commit d85cdccb authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx5e: Change the TC offload rule add/del code path to be per NIC or E-Switch 



Refactor the code to deal with add/del TC rules to have handler per NIC/E-switch
offloading use case, and push the latter into the e-switch code. This provides
better separation and is to be used in down-stream patch for applying a fix.

Fixes: bffaa916 ("net/mlx5: E-Switch, Add control for inline mode")
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1f30a86c

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

+39 −20
Original line number Diff line number Diff line
@@ -133,6 +133,23 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
	return rule;

}



static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv,

				  struct mlx5e_tc_flow *flow)

{

	struct mlx5_fc *counter = NULL;



	if (!IS_ERR(flow->rule)) {

		counter = mlx5_flow_rule_counter(flow->rule);

		mlx5_del_flow_rules(flow->rule);

		mlx5_fc_destroy(priv->mdev, counter);

	}



	if (!mlx5e_tc_num_filters(priv) && (priv->fs.tc.t)) {

		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

	}

}



static struct mlx5_flow_handle *

mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,

		      struct mlx5_flow_spec *spec,
@@ -149,7 +166,24 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, 
}



static void mlx5e_detach_encap(struct mlx5e_priv *priv,

			       struct mlx5e_tc_flow *flow) {

			       struct mlx5e_tc_flow *flow);



static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,

				  struct mlx5e_tc_flow *flow)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;



	mlx5_eswitch_del_offloaded_rule(esw, flow->rule, flow->attr);



	mlx5_eswitch_del_vlan_action(esw, flow->attr);



	if (flow->attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP)

		mlx5e_detach_encap(priv, flow);

}



static void mlx5e_detach_encap(struct mlx5e_priv *priv,

			       struct mlx5e_tc_flow *flow)

{

	struct list_head *next = flow->encap.next;



	list_del(&flow->encap);
@@ -173,25 +207,10 @@ static void mlx5e_detach_encap(struct mlx5e_priv *priv, 
static void mlx5e_tc_del_flow(struct mlx5e_priv *priv,

			      struct mlx5e_tc_flow *flow)

{

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;

	struct mlx5_fc *counter = NULL;



	if (!IS_ERR(flow->rule)) {

		counter = mlx5_flow_rule_counter(flow->rule);

		mlx5_del_flow_rules(flow->rule);

		mlx5_fc_destroy(priv->mdev, counter);

	}



	if (flow->flags & MLX5E_TC_FLOW_ESWITCH) {

		mlx5_eswitch_del_vlan_action(esw, flow->attr);

		if (flow->attr->action & MLX5_FLOW_CONTEXT_ACTION_ENCAP)

			mlx5e_detach_encap(priv, flow);

	}



	if (!mlx5e_tc_num_filters(priv) && (priv->fs.tc.t)) {

		mlx5_destroy_flow_table(priv->fs.tc.t);

		priv->fs.tc.t = NULL;

	}

	if (flow->flags & MLX5E_TC_FLOW_ESWITCH)

		mlx5e_tc_del_fdb_flow(priv, flow);

	else

		mlx5e_tc_del_nic_flow(priv, flow);

}



static void parse_vxlan_attr(struct mlx5_flow_spec *spec,

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

+5 −0
Original line number Diff line number Diff line
@@ -271,6 +271,11 @@ struct mlx5_flow_handle * 
mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,

				struct mlx5_flow_spec *spec,

				struct mlx5_esw_flow_attr *attr);

void

mlx5_eswitch_del_offloaded_rule(struct mlx5_eswitch *esw,

				struct mlx5_flow_handle *rule,

				struct mlx5_esw_flow_attr *attr);



struct mlx5_flow_handle *

mlx5_eswitch_create_vport_rx_rule(struct mlx5_eswitch *esw, int vport, u32 tirn);

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

+14 −0
Original line number Diff line number Diff line
@@ -97,6 +97,20 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, 
	return rule;

}



void

mlx5_eswitch_del_offloaded_rule(struct mlx5_eswitch *esw,

				struct mlx5_flow_handle *rule,

				struct mlx5_esw_flow_attr *attr)

{

	struct mlx5_fc *counter = NULL;



	if (!IS_ERR(rule)) {

		counter = mlx5_flow_rule_counter(rule);

		mlx5_del_flow_rules(rule);

		mlx5_fc_destroy(esw->dev, counter);

	}

}



static int esw_set_global_vlan_pop(struct mlx5_eswitch *esw, u8 val)

{

	struct mlx5_eswitch_rep *rep;