patch 'app/testpmd: fix raw encap of GENEVE option' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.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 03/06/22. 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

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9

Thanks.

Kevin

---
>From a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz at nvidia.com>
Date: Thu, 24 Feb 2022 09:02:14 +0200
Subject: [PATCH] app/testpmd: fix raw encap of GENEVE option

[ upstream commit d9e597141fd3a69278c31b1daf6da7ce54de3b8e ]

The structure "rte_flow_item_geneve_opt" is not a protocol header of
geneve tunnel option from rfc8926. The field "data" is a pointer
which points to the actual variable-length option data. So the
structure is not packed.

There is 4 bytes hole before the pointer in a 64-bit system. The
option header is just 4 bytes. When using offsetof() to get the
fixed part's size of option header, the wrong value 8 was got. When
constructing the encap header, a wrong size and offset was used due
to this hole.

With this commit, the fixed part's size is calculated explicitly
based on all fields.

Fixes: 55c074f3ba1d ("app/testpmd: support GENEVE option item")

Signed-off-by: Bing Zhao <bingz at nvidia.com>
Reviewed-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 app/test-pmd/cmdline_flow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index bbaf18d76e..a8140eda92 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -9156,5 +9156,6 @@ cmd_set_raw_parsed(const struct buffer *in)
 			opt = (const struct rte_flow_item_geneve_opt *)
 								item->spec;
-			size = offsetof(struct rte_flow_item_geneve_opt, data);
+			size = offsetof(struct rte_flow_item_geneve_opt,
+					option_len) + sizeof(uint8_t);
 			if (opt->option_len && opt->data) {
 				*total_size += opt->option_len *
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.986381410 +0000
+++ 0095-app-testpmd-fix-raw-encap-of-GENEVE-option.patch	2022-03-01 10:41:01.468244132 +0000
@@ -1 +1 @@
-From d9e597141fd3a69278c31b1daf6da7ce54de3b8e Mon Sep 17 00:00:00 2001
+From a0a07048f33ea47cf8d4ac34e1d8c7d60d8c0aa9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d9e597141fd3a69278c31b1daf6da7ce54de3b8e ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -30 +31 @@
-index b5f1191e55..4f7a9f17f9 100644
+index bbaf18d76e..a8140eda92 100644
@@ -33 +34 @@
-@@ -10967,5 +10967,6 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -9156,5 +9156,6 @@ cmd_set_raw_parsed(const struct buffer *in)