From: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
To: dev@dpdk.org
Cc: rasland@nvidia.com, matan@nvidia.com, orika@nvidia.com, stable@dpdk.org
Subject: [dpdk-stable] [PATCH] common/mlx5: fix PCI location address routine
Date: Sun, 13 Sep 2020 19:55:06 +0000 [thread overview]
Message-ID: <1600026906-9702-1-git-send-email-viacheslavo@nvidia.com> (raw)
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
next reply other threads:[~2020-09-13 19:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-13 19:55 Viacheslav Ovsiienko [this message]
2020-10-08 12:05 ` Raslan Darawsheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1600026906-9702-1-git-send-email-viacheslavo@nvidia.com \
--to=viacheslavo@nvidia.com \
--cc=dev@dpdk.org \
--cc=matan@nvidia.com \
--cc=orika@nvidia.com \
--cc=rasland@nvidia.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).