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 06A86A054A for ; Tue, 25 Oct 2022 17:10:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03F2842C54; Tue, 25 Oct 2022 17:10:19 +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 0997642C3C 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=yX8CeKEqf05uYt7TtkER3BgmFkmX9KxEaidan66iXj0=; b=YqAaYVH6CuMhgHi+r/7bFuyRS7hk3OcuXrHqp7JU56cTbxOnXrzOkL6VSr97ajis40Klh/ LX0KgycMkGkRX/5yz2uxC3qGYyDOfM4MQqN7qdOFgk4SgY9A5N+uN6lq+hhyTvFMaEZkw9 bhsHls3/X5qR+IH9WwuCaQabELUo5aw= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-Cws6wPUWMsWJyOtLOrue5w-1; Tue, 25 Oct 2022 11:10:12 -0400 X-MC-Unique: Cws6wPUWMsWJyOtLOrue5w-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 44B6C3826A41; Tue, 25 Oct 2022 15:10:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6641D4A9254; Tue, 25 Oct 2022 15:10:11 +0000 (UTC) From: Kevin Traynor To: Chengwen Feng Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix next-to-use overflow in SVE Tx' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:32 +0100 Message-Id: <20221025150734.142189-97-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/540c8608d64bc2e8b1d6738606da87a65b3b50ea Thanks. Kevin --- >From 540c8608d64bc2e8b1d6738606da87a65b3b50ea Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 5 Sep 2022 16:59:33 +0800 Subject: [PATCH] net/hns3: fix next-to-use overflow in SVE Tx [ upstream commit 3efbc3c4027c87c14727a6a5ce13b099cd8d5866 ] If txq's next-to-use plus nb_pkts equal txq's nb_tx_desc when using SVE xmit algorithm, the txq's next-to-use will equal nb_tx_desc after the xmit, this does not cause Tx exceptions, but may affect other ops that depend on this field, such as tx_descriptor_status. Fixes: f0c243a6cb6f ("net/hns3: support SVE Tx") Signed-off-by: Chengwen Feng Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rxtx_vec_sve.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c index b0dfb052bb..f09a81dbd5 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_sve.c +++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c @@ -465,5 +465,5 @@ hns3_xmit_fixed_burst_vec_sve(void *__restrict tx_queue, } - 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_sve(txq, tx_pkts, nb_tx); @@ -471,6 +471,8 @@ hns3_xmit_fixed_burst_vec_sve(void *__restrict tx_queue, } - hns3_tx_fill_hw_ring_sve(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_sve(txq, tx_pkts + nb_tx, nb_pkts - nb_tx); + txq->next_to_use += nb_pkts - nb_tx; + } txq->tx_bd_ready -= 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.733916638 +0100 +++ 0097-net-hns3-fix-next-to-use-overflow-in-SVE-Tx.patch 2022-10-25 14:18:58.537798542 +0100 @@ -1 +1 @@ -From 3efbc3c4027c87c14727a6a5ce13b099cd8d5866 Mon Sep 17 00:00:00 2001 +From 540c8608d64bc2e8b1d6738606da87a65b3b50ea Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3efbc3c4027c87c14727a6a5ce13b099cd8d5866 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org