From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Rybchenko Subject: [RFC v2 11/17] mempool: ensure the mempool is initialized before populating Date: Tue, 23 Jan 2018 13:16:06 +0000 Message-ID: <1516713372-10572-12-git-send-email-arybchenko@solarflare.com> References: <1511539591-20966-1-git-send-email-arybchenko@solarflare.com> <1516713372-10572-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 [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 1E3EC1B00C for ; Tue, 23 Jan 2018 14:16:53 +0100 (CET) In-Reply-To: <1516713372-10572-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 --- lib/librte_mempool/rte_mempool.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index fc9c95a..cbb4dd5 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -370,6 +370,21 @@ rte_mempool_free_memchunks(struct rte_mempool *mp) } } +static int +mempool_maybe_initialize(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; +} + int rte_mempool_populate_one_by_one(struct rte_mempool *mp, unsigned int max_objs, void *vaddr, rte_iova_t iova, size_t len, @@ -408,13 +423,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_maybe_initialize(mp); + if (ret != 0) + return ret; /* mempool is already populated */ if (mp->populated_size >= mp->size) @@ -587,6 +598,10 @@ rte_mempool_populate_default(struct rte_mempool *mp) unsigned mz_id, n; int ret; + ret = mempool_maybe_initialize(mp); + if (ret != 0) + return ret; + /* mempool must not be populated */ if (mp->nb_mem_chunks != 0) return -EEXIST; -- 2.7.4