Re: [dpdk-dev] [PATCH v9 2/4] net/ice: cleanup Tx buffers

["Yang, Qiming" <qiming.yang@intel.com>]

> -----Original Message-----
> From: Di, ChenxuX <chenxux.di@intel.com>
> Sent: Monday, January 13, 2020 5:57 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming <qiming.yang@intel.com>; Di, ChenxuX
> <chenxux.di@intel.com>
> Subject: [PATCH v9 2/4] net/ice: cleanup Tx buffers
> 
> Add support to the ice driver for the API rte_eth_tx_done_cleanup to force free
> consumed buffers on Tx ring.
> 
> Signed-off-by: Chenxu Di <chenxux.di@intel.com>

Acked-by: Qiming Yang <qiming.yang@intel.com>

> ---
>  drivers/net/ice/ice_ethdev.c |   1 +
>  drivers/net/ice/ice_rxtx.c   | 111 +++++++++++++++++++++++++++++++++++
>  drivers/net/ice/ice_rxtx.h   |   2 +
>  3 files changed, 114 insertions(+)
> 
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index
> de189daba..b55cdbf74 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -220,6 +220,7 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
>  	.filter_ctrl                  = ice_dev_filter_ctrl,
>  	.udp_tunnel_port_add          = ice_dev_udp_tunnel_port_add,
>  	.udp_tunnel_port_del          = ice_dev_udp_tunnel_port_del,
> +	.tx_done_cleanup              = ice_tx_done_cleanup,
>  };
> 
>  /* store statistics names and its offset in stats structure */ diff --git
> a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index
> 2db174456..8f12df807 100644
> --- a/drivers/net/ice/ice_rxtx.c
> +++ b/drivers/net/ice/ice_rxtx.c
> @@ -863,6 +863,9 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev,
> uint16_t tx_queue_id)
>  	return 0;
>  }
> 
> +
> +
> +
>  int
>  ice_rx_queue_setup(struct rte_eth_dev *dev,
>  		   uint16_t queue_idx,
> @@ -2643,6 +2646,114 @@ ice_tx_free_bufs(struct ice_tx_queue *txq)
>  	return txq->tx_rs_thresh;
>  }
> 
> +static int
> +ice_tx_done_cleanup_full(struct ice_tx_queue *txq,
> +			uint32_t free_cnt)
> +{
> +	struct ice_tx_entry *swr_ring = txq->sw_ring;
> +	uint16_t i, tx_last, tx_id;
> +	uint16_t nb_tx_free_last;
> +	uint16_t nb_tx_to_clean;
> +	uint32_t pkt_cnt;
> +
> +	/* Start free mbuf from the next of tx_tail */
> +	tx_last = txq->tx_tail;
> +	tx_id  = swr_ring[tx_last].next_id;
> +
> +	if (txq->nb_tx_free == 0 && ice_xmit_cleanup(txq))
> +		return 0;
> +
> +	nb_tx_to_clean = txq->nb_tx_free;
> +	nb_tx_free_last = txq->nb_tx_free;
> +	if (!free_cnt)
> +		free_cnt = txq->nb_tx_desc;
> +
> +	/* Loop through swr_ring to count the amount of
> +	 * freeable mubfs and packets.
> +	 */
> +	for (pkt_cnt = 0; pkt_cnt < free_cnt; ) {
> +		for (i = 0; i < nb_tx_to_clean &&
> +			pkt_cnt < free_cnt &&
> +			tx_id != tx_last; i++) {
> +			if (swr_ring[tx_id].mbuf != NULL) {
> +				rte_pktmbuf_free_seg(swr_ring[tx_id].mbuf);
> +				swr_ring[tx_id].mbuf = NULL;
> +
> +				/*
> +				 * last segment in the packet,
> +				 * increment packet count
> +				 */
> +				pkt_cnt += (swr_ring[tx_id].last_id == tx_id);
> +			}
> +
> +			tx_id = swr_ring[tx_id].next_id;
> +		}
> +
> +		if (txq->tx_rs_thresh > txq->nb_tx_desc -
> +			txq->nb_tx_free || tx_id == tx_last)
> +			break;
> +
> +		if (pkt_cnt < free_cnt) {
> +			if (ice_xmit_cleanup(txq))
> +				break;
> +
> +			nb_tx_to_clean = txq->nb_tx_free - nb_tx_free_last;
> +			nb_tx_free_last = txq->nb_tx_free;
> +		}
> +	}
> +
> +	return (int)pkt_cnt;
> +}
> +
> +static int
> +ice_tx_done_cleanup_vec(struct ice_tx_queue *txq __rte_unused,
> +			uint32_t free_cnt __rte_unused)
> +{
> +	return -ENOTSUP;
> +}
> +
> +static int
> +ice_tx_done_cleanup_simple(struct ice_tx_queue *txq,
> +			uint32_t free_cnt)
> +{
> +	int i, n, cnt;
> +
> +	if (free_cnt == 0 || free_cnt > txq->nb_tx_desc)
> +		free_cnt = txq->nb_tx_desc;
> +
> +	cnt = free_cnt - free_cnt % txq->tx_rs_thresh;
> +
> +	for (i = 0; i < cnt; i += n) {
> +		if (txq->nb_tx_desc - txq->nb_tx_free < txq->tx_rs_thresh)
> +			break;
> +
> +		n = ice_tx_free_bufs(txq);
> +
> +		if (n == 0)
> +			break;
> +	}
> +
> +	return i;
> +}
> +
> +int
> +ice_tx_done_cleanup(void *txq, uint32_t free_cnt) {
> +	struct ice_tx_queue *q = (struct ice_tx_queue *)txq;
> +	struct rte_eth_dev *dev = &rte_eth_devices[q->port_id];
> +	struct ice_adapter *ad =
> +		ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> +
> +#ifdef RTE_ARCH_X86
> +	if (ad->tx_vec_allowed)
> +		return ice_tx_done_cleanup_vec(q, free_cnt); #endif
> +	if (ad->tx_simple_allowed)
> +		return ice_tx_done_cleanup_simple(q, free_cnt);
> +	else
> +		return ice_tx_done_cleanup_full(q, free_cnt); }
> +
>  /* Populate 4 descriptors with data from 4 mbufs */  static inline void
> tx4(volatile struct ice_tx_desc *txdp, struct rte_mbuf **pkts) diff --git
> a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index
> 9e3d2cd07..0946ee69e 100644
> --- a/drivers/net/ice/ice_rxtx.h
> +++ b/drivers/net/ice/ice_rxtx.h
> @@ -202,4 +202,6 @@ uint16_t ice_recv_scattered_pkts_vec_avx2(void
> *rx_queue,  uint16_t ice_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf
> **tx_pkts,
>  				uint16_t nb_pkts);
>  int ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc *fdir_desc);
> +int ice_tx_done_cleanup(void *txq, uint32_t free_cnt);
> +
>  #endif /* _ICE_RXTX_H_ */
> --
> 2.17.1