patch 'net/mlx5/hws: check not supported fields in VXLAN' has been queued to stable release 23.11.1

[Xueming Li <xuemingl@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 23.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 04/15/24. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=21d51e8848c68523906da07edf69b41a283b6665

Thanks.

Xueming Li <xuemingl@nvidia.com>

---
From 21d51e8848c68523906da07edf69b41a283b6665 Mon Sep 17 00:00:00 2001
From: Erez Shitrit <erezsh@nvidia.com>
Date: Sun, 18 Feb 2024 07:11:16 +0200
Subject: [PATCH] net/mlx5/hws: check not supported fields in VXLAN
Cc: Xueming Li <xuemingl@nvidia.com>

[ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ]

Don't allow the user to mask over rsvd1 / rsvd2 fields which are not
supported.

Fixes: 28e69588f417 ("net/mlx5/hws: fix tunnel protocol checks")

Signed-off-by: Erez Shitrit <erezsh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/hws/mlx5dr_definer.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 7bd4ea560e..720d271179 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -1347,6 +1347,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd,
 	/* In order to match on VXLAN we must match on ether_type, ip_protocol
 	 * and l4_dport.
 	 */
+	if (m && (m->rsvd0[0] != 0 || m->rsvd0[1] != 0 || m->rsvd0[2] != 0 ||
+	    m->rsvd1 != 0)) {
+		DR_LOG(ERR, "reserved fields are not supported");
+		rte_errno = ENOTSUP;
+		return rte_errno;
+	}
+
 	if (!cd->relaxed) {
 		fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)];
 		if (!fc->tag_set) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:06.466062214 +0800
+++ 0046-net-mlx5-hws-check-not-supported-fields-in-VXLAN.patch	2024-04-13 20:43:04.957753984 +0800
@@ -1 +1 @@
-From 4506703cbe96185bf3593a222fb9f51f70de78af Mon Sep 17 00:00:00 2001
+From 21d51e8848c68523906da07edf69b41a283b6665 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 4506703cbe96185bf3593a222fb9f51f70de78af ]
@@ -10 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +21 @@
-index 79d98bbf78..8b8757ecac 100644
+index 7bd4ea560e..720d271179 100644
@@ -22,4 +24,4 @@
-@@ -1414,6 +1414,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd,
- 	struct mlx5dr_definer_fc *fc;
- 	bool inner = cd->tunnel;
- 
+@@ -1347,6 +1347,13 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd,
+ 	/* In order to match on VXLAN we must match on ether_type, ip_protocol
+ 	 * and l4_dport.
+ 	 */
@@ -33,3 +35,3 @@
- 	if (inner) {
- 		DR_LOG(ERR, "Inner VXLAN item not supported");
- 		rte_errno = ENOTSUP;
+ 	if (!cd->relaxed) {
+ 		fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, inner)];
+ 		if (!fc->tag_set) {