DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Morten Brørup" <mb@smartsharesystems.com>
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, "Morten Brørup" <mb@smartsharesystems.com>
Subject: [dpdk-dev] [PATCH v3 3/3] mbuf: add bulk free function
Date: Fri, 27 Sep 2019 10:05:13 +0000	[thread overview]
Message-ID: <20190927100513.105674-4-mb@smartsharesystems.com> (raw)
In-Reply-To: <20190927100513.105674-1-mb@smartsharesystems.com>

Add function for freeing a bulk of mbufs.

Signed-off-by: Morten Brørup <mb@smartsharesystems.com>
---
 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)
-- 
2.17.1


      parent reply	other threads:[~2019-09-27 10:05 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-27 10:05 [dpdk-dev] [PATCH v3 0/3] " Morten Brørup
2019-09-27 10:05 ` [dpdk-dev] [PATCH v3 1/3] " Morten Brørup
2019-09-27 10:05 ` [dpdk-dev] [PATCH v3 2/3] " Morten Brørup
2019-09-27 10:05 ` Morten Brørup [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190927100513.105674-4-mb@smartsharesystems.com \
    --to=mb@smartsharesystems.com \
    --cc=arybchenko@solarflare.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=harry.van.haaren@intel.com \
    --cc=konstantin.ananyev@intel.com \
    --cc=mattias.ronnblom@ericsson.com \
    --cc=olivier.matz@6wind.com \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).