From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 696FF42214; Thu, 31 Aug 2023 19:24:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 626A74028E; Thu, 31 Aug 2023 19:24:46 +0200 (CEST) Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) by mails.dpdk.org (Postfix) with ESMTP id 11BC94028D for ; Thu, 31 Aug 2023 19:24:44 +0200 (CEST) Received: from frapeml100008.china.huawei.com (unknown [172.18.147.226]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4Rc7GG01yRz67bhG; Fri, 1 Sep 2023 01:20:22 +0800 (CST) Received: from frapeml500007.china.huawei.com (7.182.85.172) by frapeml100008.china.huawei.com (7.182.85.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Thu, 31 Aug 2023 19:24:42 +0200 Received: from frapeml500007.china.huawei.com ([7.182.85.172]) by frapeml500007.china.huawei.com ([7.182.85.172]) with mapi id 15.01.2507.031; Thu, 31 Aug 2023 19:24:42 +0200 From: Konstantin Ananyev To: Feifei Wang , Konstantin Ananyev CC: "dev@dpdk.org" , nd , Honnappa Nagarahalli , Ruifeng Wang , "Yuying Zhang" , Beilei Xing , nd Subject: RE: [PATCH v11 2/4] net/i40e: implement mbufs recycle mode Thread-Topic: [PATCH v11 2/4] net/i40e: implement mbufs recycle mode Thread-Index: AQHZ1MopmqeVdJn4v02E2zeVFO109K/42CgAgAvagSA= Date: Thu, 31 Aug 2023 17:24:42 +0000 Message-ID: References: <20220420081650.2043183-1-feifei.wang2@arm.com> <20230822072710.1945027-1-feifei.wang2@arm.com> <20230822072710.1945027-3-feifei.wang2@arm.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.206.138.42] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org > > > > Define specific function implementation for i40e driver. > > Currently, mbufs recycle mode can support 128bit vector path and avx2 p= ath. > > And can be enabled both in fast free and no fast free mode. > > > > Suggested-by: Honnappa Nagarahalli > > Signed-off-by: Feifei Wang > > Reviewed-by: Ruifeng Wang > > Reviewed-by: Honnappa Nagarahalli > > --- > > drivers/net/i40e/i40e_ethdev.c | 1 + > > drivers/net/i40e/i40e_ethdev.h | 2 + > > .../net/i40e/i40e_recycle_mbufs_vec_common.c | 147 > > ++++++++++++++++++ > > drivers/net/i40e/i40e_rxtx.c | 32 ++++ > > drivers/net/i40e/i40e_rxtx.h | 4 + > > drivers/net/i40e/meson.build | 1 + > > 6 files changed, 187 insertions(+) > > create mode 100644 drivers/net/i40e/i40e_recycle_mbufs_vec_common.c > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_eth= dev.c > > index 8271bbb394..50ba9aac94 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -496,6 +496,7 @@ static const struct eth_dev_ops i40e_eth_dev_ops = =3D { > > .flow_ops_get =3D i40e_dev_flow_ops_get, > > .rxq_info_get =3D i40e_rxq_info_get, > > .txq_info_get =3D i40e_txq_info_get, > > + .recycle_rxq_info_get =3D i40e_recycle_rxq_info_get, > > .rx_burst_mode_get =3D i40e_rx_burst_mode_get, > > .tx_burst_mode_get =3D i40e_tx_burst_mode_get, > > .timesync_enable =3D i40e_timesync_enable, > > diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_eth= dev.h > > index 6f65d5e0ac..af758798e1 100644 > > --- a/drivers/net/i40e/i40e_ethdev.h > > +++ b/drivers/net/i40e/i40e_ethdev.h > > @@ -1355,6 +1355,8 @@ void i40e_rxq_info_get(struct rte_eth_dev *dev, > > uint16_t queue_id, > > struct rte_eth_rxq_info *qinfo); > > void i40e_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, > > struct rte_eth_txq_info *qinfo); > > +void i40e_recycle_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue= _id, > > + struct rte_eth_recycle_rxq_info *recycle_rxq_info); > > int i40e_rx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id, > > struct rte_eth_burst_mode *mode); int > > i40e_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id, diff= -- > > git a/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c > > b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c > > new file mode 100644 > > index 0000000000..5663ecccde > > --- /dev/null > > +++ b/drivers/net/i40e/i40e_recycle_mbufs_vec_common.c > > @@ -0,0 +1,147 @@ > > +/* SPDX-License-Identifier: BSD-3-Clause > > + * Copyright (c) 2023 Arm Limited. > > + */ > > + > > +#include > > +#include > > + > > +#include "base/i40e_prototype.h" > > +#include "base/i40e_type.h" > > +#include "i40e_ethdev.h" > > +#include "i40e_rxtx.h" > > + > > +#pragma GCC diagnostic ignored "-Wcast-qual" > > + > > +void > > +i40e_recycle_rx_descriptors_refill_vec(void *rx_queue, uint16_t > > +nb_mbufs) { > > + struct i40e_rx_queue *rxq =3D rx_queue; > > + struct i40e_rx_entry *rxep; > > + volatile union i40e_rx_desc *rxdp; > > + uint16_t rx_id; > > + uint64_t paddr; > > + uint64_t dma_addr; > > + uint16_t i; > > + > > + rxdp =3D rxq->rx_ring + rxq->rxrearm_start; > > + rxep =3D &rxq->sw_ring[rxq->rxrearm_start]; > > + > > + for (i =3D 0; i < nb_mbufs; i++) { > > + /* Initialize rxdp descs. */ > > + paddr =3D (rxep[i].mbuf)->buf_iova + > > RTE_PKTMBUF_HEADROOM; > > + dma_addr =3D rte_cpu_to_le_64(paddr); > > + /* flush desc with pa dma_addr */ > > + rxdp[i].read.hdr_addr =3D 0; > > + rxdp[i].read.pkt_addr =3D dma_addr; > > + } > > + > > + /* Update the descriptor initializer index */ > > + rxq->rxrearm_start +=3D nb_mbufs; > > + rx_id =3D rxq->rxrearm_start - 1; > > + > > + if (unlikely(rxq->rxrearm_start >=3D rxq->nb_rx_desc)) { > > + rxq->rxrearm_start =3D 0; > > + rx_id =3D rxq->nb_rx_desc - 1; > > + } > > + > > + rxq->rxrearm_nb -=3D nb_mbufs; > > + > > + rte_io_wmb(); > > + /* Update the tail pointer on the NIC */ > > + I40E_PCI_REG_WRITE_RELAXED(rxq->qrx_tail, rx_id); } > > + > > +uint16_t > > +i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue, > > + struct rte_eth_recycle_rxq_info *recycle_rxq_info) { > > + struct i40e_tx_queue *txq =3D tx_queue; > > + struct i40e_tx_entry *txep; > > + struct rte_mbuf **rxep; > > + int i, n; > > + uint16_t nb_recycle_mbufs; > > + uint16_t avail =3D 0; > > + uint16_t mbuf_ring_size =3D recycle_rxq_info->mbuf_ring_size; > > + uint16_t mask =3D recycle_rxq_info->mbuf_ring_size - 1; > > + uint16_t refill_requirement =3D recycle_rxq_info->refill_requirement; > > + uint16_t refill_head =3D *recycle_rxq_info->refill_head; > > + uint16_t receive_tail =3D *recycle_rxq_info->receive_tail; > > + > > + /* Get available recycling Rx buffers. */ > > + avail =3D (mbuf_ring_size - (refill_head - receive_tail)) & mask; > > + > > + /* Check Tx free thresh and Rx available space. */ > > + if (txq->nb_tx_free > txq->tx_free_thresh || avail <=3D txq->tx_rs_th= resh) > > + return 0; > > + > > + /* check DD bits on threshold descriptor */ > > + if ((txq->tx_ring[txq->tx_next_dd].cmd_type_offset_bsz & > > + > > rte_cpu_to_le_64(I40E_TXD_QW1_DTYPE_MASK)) !=3D > > + > > rte_cpu_to_le_64(I40E_TX_DESC_DTYPE_DESC_DONE)) > > + return 0; > > + > > + n =3D txq->tx_rs_thresh; > > + nb_recycle_mbufs =3D n; > > + > > + /* Mbufs recycle mode can only support no ring buffer wrapping > > around. > > + * Two case for this: > > + * > > + * case 1: The refill head of Rx buffer ring needs to be aligned with > > + * mbuf ring size. In this case, the number of Tx freeing buffers > > + * should be equal to refill_requirement. > > + * > > + * case 2: The refill head of Rx ring buffer does not need to be alig= ned > > + * with mbuf ring size. In this case, the update of refill head can n= ot > > + * exceed the Rx mbuf ring size. > > + */ > > + if (refill_requirement !=3D n || > > + (!refill_requirement && (refill_head + n > mbuf_ring_size))) > > + return 0; > > + > > + /* First buffer to free from S/W ring is at index > > + * tx_next_dd - (tx_rs_thresh-1). > > + */ > > + txep =3D &txq->sw_ring[txq->tx_next_dd - (n - 1)]; > > + rxep =3D recycle_rxq_info->mbuf_ring; > > + rxep +=3D refill_head; > > + > > + if (txq->offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) { > > + /* Avoid txq contains buffers from unexpected mempool. */ > > + if (unlikely(recycle_rxq_info->mp > > + !=3D txep[0].mbuf->pool)) > > + return 0; > > + > > + /* Directly put mbufs from Tx to Rx. */ > > + for (i =3D 0; i < n; i++) > > + rxep[i] =3D txep[i].mbuf; > > + } else { > > + for (i =3D 0; i < n; i++) { > > + rxep[i] =3D rte_pktmbuf_prefree_seg(txep[i].mbuf); > > + > > + /* If Tx buffers are not the last reference or from > > + * unexpected mempool, previous copied buffers are > > + * considered as invalid. > > + */ > > + if (unlikely((rxep[i] =3D=3D NULL && refill_requirement) || > [Konstantin] > Could you pls remind me why it is ok to have rxep[i]=3D=3DNULL when > refill_requirement is not set? >=20 > If reill_requirement is not zero, it means each tx freed buffer must be v= alid and can be put into Rx > sw_ring. Then the refill head of Rx buffer ring can be aligned with mbuf= ring size. Briefly speaking > the number of Tx valid freed buffer must be equal to Rx refill_requiremen= t. For example, i40e driver. >=20 > If reill_requirement is zero, it means that the refill head of Rx buffer = ring does not need to be aligned > with mbuf ring size, thus if Tx have n valid freed buffers, we just need = to put these n buffers into Rx sw-ring, > and not to be equal to the Rx setting rearm number. For example, mlx5 dri= ver. >=20 > In conclusion, above difference is due to pmd drivers have different stra= tegies to update their Rx rearm(refill) head. > For i40e driver, if rearm_head exceed 1024, it will be set as 0 due to t= he number of each rearm is a fixed value by default. > For mlx5 driver. Its rearm_head can exceed 1024, and use mask to achieve = real index. Thus its rearm number can be a different value. Ok, but if rte_pktmbuf_prefree_seg(txep[i].mbuf), it means that this mbuf i= s not free yet and can't be reused. Shouldn't we then set nb_recycle_mbufs =3D 0 in that case too? Or probably would be enough to skip that mbuf? Might be something like that: for (i =3D 0, j =3D 0; i < n; i++) { rxep[j] =3D rte_pktmbuf_prefree_seg(txep[i].mbuf); if (rxep[j] =3D=3D NULL || recycle_rxq_info->mp !=3D rxep[j].mbuf->pool)) = { if (refill_requirement) { nb_recycle_mbufs =3D 0; break;=20 } } else j++; } /* now j contains actual number of recycled mbufs */ ? >=20 > > + recycle_rxq_info->mp !=3D txep[i].mbuf- > > >pool)) > > + nb_recycle_mbufs =3D 0; > > + } > > + /* If Tx buffers are not the last reference or > > + * from unexpected mempool, all recycled buffers > > + * are put into mempool. > > + */ > > + if (nb_recycle_mbufs =3D=3D 0) > > + for (i =3D 0; i < n; i++) { > > + if (rxep[i] !=3D NULL) > > + rte_mempool_put(rxep[i]->pool, > > rxep[i]); > > + } > > + } > > + > > + /* Update counters for Tx. */ > > + txq->nb_tx_free =3D (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh); > > + txq->tx_next_dd =3D (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh); > > + if (txq->tx_next_dd >=3D txq->nb_tx_desc) > > + txq->tx_next_dd =3D (uint16_t)(txq->tx_rs_thresh - 1); > > + > > + return nb_recycle_mbufs; > > +} > > diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.= c index > > b4f65b58fa..a9c9eb331c 100644 > > --- a/drivers/net/i40e/i40e_rxtx.c > > +++ b/drivers/net/i40e/i40e_rxtx.c > > @@ -3199,6 +3199,30 @@ i40e_txq_info_get(struct rte_eth_dev *dev, > > uint16_t queue_id, > > qinfo->conf.offloads =3D txq->offloads; > > } > > > > +void > > +i40e_recycle_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, > > + struct rte_eth_recycle_rxq_info *recycle_rxq_info) { > > + struct i40e_rx_queue *rxq; > > + struct i40e_adapter *ad =3D > > + I40E_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); > > + > > + rxq =3D dev->data->rx_queues[queue_id]; > > + > > + recycle_rxq_info->mbuf_ring =3D (void *)rxq->sw_ring; > > + recycle_rxq_info->mp =3D rxq->mp; > > + recycle_rxq_info->mbuf_ring_size =3D rxq->nb_rx_desc; > > + recycle_rxq_info->receive_tail =3D &rxq->rx_tail; > > + > > + if (ad->rx_vec_allowed) { > > + recycle_rxq_info->refill_requirement =3D > > RTE_I40E_RXQ_REARM_THRESH; > > + recycle_rxq_info->refill_head =3D &rxq->rxrearm_start; > > + } else { > > + recycle_rxq_info->refill_requirement =3D rxq->rx_free_thresh; > > + recycle_rxq_info->refill_head =3D &rxq->rx_free_trigger; > > + } > > +} > > + > > #ifdef RTE_ARCH_X86 > > static inline bool > > get_avx_supported(bool request_avx512) > > @@ -3293,6 +3317,8 @@ i40e_set_rx_function(struct rte_eth_dev *dev) > > dev->rx_pkt_burst =3D ad->rx_use_avx2 ? > > i40e_recv_scattered_pkts_vec_avx2 : > > i40e_recv_scattered_pkts_vec; > > + dev->recycle_rx_descriptors_refill =3D > > + i40e_recycle_rx_descriptors_refill_vec; > > } > > } else { > > if (ad->rx_use_avx512) { > > @@ -3311,9 +3337,12 @@ i40e_set_rx_function(struct rte_eth_dev *dev) > > dev->rx_pkt_burst =3D ad->rx_use_avx2 ? > > i40e_recv_pkts_vec_avx2 : > > i40e_recv_pkts_vec; > > + dev->recycle_rx_descriptors_refill =3D > > + i40e_recycle_rx_descriptors_refill_vec; > > } > > } > > #else /* RTE_ARCH_X86 */ > > + dev->recycle_rx_descriptors_refill =3D > > +i40e_recycle_rx_descriptors_refill_vec; > > if (dev->data->scattered_rx) { > > PMD_INIT_LOG(DEBUG, > > "Using Vector Scattered Rx (port %d).", @@ > > -3481,15 +3510,18 @@ i40e_set_tx_function(struct rte_eth_dev *dev) > > dev->tx_pkt_burst =3D ad->tx_use_avx2 ? > > i40e_xmit_pkts_vec_avx2 : > > i40e_xmit_pkts_vec; > > + dev->recycle_tx_mbufs_reuse =3D > > i40e_recycle_tx_mbufs_reuse_vec; > > } > > #else /* RTE_ARCH_X86 */ > > PMD_INIT_LOG(DEBUG, "Using Vector Tx (port %d).", > > dev->data->port_id); > > dev->tx_pkt_burst =3D i40e_xmit_pkts_vec; > > + dev->recycle_tx_mbufs_reuse =3D > > i40e_recycle_tx_mbufs_reuse_vec; > > #endif /* RTE_ARCH_X86 */ > > } else { > > PMD_INIT_LOG(DEBUG, "Simple tx finally be used."); > > dev->tx_pkt_burst =3D i40e_xmit_pkts_simple; > > + dev->recycle_tx_mbufs_reuse =3D > > i40e_recycle_tx_mbufs_reuse_vec; > > } > > dev->tx_pkt_prepare =3D i40e_simple_prep_pkts; > > } else { > > diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.= h index > > a8686224e5..b191f23e1f 100644 > > --- a/drivers/net/i40e/i40e_rxtx.h > > +++ b/drivers/net/i40e/i40e_rxtx.h > > @@ -236,6 +236,10 @@ uint32_t i40e_dev_rx_queue_count(void > > *rx_queue); int i40e_dev_rx_descriptor_status(void *rx_queue, uint16_t > > offset); int i40e_dev_tx_descriptor_status(void *tx_queue, uint16_t of= fset); > > > > +uint16_t i40e_recycle_tx_mbufs_reuse_vec(void *tx_queue, > > + struct rte_eth_recycle_rxq_info *recycle_rxq_info); void > > +i40e_recycle_rx_descriptors_refill_vec(void *rx_queue, uint16_t > > +nb_mbufs); > > + > > uint16_t i40e_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, > > uint16_t nb_pkts); > > uint16_t i40e_recv_scattered_pkts_vec(void *rx_queue, diff --git > > a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build index > > 8e53b87a65..3b1a233c84 100644 > > --- a/drivers/net/i40e/meson.build > > +++ b/drivers/net/i40e/meson.build > > @@ -34,6 +34,7 @@ sources =3D files( > > 'i40e_tm.c', > > 'i40e_hash.c', > > 'i40e_vf_representor.c', > > + 'i40e_recycle_mbufs_vec_common.c', > > 'rte_pmd_i40e.c', > > ) > > > > -- > > 2.25.1