@@ -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>
@@ -66,6 +68,23 @@ 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];
+ char *base;
+
+ if (mlx5_auxiliary_get_pci_path(dev, sysfs_pci, sizeof(sysfs_pci)) != 0)
+ return -ENODEV;
+ base = basename(sysfs_pci);
+ if (base == NULL)
+ return -errno;
+ if (rte_strscpy(addr, base, size) < 0)
+ return -rte_errno;
+ return 0;
+}
+
static int
mlx5_auxiliary_get_numa(const struct rte_auxiliary_device *dev)
{
@@ -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];
@@ -417,7 +416,7 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr)
struct rte_pci_addr paddr;
DRV_LOG(DEBUG, "Checking device \"%s\"..", ibv_list[n]->name);
- if (mlx5_dev_to_pci_addr(ibv_list[n]->ibdev_path, &paddr) != 0)
+ if (mlx5_get_pci_addr(ibv_list[n]->ibdev_path, &paddr) != 0)
continue;
if (rte_pci_addr_cmp(addr, &paddr) != 0)
continue;
@@ -198,6 +198,29 @@ 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)
+{
+ struct rte_pci_addr pci_addr = { 0 };
+ int ret;
+
+ if (mlx5_dev_is_pci(dev)) {
+ /* Input might be <BDF>, format PCI address to <DBDF>. */
+ ret = rte_pci_addr_parse(dev->name, &pci_addr);
+ if (ret != 0)
+ return -ENODEV;
+ rte_pci_device_name(&pci_addr, addr, size);
+ return 0;
+ }
+#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)
{
@@ -208,6 +208,20 @@ check_cqe(volatile struct mlx5_cqe *cqe, const uint16_t cqes_n,
return MLX5_CQE_STATUS_SW_OWN;
}
+/*
+ * Get PCI address <DBDF> string from EAL device.
+ *
+ * @param[out] addr
+ * The output address buffer string
+ * @param[in] size
+ * The output buffer size
+ * @return
+ * - 0 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.
*
@@ -222,7 +236,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.
@@ -39,6 +39,8 @@ bool mlx5_dev_pci_match(const struct mlx5_class_driver *drv,
void mlx5_common_auxiliary_init(void);
struct ibv_device *mlx5_get_aux_ibv_device(
const struct rte_auxiliary_device *dev);
+int mlx5_auxiliary_get_pci_str(const struct rte_auxiliary_device *dev,
+ char *addr, size_t size);
#ifdef __cplusplus
}
@@ -15,7 +15,7 @@ INTERNAL {
mlx5_create_mr_ext;
mlx5_dev_is_pci; # WINDOWS_NO_EXPORT
- mlx5_dev_to_pci_addr; # WINDOWS_NO_EXPORT
+ mlx5_dev_to_pci_str; # WINDOWS_NO_EXPORT
mlx5_devx_alloc_uar; # WINDOWS_NO_EXPORT
@@ -75,6 +75,7 @@ INTERNAL {
mlx5_free;
mlx5_get_ifname_sysfs; # WINDOWS_NO_EXPORT
+ mlx5_get_pci_addr; # WINDOWS_NO_EXPORT
mlx5_glue;
@@ -1848,7 +1848,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;
@@ -2025,8 +2025,8 @@ 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 ||