drivers: fix memzone allocations for DMA memory
PATCH 1/1 drivers: fix memzone allocations for DMA memory
Caught by code review.
Using a random name for memzone allocations can result in init failures in the unlikely case that a name collision occurs.
Use a simple sequential generator on 64 bits.
--- drivers/common/iavf/iavf_impl.c | 5 +++-- drivers/net/hns3/hns3_cmd.c | 4 +++- drivers/net/i40e/i40e_ethdev.c | 4 +++- drivers/net/ice/base/ice_osdep.h | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-)
drivers/common/iavf/iavf_impl.c +3 -2
@@ -6,7 +6,6 @@#include <inttypes.h> #include <rte_common.h> -#include <rte_random.h> #include <rte_malloc.h> #include <rte_memzone.h>
@@ -19,13 +18,15 @@ iavf_allocate_dma_mem_d(__rte_unused struct iavf_hw *hw, u64 size, u32 alignment) { +static uint64_t iavf_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return IAVF_ERR_PARAM ; -snprintf (z_name,sizeof (z_name),"iavf_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"iavf_dma_%" PRIu64, +__atomic_fetch_add (&iavf_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );
drivers/net/hns3/hns3_cmd.c +3 -1
@@ -44,10 +44,12 @@ static int hns3_allocate_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring, uint64_t size, uint32_t alignment) { + static uint64_t hns3_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ]; -snprintf (z_name,sizeof (z_name),"hns3_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"hns3_dma_%" PRIu64, +__atomic_fetch_add (&hns3_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );
drivers/net/i40e/i40e_ethdev.c +3 -1
@@ -4548,13 +4548,15 @@ i40e_allocate_dma_mem_d(__rte_unused struct i40e_hw *hw, u64 size, u32 alignment) { +static uint64_t i40e_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return I40E_ERR_PARAM ; -snprintf (z_name,sizeof (z_name),"i40e_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"i40e_dma_%" PRIu64, +__atomic_fetch_add (&i40e_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );if (!mz)
drivers/net/ice/base/ice_osdep.h +3 -2
@@ -21,7 +21,6 @@#include <rte_cycles.h> #include <rte_spinlock.h> #include <rte_log.h> -#include <rte_random.h> #include <rte_io.h> #include "ice_alloc.h"
@@ -260,13 +259,15 @@ static inline void * ice_alloc_dma_mem(__rte_unused struct ice_hw *hw, struct ice_dma_mem *mem, u64 size) { + static uint64_t ice_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return NULL ; -snprintf (z_name,sizeof (z_name),"ice_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"ice_dma_%" PRIu64, +__atomic_fetch_add (&ice_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,0 ,0 ,RTE_PGSIZE_2M );if (!mz)
Signature · 1 line
2.23.0
acked.
Quoted 118 lines · David Marchand
Caught by code review.
Using a random name for memzone allocations can result in init failures in the unlikely case that a name collision occurs.
Use a simple sequential generator on 64 bits.Fixes 3f50f072ff06 ("i40e: fix memzone freeing")Fixes 22b123a36d07 ("net/avf: initialize PMD")Fixes 5f0978e96220 ("net/ice/base: add OS specific implementation")Fixes 737f30e1c3ab ("net/hns3: support command interface with firmware")Signed-off-by David Marchand <[email protected]>--- drivers/common/iavf/iavf_impl.c | 5 +++-- drivers/net/hns3/hns3_cmd.c | 4 +++- drivers/net/i40e/i40e_ethdev.c | 4 +++- drivers/net/ice/base/ice_osdep.h | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-)drivers/common/iavf/iavf_impl.c +3
-2@@ -6,7 +6,6 @@#include <inttypes.h> #include <rte_common.h> -#include <rte_random.h> #include <rte_malloc.h> #include <rte_memzone.h> @@ -19,13 +18,15 @@ iavf_allocate_dma_mem_d(__rte_unused struct iavf_hw *hw, u64 size, u32 alignment) { +static uint64_t iavf_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return IAVF_ERR_PARAM ; -snprintf (z_name,sizeof (z_name),"iavf_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"iavf_dma_%" PRIu64, +__atomic_fetch_add (&iavf_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );drivers/net/hns3/hns3_cmd.c +3
-1@@ -44,10 +44,12 @@ static int hns3_allocate_dma_mem(struct hns3_hw *hw, struct hns3_cmq_ring *ring, uint64_t size, uint32_t alignment) { + static uint64_t hns3_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ]; -snprintf (z_name,sizeof (z_name),"hns3_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"hns3_dma_%" PRIu64, +__atomic_fetch_add (&hns3_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );drivers/net/i40e/i40e_ethdev.c +3
-1@@ -4548,13 +4548,15 @@ i40e_allocate_dma_mem_d(__rte_unused struct i40e_hw *hw, u64 size, u32 alignment) { +static uint64_t i40e_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return I40E_ERR_PARAM ; -snprintf (z_name,sizeof (z_name),"i40e_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"i40e_dma_%" PRIu64, +__atomic_fetch_add (&i40e_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,RTE_MEMZONE_IOVA_CONTIG , alignment,RTE_PGSIZE_2M );if (!mz)drivers/net/ice/base/ice_osdep.h +3
-2@@ -21,7 +21,6 @@#include <rte_cycles.h> #include <rte_spinlock.h> #include <rte_log.h> -#include <rte_random.h> #include <rte_io.h> #include "ice_alloc.h" @@ -260,13 +259,15 @@ static inline void * ice_alloc_dma_mem(__rte_unused struct ice_hw *hw, struct ice_dma_mem *mem, u64 size) { + static uint64_t ice_dma_memzone_id;const struct rte_memzone *mz =NULL ;char z_name[RTE_MEMZONE_NAMESIZE ];if (!mem)return NULL ; -snprintf (z_name,sizeof (z_name),"ice_dma_%" PRIu64,rte_rand ()); +snprintf (z_name,sizeof (z_name),"ice_dma_%" PRIu64, +__atomic_fetch_add (&ice_dma_memzone_id,1 , __ATOMIC_RELAXED)); mz =rte_memzone_reserve_bounded (z_name, size,SOCKET_ID_ANY ,0 ,0 ,RTE_PGSIZE_2M );if (!mz)
David Marchand
Acked-by Min Hu (Connor)Quoted 2 lines · Min Hu (Connor)
acked.
Thanks for the quick review, just translating this "acked" to:
For patchwork to catch it.
Signature · 1 line
David Marchand
Quoted 9 lines · David Marchand
Quoted 2 lines · Min Hu (Connor)
acked.
Thanks for the quick review, just translating this "acked" to:
Acked-by Min Hu (Connor) <[email protected]>For patchwork to catch it.
OK, I will do it as you suggest in future.
Quoted 1 line
Quoted 24 lines
-----Original Message-----
From: stable <[email protected]> On Behalf Of David Marchand
Sent: Tuesday, July 6, 2021 16:58
To: [email protected]
Cc: [email protected]; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>; Min Hu (Connor) <[email protected]>; Yisen Zhuang <[email protected]>; Lijun Ou <[email protected]>; Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>; Zhang, Helin <[email protected]>; Yigit, Ferruh <[email protected]>; Lu, Wenzhuo <[email protected]>; Huisong Li <[email protected]>; Chunsong Feng <[email protected]>; Wei Hu (Xavier) <[email protected]>; Hao Chen <[email protected]>
Subject: [dpdk-stable] [PATCH] drivers: fix memzone allocations for DMA memoryCaught by code review.
Using a random name for memzone allocations can result in init failures in the unlikely case that a name collision occurs.
Use a simple sequential generator on 64 bits.Fixes 3f50f072ff06 ("i40e: fix memzone freeing")Fixes 22b123a36d07 ("net/avf: initialize PMD")Fixes 5f0978e96220 ("net/ice/base: add OS specific implementation")Fixes 737f30e1c3ab ("net/hns3: support command interface with firmware")
Quoted 8 lines
Signed-off-by David Marchand <[email protected]>--- drivers/common/iavf/iavf_impl.c | 5 +++-- drivers/net/hns3/hns3_cmd.c | 4 +++- drivers/net/i40e/i40e_ethdev.c | 4 +++- drivers/net/ice/base/ice_osdep.h | 5 +++-- 4 files changed, 12 insertions(+), 6 deletions(-)
Quoted 2 lines
--
2.23.0