From: Kevin Traynor <ktraynor@redhat.com>
To: Michael Baum <michaelba@nvidia.com>
Cc: Matan Azrad <matan@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'common/mlx5: add device duplication function' has been queued to stable release 24.11.2
Date: Mon, 24 Mar 2025 16:16:29 +0000 [thread overview]
Message-ID: <20250324161731.63950-22-ktraynor@redhat.com> (raw)
In-Reply-To: <20250324161731.63950-1-ktraynor@redhat.com>
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/28/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/b3c8347553fb62b70ec4fff07b71c1667a59acf9
Thanks.
Kevin
---
From b3c8347553fb62b70ec4fff07b71c1667a59acf9 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@nvidia.com>
Date: Thu, 13 Mar 2025 10:33:50 +0200
Subject: [PATCH] common/mlx5: add device duplication function
[ upstream commit 786cd5b0fac36386695627a102d58deb7b3552f8 ]
Add function for creating additional CTX for same device base on
existing CTX.
Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
drivers/common/mlx5/linux/mlx5_common_os.c | 52 ++++++++++++++++++++
drivers/common/mlx5/mlx5_common.h | 4 ++
drivers/common/mlx5/version.map | 1 +
drivers/common/mlx5/windows/mlx5_common_os.c | 31 ++++++++++++
4 files changed, 88 insertions(+)
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index 41345e1597..2f5032f0da 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -874,4 +874,56 @@ mlx5_os_open_device(struct mlx5_common_device *cdev, uint32_t classes)
}
+/**
+ * API function to obtain a new InfiniBand (IB) context for a given common device.
+ *
+ * This function provides a port-agnostic IB context for a physical device, enabling the
+ * device to create and manage resources that can be initialized when a port starts and
+ * released when another port stops.
+ *
+ * For Linux, it imports new context from the existing context.
+ *
+ * @param cdev
+ * Pointer to the mlx5 device structure.
+ *
+ * @return
+ * Pointer to an `ibv_context` on success, or NULL on failure, with `rte_errno` set.
+ */
+void *
+mlx5_os_get_physical_device_ctx(struct mlx5_common_device *cdev)
+{
+ struct ibv_context *ctx = NULL;
+ int cmd_fd = ((struct ibv_context *)cdev->ctx)->cmd_fd;
+ int new_cmd_fd;
+
+ /*
+ * Duplicate the command FD to pass it as input to the import device function.
+ * If the import function succeeds, the new device context takes ownership of
+ * this FD, which will be freed when the new device is closed.
+ * If the import function fails, we are responsible for closing this FD.
+ */
+ new_cmd_fd = dup(cmd_fd);
+ if (new_cmd_fd < 0) {
+ DRV_LOG(ERR,
+ "Failed to duplicate FD %d for IB device \"%s\": %s",
+ cmd_fd, mlx5_os_get_ctx_device_name(cdev->ctx),
+ rte_strerror(errno));
+ rte_errno = errno;
+ return NULL;
+ }
+ /* Attempt to import the duplicated FD to create a new device context. */
+ ctx = mlx5_glue->import_device(new_cmd_fd);
+ if (!ctx) {
+ DRV_LOG(ERR, "Failed to import IB device \"%s\": %s",
+ mlx5_os_get_ctx_device_name(cdev->ctx),
+ rte_strerror(errno));
+ close(new_cmd_fd);
+ rte_errno = errno;
+ return NULL;
+ }
+ DRV_LOG(INFO, "IB device \"%s\" successfully imported, old_fd=%d, new_fd=%d",
+ mlx5_os_get_ctx_device_name(cdev->ctx), cmd_fd, new_cmd_fd);
+ return (void *)ctx;
+}
+
int
mlx5_get_device_guid(const struct rte_pci_addr *dev, uint8_t *guid, size_t len)
diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 1abd1e8239..304cabcc7e 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -636,4 +636,8 @@ mlx5_devx_uar_release(struct mlx5_uar *uar);
/* mlx5_common_os.c */
+__rte_internal
+void *
+mlx5_os_get_physical_device_ctx(struct mlx5_common_device *cdev);
+
int mlx5_os_open_device(struct mlx5_common_device *cdev, uint32_t classes);
int mlx5_os_pd_prepare(struct mlx5_common_device *cdev);
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index a2f72ef46a..6311b27c8a 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -148,4 +148,5 @@ INTERNAL {
mlx5_nl_vlan_vmwa_delete; # WINDOWS_NO_EXPORT
+ mlx5_os_get_physical_device_ctx;
mlx5_os_umem_dereg;
mlx5_os_umem_reg;
diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c b/drivers/common/mlx5/windows/mlx5_common_os.c
index 2b6058eb3e..68f1981193 100644
--- a/drivers/common/mlx5/windows/mlx5_common_os.c
+++ b/drivers/common/mlx5/windows/mlx5_common_os.c
@@ -267,4 +267,35 @@ error:
}
+/**
+ * API function to obtain a new MLX5 context for a given common device.
+ *
+ * This function provides a port-agnostic context for a physical device, enabling the
+ * device to create and manage resources that can be initialized when a port starts and
+ * released when another port stops.
+ *
+ * For Windows, it creates a new context for the device regardless to existing context.
+ *
+ * @param cdev
+ * Pointer to the mlx5 device structure.
+ *
+ * @return
+ * Pointer to an `ibv_context` on success, or NULL on failure, with `rte_errno` set.
+ */
+void *
+mlx5_os_get_physical_device_ctx(struct mlx5_common_device *cdev)
+{
+ struct mlx5_common_device temp = {
+ .dev = cdev->dev,
+ };
+
+ if (mlx5_os_open_device(&temp, MLX5_CLASS_ETH) < 0) {
+ DRV_LOG(ERR, "Failed to duplicate DevX device \"%s\": %s",
+ mlx5_os_get_ctx_device_name(cdev->ctx),
+ rte_strerror(rte_errno));
+ return NULL;
+ }
+ return (void *)temp.ctx;
+}
+
/**
* Register umem.
--
2.48.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2025-03-24 16:15:15.639304331 +0000
+++ 0022-common-mlx5-add-device-duplication-function.patch 2025-03-24 16:15:14.847735896 +0000
@@ -1 +1 @@
-From 786cd5b0fac36386695627a102d58deb7b3552f8 Mon Sep 17 00:00:00 2001
+From b3c8347553fb62b70ec4fff07b71c1667a59acf9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 786cd5b0fac36386695627a102d58deb7b3552f8 ]
+
@@ -80 +82 @@
-index e7bd4c6ec4..bea1382911 100644
+index 1abd1e8239..304cabcc7e 100644
@@ -83 +85 @@
-@@ -652,4 +652,8 @@ mlx5_devx_uar_release(struct mlx5_uar *uar);
+@@ -636,4 +636,8 @@ mlx5_devx_uar_release(struct mlx5_uar *uar);
@@ -93 +95 @@
-index 8301485839..819e6b96cb 100644
+index a2f72ef46a..6311b27c8a 100644
@@ -96,2 +98,2 @@
-@@ -151,4 +151,5 @@ INTERNAL {
- mlx5_nl_rdma_monitor_cap_get; # WINDOWS_NO_EXPORT
+@@ -148,4 +148,5 @@ INTERNAL {
+ mlx5_nl_vlan_vmwa_delete; # WINDOWS_NO_EXPORT
next prev parent reply other threads:[~2025-03-24 16:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 16:16 patch 'doc: fix year of final LTS release' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/bnxt: fix epoch bit calculation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: fix mbuf release in Arm multi-process' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ice: fix flow engines order' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ice: fix dropped packets when using VRRP' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: check interrupt registration failure' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/iavf: fix crash on app exit on FreeBSD' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix hairpin queue release' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix LACP packet handling in isolated mode' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5/hws: fix crash using represented port without ID' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template set VLAN VID' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix error info in actions construct' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5/hws: fix GTP flags matching' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template flow validation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix non-template flow validation on create' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix flow group ID for action translation' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix flow matching GENEVE options' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix IPIP tunnel verification' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix mark action validation in FDB mode' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix NAT64 register selection' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/mlx5: fix GRE matching on root table' " Kevin Traynor
2025-03-24 16:16 ` Kevin Traynor [this message]
2025-03-24 16:16 ` patch 'net/mlx5: fix GENEVE parser cleanup' " Kevin Traynor
2025-03-24 16:16 ` patch 'baseband/acc: fix queue setup failure clean up' " Kevin Traynor
2025-03-24 16:16 ` patch 'common/qat: fix devargs parsing' " Kevin Traynor
2025-03-24 16:16 ` patch 'dts: fix smoke tests docstring' " Kevin Traynor
2025-03-24 16:16 ` patch 'pdump: clear statistics when enabled' " Kevin Traynor
2025-03-24 16:16 ` patch 'examples/flow_filtering: fix IPv4 matching snippet' " Kevin Traynor
2025-03-24 16:16 ` patch 'examples/ipsec-secgw: fix cryptodev and eventdev IDs' " Kevin Traynor
2025-03-24 16:16 ` patch 'doc: add no-IOMMU mode in devbind tool guide' " Kevin Traynor
2025-03-24 16:16 ` patch 'eal: fix undetected NUMA nodes' " Kevin Traynor
2025-03-24 16:16 ` patch 'net/ixgbe: add checks for E610 VF' " 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=20250324161731.63950-22-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=matan@nvidia.com \
--cc=michaelba@nvidia.com \
--cc=stable@dpdk.org \
/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).