net/mlx5: add flex parser DevX object management

[dpdk.git] / drivers / net / mlx5 / mlx5_flow_verbs.c

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 60029f7..29cd694 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -28,17 +28,6 @@
 #define VERBS_SPEC_INNER(item_flags) \
        (!!((item_flags) & MLX5_FLOW_LAYER_TUNNEL) ? IBV_FLOW_SPEC_INNER : 0)
 
-/* Map of Verbs to Flow priority with 8 Verbs priorities. */
-static const uint32_t priority_map_3[][MLX5_PRIORITY_MAP_MAX] = {
-       { 0, 1, 2 }, { 2, 3, 4 }, { 5, 6, 7 },
-};
-
-/* Map of Verbs to Flow priority with 16 Verbs priorities. */
-static const uint32_t priority_map_5[][MLX5_PRIORITY_MAP_MAX] = {
-       { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 },
-       { 9, 10, 11 }, { 12, 13, 14 },
-};
-
 /* Verbs specification header. */
 struct ibv_spec_header {
        enum ibv_flow_spec_type type;
@@ -50,13 +39,17 @@ struct ibv_spec_header {
  *
  * @param[in] dev
  *   Pointer to the Ethernet device structure.
- *
+ * @param[in] vprio
+ *   Expected result variants.
+ * @param[in] vprio_n
+ *   Number of entries in @p vprio array.
  * @return
- *   number of supported flow priority on success, a negative errno
+ *   Number of supported flow priority on success, a negative errno
  *   value otherwise and rte_errno is set.
  */
-int
-mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
+static int
+flow_verbs_discover_priorities(struct rte_eth_dev *dev,
+                              const uint16_t *vprio, int vprio_n)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
        struct {
@@ -79,15 +72,19 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
        };
        struct ibv_flow *flow;
        struct mlx5_hrxq *drop = priv->drop_queue.hrxq;
-       uint16_t vprio[] = { 8, 16 };
        int i;
        int priority = 0;
 
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+       /* If DevX supported, driver must support 16 verbs flow priorities. */
+       priority = 16;
+       goto out;
+#endif
        if (!drop->qp) {
                rte_errno = ENOTSUP;
                return -rte_errno;
        }
-       for (i = 0; i != RTE_DIM(vprio); i++) {
+       for (i = 0; i != vprio_n; i++) {
                flow_attr.attr.priority = vprio[i] - 1;
                flow = mlx5_glue->create_flow(drop->qp, &flow_attr.attr);
                if (!flow)
@@ -95,20 +92,9 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
                claim_zero(mlx5_glue->destroy_flow(flow));
                priority = vprio[i];
        }
-       switch (priority) {
-       case 8:
-               priority = RTE_DIM(priority_map_3);
-               break;
-       case 16:
-               priority = RTE_DIM(priority_map_5);
-               break;
-       default:
-               rte_errno = ENOTSUP;
-               DRV_LOG(ERR,
-                       "port %u verbs maximum priority: %d expected 8/16",
-                       dev->data->port_id, priority);
-               return -rte_errno;
-       }
+#if defined(HAVE_MLX5DV_DR_DEVX_PORT) || defined(HAVE_MLX5DV_DR_DEVX_PORT_V35)
+out:
+#endif
        DRV_LOG(INFO, "port %u supported flow priorities:"
                " 0-%d for ingress or egress root table,"
                " 0-%d for non-root table or transfer root table.",
@@ -117,37 +103,6 @@ mlx5_flow_discover_priorities(struct rte_eth_dev *dev)
        return priority;
 }
 
-/**
- * Adjust flow priority based on the highest layer and the request priority.
- *
- * @param[in] dev
- *   Pointer to the Ethernet device structure.
- * @param[in] priority
- *   The rule base priority.
- * @param[in] subpriority
- *   The priority based on the items.
- *
- * @return
- *   The new priority.
- */
-uint32_t
-mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
-                                  uint32_t subpriority)
-{
-       uint32_t res = 0;
-       struct mlx5_priv *priv = dev->data->dev_private;
-
-       switch (priv->config.flow_prio) {
-       case RTE_DIM(priority_map_3):
-               res = priority_map_3[priority][subpriority];
-               break;
-       case RTE_DIM(priority_map_5):
-               res = priority_map_5[priority][subpriority];
-               break;
-       }
-       return  res;
-}
-
 /**
  * Get Verbs flow counter by index.
  *
@@ -1715,7 +1670,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
        MLX5_ASSERT(wks);
        rss_desc = &wks->rss_desc;
        if (priority == MLX5_FLOW_LOWEST_PRIO_INDICATOR)
-               priority = priv->config.flow_prio - 1;
+               priority = priv->sh->flow_max_priority - 1;
        for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
                int ret;
 
@@ -1816,7 +1771,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_TCP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_TCP,
                                         (IBV_RX_HASH_SRC_PORT_TCP |
                                          IBV_RX_HASH_DST_PORT_TCP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP :
@@ -1829,7 +1784,7 @@ flow_verbs_translate(struct rte_eth_dev *dev,
                        if (dev_flow->hash_fields != 0)
                                dev_flow->hash_fields |=
                                        mlx5_flow_hashfields_adjust
-                                       (rss_desc, tunnel, ETH_RSS_UDP,
+                                       (rss_desc, tunnel, RTE_ETH_RSS_UDP,
                                         (IBV_RX_HASH_SRC_PORT_UDP |
                                          IBV_RX_HASH_DST_PORT_UDP));
                        item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP :
@@ -2087,4 +2042,5 @@ const struct mlx5_flow_driver_ops mlx5_flow_verbs_drv_ops = {
        .destroy = flow_verbs_destroy,
        .query = flow_verbs_query,
        .sync_domain = flow_verbs_sync_domain,
+       .discover_priorities = flow_verbs_discover_priorities,
 };