patch 'app/testpmd: use VXLAN flow flags from user if set' has been queued to stable release 24.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 24.11.2

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/12/25. 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/fa4dd4e72286450c20eb32a5d5fd1499a631deb8

Thanks.

Kevin

---
>From fa4dd4e72286450c20eb32a5d5fd1499a631deb8 Mon Sep 17 00:00:00 2001
From: "Minggang Li (Gavin)" <gavinl at nvidia.com>
Date: Tue, 18 Feb 2025 12:33:22 +0200
Subject: [PATCH] app/testpmd: use VXLAN flow flags from user if set

[ upstream commit 7441e59a1f8352f176e9a4b9c480e944a4f145f6 ]

It's user's responsibility to set correct flags, especially the G bit, to
distinguish the protocols, VXLAN and VXLAN-GBP, sharing the same port 4789.

It will be set to 0x8 if user does not specify the flags.

Fixes: da118115d95c ("app/testpmd: support matching any VXLAN field")

Signed-off-by: Minggang Li (Gavin) <gavinl at nvidia.com>
Acked-by: Dariusz Sosnowski <dsosnowski 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 9e4fc2d95d..835fc3690d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -13594,5 +13594,6 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, uint16_t next_proto)
 	case RTE_FLOW_ITEM_TYPE_VXLAN:
 		vxlan = (struct rte_vxlan_hdr *)buf;
-		vxlan->vx_flags = 0x08;
+		if (!vxlan->flags)
+			vxlan->flags = 0x08;
 		break;
 	case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
-- 
2.48.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-03-07 11:02:57.110349525 +0000
+++ 0006-app-testpmd-use-VXLAN-flow-flags-from-user-if-set.patch	2025-03-07 11:02:56.815335462 +0000
@@ -1 +1 @@
-From 7441e59a1f8352f176e9a4b9c480e944a4f145f6 Mon Sep 17 00:00:00 2001
+From fa4dd4e72286450c20eb32a5d5fd1499a631deb8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7441e59a1f8352f176e9a4b9c480e944a4f145f6 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index e1720e54d7..3947304b63 100644
+index 9e4fc2d95d..835fc3690d 100644
@@ -24 +25 @@
-@@ -13599,5 +13599,6 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, uint16_t next_proto)
+@@ -13594,5 +13594,6 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, uint16_t next_proto)