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 51A7DA0C45 for ; Thu, 10 Jun 2021 14:07:34 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C3334003C; Thu, 10 Jun 2021 14:07:34 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 605BB4003C for ; Thu, 10 Jun 2021 14:07:33 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTB-00006q-4q; Thu, 10 Jun 2021 12:07:33 +0000 From: Christian Ehrhardt To: Beilei Xing Cc: Qi Zhang , dpdk stable Date: Thu, 10 Jun 2021 14:06:09 +0200 Message-Id: <20210610120641.885862-21-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/iavf: fix Tx context descriptor' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/3cda8f66ab6771d80766dc25f0464bca03962d79 Thanks. Christian Ehrhardt --- >From 3cda8f66ab6771d80766dc25f0464bca03962d79 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Wed, 12 May 2021 16:10:14 +0800 Subject: [PATCH] net/iavf: fix Tx context descriptor [ upstream commit 2444d35dc14621c185a8c5042adfb636e5056d2b ] The QW0 of Tx context descriptor should be reset to 0, otherwise the previous hardware writeback value may pollute the next context descriptor write. Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Signed-off-by: Qi Zhang Signed-off-by: Beilei Xing Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index ae43eb49a6..93f3928af6 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -1583,6 +1583,11 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) (volatile struct iavf_tx_context_desc *) &txr[tx_id]; + /* clear QW0 or the previous writeback value + * may impact next write + */ + *(volatile uint64_t *)ctx_txd = 0; + txn = &sw_ring[txe->next_id]; RTE_MBUF_PREFETCH_TO_FREE(txn->mbuf); if (txe->mbuf) { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.060073222 +0200 +++ 0021-net-iavf-fix-Tx-context-descriptor.patch 2021-06-10 14:04:58.042024466 +0200 @@ -1 +1 @@ -From 2444d35dc14621c185a8c5042adfb636e5056d2b Mon Sep 17 00:00:00 2001 +From 3cda8f66ab6771d80766dc25f0464bca03962d79 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2444d35dc14621c185a8c5042adfb636e5056d2b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 74b5ab5bde..6a713df828 100644 +index ae43eb49a6..93f3928af6 100644 @@ -24 +25 @@ -@@ -2245,6 +2245,11 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -1583,6 +1583,11 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)