From patchwork Wed Sep 25 12:03:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Morten_Br=C3=B8rup?= X-Patchwork-Id: 59737 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A88F37B0; Wed, 25 Sep 2019 14:04:11 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by dpdk.org (Postfix) with ESMTP id 5568B2D13 for ; Wed, 25 Sep 2019 14:04:08 +0200 (CEST) Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 25 Sep 2019 14:04:07 +0200 From: =?utf-8?q?Morten_Br=C3=B8rup?= To: olivier.matz@6wind.com Cc: stephen@networkplumber.org, harry.van.haaren@intel.com, konstantin.ananyev@intel.com, dev@dpdk.org, =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Date: Wed, 25 Sep 2019 12:03:54 +0000 Message-Id: <20190925120355.44821-2-mb@smartsharesystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190925120355.44821-1-mb@smartsharesystems.com> References: <20190925120355.44821-1-mb@smartsharesystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 25 Sep 2019 12:04:08.0053 (UTC) FILETIME=[55984250:01D57399] Subject: [dpdk-dev] [PATCH v2 1/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" Add function for freeing a bulk of mbufs. Signed-off-by: Morten Brørup --- lib/librte_mbuf/rte_mbuf.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 98225ec80..f2e174da1 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -1907,6 +1907,23 @@ static inline void rte_pktmbuf_free(struct rte_mbuf *m) } } +/** + * Free a bulk of mbufs back into their original mempool. + * + * @param mbufs + * Array of pointers to mbufs + * @param count + * 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]); +} + /** * Creates a "clone" of the given packet mbuf. * From patchwork Wed Sep 25 12:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Morten_Br=C3=B8rup?= X-Patchwork-Id: 59738 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8CB251B99D; Wed, 25 Sep 2019 14:04:13 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by dpdk.org (Postfix) with ESMTP id B828534F0 for ; Wed, 25 Sep 2019 14:04:09 +0200 (CEST) Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 25 Sep 2019 14:04:08 +0200 From: =?utf-8?q?Morten_Br=C3=B8rup?= To: olivier.matz@6wind.com Cc: stephen@networkplumber.org, harry.van.haaren@intel.com, konstantin.ananyev@intel.com, dev@dpdk.org, =?utf-8?q?Morten_Br=C3=B8?= =?utf-8?q?rup?= Date: Wed, 25 Sep 2019 12:03:55 +0000 Message-Id: <20190925120355.44821-3-mb@smartsharesystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190925120355.44821-1-mb@smartsharesystems.com> References: <20190925120355.44821-1-mb@smartsharesystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 25 Sep 2019 12:04:08.0866 (UTC) FILETIME=[56145020:01D57399] Subject: [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" 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)) { + 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.