patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' has been queued to LTS release 18.11.9
@ 2020-06-05 18:23 Kevin Traynor
  2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor
                   ` (86 more replies)
  0 siblings, 87 replies; 90+ messages in thread
From: Kevin Traynor @ 2020-06-05 18:23 UTC (permalink / raw)
  To: Raslan Darawsheh; +Cc: Ori Kam, Bernard Iremonger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/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.

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/73a8faecb9d26bf73294c9bafe853b492d444344

Thanks.

Kevin.

---
From 73a8faecb9d26bf73294c9bafe853b492d444344 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland@mellanox.com>
Date: Thu, 23 Apr 2020 12:05:26 +0300
Subject: [PATCH] app/testpmd: add parsing for QinQ VLAN headers

[ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ]

When having QinQ VLAN headers in the packet, parse_ethernet
is capable of parsing only the first VLAN.

Add parsing for QinQ VLAN headers in the packet.

Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/csumonly.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 46eb52d5b8..b0d528d98c 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -139,6 +139,6 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
 /*
  * Parse an ethernet header to fill the ethertype, l2_len, l3_len and
- * ipproto. This function is able to recognize IPv4/IPv6 with one optional vlan
- * header. The l4_len argument is only set in case of TCP (useful for TSO).
+ * ipproto. This function is able to recognize IPv4/IPv6 with optional VLAN
+ * headers. The l4_len argument is only set in case of TCP (useful for TSO).
  */
 static void
@@ -147,11 +147,13 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 	struct ipv4_hdr *ipv4_hdr;
 	struct ipv6_hdr *ipv6_hdr;
+	struct vlan_hdr *vlan_hdr;
 
 	info->l2_len = sizeof(struct ether_hdr);
 	info->ethertype = eth_hdr->ether_type;
 
-	if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
-		struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
-
+	while (info->ethertype == _htons(ETHER_TYPE_VLAN) ||
+	       info->ethertype == _htons(ETHER_TYPE_QINQ)) {
+		vlan_hdr = (struct vlan_hdr *)
+			((char *)eth_hdr + info->l2_len);
 		info->l2_len  += sizeof(struct vlan_hdr);
 		info->ethertype = vlan_hdr->eth_proto;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.036607058 +0100
+++ 0001-app-testpmd-add-parsing-for-QinQ-VLAN-headers.patch	2020-06-05 19:20:50.700043313 +0100
@@ -1 +1 @@
-From f16d377150a0ab406d1e845ae1c96a4519f9c0ee Mon Sep 17 00:00:00 2001
+From 73a8faecb9d26bf73294c9bafe853b492d444344 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- app/test-pmd/csumonly.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ app/test-pmd/csumonly.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
@@ -22 +23 @@
-index fe19615b14..8626223793 100644
+index 46eb52d5b8..b0d528d98c 100644
@@ -25 +26 @@
-@@ -140,6 +140,6 @@ parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
+@@ -139,6 +139,6 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
@@ -34,4 +35,4 @@
-@@ -148,12 +148,13 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
- 	struct rte_ipv4_hdr *ipv4_hdr;
- 	struct rte_ipv6_hdr *ipv6_hdr;
-+	struct rte_vlan_hdr *vlan_hdr;
+@@ -147,11 +147,13 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)
+ 	struct ipv4_hdr *ipv4_hdr;
+ 	struct ipv6_hdr *ipv6_hdr;
++	struct vlan_hdr *vlan_hdr;
@@ -39 +40 @@
- 	info->l2_len = sizeof(struct rte_ether_hdr);
+ 	info->l2_len = sizeof(struct ether_hdr);
@@ -42,3 +43,2 @@
--	if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) {
--		struct rte_vlan_hdr *vlan_hdr = (
--			struct rte_vlan_hdr *)(eth_hdr + 1);
+-	if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
+-		struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
@@ -46,3 +46,3 @@
-+	while (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN) ||
-+	       info->ethertype == _htons(RTE_ETHER_TYPE_QINQ)) {
-+		vlan_hdr = (struct rte_vlan_hdr *)
++	while (info->ethertype == _htons(ETHER_TYPE_VLAN) ||
++	       info->ethertype == _htons(ETHER_TYPE_QINQ)) {
++		vlan_hdr = (struct vlan_hdr *)
@@ -50 +50 @@
- 		info->l2_len  += sizeof(struct rte_vlan_hdr);
+ 		info->l2_len  += sizeof(struct vlan_hdr);


^ permalink raw reply	[flat|nested] 90+ messages in thread

end of thread, other threads:[~2020-06-10 14:48 UTC | newest]

Thread overview: 90+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-05 18:23 [dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' has been queued to LTS release 18.11.9 Kevin Traynor
2020-06-05 18:23 ` [dpdk-stable] patch 'doc: fix log level example in Linux guide' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix typo in endian conversion macros' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: add i40e limitation for flow director' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/i40e: fix flush of flow director filter' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: fix peer close check' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix memory leak for thread' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix RSS enablement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix race condition for MT unsafe service' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: fix identification of service running on other lcore' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'service: remove rte prefix from static functions' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'remove references to private PCI probe function' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'mem: fix overflow on allocation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples/eventdev: fix crash on exit' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bbdev: fix doxygen comments' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/kasumi: fix extern declaration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/failsafe: fix fd leak' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix statistics after reset' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/netvsc: fix comment spelling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/vmbus: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/tap: fix crash in flow destroy' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix FW version query' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ring: fix device pointer on allocation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx4: fix drop queue error handling' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app: remove extra new line after link duplex' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'examples: " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'event/dsw: fix enqueue burst return value' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'eal: fix C++17 compilation' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'doc: fix multicast filter feature announcement' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix link state configuration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/vmxnet3: handle bad host framing' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/qede: fix port reconfiguration' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix error log for command timeout' " Kevin Traynor
2020-06-05 18:24 ` [dpdk-stable] patch 'net/bnxt: fix using RSS config struct' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'app/testpmd: fix DCB set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe/base: update copyright' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e/base: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: accept 32-bit domain numbers' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'pci: reject negative values in PCI id' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'kvargs: fix strcmp helper documentation' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'fix same typo in multiple places' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix wild pointer' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix queue related exception handling' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'vhost: fix zero-copy server mode' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' " Kevin Traynor
2020-06-05 22:46   ` Thomas Monjalon
2020-06-10 14:48     ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/i40e: fix setting L2TAG' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/iavf: " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/kni: fix crash during MTU set' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: add NASM installation steps' " Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: fix typo in contributors guide' " Kevin Traynor
2020-06-05 18:25 ` Kevin Traynor
2020-06-05 18:25 ` [dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' " Kevin Traynor

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).