patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: Jiawei Wang <jiaweiw@nvidia.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' has been queued to stable release 19.11.9
Date: Thu, 10 Jun 2021 14:05:49 +0200
Message-ID: <20210610120641.885862-1-christian.ehrhardt@canonical.com> (raw)

Hi,

FYI, your patch has been queued to stable release 19.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/12/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/74ad940af86530ca9d97bffda81680c7a8c46dcf

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 74ad940af86530ca9d97bffda81680c7a8c46dcf Mon Sep 17 00:00:00 2001
From: Jiawei Wang <jiaweiw@nvidia.com>
Date: Fri, 4 Jun 2021 16:37:33 +0300
Subject: [PATCH] app/testpmd: fix NVGRE encap configuration

[ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ]

For NVGRE protocol, the default value of 'c_k_s_rsvd0_ver'
must be 0x2000, and protocol type must be 0x6558 in the NVGRE
header.

This patch updates these two configurations while parsing the nvgre
encap.

Fixes: dcd962fc6b4e ("app/testpmd: add NVGRE encap/decap")

Signed-off-by: Jiawei Wang <jiaweiw@nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index da3533c557..0b76f7ef21 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -4250,7 +4250,11 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,
 		       .src_addr = nvgre_encap_conf.ipv4_src,
 		       .dst_addr = nvgre_encap_conf.ipv4_dst,
 		},
-		.item_nvgre.flow_id = 0,
+		.item_nvgre = {
+			.c_k_s_rsvd0_ver = RTE_BE16(0x2000),
+			.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB),
+			.flow_id = 0,
+		},
 	};
 	memcpy(action_nvgre_encap_data->item_eth.dst.addr_bytes,
 	       nvgre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN);
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-10 14:04:58.154873537 +0200
+++ 0001-app-testpmd-fix-NVGRE-encap-configuration.patch	2021-06-10 14:04:57.986024050 +0200
@@ -1 +1 @@
-From 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 Mon Sep 17 00:00:00 2001
+From 74ad940af86530ca9d97bffda81680c7a8c46dcf Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Tue, 16 Mar 2021 06:18:27 +0200
+Date: Fri, 4 Jun 2021 16:37:33 +0300
@@ -5,0 +6,2 @@
+[ upstream commit 9b0da816bdec98c0d6c5d17ccdd337bdbafc3f75 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -17 +17,0 @@
-Acked-by: Ori Kam <orika@nvidia.com>
@@ -19,2 +19,2 @@
- app/test-pmd/cmdline_flow.c | 2 ++
- 1 file changed, 2 insertions(+)
+ app/test-pmd/cmdline_flow.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
@@ -23 +23 @@
-index 49d9f9c043..2c40c6996e 100644
+index da3533c557..0b76f7ef21 100644
@@ -26 +26 @@
-@@ -5439,6 +5439,8 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,
+@@ -4250,7 +4250,11 @@ parse_vc_action_nvgre_encap(struct context *ctx, const struct token *token,
@@ -30,3 +30,6 @@
-+		.item_nvgre.c_k_s_rsvd0_ver = RTE_BE16(0x2000),
-+		.item_nvgre.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB),
- 		.item_nvgre.flow_id = 0,
+-		.item_nvgre.flow_id = 0,
++		.item_nvgre = {
++			.c_k_s_rsvd0_ver = RTE_BE16(0x2000),
++			.protocol = RTE_BE16(RTE_ETHER_TYPE_TEB),
++			.flow_id = 0,
++		},
@@ -34,0 +38 @@
+ 	       nvgre_encap_conf.eth_dst, RTE_ETHER_ADDR_LEN);

             reply	other threads:[~2021-06-10 12:06 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-10 12:05 Christian Ehrhardt [this message]
2021-06-10 12:05 ` [dpdk-stable] patch 'Revert "kni: fix compilation on SLES15-SP3"' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'bus/fslmc: remove unused debug macro' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'raw/skeleton: add missing check after setting attribute' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'ipc: use monotonic clock' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'examples/timer: fix time interval' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'test/timer: check memzone allocation' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'power: fix sanity checks for guest channel read' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'event/dpaa2: remove unused macros' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'app/eventdev: fix lcore parsing skipping last core' " Christian Ehrhardt
2021-06-10 12:05 ` [dpdk-stable] patch 'net/ice/base: fix memory allocation wrapper' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: switch memcpy to optimized version' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena/base: fix type conversions by explicit casting' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ena: remove endian swap functions' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/nfp: fix reporting of RSS capabilities' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: return error on PCI config write failure' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: clear hash map on flow director clear' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix querying flow director counter for out param' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix secondary process request start/stop Rx/Tx' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix ordering in secondary process initialization' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/iavf: fix Tx context descriptor' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice: fix VSI array out of bounds access' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/i40e: fix VF RSS configuration' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/bnx2x: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/ice/base: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/tap: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix secondary process initialization ordering' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'crypto/qat: fix null authentication request' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'app/crypto-perf: check memory allocation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/rxtx_callbacks: fix port ID format specifier' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/flow_classify: fix NUMA check of port and core' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l2fwd-cat: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/skeleton: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: check flow classifier creation' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix CPU frequency check' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: add turbo mode to " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix low frequency test when turbo enabled' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/power: fix turbo test' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/table: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'examples/l3fwd-power: fix empty poll thresholds' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix division by zero' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/crypto: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx4: fix leak when configured repeatedly' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/mlx5: " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix requested FC mode rollback' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: remove meaningless packet buffer " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/hns3: fix DCB reconfiguration' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'common/sfc_efx/base: limit reported MCDI response length' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'net/memif: fix Tx bps statistics for zero-copy' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test: fix build with GCC 11' " Christian Ehrhardt
2021-06-10 12:06 ` [dpdk-stable] patch 'test/cmdline: silence clang 12 warning' " Christian Ehrhardt
  -- strict thread matches above, loose matches on Subject: below --
2021-05-17 16:07 [dpdk-stable] patch 'vfio: do not merge contiguous areas' " Christian Ehrhardt
2021-05-17 16:08 ` [dpdk-stable] patch 'app/testpmd: fix NVGRE encap configuration' " Christian Ehrhardt

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=20210610120641.885862-1-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=jiaweiw@nvidia.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

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git