net/mlx5: DR, Remove the buddy used_list

No need to have the used_list - we don't need to keep track of the
used chunks, we only need to know the amount of used memory.

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: Alex Vesker <valex@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c
index 7e30dc64c10c2ad26227a52ec433b7a94bcfc2e9..fe228d948b47648018f6a542ddd0582a783e1834 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_buddy.c
@@ -15,7 +15,6 @@ int mlx5dr_buddy_init(struct mlx5dr_icm_buddy_mem *buddy,
        buddy->max_order = max_order;
 
        INIT_LIST_HEAD(&buddy->list_node);
-       INIT_LIST_HEAD(&buddy->used_list);
 
        buddy->bitmap = kcalloc(buddy->max_order + 1,
                                sizeof(*buddy->bitmap),

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c
index c31608a3f11c06e7662d06156e10811606d3f5db..3eb6719bc8ebdb9f9b4b945cc53ec9c871578bae 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c
@@ -207,17 +207,6 @@ static void dr_icm_chunk_ste_init(struct mlx5dr_icm_chunk *chunk, int offset)
               num_of_entries * sizeof(chunk->ste_arr[0]));
 }
 
-static void dr_icm_chunk_destroy(struct mlx5dr_icm_chunk *chunk)
-{
-       struct kmem_cache *chunks_cache =
-               chunk->buddy_mem->pool->chunks_kmem_cache;
-
-       chunk->buddy_mem->used_memory -= mlx5dr_icm_pool_get_chunk_byte_size(chunk);
-       list_del(&chunk->chunk_list);
-
-       kmem_cache_free(chunks_cache, chunk);
-}
-
 static int dr_icm_buddy_init_ste_cache(struct mlx5dr_icm_buddy_mem *buddy)
 {
        int num_of_entries =
@@ -297,11 +286,6 @@ static int dr_icm_buddy_create(struct mlx5dr_icm_pool *pool)
 
 static void dr_icm_buddy_destroy(struct mlx5dr_icm_buddy_mem *buddy)
 {
-       struct mlx5dr_icm_chunk *chunk, *next;
-
-       list_for_each_entry_safe(chunk, next, &buddy->used_list, chunk_list)
-               dr_icm_chunk_destroy(chunk);
-
        dr_icm_pool_mr_destroy(buddy->icm_mr);
 
        mlx5dr_buddy_cleanup(buddy);
@@ -312,36 +296,25 @@ static void dr_icm_buddy_destroy(struct mlx5dr_icm_buddy_mem *buddy)
        kvfree(buddy);
 }
 
-static struct mlx5dr_icm_chunk *
-dr_icm_chunk_create(struct mlx5dr_icm_pool *pool,
-                   enum mlx5dr_icm_chunk_size chunk_size,
-                   struct mlx5dr_icm_buddy_mem *buddy_mem_pool,
-                   unsigned int seg)
+static void
+dr_icm_chunk_init(struct mlx5dr_icm_chunk *chunk,
+                 struct mlx5dr_icm_pool *pool,
+                 enum mlx5dr_icm_chunk_size chunk_size,
+                 struct mlx5dr_icm_buddy_mem *buddy_mem_pool,
+                 unsigned int seg)
 {
-       struct kmem_cache *chunks_cache = buddy_mem_pool->pool->chunks_kmem_cache;
-       struct mlx5dr_icm_chunk *chunk;
        int offset;
 
-       chunk = kmem_cache_alloc(chunks_cache, GFP_KERNEL);
-       if (!chunk)
-               return NULL;
-
-       offset = mlx5dr_icm_pool_dm_type_to_entry_size(pool->icm_type) * seg;
-
        chunk->seg = seg;
        chunk->size = chunk_size;
        chunk->buddy_mem = buddy_mem_pool;
 
-       if (pool->icm_type == DR_ICM_TYPE_STE)
+       if (pool->icm_type == DR_ICM_TYPE_STE) {
+               offset = mlx5dr_icm_pool_dm_type_to_entry_size(pool->icm_type) * seg;
                dr_icm_chunk_ste_init(chunk, offset);
+       }
 
        buddy_mem_pool->used_memory += mlx5dr_icm_pool_get_chunk_byte_size(chunk);
-       INIT_LIST_HEAD(&chunk->chunk_list);
-
-       /* chunk now is part of the used_list */
-       list_add_tail(&chunk->chunk_list, &buddy_mem_pool->used_list);
-
-       return chunk;
 }
 
 static bool dr_icm_pool_is_sync_required(struct mlx5dr_icm_pool *pool)
@@ -463,10 +436,12 @@ mlx5dr_icm_alloc_chunk(struct mlx5dr_icm_pool *pool,
        if (ret)
                goto out;
 
-       chunk = dr_icm_chunk_create(pool, chunk_size, buddy, seg);
+       chunk = kmem_cache_alloc(pool->chunks_kmem_cache, GFP_KERNEL);
        if (!chunk)
                goto out_err;
 
+       dr_icm_chunk_init(chunk, pool, chunk_size, buddy, seg);
+
        goto out;
 
 out_err:
@@ -495,7 +470,6 @@ void mlx5dr_icm_free_chunk(struct mlx5dr_icm_chunk *chunk)
        hot_chunk->seg = chunk->seg;
        hot_chunk->size = chunk->size;
 
-       list_del(&chunk->chunk_list);
        kmem_cache_free(chunks_cache, chunk);
 
        /* Check if we have chunks that are waiting for sync-ste */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
index bd2c3073591ec8b26b7cd83c788da9dc04baf7ac..41a37b9ac98bd16a22470bfbea8cf975e94f8ae9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
@@ -1111,7 +1111,6 @@ int mlx5dr_rule_get_reverse_rule_members(struct mlx5dr_ste **ste_arr,
 
 struct mlx5dr_icm_chunk {
        struct mlx5dr_icm_buddy_mem *buddy_mem;
-       struct list_head chunk_list;
 
        /* indicates the index of this chunk in the whole memory,
         * used for deleting the chunk from the buddy

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
index 674efb3607b19a59cfe8dfd49d7896880ae793f1..84ed77763b21651f37600f705896c98025fe414a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
@@ -164,8 +164,7 @@ struct mlx5dr_icm_buddy_mem {
        struct mlx5dr_icm_mr    *icm_mr;
        struct mlx5dr_icm_pool  *pool;
 
-       /* This is the list of used chunks. HW may be accessing this memory */
-       struct list_head        used_list;
+       /* Amount of memory in used chunks - HW may be accessing this memory */
        u64                     used_memory;
 
        /* Memory optimisation */