From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CA0941B11F for ; Wed, 21 Nov 2018 17:50:39 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34B07C05681F; Wed, 21 Nov 2018 16:50:39 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7CED5C221; Wed, 21 Nov 2018 16:50:37 +0000 (UTC) From: Kevin Traynor To: Jerin Jacob Cc: Ferruh Yigit , Jiayu Hu , dpdk stable Date: Wed, 21 Nov 2018 16:48:00 +0000 Message-Id: <20181121164828.32249-46-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 21 Nov 2018 16:50:39 +0000 (UTC) Subject: [dpdk-stable] patch 'mbuf: fix Tx offload mask' has been queued to stable release 18.08.1 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: Wed, 21 Nov 2018 16:50:40 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/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. Kevin Traynor --- >>From 5a1f5c88e12224bf9ae9596bfcf147db454feb61 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 [ 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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 9ce5d76d7..04617b473 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -335,14 +335,19 @@ extern "C" { */ #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) + PKT_TX_SEC_OFFLOAD | \ + PKT_TX_UDP_SEG) /** -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 16:44:32.208667572 +0000 +++ 0046-mbuf-fix-Tx-offload-mask.patch 2018-11-21 16:44:30.000000000 +0000 @@ -1,8 +1,10 @@ -From 1037ed842c378e15db85f1b2451c21d2b46a8698 Mon Sep 17 00:00:00 2001 +From 5a1f5c88e12224bf9ae9596bfcf147db454feb61 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 +[ 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,7 +13,6 @@ 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 @@ -21,7 +22,7 @@ 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h -index a09377a60..eb11779e7 100644 +index 9ce5d76d7..04617b473 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -335,14 +335,19 @@ extern "C" {