From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1FF2EA04B3; Mon, 30 Dec 2019 04:29:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E77D01C0B9; Mon, 30 Dec 2019 04:29:42 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 153691BF7A for ; Mon, 30 Dec 2019 04:29:41 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Dec 2019 19:29:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,373,1571727600"; d="scan'208";a="208898714" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga007.jf.intel.com with ESMTP; 29 Dec 2019 19:29:40 -0800 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 29 Dec 2019 19:29:40 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.30]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.132]) with mapi id 14.03.0439.000; Mon, 30 Dec 2019 11:29:38 +0800 From: "Yang, Qiming" To: "Di, ChenxuX" , "dev@dpdk.org" CC: "Xing, Beilei" Thread-Topic: [PATCH v5 3/4] net/ixgbe: cleanup Tx buffers Thread-Index: AQHVvGpu56F9gtiJWUeym6exGvM0TqfSCdew Date: Mon, 30 Dec 2019 03:29:38 +0000 Message-ID: References: <20191227034520.78613-1-chenxux.di@intel.com> <20191227034520.78613-4-chenxux.di@intel.com> In-Reply-To: <20191227034520.78613-4-chenxux.di@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v5 3/4] net/ixgbe: cleanup Tx buffers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" -----Original Message----- From: Di, ChenxuX=20 Sent: Friday, December 27, 2019 11:45 To: dev@dpdk.org Cc: Yang, Qiming ; Xing, Beilei ; Di, ChenxuX Subject: [PATCH v5 3/4] net/ixgbe: cleanup Tx buffers Add support to the ixgbe driver for the API rte_eth_tx_done_cleanup to forc= e free consumed buffers on Tx ring. Signed-off-by: Chenxu Di --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 + drivers/net/ixgbe/ixgbe_rxtx.c | 121 +++++++++++++++++++++++++++++++ drivers/net/ixgbe/ixgbe_rxtx.h | 2 + 3 files changed, 125 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_eth= dev.c index 2c6fd0f13..0091405db 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -601,6 +601,7 @@ static const struct eth_dev_ops ixgbe_eth_dev_ops =3D { .udp_tunnel_port_add =3D ixgbe_dev_udp_tunnel_port_add, .udp_tunnel_port_del =3D ixgbe_dev_udp_tunnel_port_del, .tm_ops_get =3D ixgbe_tm_ops_get, + .tx_done_cleanup =3D ixgbe_tx_done_cleanup, }; =20 /* @@ -649,6 +650,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops =3D= { .reta_query =3D ixgbe_dev_rss_reta_query, .rss_hash_update =3D ixgbe_dev_rss_hash_update, .rss_hash_conf_get =3D ixgbe_dev_rss_hash_conf_get, + .tx_done_cleanup =3D ixgbe_tx_done_cleanup, }; =20 /* store statistics names and its offset in stats structure */ diff --git = a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index fa5= 72d184..8d8e0655c 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -2306,6 +2306,127 @@ ixgbe_tx_queue_release_mbufs(struct ixgbe_tx_queue = *txq) } } =20 +int ixgbe_tx_done_cleanup(void *q, uint32_t free_cnt) { + struct ixgbe_tx_queue *txq =3D (struct ixgbe_tx_queue *)q; + struct ixgbe_tx_entry *sw_ring; + volatile union ixgbe_adv_tx_desc *txr; + uint16_t tx_first; /* First segment analyzed. */ + uint16_t tx_id; /* Current segment being processed. */ + uint16_t tx_last; /* Last segment in the current packet. */ + uint16_t tx_next; /* First segment of the next packet. */ + int count; + + if (txq =3D=3D NULL) + return -ENODEV; + + count =3D 0; + sw_ring =3D txq->sw_ring; + txr =3D txq->tx_ring; + + /* + * tx_tail is the last sent packet on the sw_ring. Goto the end + * of that packet (the last segment in the packet chain) and + * then the next segment will be the start of the oldest segment + * in the sw_ring. This is the first packet that will be + * attempted to be freed. + */ + + /* Get last segment in most recently added packet. */ + tx_last =3D sw_ring[txq->tx_tail].last_id; + + /* Get the next segment, which is the oldest segment in ring. */ + tx_first =3D sw_ring[tx_last].next_id; + + /* Set the current index to the first. */ + tx_id =3D tx_first; + + /* + * Loop through each packet. For each packet, verify that an + * mbuf exists and that the last segment is free. If so, free + * it and move on. + */ + while (1) { + tx_last =3D sw_ring[tx_id].last_id; + + if (sw_ring[tx_last].mbuf) { + if (txr[tx_last].wb.status & + IXGBE_TXD_STAT_DD) { + /* Get the start of the next packet. */ + tx_next =3D sw_ring[tx_last].next_id; + + /* + * Loop through all segments in a + * packet. + */ + do { + rte_pktmbuf_free_seg(sw_ring[tx_id].mbuf); + sw_ring[tx_id].mbuf =3D NULL; + sw_ring[tx_id].last_id =3D tx_id; + + /* Move to next segment. */ + tx_id =3D sw_ring[tx_id].next_id; + + } while (tx_id !=3D tx_next); + + /* + * Increment the number of packets + * freed. + */ + count++; + + if (unlikely(count =3D=3D (int)free_cnt)) + break; + } else { + /* + * mbuf still in use, nothing left to + * free. + */ + break; same + } + } else { + /* + * There are multiple reasons to be here: + * 1) All the packets on the ring have been + * freed - tx_id is equal to tx_first + * and some packets have been freed. + * - Done, exit + * 2) Interfaces has not sent a rings worth of + * packets yet, so the segment after tail is + * still empty. Or a previous call to this + * function freed some of the segments but + * not all so there is a hole in the list. + * Hopefully this is a rare case. + * - Walk the list and find the next mbuf. If + * there isn't one, then done. + */ + if (likely(tx_id =3D=3D tx_first && count !=3D 0)) + break; + + /* + * Walk the list and find the next mbuf, if any. + */ + do { + /* Move to next segment. */ + tx_id =3D sw_ring[tx_id].next_id; + + if (sw_ring[tx_id].mbuf) + break; + + } while (tx_id !=3D tx_first); + + /* + * Determine why previous loop bailed. If there + * is not an mbuf, done. + */ + if (sw_ring[tx_id].mbuf =3D=3D NULL) + break; + } + } + + return count; +} + static void __attribute__((cold)) ixgbe_tx_free_swring(struct ixgbe_tx_queue *txq) { diff --git a/drivers/n= et/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h index 505d344b9..2c3= 770af6 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.h +++ b/drivers/net/ixgbe/ixgbe_rxtx.h @@ -285,6 +285,8 @@ int ixgbe_rx_vec_dev_conf_condition_check(struct rte_et= h_dev *dev); int ixgbe_rxq_vec_setup(struct ixgbe_rx_queue *rxq); void ix= gbe_rx_queue_release_mbufs_vec(struct ixgbe_rx_queue *rxq); =20 +int ixgbe_tx_done_cleanup(void *txq, uint32_t free_cnt); + extern const uint32_t ptype_table[IXGBE_PACKET_TYPE_MAX]; extern const uint32_t ptype_table_tn[IXGBE_PACKET_TYPE_TN_MAX]; =20 -- 2.17.1