patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Dariusz Sosnowski <dsosnowski@nvidia.com>
Cc: Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
	dpdk stable <stable@dpdk.org>
Subject: patch 'net/mlx5: fix MPLS/GRE Verbs spec ordering' has been queued to stable release 21.11.1
Date: Thu, 10 Mar 2022 12:11:19 +0000	[thread overview]
Message-ID: <20220310121127.1324802-13-ktraynor@redhat.com> (raw)
In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com>

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/14/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/d31463e0b2e89a5b3a072ef6d983405b9774dacc

Thanks.

Kevin

---
From d31463e0b2e89a5b3a072ef6d983405b9774dacc Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski@nvidia.com>
Date: Wed, 2 Mar 2022 17:06:59 +0000
Subject: [PATCH] net/mlx5: fix MPLS/GRE Verbs spec ordering

[ upstream commit 98008ce6ec2f31c2e94c0eb39740c8178aeb8392 ]

When using Verbs flow engine to create flows, GRE Verbs spec was put at
the end of specs list. This created problems for flows matching MPLSoGRE
packets. In generated specs list MPLS spec was put before GRE spec, but
Verbs API requires that MPLS spec must be put in its exact location in
protocol stack.

This patch fixes this behavior. Space for GRE Verbs spec is reserved at
its exact location. MPLS Verbs is inserted at its exact location as
well. GRE spec is filled after all flow items are parsed.

Fixes: 985b479267aa ("net/mlx5: fix GRE protocol type translation for Verbs")

Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_verbs.c | 49 +++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 66a2711e8b..165786f864 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -883,11 +883,46 @@ flow_verbs_item_gre_ip_protocol_update(struct ibv_flow_attr *attr,
 }
 
+/**
+ * Reserve space for GRE spec in spec buffer.
+ *
+ * @param[in,out] dev_flow
+ *   Pointer to dev_flow structure.
+ *
+ * @return
+ *   Pointer to reserved space in spec buffer.
+ */
+static uint8_t *
+flow_verbs_reserve_gre(struct mlx5_flow *dev_flow)
+{
+	uint8_t *buffer;
+	struct mlx5_flow_verbs_workspace *verbs = &dev_flow->verbs;
+#ifndef HAVE_IBV_DEVICE_MPLS_SUPPORT
+	unsigned int size = sizeof(struct ibv_flow_spec_tunnel);
+	struct ibv_flow_spec_tunnel tunnel = {
+		.type = IBV_FLOW_SPEC_VXLAN_TUNNEL,
+		.size = size,
+	};
+#else
+	unsigned int size = sizeof(struct ibv_flow_spec_gre);
+	struct ibv_flow_spec_gre tunnel = {
+		.type = IBV_FLOW_SPEC_GRE,
+		.size = size,
+	};
+#endif
+
+	buffer = verbs->specs + verbs->size;
+	flow_verbs_spec_add(verbs, &tunnel, size);
+	return buffer;
+}
+
 /**
  * Convert the @p item into a Verbs specification. This function assumes that
- * the input is valid and that there is space to insert the requested item
- * into the flow.
+ * the input is valid and that Verbs specification will be placed in
+ * the pre-reserved space.
  *
  * @param[in, out] dev_flow
  *   Pointer to dev_flow structure.
+ * @param[in, out] gre_spec
+ *   Pointer to space reserved for GRE spec.
  * @param[in] item
  *   Item specification.
@@ -897,4 +932,5 @@ flow_verbs_item_gre_ip_protocol_update(struct ibv_flow_attr *attr,
 static void
 flow_verbs_translate_item_gre(struct mlx5_flow *dev_flow,
+			      uint8_t *gre_spec,
 			      const struct rte_flow_item *item __rte_unused,
 			      uint64_t item_flags)
@@ -950,5 +986,6 @@ flow_verbs_translate_item_gre(struct mlx5_flow *dev_flow,
 						       IBV_FLOW_SPEC_IPV6,
 						       IPPROTO_GRE);
-	flow_verbs_spec_add(verbs, &tunnel, size);
+	MLX5_ASSERT(gre_spec);
+	memcpy(gre_spec, &tunnel, size);
 }
 
@@ -1681,4 +1718,5 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 	struct mlx5_flow_rss_desc *rss_desc;
 	const struct rte_flow_item *tunnel_item = NULL;
+	uint8_t *gre_spec = NULL;
 
 	MLX5_ASSERT(wks);
@@ -1818,4 +1856,5 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 			break;
 		case RTE_FLOW_ITEM_TYPE_GRE:
+			gre_spec = flow_verbs_reserve_gre(dev_flow);
 			subpriority = MLX5_TUNNEL_PRIO_GET(rss_desc);
 			item_flags |= MLX5_FLOW_LAYER_GRE;
@@ -1835,6 +1874,6 @@ flow_verbs_translate(struct rte_eth_dev *dev,
 	}
 	if (item_flags & MLX5_FLOW_LAYER_GRE)
-		flow_verbs_translate_item_gre(dev_flow, tunnel_item,
-					      item_flags);
+		flow_verbs_translate_item_gre(dev_flow, gre_spec,
+					      tunnel_item, item_flags);
 	dev_flow->handle->layers = item_flags;
 	/* Other members of attr will be ignored. */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-10 12:05:31.841480501 +0000
