From patchwork Wed Sep 8 08:37:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawen Wu X-Patchwork-Id: 98308 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2FB11A0C56; Wed, 8 Sep 2021 10:39:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32BB34121B; Wed, 8 Sep 2021 10:37:19 +0200 (CEST) Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by mails.dpdk.org (Postfix) with ESMTP id D792641214 for ; Wed, 8 Sep 2021 10:37:17 +0200 (CEST) X-QQ-mid: bizesmtp47t1631090232tggse40m Received: from wxdbg.localdomain.com (unknown [183.129.236.74]) by esmtp6.qq.com (ESMTP) with id ; Wed, 08 Sep 2021 16:37:12 +0800 (CST) X-QQ-SSF: 01400000002000E0G000B00A0000000 X-QQ-FEAT: 83ShfzFP0oCn4V+4E9Fsg9z/ILPqFMETWjgyqONWAPkymXZAw7SwHkz/tixOW OAB0nxIjybGT04LoCwn/627rF4r1XOogT92RBpx8B6+S8W3g1MV3bR5OyefW4iAWEYHQxqv mPq9qDDX6VVxIgJJttIxRVWWQbld2nNELOc8+5L4KqiIH3bQzs2vnnD6Cz1va0gWmhLaExN dXISKrLpFnS/F7LlL8svwbTuHBKkNkzAa6wG+6DecNswsxivafj6du3kcFdfTAie7/mPa+k bWq9Va/z/ueb8dBYxrvdBpG02qf51klgmuFIEvrJhtzV9LWOv4MaOzn4+PVzM9F7tFEbBem HJrVZ/ewz03gzCwOYEIkMrLalZyCW/52IdP3FCd X-QQ-GoodBg: 2 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu Date: Wed, 8 Sep 2021 16:37:53 +0800 Message-Id: <20210908083758.312055-28-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210908083758.312055-1-jiawenwu@trustnetic.com> References: <20210908083758.312055-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [dpdk-dev] [PATCH 27/32] net/ngbe: add Tx done cleanup 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 Sender: "dev" Add support for API rte_eth_tx_done_cleanup(). Signed-off-by: Jiawen Wu --- drivers/net/ngbe/ngbe_ethdev.c | 1 + drivers/net/ngbe/ngbe_rxtx.c | 89 ++++++++++++++++++++++++++++++++++ drivers/net/ngbe/ngbe_rxtx.h | 1 + 3 files changed, 91 insertions(+) diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index ec652aa359..4eaf9b0724 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -3200,6 +3200,7 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = { .timesync_adjust_time = ngbe_timesync_adjust_time, .timesync_read_time = ngbe_timesync_read_time, .timesync_write_time = ngbe_timesync_write_time, + .tx_done_cleanup = ngbe_dev_tx_done_cleanup, }; RTE_PMD_REGISTER_PCI(net_ngbe, rte_ngbe_pmd); diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c index 0b31474193..bee4f04616 100644 --- a/drivers/net/ngbe/ngbe_rxtx.c +++ b/drivers/net/ngbe/ngbe_rxtx.c @@ -1717,6 +1717,95 @@ ngbe_tx_queue_release_mbufs(struct ngbe_tx_queue *txq) } } +static int +ngbe_tx_done_cleanup_full(struct ngbe_tx_queue *txq, uint32_t free_cnt) +{ + struct ngbe_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 && ngbe_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 (pkt_cnt < free_cnt) { + if (ngbe_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 +ngbe_tx_done_cleanup_simple(struct ngbe_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_free_thresh; + + for (i = 0; i < cnt; i += n) { + if (txq->nb_tx_desc - txq->nb_tx_free < txq->tx_free_thresh) + break; + + n = ngbe_tx_free_bufs(txq); + + if (n == 0) + break; + } + + return i; +} + +int +ngbe_dev_tx_done_cleanup(void *tx_queue, uint32_t free_cnt) +{ + struct ngbe_tx_queue *txq = (struct ngbe_tx_queue *)tx_queue; + if (txq->offloads == 0 && + txq->tx_free_thresh >= RTE_PMD_NGBE_TX_MAX_BURST) + return ngbe_tx_done_cleanup_simple(txq, free_cnt); + + return ngbe_tx_done_cleanup_full(txq, free_cnt); +} + static void ngbe_tx_free_swring(struct ngbe_tx_queue *txq) { diff --git a/drivers/net/ngbe/ngbe_rxtx.h b/drivers/net/ngbe/ngbe_rxtx.h index 812bc57c9e..d63b25c1aa 100644 --- a/drivers/net/ngbe/ngbe_rxtx.h +++ b/drivers/net/ngbe/ngbe_rxtx.h @@ -370,6 +370,7 @@ struct ngbe_txq_ops { void ngbe_set_tx_function(struct rte_eth_dev *dev, struct ngbe_tx_queue *txq); void ngbe_set_rx_function(struct rte_eth_dev *dev); +int ngbe_dev_tx_done_cleanup(void *tx_queue, uint32_t free_cnt); uint64_t ngbe_get_tx_port_offloads(struct rte_eth_dev *dev); uint64_t ngbe_get_rx_queue_offloads(struct rte_eth_dev *dev);