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 BF769A0351 for ; Thu, 6 Aug 2020 11:59:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B780037B4; Thu, 6 Aug 2020 11:59:52 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 82CB31C199 for ; Thu, 6 Aug 2020 11:59:51 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id 88so43359653wrh.3 for ; Thu, 06 Aug 2020 02:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9vgqS4o7l8JQ5PQLsWysOYAz1bjRhGC9Xu8bSd4HDe8=; b=e7tU7nbLjFglbBbLRM/GAyCwgKvgrjRTPs7i13Si3ILPkC4cXfLRAv86OZSOqA7a/l hLjqffy7MnvRcVH/MnUQgOMRM04TshwhyXZAQt1M0KCNTyX8XVTJh6Q1G7Rhz0ASVCZq /0f8OF4gikEev5smEOu3EqJx/1Vg0tlGdx0C2gCj9QjCAygAyeFu65ihHqXvX02KvXFT oQmMKPuFtguqp3JkC8qFiMccY8WAvL1qiPfW2uMU07hi2gVWvrPm5iJnkrjavCDfUTnl A0AkhjQb9Dc9vQpkyix6S4KM0DFqRxCFhoV/uIUq3mVKP5teyg4KV+Z1of2xe6TXsjUE qbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9vgqS4o7l8JQ5PQLsWysOYAz1bjRhGC9Xu8bSd4HDe8=; b=KVtIlo/PzmoKZYTnsbJw+vJvJMcV2fonA3E1pCC2uoHg3DzFgBmHF39FTBvdemD+P9 m7Lt/RTjWimVIr3GRpRrkJemJ6qihlKbZNkRCHGfBH7+hztfEiLzsbNWRe1xVmuVsgd0 bAIf824Gtx6O0tjXdIsIPJzyio20prD0Z5XR6ydXCreWsj524Qu8mvyhE+TfFTo8/QPR /GjcDkm5uLvNWn1rALOu2v0nMlVuU8nLvtKhEFdKtDDPsm9+icEZ3adZA78E9Snl8CP/ fQnrUutU1Z5v4hK4q9yEvAlLtKbPCs0+koVKLlA7jj9kOsKBjTsIw4qBrKsOEqrcIaQ3 rngg== X-Gm-Message-State: AOAM532t+1+5COZ6ave51LBovybV4oIQgiyZv7i4mYaXJcmJtsj14R3+ g/advh411oGSIebxcddnqtBXiA9WMeNBrA== X-Google-Smtp-Source: ABdhPJz9TvrSJACy+hu74SY5FPUbrvO/ZWaBstqjhwzU4OEtuA+epV7ipurPawX0NZ0Iw/hczY4aIg== X-Received: by 2002:adf:fdce:: with SMTP id i14mr6550630wrs.273.1596707991255; Thu, 06 Aug 2020 02:59:51 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r16sm6186719wrr.13.2020.08.06.02.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Thu, 6 Aug 2020 10:54:11 +0100 Message-Id: <20200806095411.774624-43-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: revert fake TSO fixes' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. 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. Thanks. Luca Boccassi --- >From 5fceb3d600294cf2ceb153d3cbd3277e07dfe0ba Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 31 Jul 2020 13:59:40 +0800 Subject: [PATCH] net/ice: revert fake TSO fixes [ upstream commit 4339ea2979b06ad6e1ce2582a7b15faedebbd838 ] The two fixes are not the real root cause for MDD event, it mitigates the failure rate when different test mode, so revert them. Fixes: 2a0c9ae4f646 ("net/ice: fix TCP checksum offload") Fixes: 7365a3cee51f ("net/ice: calculate TCP header size for offload") Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 3d8280bb3..3030550bd 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, switch (ol_flags & PKT_TX_L4_MASK) { case PKT_TX_TCP_CKSUM: *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP; - *td_offset |= (tx_offload.l4_len >> 2) << + *td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) << ICE_TX_DESC_LEN_L4_LEN_S; break; case PKT_TX_SCTP_CKSUM: @@ -2398,28 +2398,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt) return count; } -/* Calculate TCP header length for PKT_TX_TCP_CKSUM if not provided */ -static inline uint16_t -ice_calc_pkt_tcp_hdr(struct rte_mbuf *tx_pkt, union ice_tx_offload tx_offload) -{ - uint16_t tcpoff = tx_offload.l2_len + tx_offload.l3_len; - const struct rte_tcp_hdr *tcp_hdr; - struct rte_tcp_hdr _tcp_hdr; - - if (tcpoff + sizeof(struct rte_tcp_hdr) < tx_pkt->data_len) { - tcp_hdr = rte_pktmbuf_mtod_offset(tx_pkt, struct rte_tcp_hdr *, - tcpoff); - - return (tcp_hdr->data_off & 0xf0) >> 2; - } - - tcp_hdr = rte_pktmbuf_read(tx_pkt, tcpoff, sizeof(_tcp_hdr), &_tcp_hdr); - if (tcp_hdr) - return (tcp_hdr->data_off & 0xf0) >> 2; - else - return 0; -} - uint16_t ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { @@ -2518,15 +2496,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) &cd_tunneling_params); /* Enable checksum offloading */ - if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) { - if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM && - !tx_offload.l4_len) - tx_offload.l4_len = - ice_calc_pkt_tcp_hdr(tx_pkt, tx_offload); - + if (ol_flags & ICE_TX_CKSUM_OFFLOAD_MASK) ice_txd_enable_checksum(ol_flags, &td_cmd, &td_offset, tx_offload); - } if (nb_ctx) { /* Setup TX context descriptor if required */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:17.442114402 +0100 +++ 0043-net-ice-revert-fake-TSO-fixes.patch 2020-08-06 10:53:15.844598272 +0100 @@ -1,14 +1,15 @@ -From 4339ea2979b06ad6e1ce2582a7b15faedebbd838 Mon Sep 17 00:00:00 2001 +From 5fceb3d600294cf2ceb153d3cbd3277e07dfe0ba Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Fri, 31 Jul 2020 13:59:40 +0800 Subject: [PATCH] net/ice: revert fake TSO fixes +[ upstream commit 4339ea2979b06ad6e1ce2582a7b15faedebbd838 ] + The two fixes are not the real root cause for MDD event, it mitigates the failure rate when different test mode, so revert them. Fixes: 2a0c9ae4f646 ("net/ice: fix TCP checksum offload") Fixes: 7365a3cee51f ("net/ice: calculate TCP header size for offload") -Cc: stable@dpdk.org Signed-off-by: Haiyue Wang Acked-by: Qi Zhang @@ -17,10 +18,10 @@ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c -index b83c5c862..2e1f06d2c 100644 +index 3d8280bb3..3030550bd 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c -@@ -2234,7 +2234,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, +@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, switch (ol_flags & PKT_TX_L4_MASK) { case PKT_TX_TCP_CKSUM: *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP; @@ -29,7 +30,7 @@ ICE_TX_DESC_LEN_L4_LEN_S; break; case PKT_TX_SCTP_CKSUM: -@@ -2371,28 +2371,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt) +@@ -2398,28 +2398,6 @@ ice_calc_pkt_desc(struct rte_mbuf *tx_pkt) return count; } @@ -58,7 +59,7 @@ uint16_t ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { -@@ -2491,15 +2469,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) +@@ -2518,15 +2496,9 @@ ice_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) &cd_tunneling_params); /* Enable checksum offloading */