* [dpdk-dev] [PATCH 1/2] common/mlx5: support pcie device guid query
2021-09-28 8:23 [dpdk-dev] [PATCH 0/2] support socket direct mode bonding Rongwei Liu
@ 2021-09-28 8:23 ` Rongwei Liu
2021-09-28 8:23 ` [dpdk-dev] [PATCH 2/2] net/mlx5: support socket direct mode bonding Rongwei Liu
1 sibling, 0 replies; 3+ messages in thread
From: Rongwei Liu @ 2021-09-28 8:23 UTC (permalink / raw)
To: matan, viacheslavo, orika, thomas; +Cc: dev, rasland
sysfs entry "phys_switch_id" holds each PCIe device'
guid.
The devices which reside in the same physical NIC should
have the same guid.
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Acked-by: Viacheslav Ovsiienko viacheslavo@nvidia.com
---
drivers/common/mlx5/linux/mlx5_common_os.c | 41 ++++++++++++++++++++++
drivers/common/mlx5/linux/mlx5_common_os.h | 19 ++++++++++
2 files changed, 60 insertions(+)
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index 9e0c823c97..8b3ee2baea 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -2,6 +2,7 @@
* Copyright 2020 Mellanox Technologies, Ltd
*/
+#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
@@ -428,3 +429,43 @@ mlx5_os_get_ibv_device(const struct rte_pci_addr *addr)
mlx5_glue->free_device_list(ibv_list);
return ibv_match;
}
+
+int
+mlx5_get_device_guid(const struct rte_pci_addr *dev, uint8_t *guid, size_t len)
+{
+ char tmp[512];
+ char cur_ifname[IF_NAMESIZE + 1];
+ FILE *id_file;
+ DIR *dir;
+ struct dirent *ptr;
+ int ret;
+
+ if (guid == NULL || len < sizeof(u_int64_t) + 1)
+ return -1;
+ memset(guid, 0, len);
+ snprintf(tmp, sizeof(tmp), "/sys/bus/pci/devices/%04x:%02x:%02x.%x/net",
+ dev->domain, dev->bus, dev->devid, dev->function);
+ dir = opendir(tmp);
+ if (dir == NULL)
+ return -1;
+ /* Traverse to identify PF interface */
+ do {
+ ptr = readdir(dir);
+ if (ptr == NULL || ptr->d_type != DT_DIR) {
+ closedir(dir);
+ return -1;
+ }
+ } while (strchr(ptr->d_name, '.') || strchr(ptr->d_name, '_') ||
+ strchr(ptr->d_name, 'v'));
+ snprintf(cur_ifname, sizeof(cur_ifname), "%s", ptr->d_name);
+ closedir(dir);
+ snprintf(tmp + strlen(tmp), sizeof(tmp) - strlen(tmp),
+ "/%s/phys_switch_id", cur_ifname);
+ /* Older OFED like 5.3 doesn't support read */
+ id_file = fopen(tmp, "r");
+ if (!id_file)
+ return 0;
+ ret = fscanf(id_file, "%16s", guid);
+ fclose(id_file);
+ return ret;
+}
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h
index c3202b6786..ea0467f507 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -296,4 +296,23 @@ __rte_internal
struct ibv_device *
mlx5_os_get_ibv_dev(const struct rte_device *dev);
+/**
+ * This is used to query system_image_guid as describing in PRM.
+ *
+ * @param dev[in]
+ * Pionter to a device instance as PCIe id.
+ * @param guid[out]
+ * Pointer to the buffer to hold device guid.
+ * Guid is uint64_t and corresponding to 17 bytes string.
+ * @param len[in]
+ * Guid buffer length, 17 bytes at least.
+ *
+ * @return
+ * -1 if internal failure.
+ * 0 if OFED doesn't support.
+ * >0 if success.
+ */
+int
+mlx5_get_device_guid(const struct rte_pci_addr *dev, uint8_t *guid, size_t len);
+
#endif /* RTE_PMD_MLX5_COMMON_OS_H_ */
--
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread* [dpdk-dev] [PATCH 2/2] net/mlx5: support socket direct mode bonding
2021-09-28 8:23 [dpdk-dev] [PATCH 0/2] support socket direct mode bonding Rongwei Liu
2021-09-28 8:23 ` [dpdk-dev] [PATCH 1/2] common/mlx5: support pcie device guid query Rongwei Liu
@ 2021-09-28 8:23 ` Rongwei Liu
1 sibling, 0 replies; 3+ messages in thread
From: Rongwei Liu @ 2021-09-28 8:23 UTC (permalink / raw)
To: matan, viacheslavo, orika, thomas; +Cc: dev, rasland
In socket direct mode, it's possible to bind any two (maybe four
in future) PCIe devices with IDs like xxxx:xx:xx.x and
yyyy:yy:yy.y. Bonding member interfaces are unnecessary to have
the same PCIe domain/bus/device ID anymore,
Kernel driver uses "system_image_guid" to identify if devices can
be bound together or not. Sysfs "phys_switch_id" is used to get
"system_image_guid" of each network interface.
OFED 5.4+ is required to support "phys_switch_id".
Centos 8.1 needs to enable switch_dev mode to read "phys_switch_id".
Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
Acked-by: Viacheslav Ovsiienko viacheslavo@nvidia.com
---
drivers/net/mlx5/linux/mlx5_os.c | 43 +++++++++++++++++++++++++-------
1 file changed, 34 insertions(+), 9 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 3746057673..b8ce6cd7f3 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2008,6 +2008,8 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
FILE *bond_file = NULL, *file;
int pf = -1;
int ret;
+ uint8_t cur_guid[32] = {0};
+ uint8_t guid[32] = {0};
/*
* Try to get master device name. If something goes
@@ -2022,6 +2024,8 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
np = mlx5_nl_portnum(nl_rdma, ibv_dev->name);
if (!np)
return -1;
+ if (mlx5_get_device_guid(pci_dev, cur_guid, sizeof(cur_guid)) < 0)
+ return -1;
/*
* The Master device might not be on the predefined
* port (not on port index 1, it is not garanted),
@@ -2050,6 +2054,7 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
char tmp_str[IF_NAMESIZE + 32];
struct rte_pci_addr pci_addr;
struct mlx5_switch_info info;
+ int ret;
/* Process slave interface names in the loop. */
snprintf(tmp_str, sizeof(tmp_str),
@@ -2080,15 +2085,6 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
tmp_str);
break;
}
- /* Match PCI address, allows BDF0+pfx or BDFx+pfx. */
- if (pci_dev->domain == pci_addr.domain &&
- pci_dev->bus == pci_addr.bus &&
- pci_dev->devid == pci_addr.devid &&
- ((pci_dev->function == 0 &&
- pci_dev->function + owner == pci_addr.function) ||
- (pci_dev->function == owner &&
- pci_addr.function == owner)))
- pf = info.port_name;
/* Get ifindex. */
snprintf(tmp_str, sizeof(tmp_str),
"/sys/class/net/%s/ifindex", ifname);
@@ -2105,6 +2101,30 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
bond_info->ports[info.port_name].pci_addr = pci_addr;
bond_info->ports[info.port_name].ifindex = ifindex;
bond_info->n_port++;
+ /*
+ * Under socket direct mode, bonding will use
+ * system_image_guid as identification.
+ * After OFED 5.4, guid is readable (ret >= 0) under sysfs.
+ * All bonding slaves should have the same guid even if driver
+ * is using PCIe BDF.
+ */
+ ret = mlx5_get_device_guid(&pci_addr, guid, sizeof(guid));
+ if (ret < 0)
+ break;
+ else if (ret > 0) {
+ if (!memcmp(guid, cur_guid, sizeof(guid)) &&
+ owner == info.port_name &&
+ (owner != 0 || (owner == 0 &&
+ !rte_pci_addr_cmp(pci_dev, &pci_addr))))
+ pf = info.port_name;
+ } else if (pci_dev->domain == pci_addr.domain &&
+ pci_dev->bus == pci_addr.bus &&
+ pci_dev->devid == pci_addr.devid &&
+ ((pci_dev->function == 0 &&
+ pci_dev->function + owner == pci_addr.function) ||
+ (pci_dev->function == owner &&
+ pci_addr.function == owner)))
+ pf = info.port_name;
}
if (pf >= 0) {
/* Get bond interface info */
@@ -2117,6 +2137,11 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,
DRV_LOG(INFO, "PF device %u, bond device %u(%s)",
ifindex, bond_info->ifindex, bond_info->ifname);
}
+ if (owner == 0 && pf != 0) {
+ DRV_LOG(INFO, "PCIe instance %04x:%02x:%02x.%x isn't bonding master",
+ pci_dev->domain, pci_dev->bus, pci_dev->devid,
+ pci_dev->function);
+ }
return pf;
}
--
2.27.0
^ permalink raw reply [flat|nested] 3+ messages in thread