From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5C9F6A00BE; Tue, 28 Apr 2020 11:13:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 864E41D44B; Tue, 28 Apr 2020 11:13:45 +0200 (CEST) Received: from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130]) by dpdk.org (Postfix) with ESMTP id 5BDB71D422 for ; Tue, 28 Apr 2020 11:13:44 +0200 (CEST) From: Suanming Mou To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Cc: dev@dpdk.org, rasland@mellanox.com, Lijian.Zhang@arm.com Date: Tue, 28 Apr 2020 17:13:37 +0800 Message-Id: <1588065217-199098-1-git-send-email-suanmingm@mellanox.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] net/mlx5: fix indexed pool bitmap initialization X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, the indexed memory pool bitmap start address is not aligned to cacheline size explicitly. The bitmap initialization requires the address should be cacheline aligned. In that case, the initialization maybe failed if the address is not cacheline aligned. Add RTE_CACHE_LINE_ROUNDUP() to the trunk size calculation to make sure the bitmap offset address will start with cacheline aligned. Fixes: a3cf59f56c47 ("net/mlx5: add indexed memory pool") Signed-off-by: Suanming Mou Tested-by: Lijian Zhang Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_utils.c | 10 +++++++--- drivers/net/mlx5/mlx5_utils.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c index 2146ffd..d29fbcb 100644 --- a/drivers/net/mlx5/mlx5_utils.c +++ b/drivers/net/mlx5/mlx5_utils.c @@ -265,7 +265,9 @@ struct mlx5_indexed_pool * trunk_size += sizeof(*trunk); data_size = mlx5_trunk_size_get(pool, idx); bmp_size = rte_bitmap_get_memory_footprint(data_size); - trunk_size += data_size * pool->cfg.size + bmp_size; + /* rte_bitmap requires memory cacheline aligned. */ + trunk_size += RTE_CACHE_LINE_ROUNDUP(data_size * pool->cfg.size); + trunk_size += bmp_size; trunk = pool->cfg.malloc(pool->cfg.type, trunk_size, RTE_CACHE_LINE_SIZE, rte_socket_id()); if (!trunk) @@ -278,8 +280,10 @@ struct mlx5_indexed_pool * MLX5_ASSERT(pool->free_list == TRUNK_INVALID); pool->free_list = idx; /* Mark all entries as available. */ - trunk->bmp = rte_bitmap_init_with_all_set(data_size, - &trunk->data[data_size * pool->cfg.size], bmp_size); + trunk->bmp = rte_bitmap_init_with_all_set(data_size, &trunk->data + [RTE_CACHE_LINE_ROUNDUP(data_size * pool->cfg.size)], + bmp_size); + MLX5_ASSERT(trunk->bmp); pool->n_trunk_valid++; #ifdef POOL_DEBUG pool->trunk_new++; diff --git a/drivers/net/mlx5/mlx5_utils.h b/drivers/net/mlx5/mlx5_utils.h index d81ace3..1248caa 100644 --- a/drivers/net/mlx5/mlx5_utils.h +++ b/drivers/net/mlx5/mlx5_utils.h @@ -115,7 +115,7 @@ struct mlx5_indexed_trunk { uint32_t next; /* Next free trunk in free list. */ uint32_t free; /* Free entries available */ struct rte_bitmap *bmp; - uint8_t data[] __rte_cache_min_aligned; /* Entry data start. */ + uint8_t data[] __rte_cache_aligned; /* Entry data start. */ }; struct mlx5_indexed_pool { -- 1.8.3.1