net/mlx5e: flower: check for unsupported control flags
authorAsbjørn Sloth Tønnesen <ast@fiberby.net>
Mon, 22 Apr 2024 15:27:27 +0000 (15:27 +0000)
committerJakub Kicinski <kuba@kernel.org>
Fri, 3 May 2024 01:19:13 +0000 (18:19 -0700)
Use flow_rule_is_supp_control_flags() to reject filters
with unsupported control flags.

In case any unsupported control flags are masked,
flow_rule_is_supp_control_flags() sets a NL extended
error message, and we return -EOPNOTSUPP.

Remove FLOW_DIS_FIRST_FRAG specific error message,
and treat it as any other unsupported control flag.

Only compile-tested.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Jianbo Liu <jianbol@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Acked-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240422152728.175677-1-ast@fiberby.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index aeb32cb2718288cead2979e4bc44285135f36c30..30673292e15fee976a95d4353e95cc8f9dad8637 100644 (file)
@@ -2801,12 +2801,6 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
                flow_rule_match_control(rule, &match);
                addr_type = match.key->addr_type;
 
-               /* the HW doesn't support frag first/later */
-               if (match.mask->flags & FLOW_DIS_FIRST_FRAG) {
-                       NL_SET_ERR_MSG_MOD(extack, "Match on frag first/later is not supported");
-                       return -EOPNOTSUPP;
-               }
-
                if (match.mask->flags & FLOW_DIS_IS_FRAGMENT) {
                        MLX5_SET(fte_match_set_lyr_2_4, headers_c, frag, 1);
                        MLX5_SET(fte_match_set_lyr_2_4, headers_v, frag,
@@ -2819,6 +2813,10 @@ static int __parse_cls_flower(struct mlx5e_priv *priv,
                        else
                                *match_level = MLX5_MATCH_L3;
                }
+
+               if (!flow_rule_is_supp_control_flags(FLOW_DIS_IS_FRAGMENT,
+                                                    match.mask->flags, extack))
+                       return -EOPNOTSUPP;
        }
 
        if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_BASIC)) {