On 2019-09-25 14:03, Morten Brørup wrote:
Add function for freeing a bulk of mbufs.
Signed-off-by: Morten Brørup <m...@smartsharesystems.com>
---
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.
