From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3DF7BA0C47 for ; Tue, 6 Jul 2021 11:36:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 19E1A4126A; Tue, 6 Jul 2021 11:36:49 +0200 (CEST) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 3785F40688; Tue, 6 Jul 2021 11:36:45 +0200 (CEST) Received: from dggeme756-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GJy6K1jPHzZkW6; Tue, 6 Jul 2021 17:33:29 +0800 (CST) Received: from [10.67.103.128] (10.67.103.128) by dggeme756-chm.china.huawei.com (10.3.19.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Tue, 6 Jul 2021 17:36:40 +0800 To: David Marchand , CC: , Jingjing Wu , Beilei Xing , Yisen Zhuang , Lijun Ou , Qiming Yang , Qi Zhang , Helin Zhang , Ferruh Yigit , Wenzhuo Lu , Huisong Li , Chunsong Feng , "Wei Hu (Xavier)" , Hao Chen References: <20210706085750.5453-1-david.marchand@redhat.com> From: "Min Hu (Connor)" Message-ID: <0f43445b-2c20-dfc4-392b-0278629fa1bd@huawei.com> Date: Tue, 6 Jul 2021 17:36:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <20210706085750.5453-1-david.marchand@redhat.com> Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.103.128] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggeme756-chm.china.huawei.com (10.3.19.102) X-CFilter-Loop: Reflected Subject: Re: [dpdk-stable] [PATCH] drivers: fix memzone allocations for DMA memory X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" acked. ÔÚ 2021/7/6 16:57, 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") > Cc: stable@dpdk.org > > Signed-off-by: David Marchand > --- > 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(-) > > diff --git a/drivers/common/iavf/iavf_impl.c b/drivers/common/iavf/iavf_impl.c > index 0c7d5c0dae..8919b0e7c3 100644 > --- a/drivers/common/iavf/iavf_impl.c > +++ b/drivers/common/iavf/iavf_impl.c > @@ -6,7 +6,6 @@ > #include > > #include > -#include > #include > #include > > @@ -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); > diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c > index 44a4e2860d..175d48d14b 100644 > --- a/drivers/net/hns3/hns3_cmd.c > +++ b/drivers/net/hns3/hns3_cmd.c > @@ -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); > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c > index dd61258739..87d5053a24 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -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) > diff --git a/drivers/net/ice/base/ice_osdep.h b/drivers/net/ice/base/ice_osdep.h > index 878c5597d4..154fe96e93 100644 > --- a/drivers/net/ice/base/ice_osdep.h > +++ b/drivers/net/ice/base/ice_osdep.h > @@ -21,7 +21,6 @@ > #include > #include > #include > -#include > #include > > #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) >