Skip to content

Commit

Permalink
net/mlx5e: TC, store tc action cookies per attr
Browse files Browse the repository at this point in the history
The tc parse action phase translates the tc actions to mlx5 flow
attributes data structure that is used during the flow offload phase.
Currently, the flow offload stage instantiates hw counters while
associating them to flow cookie. However, flows with branching
actions are required to associate a hardware counter with its action
cookies.

Store the parsed tc action cookies on the flow attribute.
Use the list of cookies in the next patch to associate a tc action cookie
with its allocated hw counter.

Signed-off-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Oz Shlomo authored and Paolo Abeni committed Feb 14, 2023
1 parent e9d1061 commit cca7eac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Original file line number Diff line number Diff line change
Expand Up @@ -3786,6 +3786,7 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,
parse_attr->filter_dev = attr->parse_attr->filter_dev;
attr2->action = 0;
attr2->counter = NULL;
attr->tc_act_cookies_count = 0;
attr2->flags = 0;
attr2->parse_attr = parse_attr;
attr2->dest_chain = 0;
Expand Down Expand Up @@ -4149,6 +4150,8 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
goto out_free;

parse_state->actions |= attr->action;
if (!tc_act->stats_action)
attr->tc_act_cookies[attr->tc_act_cookies_count++] = act->act_cookie;

/* Split attr for multi table act if not the last act. */
if (jump_state.jump_target ||
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ struct mlx5_nic_flow_attr {

struct mlx5_flow_attr {
u32 action;
unsigned long tc_act_cookies[TCA_ACT_MAX_PRIO];
struct mlx5_fc *counter;
struct mlx5_modify_hdr *modify_hdr;
struct mlx5e_mod_hdr_handle *mh; /* attached mod header instance */
Expand All @@ -79,6 +80,7 @@ struct mlx5_flow_attr {
struct mlx5e_tc_flow_parse_attr *parse_attr;
u32 chain;
u16 prio;
u16 tc_act_cookies_count;
u32 dest_chain;
struct mlx5_flow_table *ft;
struct mlx5_flow_table *dest_ft;
Expand Down

0 comments on commit cca7eac

Please sign in to comment.