From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Rybchenko Subject: [PATCH v4 03/11] mempool: ensure the mempool is initialized before populating Date: Mon, 16 Apr 2018 14:24:32 +0100 Message-ID: <1523885080-17168-4-git-send-email-arybchenko@solarflare.com> References: <1511539591-20966-1-git-send-email-arybchenko@solarflare.com> <1523885080-17168-1-git-send-email-arybchenko@solarflare.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Olivier MATZ , "Artem V. Andreev" To: Return-path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 73D13D14E for ; Mon, 16 Apr 2018 15:24:59 +0200 (CEST) In-Reply-To: <1523885080-17168-1-git-send-email-arybchenko@solarflare.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: "Artem V. Andreev" Callback to calculate required memory area size may require mempool driver data to be already allocated and initialized. Signed-off-by: Artem V. Andreev Signed-off-by: Andrew Rybchenko Acked-by: Santosh Shukla Acked-by: Olivier Matz --- v3 -> v4: - rebase v2 -> v3: - none v1 -> v2: - add init check to mempool_ops_alloc_once() - move ealier in the patch series since it is required when driver ops are called and it is better to have it before new ops are added RFCv2 -> v1: - rename helper function as mempool_ops_alloc_once() lib/librte_mempool/rte_mempool.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index d9c09e1..b15b79b 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -346,6 +346,21 @@ rte_mempool_free_memchunks(struct rte_mempool *mp) } } +static int +mempool_ops_alloc_once(struct rte_mempool *mp) +{ + int ret; + + /* create the internal ring if not already done */ + if ((mp->flags & MEMPOOL_F_POOL_CREATED) == 0) { + ret = rte_mempool_ops_alloc(mp); + if (ret != 0) + return ret; + mp->flags |= MEMPOOL_F_POOL_CREATED; + } + return 0; +} + /* Add objects in the pool, using a physically contiguous memory * zone. Return the number of objects added, or a negative value * on error. @@ -362,13 +377,9 @@ rte_mempool_populate_iova(struct rte_mempool *mp, char *vaddr, struct rte_mempool_memhdr *memhdr; int ret; - /* create the internal ring if not already done */ - if ((mp->flags & MEMPOOL_F_POOL_CREATED) == 0) { - ret = rte_mempool_ops_alloc(mp); - if (ret != 0) - return ret; - mp->flags |= MEMPOOL_F_POOL_CREATED; - } + ret = mempool_ops_alloc_once(mp); + if (ret != 0) + return ret; /* Notify memory area to mempool */ ret = rte_mempool_ops_register_memory_area(mp, vaddr, iova, len); @@ -570,6 +581,10 @@ rte_mempool_populate_default(struct rte_mempool *mp) int ret; bool force_contig, no_contig, try_contig, no_pageshift; + ret = mempool_ops_alloc_once(mp); + if (ret != 0) + return ret; + /* mempool must not be populated */ if (mp->nb_mem_chunks != 0) return -EEXIST; @@ -774,6 +789,10 @@ rte_mempool_populate_anon(struct rte_mempool *mp) return 0; } + ret = mempool_ops_alloc_once(mp); + if (ret != 0) + return ret; + /* get chunk of virtually continuous memory */ size = get_anon_size(mp); addr = mmap(NULL, size, PROT_READ | PROT_WRITE, -- 2.7.4