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

Commit 171c7625 authored by Mark Bloch's avatar Mark Bloch Committed by Saeed Mahameed
Browse files

net/mlx5: Use flow counter IDs and not the wrapping cache object 



Currently, when a flow rule is created using the FS core layer, the caller
has to pass the entire flow counter object and not just the counter HW
handle (ID). This requires both the FS core and the caller to have
knowledge about the inner implementation of the FS layer flow counters
cache and limits the possible users.

Move to use the counter ID across the place when dealing with flows.

Doing this decoupling, now can we privatize the inner implementation
of the flow counters.

Signed-off-by: default avatarMark Bloch <markb@mellanox.com>
Reviewed-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b8aee822

drivers/infiniband/hw/mlx5/main.c

+5 −2
Original line number Diff line number Diff line
@@ -3320,15 +3320,18 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
	}



	if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {

		struct mlx5_ib_mcounters *mcounters;



		err = flow_counters_set_data(flow_act.counters, ucmd);

		if (err)

			goto free;



		mcounters = to_mcounters(flow_act.counters);

		handler->ibcounters = flow_act.counters;

		dest_arr[dest_num].type =

			MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		dest_arr[dest_num].counter =

			to_mcounters(flow_act.counters)->hw_cntrs_hndl;

		dest_arr[dest_num].counter_id =

			mlx5_fc_id(mcounters->hw_cntrs_hndl);

		dest_num++;

	}

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h

+3 −3
Original line number Diff line number Diff line
@@ -252,10 +252,10 @@ TRACE_EVENT(mlx5_fs_add_rule, 
			   memcpy(__entry->destination,

				  &rule->dest_attr,

				  sizeof(__entry->destination));

			   if (rule->dest_attr.type & MLX5_FLOW_DESTINATION_TYPE_COUNTER &&

			       rule->dest_attr.counter)

			   if (rule->dest_attr.type &

			       MLX5_FLOW_DESTINATION_TYPE_COUNTER)

				__entry->counter_id =

				rule->dest_attr.counter->id;

					rule->dest_attr.counter_id;

	    ),

	    TP_printk("rule=%p fte=%p index=%u sw_action=<%s> [dst] %s\n",

		      __entry->rule, __entry->fte, __entry->index,

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

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ mlx5e_tc_add_nic_flow(struct mlx5e_priv *priv, 
			goto err_fc_create;

		}

		dest[dest_ix].type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		dest[dest_ix].counter = counter;

		dest[dest_ix].counter_id = mlx5_fc_id(counter);

		dest_ix++;

		attr->counter = counter;

	}

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

+2 −2
Original line number Diff line number Diff line
@@ -1198,7 +1198,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw, 
	if (counter) {

		flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;

		drop_ctr_dst.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		drop_ctr_dst.counter = counter;

		drop_ctr_dst.counter_id = mlx5_fc_id(counter);

		dst = &drop_ctr_dst;

		dest_num++;

	}
@@ -1285,7 +1285,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw, 
	if (counter) {

		flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_COUNT;

		drop_ctr_dst.type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		drop_ctr_dst.counter = counter;

		drop_ctr_dst.counter_id = mlx5_fc_id(counter);

		dst = &drop_ctr_dst;

		dest_num++;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, 
	}

	if (flow_act.action & MLX5_FLOW_CONTEXT_ACTION_COUNT) {

		dest[i].type = MLX5_FLOW_DESTINATION_TYPE_COUNTER;

		dest[i].counter = attr->counter;

		dest[i].counter_id = mlx5_fc_id(attr->counter);

		i++;

	}