patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Gregory Etelson <getelson@nvidia.com>
Cc: Viacheslav Ovsiienko <viacheslavo@nvidia.com>,
	dpdk stable <stable@dpdk.org>
Subject: patch 'net/mlx5: fix flex item availability' has been queued to stable release 21.11.1
Date: Thu, 10 Mar 2022 12:11:18 +0000	[thread overview]
Message-ID: <20220310121127.1324802-12-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/48fe9efaf2fb974e3f805eb7c54440ec3818a4b6

Thanks.

Kevin

---
From 48fe9efaf2fb974e3f805eb7c54440ec3818a4b6 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Wed, 2 Mar 2022 13:06:42 +0200
Subject: [PATCH] net/mlx5: fix flex item availability

[ upstream commit 71adf25dbfb3a60731bd922342cc0f171714db81 ]

Flex item availability is restricted to BlueField-2 and BlueField-3
PF ports.

The patch validates port type compliance before proceeding to
flex item creation.

Fixes: db25cadc0887 ("net/mlx5: add flex item operations")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/common/mlx5/linux/mlx5_common_os.h |  1 +
 drivers/net/mlx5/mlx5_flow.c               | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h
index 83066e752d..2e4ac09bbf 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -10,4 +10,5 @@
 
 #include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_debug.h>
 #include <rte_atomic.h>
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 5b36cfa042..41a648ff3f 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -9854,8 +9854,25 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev,
 {
 	static const char err_msg[] = "flex item creation unsupported";
+	struct mlx5_priv *priv = dev->data->dev_private;
 	struct rte_flow_attr attr = { .transfer = 0 };
 	const struct mlx5_flow_driver_ops *fops =
 			flow_get_drv_ops(flow_get_drv_type(dev, &attr));
 
+	if (!priv->pci_dev) {
+		rte_flow_error_set(error, ENOTSUP,
+				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+				   "create flex item on PF only");
+		return NULL;
+	}
+	switch (priv->pci_dev->id.device_id) {
+	case PCI_DEVICE_ID_MELLANOX_CONNECTX6DXBF:
+	case PCI_DEVICE_ID_MELLANOX_CONNECTX7BF:
+		break;
+	default:
+		rte_flow_error_set(error, ENOTSUP,
+				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+				   "flex item available on BlueField ports only");
+		return NULL;
+	}
 	if (!fops->item_create) {
 		DRV_LOG(ERR, "port %u %s.", dev->data->port_id, err_msg);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-10 12:05:31.815513907 +0000
+++ 0019-net-mlx5-fix-flex-item-availability.patch	2022-03-10 12:05:31.314630891 +0000
@@ -1 +1 @@
-From 71adf25dbfb3a60731bd922342cc0f171714db81 Mon Sep 17 00:00:00 2001
+From 48fe9efaf2fb974e3f805eb7c54440ec3818a4b6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 71adf25dbfb3a60731bd922342cc0f171714db81 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index a85f3b5f3c..27f1192205 100644
+index 83066e752d..2e4ac09bbf 100644
@@ -33 +34 @@
-index 15a4a8cd98..ffcaef0baa 100644
+index 5b36cfa042..41a648ff3f 100644
@@ -36 +37 @@
-@@ -10631,8 +10631,25 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev,
+@@ -9854,8 +9854,25 @@ mlx5_flow_flex_item_create(struct rte_eth_dev *dev,


  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 ` Kevin Traynor [this message]
2022-03-21 17:02   ` patch 'net/mlx5: fix flex item availability' " Kevin Traynor
2022-03-23 16:03     ` Kevin Traynor
2022-03-25 17:27       ` Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix MPLS/GRE Verbs spec ordering' " Kevin Traynor
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-12-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=getelson@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).