From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 27D16A0613 for ; Wed, 25 Sep 2019 21:02:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ED76B1041; Wed, 25 Sep 2019 21:02:32 +0200 (CEST) Received: from mail.lysator.liu.se (mail.lysator.liu.se [130.236.254.3]) by dpdk.org (Postfix) with ESMTP id 61AAB23D for ; Wed, 25 Sep 2019 21:02:31 +0200 (CEST) Received: from mail.lysator.liu.se (localhost [127.0.0.1]) by mail.lysator.liu.se (Postfix) with ESMTP id 998C940006 for ; Wed, 25 Sep 2019 21:02:30 +0200 (CEST) Received: by mail.lysator.liu.se (Postfix, from userid 1004) id 86E1A40005; Wed, 25 Sep 2019 21:02:30 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on bernadotte.lysator.liu.se X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=ALL_TRUSTED,AWL autolearn=disabled version=3.4.2 X-Spam-Score: -0.9 Received: from [192.168.1.59] (host-90-232-207-236.mobileonline.telia.com [90.232.207.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.lysator.liu.se (Postfix) with ESMTPSA id EF1A440002; Wed, 25 Sep 2019 21:02:28 +0200 (CEST) To: =?UTF-8?Q?Morten_Br=c3=b8rup?= , olivier.matz@6wind.com Cc: stephen@networkplumber.org, harry.van.haaren@intel.com, konstantin.ananyev@intel.com, dev@dpdk.org References: <20190925120355.44821-1-mb@smartsharesystems.com> <20190925120355.44821-3-mb@smartsharesystems.com> From: =?UTF-8?Q?Mattias_R=c3=b6nnblom?= Message-ID: Date: Wed, 25 Sep 2019 21:02:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190925120355.44821-3-mb@smartsharesystems.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP Subject: Re: [dpdk-dev] [PATCH v2 2/2] mbuf: add bulk free function 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 2019-09-25 14:03, Morten Brørup wrote: > Add function for freeing a bulk of mbufs. > > Signed-off-by: Morten Brørup > --- > lib/librte_mbuf/rte_mbuf.c | 35 +++++++++++++++++++++++++++++++++++ > lib/librte_mbuf/rte_mbuf.h | 16 +++++----------- > 2 files changed, 40 insertions(+), 11 deletions(-) > > diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c > index 37718d49c..b63a0eced 100644 > --- a/lib/librte_mbuf/rte_mbuf.c > +++ b/lib/librte_mbuf/rte_mbuf.c > @@ -245,6 +245,41 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header, > return 0; > } > > +/** > + * Maximum bulk of mbufs rte_pktmbuf_free_bulk() returns to mempool. > + */ > +#define RTE_PKTMBUF_FREE_BULK_SZ 64 > + > +/* Free a bulk of mbufs back into their original mempools. */ > +void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count) > +{ > + struct rte_mbuf *m, *free[RTE_PKTMBUF_FREE_BULK_SZ]; > + unsigned int idx, nb_free = 0; > + > + for (idx = 0; idx < count; idx++) { > + m = mbufs[idx]; > + if (unlikely(m == NULL)) > + continue; > + > + __rte_mbuf_sanity_check(m, 1); > + m = rte_pktmbuf_prefree_seg(m); > + if (unlikely(m == NULL)) > + continue; > + > + if (nb_free >= RTE_PKTMBUF_FREE_BULK_SZ || > + (nb_free > 0 && m->pool != free[0]->pool)) { Maybe an unlikely() would be in order here? > + rte_mempool_put_bulk(free[0]->pool, > + (void **)free, nb_free); > + nb_free = 0; > + } > + > + free[nb_free++] = m; > + } > + > + if (nb_free > 0) > + rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free); > +} > + > /* dump a mbuf on console */ > void > rte_pktmbuf_dump(FILE *f, const struct rte_mbuf *m, unsigned dump_len) > diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h > index f2e174da1..6910b3fe6 100644 > --- a/lib/librte_mbuf/rte_mbuf.h > +++ b/lib/librte_mbuf/rte_mbuf.h > @@ -1908,21 +1908,15 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m) > } > > /** > - * Free a bulk of mbufs back into their original mempool. > + * Free a bulk of mbufs back into their original mempools. > * > * @param mbufs > - * Array of pointers to mbufs > + * Array of pointers to mbufs. > + * The array may contain NULL pointers. > * @param count > - * Array size > + * Array size. > */ > -static inline void > -rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned count) > -{ > - unsigned idx = 0; > - > - for (idx = 0; idx < count; idx++) > - rte_pktmbuf_free(mbufs[idx]); > -} > +void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count); > > /** > * Creates a "clone" of the given packet mbuf. >