On Mon, Dec 02, 2024 at 01:59:37PM +0100, David Marchand wrote:
> On Mon, Dec 2, 2024 at 12:27 PM Bruce Richardson
> <bruce.richard...@intel.com> wrote:
> >
> > The actions taken for post-Tx buffer free for the SSE and AVX drivers
> > for i40e, iavf and ice drivers are all common, so centralize those in
> > common/intel_eth driver.
> >
> > Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
> > ---
> > drivers/net/_common_intel/tx.h | 71 ++++++++++++++++++++++++
> > drivers/net/i40e/i40e_rxtx_vec_common.h | 72 ++++---------------------
> > drivers/net/iavf/iavf_rxtx_vec_common.h | 61 ++++-----------------
> > drivers/net/ice/ice_rxtx_vec_common.h | 61 ++++-----------------
> > 4 files changed, 98 insertions(+), 167 deletions(-)
> >
> > diff --git a/drivers/net/_common_intel/tx.h b/drivers/net/_common_intel/tx.h
> > index c372d2838b..a930309c05 100644
> > --- a/drivers/net/_common_intel/tx.h
> > +++ b/drivers/net/_common_intel/tx.h
> > @@ -7,6 +7,7 @@
> >
> > #include <stdint.h>
> > #include <rte_mbuf.h>
> > +#include <rte_ethdev.h>
> >
> > /* forward declaration of the common intel (ci) queue structure */
> > struct ci_tx_queue;
> > @@ -107,4 +108,74 @@ ci_tx_backlog_entry(struct ci_tx_entry *txep, struct
> > rte_mbuf **tx_pkts, uint16_
> > txep[i].mbuf = tx_pkts[i];
> > }
> >
> > +#define IETH_VPMD_TX_MAX_FREE_BUF 64
> > +
> > +typedef int (*ci_desc_done_fn)(struct ci_tx_queue *txq, uint16_t idx);
> > +
> > +static __rte_always_inline int
> > +ci_tx_free_bufs(struct ci_tx_queue *txq, ci_desc_done_fn desc_done)
> > +{
> > + struct ci_tx_entry *txep;
> > + uint32_t n;
> > + uint32_t i;
> > + int nb_free = 0;
> > + struct rte_mbuf *m, *free[IETH_VPMD_TX_MAX_FREE_BUF];
> > +
> > + /* check DD bits on threshold descriptor */
> > + if (!desc_done(txq, txq->tx_next_dd))
> > + return 0;
> > +
> > + n = txq->tx_rs_thresh;
> > +
> > + /* first buffer to free from S/W ring is at index
> > + * tx_next_dd - (tx_rs_thresh-1)
> > + */
> > + txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
> > +
> > + if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) {
> > + for (i = 0; i < n; i++) {
> > + free[i] = txep[i].mbuf;
> > + /* no need to reset txep[i].mbuf in vector path */
> > + }
> > + rte_mempool_put_bulk(free[0]->pool, (void **)free, n);
> > + goto done;
> > + }
> > +
> > + m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
> > + if (likely(m != NULL)) {
> > + free[0] = m;
> > + nb_free = 1;
> > + for (i = 1; i < n; i++) {
> > + m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
> > + if (likely(m != NULL)) {
> > + if (likely(m->pool == free[0]->pool)) {
> > + free[nb_free++] = m;
> > + } else {
> > + rte_mempool_put_bulk(free[0]->pool,
> > + (void *)free,
> > + nb_free);
> > + free[0] = m;
> > + nb_free = 1;
> > + }
> > + }
> > + }
> > + rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);
> > + } else {
> > + for (i = 1; i < n; i++) {
> > + m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
> > + if (m != NULL)
> > + rte_mempool_put(m->pool, m);
> > + }
> > + }
>
> Is it possible to take an extra step and convert to rte_pktmbuf_free_bulk?
>
Will investigate....
