net/mlx5: handle flex item in flows

Provide flex item recognition, validation and translation
in flow patterns. Track the flex item referencing.

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/doc/guides/nics/features/mlx5.ini b/doc/guides/nics/features/mlx5.ini
index 403f58cd7e2c5e4f5203bb2f3ed984f1832d4a4e..c10e5dd1722330b26a7408102f9feea945a0801a 100644 (file)
--- a/doc/guides/nics/features/mlx5.ini
+++ b/doc/guides/nics/features/mlx5.ini
@@ -56,6 +56,7 @@ Usage doc            = Y
 conntrack            = Y
 ecpri                = Y
 eth                  = Y
+flex                 = Y
 geneve               = Y
 geneve_opt           = Y
 gre                  = Y

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 458634dab39cbdc877e5e4aee076fb44ceed7cba..4026255ce49d44d6d9988f4022392a03e7855216 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -179,6 +179,11 @@ enum mlx5_feature_name {
 /* Conntrack item. */
 #define MLX5_FLOW_LAYER_ASO_CT (UINT64_C(1) << 36)
 
+/* Flex item */
+#define MLX5_FLOW_ITEM_OUTER_FLEX (UINT64_C(1) << 36)
+#define MLX5_FLOW_ITEM_INNER_FLEX (UINT64_C(1) << 37)
+#define MLX5_FLOW_ITEM_FLEX_TUNNEL (UINT64_C(1) << 38)
+
 /* Outer Masks. */
 #define MLX5_FLOW_LAYER_OUTER_L3 \
        (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6)
@@ -193,7 +198,8 @@ enum mlx5_feature_name {
        (MLX5_FLOW_LAYER_VXLAN | MLX5_FLOW_LAYER_VXLAN_GPE | \
         MLX5_FLOW_LAYER_GRE | MLX5_FLOW_LAYER_NVGRE | MLX5_FLOW_LAYER_MPLS | \
         MLX5_FLOW_LAYER_IPIP | MLX5_FLOW_LAYER_IPV6_ENCAP | \
-        MLX5_FLOW_LAYER_GENEVE | MLX5_FLOW_LAYER_GTP)
+        MLX5_FLOW_LAYER_GENEVE | MLX5_FLOW_LAYER_GTP | \
+        MLX5_FLOW_ITEM_FLEX_TUNNEL)
 
 /* Inner Masks. */
 #define MLX5_FLOW_LAYER_INNER_L3 \
@@ -692,6 +698,7 @@ struct mlx5_flow_handle {
        uint32_t is_meter_flow_id:1; /**< Indate if flow_id is for meter. */
        uint32_t mark:1; /**< Metadate rxq mark flag. */
        uint32_t fate_action:3; /**< Fate action type. */
+       uint32_t flex_item; /**< referenced Flex Item bitmask. */
        union {
                uint32_t rix_hrxq; /**< Hash Rx queue object index. */
                uint32_t rix_jump; /**< Index to the jump action resource. */

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 38110cc0d61a8ea6df14751b286660c44728cfeb..842ada2ea96bc8354cb87506f871e7de86c707d2 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6687,6 +6687,88 @@ flow_dv_validate_item_integrity(struct rte_eth_dev *dev,
        return 0;
 }
 
+static int
+flow_dv_validate_item_flex(struct rte_eth_dev *dev,
+                          const struct rte_flow_item *item,
+                          uint64_t item_flags,
+                          uint64_t *last_item,
+                          bool is_inner,
+                          struct rte_flow_error *error)
+{
+       const struct rte_flow_item_flex *flow_spec = item->spec;
+       const struct rte_flow_item_flex *flow_mask = item->mask;
+       struct mlx5_flex_item *flex;
+
+       if (!flow_spec)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "flex flow item spec cannot be NULL");
+       if (!flow_mask)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "flex flow item mask cannot be NULL");
+       if (item->last)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "flex flow item last not supported");
+       if (mlx5_flex_acquire_index(dev, flow_spec->handle, false) < 0)
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+                                         "invalid flex flow item handle");
+       flex = (struct mlx5_flex_item *)flow_spec->handle;
+       switch (flex->tunnel_mode) {
+       case FLEX_TUNNEL_MODE_SINGLE:
+               if (item_flags &
+                   (MLX5_FLOW_ITEM_OUTER_FLEX | MLX5_FLOW_ITEM_INNER_FLEX))
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "multiple flex items not supported");
+               break;
+       case FLEX_TUNNEL_MODE_OUTER:
+               if (is_inner)
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "inner flex item was not configured");
+               if (item_flags & MLX5_FLOW_ITEM_OUTER_FLEX)
+                       rte_flow_error_set(error, ENOTSUP,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "multiple flex items not supported");
+               break;
+       case FLEX_TUNNEL_MODE_INNER:
+               if (!is_inner)
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "outer flex item was not configured");
+               if (item_flags & MLX5_FLOW_ITEM_INNER_FLEX)
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "multiple flex items not supported");
+               break;
+       case FLEX_TUNNEL_MODE_MULTI:
+               if ((is_inner && (item_flags & MLX5_FLOW_ITEM_INNER_FLEX)) ||
+                   (!is_inner && (item_flags & MLX5_FLOW_ITEM_OUTER_FLEX))) {
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "multiple flex items not supported");
+               }
+               break;
+       case FLEX_TUNNEL_MODE_TUNNEL:
+               if (is_inner || (item_flags & MLX5_FLOW_ITEM_FLEX_TUNNEL))
+                       rte_flow_error_set(error, EINVAL,
+                                          RTE_FLOW_ERROR_TYPE_ITEM,
+                                          NULL, "multiple flex tunnel items not supported");
+               break;
+       default:
+               rte_flow_error_set(error, EINVAL,
+                                  RTE_FLOW_ERROR_TYPE_ITEM,
+                                  NULL, "invalid flex item configuration");
+       }
+       *last_item = flex->tunnel_mode == FLEX_TUNNEL_MODE_TUNNEL ?
+                    MLX5_FLOW_ITEM_FLEX_TUNNEL : is_inner ?
+                    MLX5_FLOW_ITEM_INNER_FLEX : MLX5_FLOW_ITEM_OUTER_FLEX;
+       return 0;
+}
+
 /**
  * Internal validation function. For validating both actions and items.
  *
@@ -7125,6 +7207,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
                         * list it here as a supported type
                         */
                        break;
