From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id A71861B937 for ; Fri, 11 Jan 2019 11:31:48 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 11 Jan 2019 12:31:47 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x0BAVjcP018586; Fri, 11 Jan 2019 12:31:46 +0200 From: Yongseok Koh To: Jerin Jacob Cc: Vikas Aggarwal , Santosh Shukla , dpdk stable Date: Fri, 11 Jan 2019 02:31:24 -0800 Message-Id: <20190111103142.21088-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 Subject: [dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jan 2019 10:31:49 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/13/19. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From 71b0c00e7df02ce45093baaf7ecfb54f8ba2c12c Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Fri, 17 Aug 2018 20:00:22 +0530 Subject: [PATCH] net/octeontx: fix packet corruption on Tx [ backported from upstream commit 9f92552eb997819d8af80b0634849070075cce2a ] LMTST does not guarantee packet content get synced with L2C when HW access the packet for transmitting. Adding coherent IO write barrier will make sure HW sees the correct packet if its modified. Fixes: 9e747589bd4c ("net/octeontx: add packet transmit burst function") Reported-by: Vikas Aggarwal Signed-off-by: Jerin Jacob Acked-by: Santosh Shukla --- drivers/net/octeontx/octeontx_rxtx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c index c97d5b351..e6f917f72 100644 --- a/drivers/net/octeontx/octeontx_rxtx.c +++ b/drivers/net/octeontx/octeontx_rxtx.c @@ -91,6 +91,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) count = 0; + rte_io_wmb(); while (count < nb_pkts) { res = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va, dq->fc_status_va, -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-11 02:29:10.908957324 -0800 +++ 0001-net-octeontx-fix-packet-corruption-on-Tx.patch 2019-01-11 02:29:10.643973000 -0800 @@ -1,8 +1,10 @@ -From 9f92552eb997819d8af80b0634849070075cce2a Mon Sep 17 00:00:00 2001 +From 71b0c00e7df02ce45093baaf7ecfb54f8ba2c12c Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Fri, 17 Aug 2018 20:00:22 +0530 Subject: [PATCH] net/octeontx: fix packet corruption on Tx +[ backported from upstream commit 9f92552eb997819d8af80b0634849070075cce2a ] + LMTST does not guarantee packet content get synced with L2C when HW access the packet for transmitting. @@ -10,7 +12,6 @@ packet if its modified. Fixes: 9e747589bd4c ("net/octeontx: add packet transmit burst function") -Cc: stable@dpdk.org Reported-by: Vikas Aggarwal Signed-off-by: Jerin Jacob @@ -20,14 +21,14 @@ 1 file changed, 1 insertion(+) diff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c -index a9149b4e1..f861313e6 100644 +index c97d5b351..e6f917f72 100644 --- a/drivers/net/octeontx/octeontx_rxtx.c +++ b/drivers/net/octeontx/octeontx_rxtx.c -@@ -63,6 +63,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -91,6 +91,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) count = 0; -+ rte_cio_wmb(); ++ rte_io_wmb(); while (count < nb_pkts) { res = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va, dq->fc_status_va,