From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2321A0613 for ; Wed, 28 Aug 2019 15:43:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 996E51C219; Wed, 28 Aug 2019 15:43:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 615E81C219 for ; Wed, 28 Aug 2019 15:43:10 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D29A42A973; Wed, 28 Aug 2019 13:43:09 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4B81196AE; Wed, 28 Aug 2019 13:43:08 +0000 (UTC) From: Kevin Traynor To: Ting Xu Cc: Qi Zhang , dpdk stable Date: Wed, 28 Aug 2019 14:41:56 +0100 Message-Id: <20190828134234.20547-20-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Wed, 28 Aug 2019 13:43:09 +0000 (UTC) Subject: [dpdk-stable] patch 'net/iavf: fix driver crash when enable TSO' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.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 09/04/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. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6a1aa84302932d33774aa6492eae4002b6e674de Thanks. Kevin Traynor --- >From 6a1aa84302932d33774aa6492eae4002b6e674de Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Tue, 16 Jul 2019 16:12:25 +0000 Subject: [PATCH] net/iavf: fix driver crash when enable TSO [ upstream commit e3258d02c21dd9c62797846db568806bf2a57f88 ] The iavf driver crashes when forwarding packets with TSO enabled. The reason is that the tx context descriptor configuration is not transferred to tx-ring. This step is added in this patch. Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Signed-off-by: Ting Xu Acked-by: Qi Zhang --- drivers/net/avf/avf_rxtx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c index 52056c770..1073876e4 100644 --- a/drivers/net/avf/avf_rxtx.c +++ b/drivers/net/avf/avf_rxtx.c @@ -1584,4 +1584,7 @@ avf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) uint64_t cd_type_cmd_tso_mss = AVF_TX_DESC_DTYPE_CONTEXT; + volatile struct avf_tx_context_desc *ctx_txd = + (volatile struct avf_tx_context_desc *) + &txr[tx_id]; txn = &sw_ring[txe->next_id]; @@ -1597,4 +1600,7 @@ avf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) avf_set_tso_ctx(tx_pkt, tx_offload); + ctx_txd->type_cmd_tso_mss = + rte_cpu_to_le_64(cd_type_cmd_tso_mss); + AVF_DUMP_TX_DESC(txq, &txr[tx_id], tx_id); txe->last_id = tx_last; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.968615501 +0100 +++ 0021-net-iavf-fix-driver-crash-when-enable-TSO.patch 2019-08-28 14:32:31.629957628 +0100 @@ -1 +1 @@ -From e3258d02c21dd9c62797846db568806bf2a57f88 Mon Sep 17 00:00:00 2001 +From 6a1aa84302932d33774aa6492eae4002b6e674de Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e3258d02c21dd9c62797846db568806bf2a57f88 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/iavf/iavf_rxtx.c | 6 ++++++ + drivers/net/avf/avf_rxtx.c | 6 ++++++ @@ -20,5 +21,5 @@ -diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c -index 2d37c1705..d8eb6d296 100644 ---- a/drivers/net/iavf/iavf_rxtx.c -+++ b/drivers/net/iavf/iavf_rxtx.c -@@ -1581,4 +1581,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c +index 52056c770..1073876e4 100644 +--- a/drivers/net/avf/avf_rxtx.c ++++ b/drivers/net/avf/avf_rxtx.c +@@ -1584,4 +1584,7 @@ avf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) @@ -26,3 +27,3 @@ - IAVF_TX_DESC_DTYPE_CONTEXT; -+ volatile struct iavf_tx_context_desc *ctx_txd = -+ (volatile struct iavf_tx_context_desc *) + AVF_TX_DESC_DTYPE_CONTEXT; ++ volatile struct avf_tx_context_desc *ctx_txd = ++ (volatile struct avf_tx_context_desc *) @@ -32,2 +33,2 @@ -@@ -1594,4 +1597,7 @@ iavf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) - iavf_set_tso_ctx(tx_pkt, tx_offload); +@@ -1597,4 +1600,7 @@ avf_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) + avf_set_tso_ctx(tx_pkt, tx_offload); @@ -38 +39 @@ - IAVF_DUMP_TX_DESC(txq, &txr[tx_id], tx_id); + AVF_DUMP_TX_DESC(txq, &txr[tx_id], tx_id);