[dpdk-stable] patch 'net: fix encapsulation markers for inner L3 offset' has been queued to LTS release 18.11.3
Kevin Traynor
ktraynor at redhat.com
Fri Aug 23 11:43:09 CEST 2019
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 08/28/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/88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44
Thanks.
Kevin Traynor
---
>From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Fri, 24 May 2019 17:57:14 +0300
Subject: [PATCH] net: fix encapsulation markers for inner L3 offset
[ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ]
The API to prepare checksum offloads employs outer
IP checksum flag to tell regular IPv4 packets from
tunnel packets with outer IPv4 encapsulation. This
flag cannot serve as a marker for the said purpose
because a packet can have outer IPv4 encapsulation
and may not have outer IP checksum offload request.
Fix the API by changing the said criterion to test
outer IPv4 flag rather than outer IP checksum flag.
Use simpler spelling of the conditional expression.
Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")
Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev at intel.com>
---
lib/librte_net/rte_net.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
index e59760a0a..a8eafa146 100644
--- a/lib/librte_net/rte_net.h
+++ b/lib/librte_net/rte_net.h
@@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
uint64_t inner_l3_offset = m->l2_len;
- if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||
- (ol_flags & PKT_TX_OUTER_IPV6))
+ if (ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6))
inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-08-22 19:38:21.713661170 +0100
+++ 0019-net-fix-encapsulation-markers-for-inner-L3-offset.patch 2019-08-22 19:38:20.438026856 +0100
@@ -1 +1 @@
-From 6bf0912011eed76285a6acf2ddb9b126008b6339 Mon Sep 17 00:00:00 2001
+From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index b83f8c13a..461f2c81d 100644
+index e59760a0a..a8eafa146 100644
@@ -31,2 +32,2 @@
-@@ -130,6 +130,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
- #endif
+@@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
+ uint64_t inner_l3_offset = m->l2_len;
More information about the stable
mailing list