[dpdk-dev] [PATCH v3 3/3] mbuf: add bulk free function

[Morten Brørup]

Add function for freeing a bulk of mbufs.

Signed-off-by: Morten Brørup <m...@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