net/mlx5e: CT: Allow header rewrite of 5-tuple and ct clear action

With ct clear we don't jump to the ct tables, so header rewrite
of 5-tuple can be done in place (and not moved to after the CT action).

Check for ct clear action, and if so, allow 5-tuple header
rewrite.

Signed-off-by: Paul Blakey <paulb@mellanox.com>
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index bc9c0ac..5674dbb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3191,13 +3191,14 @@ static bool actions_match_supported(struct mlx5e_priv *priv,
                                    struct mlx5e_tc_flow *flow,
                                    struct netlink_ext_ack *extack)
 {
-       bool ct_flow;
+       bool ct_flow = false, ct_clear = false;
        u32 actions;
 
-       ct_flow = flow_flag_test(flow, CT);
        if (mlx5e_is_eswitch_flow(flow)) {
                actions = flow->esw_attr->action;
-
+               ct_clear = flow->esw_attr->ct_attr.ct_action &
+                          TCA_CT_ACT_CLEAR;
+               ct_flow = flow_flag_test(flow, CT) && !ct_clear;
                if (flow->esw_attr->split_count && ct_flow) {
                        /* All registers used by ct are cleared when using
                         * split rules.