From: Thomas Monjalon <tho...@monjalon.net>
A function is exported to allow retrieving the PCI address
of the parent PCI device of a Sub-Function in auxiliary bus sysfs.
The function mlx5_dev_to_pci_str() is accepting both PCI and auxiliary
devices. In case of a PCI device, it is simply using the device name.
The function mlx5_dev_to_pci_addr(), which is based on sysfs path
and do not use any device object, is renamed to mlx5_get_pci_addr()
for clarity purpose.
Signed-off-by: Thomas Monjalon <tho...@monjalon.net>
---
drivers/common/mlx5/linux/mlx5_common_auxiliary.c | 15 +++++++++++++++
drivers/common/mlx5/linux/mlx5_common_os.c | 3 +--
drivers/common/mlx5/mlx5_common.c | 14 ++++++++++++++
drivers/common/mlx5/mlx5_common.h | 12 +++++++++++-
drivers/common/mlx5/mlx5_common_private.h | 2 ++
drivers/common/mlx5/version.map | 3 ++-
drivers/net/mlx5/linux/mlx5_os.c | 5 ++---
7 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
index f16fd2ee37..f97c5e7350 100644
--- a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
+++ b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
@@ -4,6 +4,8 @@
#include <stdlib.h>
#include <dirent.h>
+#include <libgen.h>
+
#include <rte_malloc.h>
#include <rte_errno.h>
#include <rte_bus_auxiliary.h>
@@ -67,6 +69,19 @@ mlx5_auxiliary_get_pci_path(const struct
rte_auxiliary_device *dev,
return 0;
}
+int
+mlx5_auxiliary_get_pci_str(const struct rte_auxiliary_device *dev,
+ char *addr, size_t size)
+{
+ char sysfs_pci[PATH_MAX];
+
+ if (mlx5_auxiliary_get_pci_path(dev, sysfs_pci, sizeof(sysfs_pci)) != 0)
+ return -ENODEV;
+ if (rte_strscpy(addr, basename(dirname(sysfs_pci)), size) < 0)
+ return -rte_errno;
+ return 0;
+}
+
static int
mlx5_auxiliary_get_numa(const struct rte_auxiliary_device *dev)
{
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c
b/drivers/common/mlx5/linux/mlx5_common_os.c
index cd1c305cc1..464a897072 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -24,8 +24,7 @@ const struct mlx5_glue *mlx5_glue;
#endif
int
-mlx5_dev_to_pci_addr(const char *dev_path,
- struct rte_pci_addr *pci_addr)
+mlx5_get_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr)
{
FILE *file;
char line[32];
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index b7be713cbe..c3fdb7d23f 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -158,6 +158,20 @@ to_mlx5_device(const struct rte_device *rte_dev)
return NULL;
}
+int
+mlx5_dev_to_pci_str(const struct rte_device *dev, char *addr, size_t size)
+{
+ if (mlx5_dev_is_pci(dev))
+ return rte_strscpy(addr, dev->name, size);
+#ifdef RTE_EXEC_ENV_LINUX
+ return mlx5_auxiliary_get_pci_str(RTE_DEV_TO_AUXILIARY_CONST(dev),
+ addr, size);
+#else
+ rte_errno = ENODEV;
+ return -rte_errno;
+#endif
+}
+
static void
dev_release(struct mlx5_common_device *dev)
{
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index c9c77ce540..4d520b16eb 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -213,6 +213,16 @@ check_cqe(volatile struct mlx5_cqe *cqe, const uint16_t
cqes_n,
return MLX5_CQE_STATUS_SW_OWN;
}
+/*
+ * Get PCI address string from EAL device.
+ *
+ * @return
+ * - Copied string length on success.
+ * - Negative value and rte_errno is set otherwise.
+ */
+__rte_internal
+int mlx5_dev_to_pci_str(const struct rte_device *dev, char *addr, size_t size);
+
/*
* Get PCI address from sysfs of a PCI-related device.
*
@@ -227,7 +237,7 @@ check_cqe(volatile struct mlx5_cqe *cqe, const uint16_t
cqes_n,
* - Negative value and rte_errno is set otherwise.
*/
__rte_internal
-int mlx5_dev_to_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr);
+int mlx5_get_pci_addr(const char *dev_path, struct rte_pci_addr *pci_addr);
/*
* Get kernel network interface name from sysfs IB device path.
diff --git a/drivers/common/mlx5/mlx5_common_private.h
b/drivers/common/mlx5/mlx5_common_private.h
index d1ab15ac43..26dfc55a61 100644
--- a/drivers/common/mlx5/mlx5_common_private.h
+++ b/drivers/common/mlx5/mlx5_common_private.h
@@ -39,6 +39,8 @@ struct ibv_device *mlx5_get_pci_ibv_device(const struct
rte_pci_addr *);
/* Common auxiliary bus driver: */
void mlx5_common_auxiliary_init(void);
+int mlx5_auxiliary_get_pci_str(const struct rte_auxiliary_device *dev,
+ char *addr, size_t size);
struct ibv_device *mlx5_get_aux_ibv_device(const struct rte_auxiliary_device
*);
#ifdef __cplusplus
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 33eb7f09bc..afa52ec6bb 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -15,7 +15,7 @@ INTERNAL {
mlx5_create_mr_ext;
mlx5_dev_is_pci;
- mlx5_dev_to_pci_addr; # WINDOWS_NO_EXPORT
+ mlx5_dev_to_pci_str;
mlx5_devx_alloc_uar; # WINDOWS_NO_EXPORT
@@ -77,6 +77,7 @@ INTERNAL {
mlx5_get_ibv_device; # WINDOWS_NO_EXPORT
mlx5_get_ifname_sysfs; # WINDOWS_NO_EXPORT
+ mlx5_get_pci_addr; # WINDOWS_NO_EXPORT
mlx5_glue;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index e8e6b0d5c9..4f16230fa5 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1857,7 +1857,7 @@ mlx5_device_bond_pci_match(const struct ibv_device
*ibv_dev,
/* Process slave interface names in the loop. */
snprintf(tmp_str, sizeof(tmp_str),
"/sys/class/net/%s", ifname);
- if (mlx5_dev_to_pci_addr(tmp_str, &pci_addr)) {
+ if (mlx5_get_pci_addr(tmp_str, &pci_addr)) {
DRV_LOG(WARNING, "can not get PCI address"
" for netdev \"%s\"", ifname);
continue;
@@ -2026,8 +2026,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,
break;
} else {
/* Bonding device not found. */
- if (mlx5_dev_to_pci_addr
- (ibv_list[ret]->ibdev_path, &pci_addr))
+ if (mlx5_get_pci_addr(ibv_list[ret]->ibdev_path,
&pci_addr))
continue;
if (owner_pci.domain != pci_addr.domain ||
owner_pci.bus != pci_addr.bus ||
--
2.25.1
