> -----Original Message----- > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Andrew Rybchenko > Sent: Thursday, September 26, 2019 11:27 AM > To: Morten Brørup; olivier.m...@6wind.com > Cc: step...@networkplumber.org; harry.van.haa...@intel.com; > konstantin.anan...@intel.com; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v2 2/2] mbuf: add bulk free function > > On 9/25/19 3:03 PM, 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); > > Who cares about next segments if any? It looks like nobody. > > > + 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) > > 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. > > Is it just a mistake that two patches are not squashed? >
Yes. Plenty of rookie git mistakes by my hand. We don't use git in-house, and I have no git experience. So I'm trying my best, relying on the DPDK Contributor guide and git documentation. :-) Med venlig hilsen / kind regards - Morten Brørup
