diff mbox series

common/mlx5: fix PCI location address routine

Message ID 1600026906-9702-1-git-send-email-viacheslavo@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series common/mlx5: fix PCI location address routine |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-testing success Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Slava Ovsiienko Sept. 13, 2020, 7:55 p.m. UTC 
  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: 79aa430721b1 ("common/mlx5: split common file under Linux directory")
Cc: stable@dpdk.org

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/common/mlx5/linux/mlx5_common_os.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Raslan Darawsheh Oct. 8, 2020, 12:05 p.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Sent: Sunday, September 13, 2020 10:55 PM
> To: dev@dpdk.org
> Cc: Raslan Darawsheh <rasland@nvidia.com>; Matan Azrad
> <matan@nvidia.com>; Ori Kam <orika@nvidia.com>; stable@dpdk.org
> Subject: [PATCH] common/mlx5: fix PCI location address routine
> 
> 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: 79aa430721b1 ("common/mlx5: split common file under Linux
> directory")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> ---
>  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 7bb3ba6..0edd78e 100644
> --- a/drivers/common/mlx5/linux/mlx5_common_os.c
> +++ b/drivers/common/mlx5/linux/mlx5_common_os.c
> @@ -39,6 +39,7 @@
>  {
>  	FILE *file;
>  	char line[32];
> +	int rc = -ENOENT;
>  	MKSTR(path, "%s/device/uevent", dev_path);
> 
>  	file = fopen(path, "rb");
> @@ -48,16 +49,19 @@
>  	}
>  	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 @@
>  			   &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;
>  }
> 
>  /**
> --
> 1.8.3.1

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh
diff mbox series

Patch

diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index 7bb3ba6..0edd78e 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -39,6 +39,7 @@ 
 {
 	FILE *file;
 	char line[32];
+	int rc = -ENOENT;
 	MKSTR(path, "%s/device/uevent", dev_path);
 
 	file = fopen(path, "rb");
@@ -48,16 +49,19 @@ 
 	}
 	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 @@ 
 			   &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;
 }
 
 /**