Re: [dpdk-dev] [PATCH 1/4] net/fm10k: cleanup Tx buffers

[Gavin Hu (Arm Technology China)]

> -----Original Message-----
> From: dev <dev-boun...@dpdk.org> On Behalf Of Di ChenxuX
> Sent: Thursday, September 26, 2019 5:30 PM
> To: dev@dpdk.org
> Cc: qiming.y...@intel.com; Di ChenxuX <chenxux...@intel.com>
> Subject: [dpdk-dev] [PATCH 1/4] net/fm10k: cleanup Tx buffers
> 
> Add support to the fm10k driver for the API rte_eth_tx_done_cleanup
>  to force free consumed buffers on Tx ring.
> 
> Signed-off-by: Di ChenxuX <chenxux...@intel.com>
> ---
>  drivers/net/fm10k/fm10k.h        |  2 ++
>  drivers/net/fm10k/fm10k_ethdev.c |  1 +
>  drivers/net/fm10k/fm10k_rxtx.c   | 45
> ++++++++++++++++++++++++++++++++
>  3 files changed, 48 insertions(+)
> 
> diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
> index 916b856ac..ddb1d64ec 100644
> --- a/drivers/net/fm10k/fm10k.h
> +++ b/drivers/net/fm10k/fm10k.h
> @@ -342,6 +342,8 @@ uint16_t fm10k_xmit_pkts(void *tx_queue, struct
> rte_mbuf **tx_pkts,
>  uint16_t fm10k_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
>       uint16_t nb_pkts);
> 
> +int fm10k_tx_done_cleanup(void *txq, uint32_t free_cnt);
> +
>  int fm10k_rxq_vec_setup(struct fm10k_rx_queue *rxq);
>  int fm10k_rx_vec_condition_check(struct rte_eth_dev *);
>  void fm10k_rx_queue_release_mbufs_vec(struct fm10k_rx_queue *rxq);
> diff --git a/drivers/net/fm10k/fm10k_ethdev.c
> b/drivers/net/fm10k/fm10k_ethdev.c
> index db4d72129..328468185 100644
> --- a/drivers/net/fm10k/fm10k_ethdev.c
> +++ b/drivers/net/fm10k/fm10k_ethdev.c
> @@ -2838,6 +2838,7 @@ static const struct eth_dev_ops
> fm10k_eth_dev_ops = {
>       .reta_query             = fm10k_reta_query,
>       .rss_hash_update        = fm10k_rss_hash_update,
>       .rss_hash_conf_get      = fm10k_rss_hash_conf_get,
> +     .tx_done_cleanup    = fm10k_tx_done_cleanup,
>  };
> 
>  static int ftag_check_handler(__rte_unused const char *key,
> diff --git a/drivers/net/fm10k/fm10k_rxtx.c
> b/drivers/net/fm10k/fm10k_rxtx.c
> index 5c3112183..f67c5bf00 100644
> --- a/drivers/net/fm10k/fm10k_rxtx.c
> +++ b/drivers/net/fm10k/fm10k_rxtx.c
> @@ -541,6 +541,51 @@ static inline void tx_free_bulk_mbuf(struct
> rte_mbuf **txep, int num)
>       }
>  }
> 
> +int fm10k_tx_done_cleanup(void *txq, uint32_t free_cnt)
> +{
> +     struct fm10k_tx_queue *q = (struct fm10k_tx_queue *)txq;
> +     uint16_t next_rs, count = 0;
"count" should be declared as uint32_t to compare against free_cnt.
/Gavin
> +
> +     if (q == NULL)
> +             return -ENODEV;
> +
> +     next_rs = fifo_peek(&q->rs_tracker);
> +     if (!(q->hw_ring[next_rs].flags & FM10K_TXD_FLAG_DONE))
> +             return count;
> +
> +     /* the DONE flag is set on this descriptor so remove the ID
> +      * from the RS bit tracker and free the buffers
> +      */
> +     fifo_remove(&q->rs_tracker);
> +
> +     /* wrap around? if so, free buffers from last_free up to but NOT
> +      * including nb_desc
> +      */
> +     if (q->last_free > next_rs) {
> +             count = q->nb_desc - q->last_free;
> +             tx_free_bulk_mbuf(&q->sw_ring[q->last_free], count);
> +             q->last_free = 0;
> +
> +             if (unlikely(count == (int)free_cnt))
> +                     return count;
> +     }
> +
> +     /* adjust free descriptor count before the next loop */
> +     q->nb_free += count + (next_rs + 1 - q->last_free);
> +
> +     /* free buffers from last_free, up to and including next_rs */
> +     if (q->last_free <= next_rs) {
> +             count = next_rs - q->last_free + 1;
> +             tx_free_bulk_mbuf(&q->sw_ring[q->last_free], count);
> +             q->last_free += count;
> +     }
> +
> +     if (q->last_free == q->nb_desc)
> +             q->last_free = 0;
> +
> +     return count;
> +}
> +
>  static inline void tx_free_descriptors(struct fm10k_tx_queue *q)
>  {
>       uint16_t next_rs, count = 0;
> --
> 2.17.1