net/enic: enable flow API for VF representor

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

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index ebc3929..3e81fcc 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -679,54 +679,33 @@ mlx5_devx_ind_table_destroy(struct mlx5_ind_table_obj *ind_tbl)
  *
  * @param dev
  *   Pointer to Ethernet device.
- * @param rss_key
- *   RSS key for the Rx hash queue.
- * @param rss_key_len
- *   RSS key length.
- * @param hash_fields
- *   Verbs protocol hash field to make the RSS on.
- * @param queues
- *   Queues entering in hash queue. In case of empty hash_fields only the
- *   first queue index will be taken for the indirection table.
- * @param queues_n
- *   Number of queues.
+ * @param hrxq
+ *   Pointer to Rx Hash queue.
  * @param tunnel
  *   Tunnel type.
  *
  * @return
- *   The DevX object initialized index, 0 otherwise and rte_errno is set.
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-static uint32_t
-mlx5_devx_hrxq_new(struct rte_eth_dev *dev,
-                  const uint8_t *rss_key, uint32_t rss_key_len,
-                  uint64_t hash_fields,
-                  const uint16_t *queues, uint32_t queues_n,
+static int
+mlx5_devx_hrxq_new(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq,
                   int tunnel __rte_unused)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_hrxq *hrxq = NULL;
-       uint32_t hrxq_idx = 0;
-       struct mlx5_ind_table_obj *ind_tbl;
-       struct mlx5_devx_obj *tir = NULL;
-       struct mlx5_rxq_data *rxq_data = (*priv->rxqs)[queues[0]];
+       struct mlx5_ind_table_obj *ind_tbl = hrxq->ind_table;
+       struct mlx5_rxq_data *rxq_data = (*priv->rxqs)[ind_tbl->queues[0]];
        struct mlx5_rxq_ctrl *rxq_ctrl =
                container_of(rxq_data, struct mlx5_rxq_ctrl, rxq);
        struct mlx5_devx_tir_attr tir_attr;
-       int err;
-       uint32_t i;
+       const uint8_t *rss_key = hrxq->rss_key;
+       uint64_t hash_fields = hrxq->hash_fields;
        bool lro = true;
+       uint32_t i;
+       int err;
 
-       queues_n = hash_fields ? queues_n : 1;
-       ind_tbl = mlx5_ind_table_obj_get(dev, queues, queues_n);
-       if (!ind_tbl)
-               ind_tbl = mlx5_ind_table_obj_new(dev, queues, queues_n);
-       if (!ind_tbl) {
-               rte_errno = ENOMEM;
-               return 0;
-       }
        /* Enable TIR LRO only if all the queues were configured for. */
-       for (i = 0; i < queues_n; ++i) {
-               if (!(*priv->rxqs)[queues[i]]->lro) {
+       for (i = 0; i < ind_tbl->queues_n; ++i) {
+               if (!(*priv->rxqs)[ind_tbl->queues[i]]->lro) {
                        lro = false;
                        break;
                }
@@ -776,18 +755,13 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev,
                tir_attr.lro_enable_mask = MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO |
                                           MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO;
        }
-       tir = mlx5_devx_cmd_create_tir(priv->sh->ctx, &tir_attr);
-       if (!tir) {
+       hrxq->tir = mlx5_devx_cmd_create_tir(priv->sh->ctx, &tir_attr);
+       if (!hrxq->tir) {
                DRV_LOG(ERR, "Port %u cannot create DevX TIR.",
                        dev->data->port_id);
                rte_errno = errno;
                goto error;
        }
-       hrxq = mlx5_ipool_zmalloc(priv->sh->ipool[MLX5_IPOOL_HRXQ], &hrxq_idx);
-       if (!hrxq)
-               goto error;
-       hrxq->ind_table = ind_tbl;
-       hrxq->tir = tir;
 #ifdef HAVE_IBV_FLOW_DV_SUPPORT
        hrxq->action = mlx5_glue->dv_create_flow_action_dest_devx_tir
                                                               (hrxq->tir->obj);
@@ -796,22 +770,13 @@ mlx5_devx_hrxq_new(struct rte_eth_dev *dev,
                goto error;
        }
 #endif
-       hrxq->rss_key_len = rss_key_len;
-       hrxq->hash_fields = hash_fields;
-       memcpy(hrxq->rss_key, rss_key, rss_key_len);
-       rte_atomic32_inc(&hrxq->refcnt);
-       ILIST_INSERT(priv->sh->ipool[MLX5_IPOOL_HRXQ], &priv->hrxqs, hrxq_idx,
-                    hrxq, next);
-       return hrxq_idx;
+       return 0;
 error:
        err = rte_errno; /* Save rte_errno before cleanup. */
-       mlx5_ind_table_obj_release(dev, ind_tbl);
-       if (tir)
-               claim_zero(mlx5_devx_cmd_destroy(tir));
-       if (hrxq)
-               mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_HRXQ], hrxq_idx);
+       if (hrxq->tir)
+               claim_zero(mlx5_devx_cmd_destroy(hrxq->tir));
        rte_errno = err; /* Restore rte_errno. */
-       return 0;
+       return -rte_errno;
 }
 
 /**
@@ -826,6 +791,38 @@ mlx5_devx_tir_destroy(struct mlx5_hrxq *hrxq)
        claim_zero(mlx5_devx_cmd_destroy(hrxq->tir));
 }
 
+/**
+ * Create a DevX drop action for Rx Hash queue.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_devx_drop_action_create(struct rte_eth_dev *dev)
+{
+       (void)dev;
+       DRV_LOG(ERR, "DevX drop action is not supported yet");
+       rte_errno = ENOTSUP;
+       return -rte_errno;
+}
+
+/**
+ * Release a drop hash Rx queue.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ */
+static void
+mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)
+{
+       (void)dev;
+       DRV_LOG(ERR, "DevX drop action is not supported yet");
+       rte_errno = ENOTSUP;
+}
+
 struct mlx5_obj_ops devx_obj_ops = {
        .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,
        .rxq_obj_new = mlx5_rxq_devx_obj_new,
@@ -836,4 +833,6 @@ struct mlx5_obj_ops devx_obj_ops = {
        .ind_table_destroy = mlx5_devx_ind_table_destroy,
        .hrxq_new = mlx5_devx_hrxq_new,
        .hrxq_destroy = mlx5_devx_tir_destroy,
+       .drop_action_create = mlx5_devx_drop_action_create,
+       .drop_action_destroy = mlx5_devx_drop_action_destroy,
 };