From patchwork Fri Sep 27 10:05:13 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: 60018 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 C35551BEED; Fri, 27 Sep 2019 12:05:38 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by dpdk.org (Postfix) with ESMTP id 3F8811BEDD for ; Fri, 27 Sep 2019 12:05:30 +0200 (CEST) Received: from dkrd2.smartsharesys.local ([192.168.4.12]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 27 Sep 2019 12:05:29 +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, mattias.ronnblom@ericsson.com, bruce.richardson@intel.com, arybchenko@solarflare.com, dev@dpdk.org, =?utf-8?q?Morten_Br=C3=B8rup?= Date: Fri, 27 Sep 2019 10:05:13 +0000 Message-Id: <20190927100513.105674-4-mb@smartsharesystems.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927100513.105674-1-mb@smartsharesystems.com> References: <20190927100513.105674-1-mb@smartsharesystems.com> MIME-Version: 1.0 X-OriginalArrivalTime: 27 Sep 2019 10:05:29.0798 (UTC) FILETIME=[179C3E60:01D5751B] Subject: [dpdk-dev] [PATCH v3 3/3] 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 | 41 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c index b63a0eced..008891720 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -246,14 +246,35 @@ int rte_mbuf_check(const struct rte_mbuf *m, int is_header, } /** - * Maximum bulk of mbufs rte_pktmbuf_free_bulk() returns to mempool. + * Size of the array holding mbufs from the same membool to be freed in bulk. */ #define RTE_PKTMBUF_FREE_BULK_SZ 64 +/** + * @internal helper function for freeing a bulk of mbufs via an array holding + * mbufs from the same mempool. + */ +static __rte_always_inline void +rte_pktmbuf_free_seg_via_array(struct rte_mbuf *m, + struct rte_mbuf * * const free, unsigned int * const nb_free) +{ + m = rte_pktmbuf_prefree_seg(m); + if (likely(m != NULL)) { + 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; + } +} + /* 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]; + struct rte_mbuf *m, *m_next, *free[RTE_PKTMBUF_FREE_BULK_SZ]; unsigned int idx, nb_free = 0; for (idx = 0; idx < count; idx++) { @@ -262,18 +283,12 @@ void rte_pktmbuf_free_bulk(struct rte_mbuf **mbufs, unsigned int count) 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; + do { + m_next = m->next; + rte_pktmbuf_free_seg_via_array(m, free, &nb_free); + m = m_next; + } while (m != NULL); } if (nb_free > 0)