From mboxrd@z Thu Jan 1 00:00:00 1970 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 A76812A62 for ; Tue, 20 Mar 2018 14:32:15 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 4D3C0780094; Tue, 20 Mar 2018 13:32:14 +0000 (UTC) Received: from [192.168.38.17] (84.52.114.114) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Tue, 20 Mar 2018 13:32:09 +0000 To: Olivier Matz CC: , "Artem V. Andreev" References: <1516713372-10572-1-git-send-email-arybchenko@solarflare.com> <1520696382-16400-1-git-send-email-arybchenko@solarflare.com> <1520696382-16400-9-git-send-email-arybchenko@solarflare.com> <20180319170657.vjnaze5gwslcu2pi@platinum> From: Andrew Rybchenko Message-ID: <54533ea3-1de9-6558-3979-c239ed5ed847@solarflare.com> Date: Tue, 20 Mar 2018 16:32:04 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180319170657.vjnaze5gwslcu2pi@platinum> Content-Language: en-GB X-Originating-IP: [84.52.114.114] X-ClientProxiedBy: ocex03.SolarFlarecom.com (10.20.40.36) To ukex01.SolarFlarecom.com (10.17.10.4) X-TM-AS-Product-Ver: SMEX-11.0.0.1191-8.100.1062-23730.003 X-TM-AS-Result: No--16.973200-0.000000-31 X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-MDID: 1521552735-DtmKcAbYTtsf Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v1 8/9] mempool: ensure the mempool is initialized before populating 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: , X-List-Received-Date: Tue, 20 Mar 2018 13:32:16 -0000 On 03/19/2018 08:06 PM, Olivier Matz wrote: > On Sat, Mar 10, 2018 at 03:39:41PM +0000, Andrew Rybchenko wrote: >> 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 >> --- >> RFCv2 -> v1: >> - rename helper function as mempool_ops_alloc_once() >> >> 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 844d907..12085cd 100644 >> --- a/lib/librte_mempool/rte_mempool.c >> +++ b/lib/librte_mempool/rte_mempool.c >> @@ -322,6 +322,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. >> @@ -336,13 +351,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; >> >> /* mempool is already populated */ >> if (mp->populated_size >= mp->size) >> @@ -515,6 +526,10 @@ rte_mempool_populate_default(struct rte_mempool *mp) >> unsigned mz_id, n; >> int ret; >> >> + ret = mempool_ops_alloc_once(mp); >> + if (ret != 0) >> + return ret; >> + >> /* mempool must not be populated */ >> if (mp->nb_mem_chunks != 0) >> return -EEXIST; > > Is there a reason why we need to add it in > rte_mempool_populate_default() but not in rte_mempool_populate_virt() and > rte_mempool_populate_iova_tab()? The reason is rte_mempool_ops_calc_mem_size() call from rte_mempool_populate_default(). rte_mempool_ops_*() are not called directly from rte_mempool_populate_virt() and rte_mempool_populate_iova_tab(). In fact I've found out that rte_mempool_ops_calc_mem_size() is called from get_anon_size() which is called from rte_mempool_populate_anon(). So, we need to add to get_anon_size() as well. May be it is even better to make the patch the first in series to make sure that it is already OK when rte_mempool_ops_calc_mem_size() is added. What do you think?