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 71E97A0542 for ; Tue, 30 Aug 2022 03:06:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F14341181; Tue, 30 Aug 2022 03:06:01 +0200 (CEST) Received: from mail15.f5.com (mail15.f5.com [104.219.106.14]) by mails.dpdk.org (Postfix) with ESMTP id F327040F17; Tue, 30 Aug 2022 03:05:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=f5.com; i=@f5.com; q=dns/txt; s=f5; t=1661821560; x=1693357560; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VVxD8snFgvq8SZzAM722balZcq4PNvrn8hzayD2/fok=; b=CH1gMoDPwB97FYMDTd4wNUYgHH82m79YANkW7AhySTNf77IAvSNMJDZw I109QZzQp/cENDm5RA3wdA7luGv77Rcehg+T1apfizGjA0uUy8N00lpoj gKZem5B0TjdFjkrSb/jcJlzRIzljwvuQafbGCD6E8Okjrgaijem+sDvEZ HtoI3uk++pdJ9Q7cUJSZyJlQ9jEn3esSeS7rSlim4RVeqJRiObENxJFR6 hwIG3UBXCyWyus0TxJS8Al8mLmLzCEShlIv462LEtGZOZIbtX5vt5pxQf aGSAuT794kIMgN+on6fhrEUJPy/hZLNa7asv4ijDCsLXCgIEuUFP6ZPpM g==; IronPort-SDR: CNn9v2Fw9z1frzYeCLa5WHQo17UMYyjxO5g9Saq1zA0rQQLl4PemGx2676mLEe1vF0PSQLTN0e KBsHOTA8YHrkWhUFRwDxWyYheaZ2AxqtQD0eLjL/lM60d/o1riu0pmkLBsUX8GLmmWiW5pgFqu fgi9YKu/VE1md+IuDpxyyCj8Qt9q9sAQISgmFhxFrug618D9utzeZhPOimu+rcXCcSl1IfmPGU RAwg4dyWn2Nl8C159cNSlS0TIYhWjKeyson5JdOr8lC4ZetHJ6Qumm8XZcuFlitC621BjjJI7Q ZXE= IronPort-Data: A9a23:12iZ26C+Qr+U3BVW/7rhw5YqxClBgxIJ4kV8jS/XYbTApD0g0zQGy WAYWGyDa/3cNzGneItyPIvk9R8AvJGHytdkHQtv/xmBbZ7oRentXo3Fcxiqb0t+CuWZESqLy e1AN4GYRCwTZiaE+krxWlTZQPUVOZigHtIQMsadUsxKbVIiGXxJZS5LwbZj2NY42oDhWmthh PupyyHhEA78s9JLGjJMg06zgEsHUMXa4Fv0jHRnDRx4lAO2e00uMX4qDfrZw03QGdAIQ7HgF 44v+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOK/WfzxHe3JrXNNJEAatWZ9Vlnfgok JMU6cH2EF92ePCR8Agee0Aw/yVWNOtD+bvAOniyt8+U50ObNXDrxp2CCWlvbNFHq78oXT8mG fswbWplggq4r/u3hqD9WOllgMsLLc/3MYdZsXZlpRnbDPApQ5HFTOPV+PdZ2is9goZFGvO2T 8AUaD5ibVLQYhtAElYRFJ862uyvgxHXfzBGgF6Nqalx5HLcpCR4lr3sNN3OetGMRsJ9kBver WXDl0ziHhgQMNG3xSKJ8TSrnOCnoM9RcOr+D5Xhrrgz3ADVnzRMTkBLPWZXaMKR0iaWM++z4 WRNksbyhcDeLHCWc+Q= IronPort-HdrOrdr: A9a23:4y4ay69ITxh6jAxQvZRuk+EKdb1zdoMgy1knxilNoENuH/Bwxv rFoB1E73TJYVcqKRcdcLW7VJVoLkmskaKdjbNhX4tKPzOW21dATrsSlLcKqgeIc0KRltK1vZ 0QC5SWY+eAamSS4/yKhTVQJ+xQu+VvvZrY9tv2/jNId0VHeqtg5wB2BkKyFVB3fhBPAd4cGI CH7sRKijK8cTBPB/7Lc0UtbqzmnZnmhZjmaRkJC1oO7xSPtyqh7PrfHwKD1hkTfjtTyfMJ8H TDkSb++qK/2svLuCP05iv21dB7idHhwtxMCIiljdUUECzljkKSaIFoS9S5zU4ISLXE0jcXue iJhy1lE9V46nvXcG3wiwDqwRPc3DEn7GKn4UOEgFP4yPaJDg4SOo5kv8Z0YxHZ400vsJVXy6 RQxV+UsJJREFfpgDn93d7VTBtn/3DE6kbKqdRjwkC3bLFuIYO57LZvin+9Ka1wax4SPbpXWN WHD6nnlYlrmB2hHjzkV1JUsaCRt0QIb2q7q3c5y7aoOhht7QFEJhgjtbwidzE7heYAd6U= X-IronPort-AV: E=McAfee;i="6500,9779,10454"; a="194791746" X-IronPort-AV: E=Sophos;i="5.93,274,1654585200"; d="scan'208";a="194791746" Received: from unknown (HELO localhost.localdomain) ([10.145.107.55]) by mail.f5net.com with ESMTP; 29 Aug 2022 18:05:58 -0700 From: Aleksandr Miloshenko To: qi.z.zhang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com Cc: dev@dpdk.org, Aleksandr Miloshenko , stable@dpdk.org Subject: [PATCH v2] net/iavf: do Tx done cleanup starting from Tx tail Date: Mon, 29 Aug 2022 18:05:25 -0700 Message-Id: <20220830010525.24632-1-a.miloshenko@f5.com> X-Mailer: git-send-email 2.37.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org iavf_xmit_pkts() sets tx_tail to the next of last transmitted Tx descriptor. So the cleanup of Tx done descriptors must be started from tx_tail, not from the next of tx_tail. Otherwise rte_eth_tx_done_cleanup() doesn't free the first Tx done mbuf when tx queue is full. Fixes: 86e44244f95c ("net/iavf: cleanup Tx buffers") Cc: stable@dpdk.org Signed-off-by: Aleksandr Miloshenko --- v2: * Fixed the commit style. drivers/net/iavf/iavf_rxtx.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 109ba756f8..7cd5db6e49 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -3184,14 +3184,14 @@ iavf_tx_done_cleanup_full(struct iavf_tx_queue *txq, uint32_t free_cnt) { struct iavf_tx_entry *swr_ring = txq->sw_ring; - uint16_t i, tx_last, tx_id; + uint16_t tx_last, tx_id; uint16_t nb_tx_free_last; uint16_t nb_tx_to_clean; - uint32_t pkt_cnt; + uint32_t pkt_cnt = 0; - /* Start free mbuf from the next of tx_tail */ - tx_last = txq->tx_tail; - tx_id = swr_ring[tx_last].next_id; + /* Start free mbuf from tx_tail */ + tx_id = txq->tx_tail; + tx_last = tx_id; if (txq->nb_free == 0 && iavf_xmit_cleanup(txq)) return 0; @@ -3204,10 +3204,8 @@ iavf_tx_done_cleanup_full(struct iavf_tx_queue *txq, /* 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++) { + while (pkt_cnt < free_cnt) { + do { if (swr_ring[tx_id].mbuf != NULL) { rte_pktmbuf_free_seg(swr_ring[tx_id].mbuf); swr_ring[tx_id].mbuf = NULL; @@ -3220,7 +3218,7 @@ iavf_tx_done_cleanup_full(struct iavf_tx_queue *txq, } tx_id = swr_ring[tx_id].next_id; - } + } while (--nb_tx_to_clean && pkt_cnt < free_cnt && tx_id != tx_last); if (txq->rs_thresh > txq->nb_tx_desc - txq->nb_free || tx_id == tx_last) -- 2.37.0