net/mlx5: make push VLAN action cache thread safe

To support multi-thread flow insertion, this patch converts push VLAN
action cache list to thread safe cache list.

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 3d2bf57..9ab3ba9 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -242,6 +242,12 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
                             flow_dv_port_id_create_cb,
                             flow_dv_port_id_match_cb,
                             flow_dv_port_id_remove_cb);
+       /* Init push vlan action cache list. */
+       snprintf(s, sizeof(s), "%s_push_vlan_action_cache", sh->ibdev_name);
+       mlx5_cache_list_init(&sh->push_vlan_action_list, s, 0, sh,
+                            flow_dv_push_vlan_create_cb,
+                            flow_dv_push_vlan_match_cb,
+                            flow_dv_push_vlan_remove_cb);
        /* Create tags hash list table. */
        snprintf(s, sizeof(s), "%s_tags", sh->ibdev_name);
        sh->tag_table = mlx5_hlist_create(s, MLX5_TAGS_HLIST_ARRAY_SIZE, 0,
@@ -438,6 +444,7 @@ mlx5_os_free_shared_dr(struct mlx5_priv *priv)
                sh->tunnel_hub = NULL;
        }
        mlx5_cache_list_destroy(&sh->port_id_action_list);
+       mlx5_cache_list_destroy(&sh->push_vlan_action_list);
        mlx5_free_table_hash_list(priv);
 }
 

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 1cd42eb..9efa354 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -660,7 +660,7 @@ struct mlx5_dev_ctx_shared {
        struct mlx5_hlist *modify_cmds;
        struct mlx5_hlist *tag_table;
        struct mlx5_cache_list port_id_action_list; /* Port ID action cache. */
-       uint32_t push_vlan_action_list; /* List of push VLAN actions. */
+       struct mlx5_cache_list push_vlan_action_list; /* Push VLAN actions. */
        uint32_t sample_action_list; /* List of sample actions. */
        uint32_t dest_array_list; /* List of destination array actions. */
        struct mlx5_flow_counter_mng cmng; /* Counters management structure. */

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 18f57a4..10b594f 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -493,12 +493,11 @@ struct mlx5_flow_dv_port_id_action_resource {
 
 /* Push VLAN action resource structure */
 struct mlx5_flow_dv_push_vlan_action_resource {
-       ILIST_ENTRY(uint32_t)next;
-       /* Pointer to next element. */
-       uint32_t refcnt; /**< Reference counter. */
+       struct mlx5_cache_entry entry; /* Cache entry. */
        void *action; /**< Action object. */
        uint8_t ft_type; /**< Flow table type, Rx, Tx or FDB. */
        rte_be32_t vlan_tag; /**< VLAN tag value. */
+       uint32_t idx; /**< Indexed pool memory index. */
 };
 
 /* Metadata register copy table entry. */
@@ -1442,4 +1441,12 @@ struct mlx5_cache_entry *flow_dv_port_id_create_cb(struct mlx5_cache_list *list,
 void flow_dv_port_id_remove_cb(struct mlx5_cache_list *list,
                               struct mlx5_cache_entry *entry);
 
+int flow_dv_push_vlan_match_cb(struct mlx5_cache_list *list,
+                              struct mlx5_cache_entry *entry, void *cb_ctx);
+struct mlx5_cache_entry *flow_dv_push_vlan_create_cb
+                               (struct mlx5_cache_list *list,
+                                struct mlx5_cache_entry *entry, void *cb_ctx);
+void flow_dv_push_vlan_remove_cb(struct mlx5_cache_list *list,
+                                struct mlx5_cache_entry *entry);
+
 #endif /* RTE_PMD_MLX5_FLOW_H_ */

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index e48faf0..d6414eb 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3047,6 +3047,58 @@ flow_dv_port_id_action_resource_register
        return 0;
 }
 
+int
+flow_dv_push_vlan_match_cb(struct mlx5_cache_list *list __rte_unused,
+                        struct mlx5_cache_entry *entry, void *cb_ctx)
+{
+       struct mlx5_flow_cb_ctx *ctx = cb_ctx;
+       struct mlx5_flow_dv_push_vlan_action_resource *ref = ctx->data;
+       struct mlx5_flow_dv_push_vlan_action_resource *res =
+                       container_of(entry, typeof(*res), entry);
+
+       return ref->vlan_tag != res->vlan_tag || ref->ft_type != res->ft_type;
+}
+
+struct mlx5_cache_entry *
+flow_dv_push_vlan_create_cb(struct mlx5_cache_list *list,
+                         struct mlx5_cache_entry *entry __rte_unused,
+                         void *cb_ctx)
+{
+       struct mlx5_dev_ctx_shared *sh = list->ctx;
+       struct mlx5_flow_cb_ctx *ctx = cb_ctx;
+       struct mlx5_flow_dv_push_vlan_action_resource *ref = ctx->data;
+       struct mlx5_flow_dv_push_vlan_action_resource *cache;
+       struct mlx5dv_dr_domain *domain;
+       uint32_t idx;
+       int ret;
+
+       /* Register new port id action resource. */
+       cache = mlx5_ipool_zmalloc(sh->ipool[MLX5_IPOOL_PUSH_VLAN], &idx);
+       if (!cache) {
+               rte_flow_error_set(ctx->error, ENOMEM,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "cannot allocate push_vlan action cache memory");
+               return NULL;
+       }
+       *cache = *ref;
+       if (ref->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB)
+               domain = sh->fdb_domain;
+       else if (ref->ft_type == MLX5DV_FLOW_TABLE_TYPE_NIC_RX)
+               domain = sh->rx_domain;
+       else
+               domain = sh->tx_domain;
+       ret = mlx5_flow_os_create_flow_action_push_vlan(domain, ref->vlan_tag,
+                                                       &cache->action);
+       if (ret) {
+               mlx5_ipool_free(sh->ipool[MLX5_IPOOL_PUSH_VLAN], idx);
+               rte_flow_error_set(ctx->error, ENOMEM,
+                                  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                  "cannot create push vlan action");
+               return NULL;
+       }
+       return &cache->entry;
+}
+
 /**
  * Find existing push vlan resource or create and register a new one.
  *
@@ -3070,63 +3122,23 @@ flow_dv_push_vlan_action_resource_register
                        struct rte_flow_error *error)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
-       struct mlx5_dev_ctx_shared *sh = priv->sh;
-       struct mlx5_flow_dv_push_vlan_action_resource *cache_resource;
-       struct mlx5dv_dr_domain *domain;
-       uint32_t idx = 0;
-       int ret;
+       struct mlx5_flow_dv_push_vlan_action_resource *cache;
+       struct mlx5_cache_entry *entry;
+       struct mlx5_flow_cb_ctx ctx = {
+               .error = error,
+               .data = resource,
+       };
 
-       /* Lookup a matching resource from cache. */
-       ILIST_FOREACH(sh->ipool[MLX5_IPOOL_PUSH_VLAN],
-                     sh->push_vlan_action_list, idx, cache_resource, next) {
-               if (resource->vlan_tag == cache_resource->vlan_tag &&
-                   resource->ft_type == cache_resource->ft_type) {
-                       DRV_LOG(DEBUG, "push-VLAN action resource resource %p: "
-                               "refcnt %d++",
-                               (void *)cache_resource,
-                               __atomic_load_n(&cache_resource->refcnt,
-                                               __ATOMIC_RELAXED));
-                       __atomic_fetch_add(&cache_resource->refcnt, 1,
-                                          __ATOMIC_RELAXED);
-                       dev_flow->handle->dvh.rix_push_vlan = idx;
-                       dev_flow->dv.push_vlan_res = cache_resource;
-                       return 0;
-               }
-       }
-       /* Register new push_vlan action resource. */
-       cache_resource = mlx5_ipool_zmalloc(sh->ipool[MLX5_IPOOL_PUSH_VLAN],
-                                      &dev_flow->handle->dvh.rix_push_vlan);
-       if (!cache_resource)
-               return rte_flow_error_set(error, ENOMEM,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-                                         "cannot allocate resource memory");
-       *cache_resource = *resource;
-       if (resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB)
-               domain = sh->fdb_domain;
-       else if (resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_NIC_RX)
-               domain = sh->rx_domain;
-       else
-               domain = sh->tx_domain;
-       ret = mlx5_flow_os_create_flow_action_push_vlan
-                                       (domain, resource->vlan_tag,
-                                        &cache_resource->action);
-       if (ret) {
-               mlx5_free(cache_resource);
-               return rte_flow_error_set(error, ENOMEM,
-                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-                                         NULL, "cannot create action");
-       }
-       __atomic_store_n(&cache_resource->refcnt, 1, __ATOMIC_RELAXED);
-       ILIST_INSERT(sh->ipool[MLX5_IPOOL_PUSH_VLAN],
-                    &sh->push_vlan_action_list,
-                    dev_flow->handle->dvh.rix_push_vlan,
-                    cache_resource, next);
-       dev_flow->dv.push_vlan_res = cache_resource;
-       DRV_LOG(DEBUG, "new push vlan action resource %p: refcnt %d++",
-               (void *)cache_resource,
-               __atomic_load_n(&cache_resource->refcnt, __ATOMIC_RELAXED));
+       entry = mlx5_cache_register(&priv->sh->push_vlan_action_list, &ctx);
+       if (!entry)
+               return -rte_errno;
+       cache = container_of(entry, typeof(*cache), entry);
+
+       dev_flow->handle->dvh.rix_push_vlan = cache->idx;
+       dev_flow->dv.push_vlan_res = cache;
        return 0;
 }
+
 /**
  * Get the size of specific rte_flow_item_type hdr size
  *
@@ -10571,6 +10583,18 @@ flow_dv_port_id_action_resource_release(struct rte_eth_dev *dev,
                                     &cache->entry);
 }
 
+void
+flow_dv_push_vlan_remove_cb(struct mlx5_cache_list *list,
+                           struct mlx5_cache_entry *entry)
+{
+       struct mlx5_dev_ctx_shared *sh = list->ctx;
+       struct mlx5_flow_dv_push_vlan_action_resource *cache =
+                       container_of(entry, typeof(*cache), entry);
+
+       claim_zero(mlx5_flow_os_destroy_flow_action(cache->action));
+       mlx5_ipool_free(sh->ipool[MLX5_IPOOL_PUSH_VLAN], cache->idx);
+}
+
 /**
  * Release push vlan action resource.
  *
@@ -10587,30 +10611,15 @@ flow_dv_push_vlan_action_resource_release(struct rte_eth_dev *dev,
                                          struct mlx5_flow_handle *handle)
 {
        struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_flow_dv_push_vlan_action_resource *cache;
        uint32_t idx = handle->dvh.rix_push_vlan;
-       struct mlx5_flow_dv_push_vlan_action_resource *cache_resource;
 
-       cache_resource = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_PUSH_VLAN],
-                                       idx);
-       if (!cache_resource)
-               return 0;
-       MLX5_ASSERT(cache_resource->action);
-       DRV_LOG(DEBUG, "push VLAN action resource %p: refcnt %d--",
-               (void *)cache_resource,
-               __atomic_load_n(&cache_resource->refcnt, __ATOMIC_RELAXED));
-       if (__atomic_sub_fetch(&cache_resource->refcnt, 1,
-                              __ATOMIC_RELAXED) == 0) {
-               claim_zero(mlx5_flow_os_destroy_flow_action
-                                               (cache_resource->action));
-               ILIST_REMOVE(priv->sh->ipool[MLX5_IPOOL_PUSH_VLAN],
-                            &priv->sh->push_vlan_action_list, idx,
-                            cache_resource, next);
-               mlx5_ipool_free(priv->sh->ipool[MLX5_IPOOL_PUSH_VLAN], idx);
-               DRV_LOG(DEBUG, "push vlan action resource %p: removed",
-                       (void *)cache_resource);
+       cache = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_PUSH_VLAN], idx);
+       if (!cache)
                return 0;
-       }
-       return 1;
+       MLX5_ASSERT(cache->action);
+       return mlx5_cache_unregister(&priv->sh->push_vlan_action_list,
+                                    &cache->entry);
 }
 
 /**