net/mlx5e: Pass actions param to actions_match_supported()

Currently the mlx5_flow object contains a single mlx5_attr instance.
However, multi table actions (e.g. CT) instantiate multiple attr instances.

Currently action_match_supported() reads the actions flag from the
flow's attribute instance. Modify the function to receive the action
flags as a parameter which is set by the calling function and
pass the aggregated actions to actions_match_supported().

Signed-off-by: Roi Dayan <roid@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
index bfbc91c..fc7c066 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
@@ -16,6 +16,7 @@ struct mlx5e_tc_act_parse_state {
        unsigned int num_actions;
        struct mlx5e_tc_flow *flow;
        struct netlink_ext_ack *extack;
+       u32 actions;
        bool ct;
        bool encap;
        bool decap;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 342ab06..a709b2e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3257,11 +3257,11 @@ actions_match_supported_fdb(struct mlx5e_priv *priv,
 static bool
 actions_match_supported(struct mlx5e_priv *priv,
                        struct flow_action *flow_action,
+                       u32 actions,
                        struct mlx5e_tc_flow_parse_attr *parse_attr,
                        struct mlx5e_tc_flow *flow,
                        struct netlink_ext_ack *extack)
 {
-       u32 actions = flow->attr->action;
        bool ct_flow, ct_clear;
 
        ct_clear = flow->attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR;
@@ -3344,6 +3344,8 @@ parse_tc_actions(struct mlx5e_tc_act_parse_state *parse_state,
                err = tc_act->parse_action(parse_state, act, priv, attr);
                if (err)
                        return err;
+
+               parse_state->actions |= attr->action;
        }
 
        flow_action_for_each(i, act, flow_action) {
@@ -3445,7 +3447,8 @@ parse_tc_nic_actions(struct mlx5e_priv *priv,
        if (err)
                return err;
 
-       if (!actions_match_supported(priv, flow_action, parse_attr, flow, extack))
+       if (!actions_match_supported(priv, flow_action, parse_state->actions,
+                                    parse_attr, flow, extack))
                return -EOPNOTSUPP;
 
        return 0;
@@ -3574,7 +3577,8 @@ parse_tc_fdb_actions(struct mlx5e_priv *priv,
        if (err)
                return err;
 
-       if (!actions_match_supported(priv, flow_action, parse_attr, flow, extack))
+       if (!actions_match_supported(priv, flow_action, parse_state->actions,
+                                    parse_attr, flow, extack))
                return -EOPNOTSUPP;
 
        return 0;