patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Konstantin Ananyev <konstantin.ananyev@intel.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'examples/ip_frag: fix unknown ethernet type' has been queued to LTS release 18.11.3
Date: Tue, 27 Aug 2019 10:30:30 +0100	[thread overview]
Message-ID: <20190827093032.20423-53-ktraynor@redhat.com> (raw)
In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com>

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/03/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/bf07a56016504c4117b3f7e4afb06a389a2e2ebd

Thanks.

Kevin Traynor

---
From bf07a56016504c4117b3f7e4afb06a389a2e2ebd Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Thu, 18 Jul 2019 11:11:13 +0100
Subject: [PATCH] examples/ip_frag: fix unknown ethernet type

[ upstream commit 826038fcfc7b82866673f10e22cc89860ca4cba3 ]

Right now app blindly set IPv4 ether type for all non IPv6 packets.
Instead we can save and later restore original type value.

Fixes: 74de12b7b63a ("examples/ip_fragmentation: overhaul")

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 examples/ip_fragmentation/main.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 8ffcfef80..1bcda4e52 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -234,9 +234,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 	struct rx_queue *rxq;
 	uint32_t i, len, next_hop;
-	uint8_t ipv6;
-	uint16_t port_out;
+	uint16_t port_out, ether_type;
 	int32_t len2;
+	const struct ether_hdr *eth;
 
-	ipv6 = 0;
 	rxq = &qconf->rx_queue_list[queueid];
 
@@ -244,4 +243,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 	port_out = port_in;
 
+	/* save ether type of the incoming packet */
+	eth = rte_pktmbuf_mtod(m, const struct ether_hdr *);
+	ether_type = eth->ether_type;
+
 	/* Remove the Ethernet header and trailer from the input packet */
 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
@@ -289,6 +292,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		struct ipv6_hdr *ip_hdr;
 
-		ipv6 = 1;
-
 		/* Read the lookup key (i.e. ip_dst) from the input packet */
 		ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
@@ -347,8 +348,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		/* src addr */
 		ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
-		if (ipv6)
-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
-		else
-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
+		eth_hdr->ether_type = ether_type;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.804656569 +0100
+++ 0053-examples-ip_frag-fix-unknown-ethernet-type.patch	2019-08-27 09:40:10.963143344 +0100
@@ -1 +1 @@
-From 826038fcfc7b82866673f10e22cc89860ca4cba3 Mon Sep 17 00:00:00 2001
+From bf07a56016504c4117b3f7e4afb06a389a2e2ebd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 826038fcfc7b82866673f10e22cc89860ca4cba3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- examples/ip_fragmentation/main.c | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ examples/ip_fragmentation/main.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
@@ -18 +19 @@
-index d03e93c90..edf87a1a1 100644
+index 8ffcfef80..1bcda4e52 100644
@@ -21 +22 @@
-@@ -243,10 +243,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+@@ -234,9 +234,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
@@ -28,2 +29 @@
- 	uint64_t ol_flags;
-+	const struct rte_ether_hdr *eth;
++	const struct ether_hdr *eth;
@@ -32 +31,0 @@
- 	ol_flags = 0;
@@ -34 +33,2 @@
-@@ -255,4 +254,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 
+@@ -244,4 +243,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
@@ -38 +38 @@
-+	eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *);
++	eth = rte_pktmbuf_mtod(m, const struct ether_hdr *);
@@ -42,3 +42,3 @@
- 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
-@@ -303,6 +306,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
- 		struct rte_ipv6_hdr *ip_hdr;
+ 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
+@@ -289,6 +292,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 		struct ipv6_hdr *ip_hdr;
@@ -49,11 +49,8 @@
- 		ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);
-@@ -365,11 +366,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
- 		rte_ether_addr_copy(&ports_eth_addr[port_out],
- 				&eth_hdr->s_addr);
--		if (ipv6) {
--			eth_hdr->ether_type =
--				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6);
--		} else {
--			eth_hdr->ether_type =
--				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
--		}
+ 		ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
+@@ -347,8 +348,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 		/* src addr */
+ 		ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
+-		if (ipv6)
+-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
+-		else
+-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);

  parent reply	other threads:[~2019-08-27  9:32 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-27  9:29 [dpdk-stable] patch 'test/hash: fix data reset on new run' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'mem: fix typo in API description' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'kni: abort when IOVA is not PA' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'doc: fix build with latest meson' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'ethdev: avoid error on PCI unplug of closed port' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/sfc: ensure that device is closed on removal' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net: define IPv4 IHL and VHL' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'app/testpmd: fix MPLS IPv4 encapsulation fields' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/netvsc: fix definition of offload values' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/i40e: fix crash when TxQ/RxQ set to 0 in VF' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/mlx5: fix crash on null operation' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/mlx5: fix condition for link update fallback' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'net/mlx5: check memory allocation in flow creation' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'app/testpmd: fix parsing RSS queue rule' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'app/testpmd: fix queue offload configuration' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'compress/isal: fix use after free' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'doc: cleanup test removal in armv8 and openssl guides' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'crypto/mvsam: fix typo in comment' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'doc: fix triplicated typo in prog guides' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'doc: fix grammar " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'drivers: fix typo in NXP comments' " Kevin Traynor
2019-08-27  9:29 ` [dpdk-stable] patch 'crypto/qat: set message field to zero in sym SGL case' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'app/crypto-perf: fix CSV format' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'crypto/openssl: fix usage of non constant time memcmp' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'doc: clarify data plane error handling in compressdev' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'crypto/virtio: check PCI config read' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'app/crypto-perf: fix display once detection' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'app/crypto-perf: check lcore job failure' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'net/ixgbe: fix IP type for crypto session' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'eal: fix typo in comments' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/ipsec-secgw: fix error sign' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'eventdev: " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'event/sw: " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'event/opdl: " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'hash: use ordered loads only if signature matches' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'doc: fix a grammar mistake in rawdev guide' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'doc: fix link about bifurcated model in Linux " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'net/i40e: fix unexpected skip FDIR setup' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'net/fm10k: fix descriptor filling in vector Tx' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'doc: fix PDF build' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'flow_classify: fix out-of-bounds access' " Kevin Traynor
2019-08-27 13:52   ` Iremonger, Bernard
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/power: fix FreeBSD meson lib dependency' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'eal/freebsd: fix config creation' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'kni: fix copy_from_user failure handling' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'kni: fix style' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'kni: fix kernel crash with multi-segments' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/power: fix strcpy buffer overrun' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'test/distributor: fix flush with worker shutdown' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'distributor: fix check of workers number' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples: fix use of ethdev internal device array' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/ip_frag: fix use of ethdev internal device array' " Kevin Traynor
2019-08-27  9:30 ` Kevin Traynor [this message]
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/tep_term: remove duplicate definitions' " Kevin Traynor
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/performance-thread: init timer subsystem' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190827093032.20423-53-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=konstantin.ananyev@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).