+++ 0020-net-mlx5-fix-MPLS-GRE-Verbs-spec-ordering.patch	2022-03-10 12:05:31.315630894 +0000
@@ -1 +1 @@
-From 98008ce6ec2f31c2e94c0eb39740c8178aeb8392 Mon Sep 17 00:00:00 2001
+From d31463e0b2e89a5b3a072ef6d983405b9774dacc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 98008ce6ec2f31c2e94c0eb39740c8178aeb8392 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 85f0788222..fd902078f8 100644
+index 66a2711e8b..165786f864 100644


  parent reply	other threads:[~2022-03-10 12:12 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 12:11 patch 'examples/kni: add missing trailing newline in log' " Kevin Traynor
2022-03-10 12:11 ` patch 'devtools: remove event/dlb exception in ABI check' " Kevin Traynor
2022-03-10 12:11 ` patch 'build: fix build on FreeBSD with Meson 0.61.1' " Kevin Traynor
2022-03-10 12:11 ` patch 'ethdev: fix doxygen comments for device info struct' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/bnxt: fix null dereference in session cleanup' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix inet IPIP protocol type' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix next protocol RSS expansion' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix shared RSS destroy' " Kevin Traynor
2022-03-10 13:12   ` Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix modify port action validation' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: remove unused reference counter' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix meter policy creation assert' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix flex item availability' " Kevin Traynor
2022-03-21 17:02   ` Kevin Traynor
2022-03-23 16:03     ` Kevin Traynor
2022-03-25 17:27       ` Kevin Traynor
2022-03-10 12:11 ` Kevin Traynor [this message]
2022-03-10 12:11 ` patch 'net/mlx5: fix configuration without Rx queue' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix meter creation default state' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/sfc: reduce log level of tunnel restore info error' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/iavf: fix potential out-of-bounds access' " Kevin Traynor
2022-03-10 12:11 ` patch 'regexdev: fix section attribute of symbols' " Kevin Traynor
2022-03-10 12:11 ` patch 'common/mlx5: consider local functions as internal' " Kevin Traynor
2022-03-10 12:11 ` patch 'build: hide local symbols in shared libraries' " Kevin Traynor
2022-03-10 12:11 ` patch 'devtools: fix symbols check' " Kevin Traynor

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=20220310121127.1324802-13-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=dsosnowski@nvidia.com \
    --cc=stable@dpdk.org \
    --cc=viacheslavo@nvidia.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).