net/hns3: fix queue state when concurrent with reset

[dpdk.git] / drivers / net / mlx5 / mlx5_utils.h

diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h
index be6e5f6..5088c95 100644 (file)
--- a/drivers/net/mlx5/mlx5_utils.h
+++ b/drivers/net/mlx5/mlx5_utils.h
@@ -29,9 +29,11 @@
 
 extern int mlx5_logtype;
 
+#define MLX5_NET_LOG_PREFIX "mlx5_net"
+
 /* Generic printf()-like logging macro with automatic line feed. */
 #define DRV_LOG(level, ...) \
-       PMD_DRV_LOG_(level, mlx5_logtype, MLX5_DRIVER_NAME, \
+       PMD_DRV_LOG_(level, mlx5_logtype, MLX5_NET_LOG_PREFIX, \
                __VA_ARGS__ PMD_DRV_LOG_STRIP PMD_DRV_LOG_OPAREN, \
                PMD_DRV_LOG_CPAREN)
 
@@ -274,7 +276,7 @@ struct mlx5_hlist;
  */
 struct mlx5_hlist_entry {
        LIST_ENTRY(mlx5_hlist_entry) next; /* entry pointers in the list. */
-       uint64_t key; /* user defined 'key', could be the hash signature. */
+       uint32_t idx; /* Bucket index the entry belongs to. */
        uint32_t ref_cnt; /* Reference count. */
 };
 
@@ -328,6 +330,13 @@ typedef struct mlx5_hlist_entry *(*mlx5_hlist_create_cb)
                                  (struct mlx5_hlist *list,
                                   uint64_t key, void *ctx);
 
+/* Hash list bucket head. */
+struct mlx5_hlist_bucket {
+       struct mlx5_hlist_head head; /* List head. */
+       rte_rwlock_t lock; /* Bucket lock. */
+       uint32_t gen_cnt; /* List modification will update generation count. */
+} __rte_cache_aligned;
+
 /**
  * Hash list table structure
  *
@@ -344,15 +353,14 @@ struct mlx5_hlist {
        uint32_t entry_sz; /**< Size of entry, used to allocate entry. */
        /**< mask to get the index of the list heads. */
        uint32_t mask;
-       rte_rwlock_t lock;
-       uint32_t gen_cnt; /* List modification will update generation count. */
        bool direct_key; /* Use the new entry key directly as hash index. */
        bool write_most; /* List mostly used for append new or destroy. */
        void *ctx;
        mlx5_hlist_create_cb cb_create; /**< entry create callback. */
        mlx5_hlist_match_cb cb_match; /**< entry match callback. */
        mlx5_hlist_remove_cb cb_remove; /**< entry remove callback. */
-       struct mlx5_hlist_head heads[]; /**< list head arrays. */
+       struct mlx5_hlist_bucket buckets[] __rte_cache_aligned;
+       /**< list bucket arrays. */
 };
 
 /**