From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 56BF7A0C51;
Tue, 13 Jul 2021 15:16:12 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 19C7F41272;
Tue, 13 Jul 2021 15:16:07 +0200 (CEST)
Received: from NAM11-BN8-obe.outbound.protection.outlook.com
(mail-bn8nam11on2073.outbound.protection.outlook.com [40.107.236.73])
by mails.dpdk.org (Postfix) with ESMTP id 12FB1410DF
for <dev@dpdk.org>; Tue, 13 Jul 2021 15:16:04 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=oHi6ghWxra4HZMI8CZJi1fWCQ/m5E4gRBZvyR2RT+wxkTm6HmDs6ojGxolFTsKGWP0XyDPHZDQW7pPJKDyl4wx7R8tQEYXDZv/qBFaN6/gNG70CsNBCygsgMzebhn50f1qI4vLcqDZDMKX5MDRuNbCEFE476U+DSXmKxktMNjY5CQqlihZSSkBqfdeccHO6ovgLk18zfUeqgdoxjGsUdjNSqBQ7iGypY1+i7rgtKHciWoMkoRxf1oWcmYpFj6fYDDEDB9bGt7MK8WL8XUQp2ho34j0pOu55jydU1/x7C1JjonrJTWaaG4IhfcexHKXL8nTnpnFQFjsecVni3dTQlXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=Y12edau56bAzhVULkZpTlz5Zl+APFeJXpIIcovZSYA0=;
b=mJKi7L24alkggZkum6QXNhIVjzU5jhuz9QZLanUPm27qWSWtecRUhVjvjwf85aElEUH8eBgsFQt5J7/1/VOZfmP+6h1Uz54uW11O+GnxEZMhBd8iZvcpIJ/cQ51WiEwUF1T1Ka6RnotI+tcheNZE/bc5KifNBUmSeMyS/tdneL5A5h5oyGiiKgzQ3Y6BFk/e2Zc9eTj/U7g76eB4AY81Dv648LCKfveLgWCJypa27PX7p1WipZSIv6us/JmKB7kd81nU9e2iy73MU6mVcWnXE6u7vMQirG2wvxBe4uRKf/HqPW0O8BYSIDOXjnSQ8bTnd6pEw3NR6DD1/M0eCKbxhQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=ashroe.eu smtp.mailfrom=nvidia.com;
dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;
dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=Y12edau56bAzhVULkZpTlz5Zl+APFeJXpIIcovZSYA0=;
b=uC7nE9PCdaWbAK2bEL6q6GaQZE/vvbiTjGd6MfZ1igCVmb49Be0leuTNPeb73/Wn5a4hrZddW361Dd84OtqJ5pV6JOLS7rDGWbqI+qm8UD9Ya0dIx3H8GMuKu7ir/O4sSWKq9nTiU4DvosGlZcIOta6m9p/ljBWPV2XxVjz76ynzfNpQtX0DxU1p6IdjCEF7A8+99oGPzr42O/HSUM+nOIrYY4ImGggjDWbSxd4PUd2NdpOnVhfB+AXVNffcxEJkPrWUKpYU4R3O65ZhNvqJRTDsxVE2at9WvBZriJCjYmyUJOi0zpqMsNrXjllphuD0jXewvIXpd7Tu4qtpBBPyKA==
Received: from MWHPR21CA0040.namprd21.prod.outlook.com (2603:10b6:300:129::26)
by SN6PR12MB2688.namprd12.prod.outlook.com (2603:10b6:805:6f::29)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.20; Tue, 13 Jul
2021 13:16:01 +0000
Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com
(2603:10b6:300:129:cafe::89) by MWHPR21CA0040.outlook.office365.com
(2603:10b6:300:129::26) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.0 via Frontend
Transport; Tue, 13 Jul 2021 13:16:00 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; ashroe.eu; dkim=none (message not signed)
header.d=none;ashroe.eu; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4308.20 via Frontend Transport; Tue, 13 Jul 2021 13:16:00 +0000
Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Jul
2021 13:15:42 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
CC: Thomas Monjalon <thomas@monjalon.net>, <dev@dpdk.org>,
<xuemingl@nvidia.com>, Matan Azrad <matan@nvidia.com>, Shahaf Shuler
<shahafs@nvidia.com>, Ray Kinsella <mdr@ashroe.eu>
Date: Tue, 13 Jul 2021 21:14:27 +0800
Message-ID: <20210713131437.30170-5-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210616040935.311733-2-xuemingl@nvidia.com>
References: <20210616040935.311733-2-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.6]
X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 43e2257c-fba3-44d0-6a6e-08d946005c19
X-MS-TrafficTypeDiagnostic: SN6PR12MB2688:
X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr
X-Microsoft-Antispam-PRVS: <SN6PR12MB2688E7F5B4D3FEB4FF01DCD2A1149@SN6PR12MB2688.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:568;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: fxfyc6NoYOeFgns8c1FFO1NOS8RfX2j5j3YVbk5+S9v8TevWHBmVq7GxDPc/UbKlwhbzCBwLETqLbc6efAO2rsJMbeU8a/Ie7C42aVsONXNuqgh5VpeyJFGOvFQP2t+K2pK5TBoaf52hL1YKsAKdS/2w3p0jWOGDGTvRmh1NzXxW0ge1jduSx/XZ5G0VG7paQsRgNGUK0l36uQs0Ee6cvuCHSk/9ZkA525G3+KM3rUOQeQ3fwZtKWsbqZCKFcFfMJtG2+q8ytkIwN5M6FJmuL2XPzszxoFKDnb3Q0IlRrCG9nb0845q9s+vDQwwaybBbi4gLAixJnYXjlsUD5pJJuCAusTeHoB6b/LHStHWZ0jLG/pE6H8YTRnoO5hU3k/Nw3y4+Wfq96c2FhM3/0kU1LVZHRt90Oj3vM4PS2DJ9c6CRgcxybYKpUcJhxoAFivyGptUeY2CG7q3T0djEReYv9GFZvqJLhRtIEUN90aJX6xyMQ/SEBX7Y1+YgepdcUqF6PmRDT9uRSgLRN25zWcUbMkvOoZiweAzgsW7zZOL51Pv0PzPlNjC/rG+iSJ8WVkg6V4yloYkEbRz+JYL2CKT6KFeYsJmlHXg06TQXRKvVMX9rKjvF+nPqGUxlb+scyxqMY6lTpea95uoU7ZulEr4BZ5WnQJaqarYdrT1w8Vv+8ngGHC/V5snuMzCUeDQZIGfsNXdZ9Br9wqoPvfV7Qw3n/xjM1VbGuG/XrGQEPW1m8hc=
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(396003)(39860400002)(346002)(376002)(136003)(36840700001)(46966006)(5660300002)(7636003)(36756003)(8936002)(55016002)(82740400003)(54906003)(186003)(316002)(36906005)(16526019)(6666004)(8676002)(6636002)(6862004)(70586007)(34020700004)(70206006)(7696005)(37006003)(26005)(4326008)(36860700001)(336012)(82310400003)(2906002)(86362001)(478600001)(83380400001)(1076003)(47076005)(356005)(426003)(2616005)(6286002);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2021 13:16:00.7450 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 43e2257c-fba3-44d0-6a6e-08d946005c19
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2688
Subject: [dpdk-dev] [PATCH v2 04/14] common/mlx5: get PCI device address
from any bus
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Thomas Monjalon <thomas@monjalon.net>
A function is exported to allow retrieving the PCI address
of the parent PCI device of a Sub-Function in auxiliary bus sysfs.
The function mlx5_dev_to_pci_str() is accepting both PCI and auxiliary
devices. In case of a PCI device, it is simply using the device name.
The function mlx5_dev_to_pci_addr(), which is based on sysfs path
and do not use any device object, is renamed to mlx5_get_pci_addr()
for clarity purpose.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
.../common/mlx5/linux/mlx5_common_auxiliary.c | 19 +++++++++++++++
drivers/common/mlx5/linux/mlx5_common_os.c | 5 ++--
drivers/common/mlx5/mlx5_common.c | 23 +++++++++++++++++++
drivers/common/mlx5/mlx5_common.h | 16 ++++++++++++-
drivers/common/mlx5/mlx5_common_private.h | 2 ++
drivers/common/mlx5/version.map | 3 ++-
drivers/net/mlx5/linux/mlx5_os.c | 6 ++---
7 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
index 4ca27cd281..6584aeb18e 100644
--- a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
+++ b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c
@@ -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)
{
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.c b/drivers/common/mlx5/linux/mlx5_common_os.c
index 337e9df8cb..9e0c823c97 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.c
+++ b/drivers/common/mlx5/linux/mlx5_common_os.c
@@ -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;
diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 6544e664ce..c258cd127a 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -196,6 +196,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)
{
diff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h
index 5a027903b3..26d1b58853 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -210,6 +210,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.
*
@@ -224,7 +238,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.
diff --git a/drivers/common/mlx5/mlx5_common_private.h b/drivers/common/mlx5/mlx5_common_private.h
index 9f00a6c54d..1096fa85e7 100644
--- a/drivers/common/mlx5/mlx5_common_private.h
+++ b/drivers/common/mlx5/mlx5_common_private.h
@@ -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
}
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index b47d73b425..a47c86e354 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -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;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index ec2f8a4aed..5c568794d7 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1918,7 +1918,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;
@@ -2095,8 +2095,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 ||
--
2.25.1