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 DC446A054A for ; Tue, 25 Oct 2022 17:10:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D978942C4C; Tue, 25 Oct 2022 17:10:18 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0389542C34 for ; Tue, 25 Oct 2022 17:10:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gsycqJtQCvuCcYH/GIYerZqvr1J54CbHfmkdh97mAak=; b=UvD0arf5Be7u4kRVv4OQ1PfjLjp81toeXS/8vswF/iX+KLosFguHPB2ylz8NyL+FsUNHi8 sYF92E+esH730agb+6VDBV4Bpsbw5FqzLii2g33U+p6BZdcYbWmI2vN6z0YHtH6508zO3L g7jcrYJkoylae7vHdQiN+L2CPJi+XEo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-EBb5ap_APbaNg-r9suQEhw-1; Tue, 25 Oct 2022 11:10:14 -0400 X-MC-Unique: EBb5ap_APbaNg-r9suQEhw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9130485A59D; Tue, 25 Oct 2022 15:10:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FADB4A9255; Tue, 25 Oct 2022 15:10:12 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix next-to-use overflow in simple Tx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:33 +0100 Message-Id: <20221025150734.142189-98-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/daf6edc3174b090cae59e226206511428629aaa0 Thanks. Kevin --- >From daf6edc3174b090cae59e226206511428629aaa0 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 5 Sep 2022 16:59:34 +0800 Subject: [PATCH] net/hns3: fix next-to-use overflow in simple Tx [ upstream commit 76a9c980cf61d8ee21402d1d1d650d2f9d49cfb0 ] If txq's next-to-use plus nb_pkts equal txq's nb_tx_desc when using simple xmit algorithm, the txq's next-to-use will equal nb_tx_desc fter the xmit, this does not cause Tx exceptions, but may affect other ops that depend on this field, such as tx_descriptor_status. Fixes: 7ef933908f04 ("net/hns3: add simple Tx path") Signed-off-by: Chengwen Feng Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rxtx.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 403f811a51..49b116c1b8 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -4138,5 +4138,5 @@ hns3_xmit_pkts_simple(void *tx_queue, txq->tx_bd_ready -= nb_pkts; - if (txq->next_to_use + nb_pkts > txq->nb_tx_desc) { + if (txq->next_to_use + nb_pkts >= txq->nb_tx_desc) { nb_tx = txq->nb_tx_desc - txq->next_to_use; hns3_tx_fill_hw_ring(txq, tx_pkts, nb_tx); @@ -4144,6 +4144,8 @@ hns3_xmit_pkts_simple(void *tx_queue, } - hns3_tx_fill_hw_ring(txq, tx_pkts + nb_tx, nb_pkts - nb_tx); - txq->next_to_use += nb_pkts - nb_tx; + if (nb_pkts > nb_tx) { + hns3_tx_fill_hw_ring(txq, tx_pkts + nb_tx, nb_pkts - nb_tx); + txq->next_to_use += nb_pkts - nb_tx; + } hns3_write_txq_tail_reg(txq, nb_pkts); -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.758120693 +0100 +++ 0098-net-hns3-fix-next-to-use-overflow-in-simple-Tx.patch 2022-10-25 14:18:58.540798553 +0100 @@ -1 +1 @@ -From 76a9c980cf61d8ee21402d1d1d650d2f9d49cfb0 Mon Sep 17 00:00:00 2001 +From daf6edc3174b090cae59e226206511428629aaa0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 76a9c980cf61d8ee21402d1d1d650d2f9d49cfb0 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a6481bb68b..ecee5363b2 100644 +index 403f811a51..49b116c1b8 100644 @@ -24 +25 @@ -@@ -4127,5 +4127,5 @@ hns3_xmit_pkts_simple(void *tx_queue, +@@ -4138,5 +4138,5 @@ hns3_xmit_pkts_simple(void *tx_queue, @@ -31 +32 @@ -@@ -4133,6 +4133,8 @@ hns3_xmit_pkts_simple(void *tx_queue, +@@ -4144,6 +4144,8 @@ hns3_xmit_pkts_simple(void *tx_queue,