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 A0FBC1B512 for ; Fri, 30 Nov 2018 00:14:10 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:20:01 +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 wATNCW7u032075; Fri, 30 Nov 2018 01:14:06 +0200 From: Yongseok Koh To: Jerin Jacob Cc: Ferruh Yigit , Jiayu Hu , dpdk stable Date: Thu, 29 Nov 2018 15:10:50 -0800 Message-Id: <20181129231202.30436-56-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'mbuf: fix Tx offload mask' 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: Thu, 29 Nov 2018 23:14:11 -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 12/01/18. 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 4723642f5ff2bcbf8b46e70e4fffbc72518a855d Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Tue, 2 Oct 2018 16:21:42 +0530 Subject: [PATCH] mbuf: fix Tx offload mask [ backported from upstream commit 1037ed842c378e15db85f1b2451c21d2b46a8698 ] Fixes missing PKT_TX_UDP_SEG, PKT_TX_OUTER_IPV6,PKT_TX_OUTER_IPV4, PKT_TX_IPV6 and PKT_TX_IPV4 values in PKT_TX_OFFLOAD_MASK. Also sort them in bit wise order to recognize missing items later. Fixes: 6d18505efaa6 ("vhost: support UDP Fragmentation Offload") Fixes: 1c3b7c33e977 ("mbuf: add Tx offloading flags for tunnels") Fixes: 711ba9e23e68 ("mbuf: remove aliasing of Tx offloading flags with Rx ones") Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit Acked-by: Jiayu Hu --- lib/librte_mbuf/rte_mbuf.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 807a8d419..e5697614f 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -322,13 +322,17 @@ extern "C" { * which can be set for packet. */ #define PKT_TX_OFFLOAD_MASK ( \ + PKT_TX_OUTER_IPV6 | \ + PKT_TX_OUTER_IPV4 | \ + PKT_TX_OUTER_IP_CKSUM | \ + PKT_TX_VLAN_PKT | \ + PKT_TX_IPV6 | \ + PKT_TX_IPV4 | \ PKT_TX_IP_CKSUM | \ PKT_TX_L4_MASK | \ - PKT_TX_OUTER_IP_CKSUM | \ - PKT_TX_TCP_SEG | \ PKT_TX_IEEE1588_TMST | \ + PKT_TX_TCP_SEG | \ PKT_TX_QINQ_PKT | \ - PKT_TX_VLAN_PKT | \ PKT_TX_TUNNEL_MASK | \ PKT_TX_MACSEC | \ PKT_TX_SEC_OFFLOAD) -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:47.710006282 -0800 +++ 0056-mbuf-fix-Tx-offload-mask.patch 2018-11-29 15:01:45.135959000 -0800 @@ -1,8 +1,10 @@ -From 1037ed842c378e15db85f1b2451c21d2b46a8698 Mon Sep 17 00:00:00 2001 +From 4723642f5ff2bcbf8b46e70e4fffbc72518a855d Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Tue, 2 Oct 2018 16:21:42 +0530 Subject: [PATCH] mbuf: fix Tx offload mask +[ backported from upstream commit 1037ed842c378e15db85f1b2451c21d2b46a8698 ] + Fixes missing PKT_TX_UDP_SEG, PKT_TX_OUTER_IPV6,PKT_TX_OUTER_IPV4, PKT_TX_IPV6 and PKT_TX_IPV4 values in PKT_TX_OFFLOAD_MASK. @@ -11,20 +13,19 @@ Fixes: 6d18505efaa6 ("vhost: support UDP Fragmentation Offload") Fixes: 1c3b7c33e977 ("mbuf: add Tx offloading flags for tunnels") Fixes: 711ba9e23e68 ("mbuf: remove aliasing of Tx offloading flags with Rx ones") -Cc: stable@dpdk.org Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit Acked-by: Jiayu Hu --- - lib/librte_mbuf/rte_mbuf.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) + lib/librte_mbuf/rte_mbuf.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h -index a09377a60..eb11779e7 100644 +index 807a8d419..e5697614f 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h -@@ -334,16 +334,21 @@ extern "C" { +@@ -322,13 +322,17 @@ extern "C" { * which can be set for packet. */ #define PKT_TX_OFFLOAD_MASK ( \ @@ -44,12 +45,7 @@ - PKT_TX_VLAN_PKT | \ PKT_TX_TUNNEL_MASK | \ PKT_TX_MACSEC | \ -- PKT_TX_SEC_OFFLOAD) -+ PKT_TX_SEC_OFFLOAD | \ -+ PKT_TX_UDP_SEG) - - /** - * Mbuf having an external buffer attached. shinfo in mbuf must be filled. + PKT_TX_SEC_OFFLOAD) -- 2.11.0