+               case RTE_FLOW_ITEM_TYPE_FLEX:
+                       ret = flow_dv_validate_item_flex(dev, items, item_flags,
+                                                        &last_item,
+                                                        tunnel != 0, error);
+                       if (ret < 0)
+                               return ret;
+                       break;
                default:
                        return rte_flow_error_set(error, ENOTSUP,
                                                  RTE_FLOW_ERROR_TYPE_ITEM,
@@ -9995,6 +10084,27 @@ flow_dv_translate_item_aso_ct(struct rte_eth_dev *dev,
                               reg_value, reg_mask);
 }
 
+static void
+flow_dv_translate_item_flex(struct rte_eth_dev *dev, void *matcher, void *key,
+                           const struct rte_flow_item *item,
+                           struct mlx5_flow *dev_flow, bool is_inner)
+{
+       const struct rte_flow_item_flex *spec =
+               (const struct rte_flow_item_flex *)item->spec;
+       int index = mlx5_flex_acquire_index(dev, spec->handle, false);
+
+       MLX5_ASSERT(index >= 0 && index <= (int)(sizeof(uint32_t) * CHAR_BIT));
+       if (index < 0)
+               return;
+       if (!(dev_flow->handle->flex_item & RTE_BIT32(index))) {
+               /* Don't count both inner and outer flex items in one rule. */
+               if (mlx5_flex_acquire_index(dev, spec->handle, true) != index)
+                       MLX5_ASSERT(false);
+               dev_flow->handle->flex_item |= RTE_BIT32(index);
+       }
+       mlx5_flex_flow_translate_item(dev, matcher, key, item, is_inner);
+}
+
 static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 };
 
 #define HEADER_IS_ZERO(match_criteria, headers)                                     \
@@ -13431,6 +13541,13 @@ flow_dv_translate(struct rte_eth_dev *dev,
                        flow_dv_translate_item_aso_ct(dev, match_mask,
                                                      match_value, items);
                        break;
+               case RTE_FLOW_ITEM_TYPE_FLEX:
+                       flow_dv_translate_item_flex(dev, match_mask,
+                                                   match_value, items,
+                                                   dev_flow, tunnel != 0);
+                       last_item = tunnel ? MLX5_FLOW_ITEM_INNER_FLEX :
+                                   MLX5_FLOW_ITEM_OUTER_FLEX;
+                       break;
                default:
                        break;
                }
@@ -14310,6 +14427,12 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)
                if (!dev_handle)
                        return;
                flow->dev_handles = dev_handle->next.next;
+               while (dev_handle->flex_item) {
+                       int index = rte_bsf32(dev_handle->flex_item);
+
+                       mlx5_flex_release_index(dev, index);
+                       dev_handle->flex_item &= ~RTE_BIT32(index);
+               }
                if (dev_handle->dvh.matcher)
                        flow_dv_matcher_release(dev, dev_handle);
                if (dev_handle->dvh.rix_sample)
@@ -18071,5 +18194,6 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = {
        .item_create = flow_dv_item_create,
        .item_release = flow_dv_item_release,
 };
+
 #endif /* HAVE_IBV_FLOW_DV_SUPPORT */