From 482a1d34b60e7b918a39b2ccd32e06638f8c5aa4 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Sun, 13 Sep 2020 19:55:06 +0000 Subject: [PATCH] common/mlx5: fix PCI address lookup mlx5 PMDs use the mlx5_dev_to_pci_addr() routine to convert Infiniband device name to the Bus-Device-Function location on the PCI bus. The routine returned success even in case of not found identification string. On caller side it likely caused the wrong match with the BDF of previous device resulting in wrong representor and master recognitions. Fixes: 771fa900b73a ("mlx5: introduce new driver for Mellanox ConnectX-4 adapters") Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/mlx5_common_os.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c index 7bb3ba6f82..0edd78ea6d 100644 --- a/drivers/common/mlx5/linux/mlx5_common_os.c +++ b/drivers/common/mlx5/linux/mlx5_common_os.c @@ -39,6 +39,7 @@ mlx5_dev_to_pci_addr(const char *dev_path, { FILE *file; char line[32]; + int rc = -ENOENT; MKSTR(path, "%s/device/uevent", dev_path); file = fopen(path, "rb"); @@ -48,16 +49,19 @@ mlx5_dev_to_pci_addr(const char *dev_path, } while (fgets(line, sizeof(line), file) == line) { size_t len = strlen(line); - int ret; /* Truncate long lines. */ - if (len == (sizeof(line) - 1)) + if (len == (sizeof(line) - 1)) { while (line[(len - 1)] != '\n') { - ret = fgetc(file); + int ret = fgetc(file); + if (ret == EOF) - break; + goto exit; line[(len - 1)] = ret; } + /* No match for long lines. */ + continue; + } /* Extract information. */ if (sscanf(line, "PCI_SLOT_NAME=" @@ -66,11 +70,15 @@ mlx5_dev_to_pci_addr(const char *dev_path, &pci_addr->bus, &pci_addr->devid, &pci_addr->function) == 4) { + rc = 0; break; } } +exit: fclose(file); - return 0; + if (rc) + rte_errno = -rc; + return rc; } /** -- 2.20.1