1 files changed, 23 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index fc02f5f05b38..2e85f73c3235 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -1669,6 +1669,7 @@ static void set_tos(void *outer_c, void *outer_v, u8 mask, u8 val)
 #define LAST_IPV6_FIELD traffic_class
 #define LAST_TCP_UDP_FIELD src_port
 #define LAST_TUNNEL_FIELD tunnel_id
+#define LAST_FLOW_TAG_FIELD tag_id
 
 /* Field is the last supported field */
 #define FIELDS_NOT_SUPPORTED(filter, field)\
@@ -1679,7 +1680,7 @@ static void set_tos(void *outer_c, void *outer_v, u8 mask, u8 val)
                    sizeof(filter.field))
 
 static int parse_flow_attr(u32 *match_c, u32 *match_v,
-                           const union ib_flow_spec *ib_spec)
+                           const union ib_flow_spec *ib_spec, u32 *tag_id)
 {
         void *misc_params_c = MLX5_ADDR_OF(fte_match_param, match_c,
                                            misc_parameters);
@@ -1871,6 +1872,15 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v,
                 MLX5_SET(fte_match_set_misc, misc_params_v, vxlan_vni,
                          ntohl(ib_spec->tunnel.val.tunnel_id));
                 break;
+        case IB_FLOW_SPEC_ACTION_TAG:
+                if (FIELDS_NOT_SUPPORTED(ib_spec->flow_tag,
+                                         LAST_FLOW_TAG_FIELD))
+                        return -EOPNOTSUPP;
+                if (ib_spec->flow_tag.tag_id >= BIT(24))
+                        return -EINVAL;
+
+                *tag_id = ib_spec->flow_tag.tag_id;
+                break;
         default:
                 return -EINVAL;
         }
@@ -2054,6 +2064,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,
         struct mlx5_flow_spec *spec;
         const void *ib_flow = (const void *)flow_attr + sizeof(*flow_attr);
         unsigned int spec_index;
+        u32 flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
         int err = 0;
 
         if (!is_valid_attr(flow_attr))
@@ -2070,7 +2081,7 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,
 
         for (spec_index = 0; spec_index < flow_attr->num_of_specs; spec_index++) {
                 err = parse_flow_attr(spec->match_criteria,
-                                      spec->match_value, ib_flow);
+                                      spec->match_value, ib_flow, &flow_tag);
                 if (err < 0)
                         goto free;
 
@@ -2080,7 +2091,16 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev,
         spec->match_criteria_enable = get_match_criteria_enable(spec->match_criteria);
         flow_act.action = dst ? MLX5_FLOW_CONTEXT_ACTION_FWD_DEST :
                 MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;
-        flow_act.flow_tag = MLX5_FS_DEFAULT_FLOW_TAG;
+
+        if (flow_tag != MLX5_FS_DEFAULT_FLOW_TAG &&
+            (flow_attr->type == IB_FLOW_ATTR_ALL_DEFAULT ||
+             flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT)) {
+                mlx5_ib_warn(dev, "Flow tag %u and attribute type %x isn't allowed in leftovers\n",
+                             flow_tag, flow_attr->type);
+                err = -EINVAL;
+                goto free;
+        }
+        flow_act.flow_tag = flow_tag;
         handler->rule = mlx5_add_flow_rules(ft, spec,
                                             &flow_act,
                                             dst, 1);