mbuf: add bulk free function
v3 cover mbuf: add bulk free function
Add function for freeing a bulk of mbufs.
v3:
* Bugfix: Handle pakets with multiple segments.
* Added inline helper function, mainly for readability.
* Fix source code formatting regarding indentation.
v2:
* Function is not inline.
* Optimized to free multible mbufs belonging to the same mempool in bulk. Inspired by ixgbe_tx_free_bufs(), but allowing NULL pointers in the array, just like rte_pktmbuf_free() can take a NULL pointer.
* Use unsigned int instead of unsigned. Passes checkpatch, but mismatches the original coding style of the modified files.
* Fixed a typo in the description headline: mempools is plural.
Morten Brørup (3):
mbuf: add bulk free function
mbuf: add bulk free function
mbuf: add bulk free function
lib/librte_mbuf/rte_mbuf.c | 50 ++++++++++++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 11 +++++++++ 2 files changed, 61 insertions(+)
Signature · 1 line
2.17.1
PATCH v3 1/3 mbuf: add bulk free function
Add function for freeing a bulk of mbufs.
--- lib/librte_mbuf/rte_mbuf.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
lib/librte_mbuf/rte_mbuf.h +17 -0
@@ -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. *
Signature · 1 line
2.17.1
PATCH v3 2/3 mbuf: add bulk free function
In reply to Morten BrørupAdd function for freeing a bulk of mbufs.
--- lib/librte_mbuf/rte_mbuf.c | 35 +++++++++++++++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 16 +++++----------- 2 files changed, 40 insertions(+), 11 deletions(-)
lib/librte_mbuf/rte_mbuf.c +35 -0
@@ -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)
lib/librte_mbuf/rte_mbuf.h +5 -11
@@ -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.
Signature · 1 line
2.17.1
PATCH v3 3/3 mbuf: add bulk free function
In reply to Morten BrørupAdd function for freeing a bulk of mbufs.
--- lib/librte_mbuf/rte_mbuf.c | 41 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-)
lib/librte_mbuf/rte_mbuf.c +28 -13
@@ -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 )
Signature · 1 line
2.17.1