net/mlx5: fix indirect action modify rollback

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

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index f8769da..49165f4 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1240,7 +1240,7 @@ mlx5_mprq_alloc_mp(struct rte_eth_dev *dev)
        snprintf(name, sizeof(name), "port-%u-mprq", dev->data->port_id);
        mp = rte_mempool_create(name, obj_num, obj_size, MLX5_MPRQ_MP_CACHE_SZ,
                                0, NULL, NULL, mlx5_mprq_buf_init,
-                               (void *)(uintptr_t)(1 << strd_num_n),
+                               (void *)((uintptr_t)1 << strd_num_n),
                                dev->device->numa_node, 0);
        if (mp == NULL) {
                DRV_LOG(ERR,
@@ -1712,7 +1712,7 @@ mlx5_rxq_release(struct rte_eth_dev *dev, uint16_t idx)
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_rxq_ctrl *rxq_ctrl;
 
-       if (!(*priv->rxqs)[idx])
+       if (priv->rxqs == NULL || (*priv->rxqs)[idx] == NULL)
                return 0;
        rxq_ctrl = container_of((*priv->rxqs)[idx], struct mlx5_rxq_ctrl, rxq);
        if (__atomic_sub_fetch(&rxq_ctrl->refcnt, 1, __ATOMIC_RELAXED) > 1)
@@ -2086,46 +2086,27 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
 error:
        err = rte_errno;
        for (j = 0; j < i; j++)
-               mlx5_rxq_release(dev, ind_tbl->queues[j]);
+               mlx5_rxq_release(dev, queues[j]);
        rte_errno = err;
        DRV_LOG(DEBUG, "Port %u cannot setup indirection table.",
                dev->data->port_id);
        return ret;
 }
 
-/**
- * Match an Rx Hash queue.
- *
- * @param list
- *   mlx5 list pointer.
- * @param entry
- *   Hash queue entry pointer.
- * @param cb_ctx
- *   Context of the callback function.
- *
- * @return
- *   0 if match, none zero if not match.
- */
 int
-mlx5_hrxq_match_cb(struct mlx5_list *list,
-                  struct mlx5_list_entry *entry,
+mlx5_hrxq_match_cb(void *tool_ctx __rte_unused, struct mlx5_list_entry *entry,
                   void *cb_ctx)
 {
-       struct rte_eth_dev *dev = list->ctx;
        struct mlx5_flow_cb_ctx *ctx = cb_ctx;
        struct mlx5_flow_rss_desc *rss_desc = ctx->data;
        struct mlx5_hrxq *hrxq = container_of(entry, typeof(*hrxq), entry);
-       struct mlx5_ind_table_obj *ind_tbl;
 
-       if (hrxq->rss_key_len != rss_desc->key_len ||
+       return (hrxq->rss_key_len != rss_desc->key_len ||
            memcmp(hrxq->rss_key, rss_desc->key, rss_desc->key_len) ||
-           hrxq->hash_fields != rss_desc->hash_fields)
-               return 1;
-       ind_tbl = mlx5_ind_table_obj_get(dev, rss_desc->queue,
-                                        rss_desc->queue_num);
-       if (ind_tbl)
-               mlx5_ind_table_obj_release(dev, ind_tbl, hrxq->standalone);
-       return ind_tbl != hrxq->ind_table;
+           hrxq->hash_fields != rss_desc->hash_fields ||
+           hrxq->ind_table->queues_n != rss_desc->queue_num ||
+           memcmp(hrxq->ind_table->queues, rss_desc->queue,
+           rss_desc->queue_num * sizeof(rss_desc->queue[0])));
 }
 
 /**
@@ -2251,10 +2232,9 @@ __mlx5_hrxq_remove(struct rte_eth_dev *dev, struct mlx5_hrxq *hrxq)
  *   Hash queue entry pointer.
  */
 void
-mlx5_hrxq_remove_cb(struct mlx5_list *list,
-                   struct mlx5_list_entry *entry)
+mlx5_hrxq_remove_cb(void *tool_ctx, struct mlx5_list_entry *entry)
 {
-       struct rte_eth_dev *dev = list->ctx;
+       struct rte_eth_dev *dev = tool_ctx;
        struct mlx5_hrxq *hrxq = container_of(entry, typeof(*hrxq), entry);
 
        __mlx5_hrxq_remove(dev, hrxq);
@@ -2305,25 +2285,10 @@ error:
        return NULL;
 }
 
-/**
- * Create an Rx Hash queue.
- *
- * @param list
- *   mlx5 list pointer.
- * @param entry
- *   Hash queue entry pointer.
- * @param cb_ctx
- *   Context of the callback function.
- *
- * @return
- *   queue entry on success, NULL otherwise.
- */
 struct mlx5_list_entry *
-mlx5_hrxq_create_cb(struct mlx5_list *list,
-                   struct mlx5_list_entry *entry __rte_unused,
-                   void *cb_ctx)
+mlx5_hrxq_create_cb(void *tool_ctx, void *cb_ctx)
 {
-       struct rte_eth_dev *dev = list->ctx;
+       struct rte_eth_dev *dev = tool_ctx;
        struct mlx5_flow_cb_ctx *ctx = cb_ctx;
        struct mlx5_flow_rss_desc *rss_desc = ctx->data;
        struct mlx5_hrxq *hrxq;
@@ -2333,11 +2298,10 @@ mlx5_hrxq_create_cb(struct mlx5_list *list,
 }
 
 struct mlx5_list_entry *
-mlx5_hrxq_clone_cb(struct mlx5_list *list,
-                   struct mlx5_list_entry *entry,
+mlx5_hrxq_clone_cb(void *tool_ctx, struct mlx5_list_entry *entry,
                    void *cb_ctx __rte_unused)
 {
-       struct rte_eth_dev *dev = list->ctx;
+       struct rte_eth_dev *dev = tool_ctx;
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_hrxq *hrxq;
        uint32_t hrxq_idx = 0;
@@ -2351,10 +2315,9 @@ mlx5_hrxq_clone_cb(struct mlx5_list *list,
 }
 
 void
-mlx5_hrxq_clone_free_cb(struct mlx5_list *list,
-                   struct mlx5_list_entry *entry)
+mlx5_hrxq_clone_free_cb(void *tool_ctx, struct mlx5_list_entry *entry)
 {
-       struct rte_eth_dev *dev = list->ctx;
+       struct rte_eth_dev *dev = tool_ctx;
        struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_hrxq *hrxq = container_of(entry, typeof(*hrxq), entry);
 
@@ -2385,7 +2348,7 @@ uint32_t mlx5_hrxq_get(struct rte_eth_dev *dev,
        if (rss_desc->shared_rss) {
                hrxq = __mlx5_hrxq_create(dev, rss_desc);
        } else {
-               entry = mlx5_list_register(&priv->hrxqs, &ctx);
+               entry = mlx5_list_register(priv->hrxqs, &ctx);
                if (!entry)
                        return 0;
                hrxq = container_of(entry, typeof(*hrxq), entry);
@@ -2415,7 +2378,7 @@ int mlx5_hrxq_release(struct rte_eth_dev *dev, uint32_t hrxq_idx)
        if (!hrxq)
                return 0;
        if (!hrxq->standalone)
-               return mlx5_list_unregister(&priv->hrxqs, &hrxq->entry);
+               return mlx5_list_unregister(priv->hrxqs, &hrxq->entry);
        __mlx5_hrxq_remove(dev, hrxq);
        return 0;
 }
@@ -2503,7 +2466,7 @@ mlx5_hrxq_verify(struct rte_eth_dev *dev)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
 
-       return mlx5_list_get_entry_num(&priv->hrxqs);
+       return mlx5_list_get_entry_num(priv->hrxqs);
 }
 
 /**