From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3F57FA0548; Thu, 27 May 2021 16:02:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 09C234110C; Thu, 27 May 2021 16:02:35 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2055.outbound.protection.outlook.com [40.107.93.55]) by mails.dpdk.org (Postfix) with ESMTP id C136841104 for ; Thu, 27 May 2021 16:02:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lxp4f4KS3SO9i2fw8hOEKlcQk+ozHaqJvcpFzZ+ZiN+vP1PIVjELWA8jCfFIEHHTG06c4NtBS7qRYuDM4t0jbyNEAGiKIomJGZTOhlSR4ywgBQ1ezcoYMJHOHHWlsHLBwXcLxIQA6vsu4tnZfiMeYcsoKH9gYwotRutbRp8jt9vnhRQ0eF/XQ3cIsYOSEoOvYZ9niyCO11h5sFIW8Syz3y7HXgRojfvNmWlHmwNnipKM7Ctt9zRw1/MUU/wqcAV6eW0KSHzS25+TaD3jv4pr79qoJ/syc4HCIuMfWaETlP4QEyOpfYr7F0dSBc3ymkBWlNGiRhXxd66xejvvvLruWQ== 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=ps17lqtqUffF7kUuQd/oNdqHaPmrR58DiS9pM4VVF9Y=; b=gs4fTB3/o8QahvmzEoF6v1NCrpvAksxRqVWavpivHs3AGr4vofqCWKiO/2RhfdnuemTXmcLy7Ndesdfl2X/gRaSE7grk5juDuc0aJ3e/3duXHHiA0/OGxqbJSIShdnf4Vm00lCZqChFnvln0/Bb6No66C32E2dhKe7ISM78Ar4PNvOIStFqEk8dnjPLFclQd652+vN5tSMAwbU0pc73/YAZNE9kWopxRo7+QO1BiDxRB6lO2shxTQ50KGeLZc6pqoidE/EBDkDsO9+9qrKYoYo+xsDW/QqF1D3y8x7moJTxt7OYQ4pAxPTwN8dN+zvtPUzNXp0yTGt1DaXc/OfY35A== 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=ps17lqtqUffF7kUuQd/oNdqHaPmrR58DiS9pM4VVF9Y=; b=hEJoFgDWkMO98mu7W82PUS6oNUCwgtpYBh+iNfKMbrXuuCZVWzMQd3arA0gCWfVSOm4gV+Wa8euoNL2MB/TYXUwCFI3XYOiU8HhrKnHWiSF5XHFbcsinFC+6cVrWBzev2PgFqefeNf0rWf8FAJxRtMcPq/YdCZdCuuo/Z7ICZU7sSyGDr8PAIwlLEggba5fkYuq2sbJWpPF5OX56CDjtgELyx3VDmluccT96une3XyaULqw1RTegVFHadNujEDQsAcKQLY9XOdNYEHaookXeE1K2Jqjh97+tLynNNCM2uWta5rUznTN6vkPpX+LNfnZyHP7PBiiK4hIyzf2IJJmSPg== Received: from BN1PR10CA0030.namprd10.prod.outlook.com (2603:10b6:408:e0::35) by DM6PR12MB4075.namprd12.prod.outlook.com (2603:10b6:5:21d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.21; Thu, 27 May 2021 14:02:31 +0000 Received: from BN8NAM11FT039.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e0:cafe::83) by BN1PR10CA0030.outlook.office365.com (2603:10b6:408:e0::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20 via Frontend Transport; Thu, 27 May 2021 14:02:31 +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 BN8NAM11FT039.mail.protection.outlook.com (10.13.177.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4129.25 via Frontend Transport; Thu, 27 May 2021 14:02:31 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 27 May 2021 14:02:21 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Thomas Monjalon , , , Matan Azrad , Shahaf Shuler , Ray Kinsella , Neil Horman Date: Thu, 27 May 2021 17:02:00 +0300 Message-ID: <20210527140202.19377-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210527140202.19377-1-xuemingl@nvidia.com> References: <20210527133759.17401-1-xuemingl@nvidia.com> <20210527140202.19377-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7eeaa84b-5cea-4206-accd-08d9211811f5 X-MS-TrafficTypeDiagnostic: DM6PR12MB4075: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:568; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4eD8IhexKYN7TxOcKhS+WObt38L+gBbA4aH3gsF6r/wJd+wL9bk64g7PPz9APIJmoAXRBHCwhZudCNACc3xV3xi98itjZdUXe6hRXttrM9NYhZsosLh2BFm0R9UIWxA3jViwthZxMIfbdQA2C3fhB33keLYhSTHnOXuRaSciIlFfMQ67i9gyy5aFB8p/afT8CHW3kHKEQQR7j44h3W9UPRZWcIiwk6PG0U/T/BySf8JR4SVVtpH492patwSaDqc/qdhDkxUxoSL/z32VRiHiKlfYq7uv+QbZ/Fp2sQGSMbBe/g8k7Lvcy7RXWjgrMJWTBD4lGhXi/q4/+owqNPlzwjYC27peSWs/uV1iKHprFIQ00APpVnwz0V5HTDtTHEKUvWA0IUAbtQOZJMRhSbt73lzfWmUP6nFF+GSvACWJFweO5srl+Kyl3DaS9oj1MULzrXjE1KL1y+d+gx96XnlyHnlEAPKlF1K6oZlvqkl5NQYzP/a9uif7nHqHC29fWZJa9i+2jmv7Do1eyox6wFzy7fVumShZPmVrQ8ptendAZN4Et6QFfj7HsRxA8h+WR1Y2PlHVkYbxDrDNR91DBOFI2XKIjmarrsVvOuGXG/inz/wbjt5JCqWGnuA390VuoE2sJSF8vW5NMnw1JjHFJdzaxw== 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)(136003)(346002)(39860400002)(376002)(396003)(46966006)(36840700001)(26005)(7696005)(37006003)(6862004)(86362001)(55016002)(8676002)(8936002)(47076005)(6666004)(70586007)(36756003)(70206006)(316002)(16526019)(2616005)(426003)(1076003)(186003)(83380400001)(2906002)(6636002)(36906005)(7636003)(54906003)(478600001)(356005)(6286002)(336012)(5660300002)(36860700001)(82310400003)(4326008)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 May 2021 14:02:31.1951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7eeaa84b-5cea-4206-accd-08d9211811f5 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: BN8NAM11FT039.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4075 Subject: [dpdk-dev] [RFC 12/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Thomas Monjalon 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 --- drivers/common/mlx5/linux/mlx5_common_auxiliary.c | 15 +++++++++++++++ drivers/common/mlx5/linux/mlx5_common_os.c | 3 +-- drivers/common/mlx5/mlx5_common.c | 14 ++++++++++++++ drivers/common/mlx5/mlx5_common.h | 12 +++++++++++- drivers/common/mlx5/mlx5_common_private.h | 2 ++ drivers/common/mlx5/version.map | 3 ++- drivers/net/mlx5/linux/mlx5_os.c | 5 ++--- 7 files changed, 47 insertions(+), 7 deletions(-) diff --git a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c index f16fd2ee37..f97c5e7350 100644 --- a/drivers/common/mlx5/linux/mlx5_common_auxiliary.c +++ b/drivers/common/mlx5/linux/mlx5_common_auxiliary.c @@ -4,6 +4,8 @@ #include #include +#include + #include #include #include @@ -67,6 +69,19 @@ 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]; + + if (mlx5_auxiliary_get_pci_path(dev, sysfs_pci, sizeof(sysfs_pci)) != 0) + return -ENODEV; + if (rte_strscpy(addr, basename(dirname(sysfs_pci)), 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 cd1c305cc1..464a897072 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]; diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index b7be713cbe..c3fdb7d23f 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -158,6 +158,20 @@ 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) +{ + if (mlx5_dev_is_pci(dev)) + return rte_strscpy(addr, dev->name, size); +#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 c9c77ce540..4d520b16eb 100644 --- a/drivers/common/mlx5/mlx5_common.h +++ b/drivers/common/mlx5/mlx5_common.h @@ -213,6 +213,16 @@ check_cqe(volatile struct mlx5_cqe *cqe, const uint16_t cqes_n, return MLX5_CQE_STATUS_SW_OWN; } +/* + * Get PCI address string from EAL device. + * + * @return + * - Copied string length 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. * @@ -227,7 +237,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 d1ab15ac43..26dfc55a61 100644 --- a/drivers/common/mlx5/mlx5_common_private.h +++ b/drivers/common/mlx5/mlx5_common_private.h @@ -39,6 +39,8 @@ struct ibv_device *mlx5_get_pci_ibv_device(const struct rte_pci_addr *); /* Common auxiliary bus driver: */ void mlx5_common_auxiliary_init(void); +int mlx5_auxiliary_get_pci_str(const struct rte_auxiliary_device *dev, + char *addr, size_t size); struct ibv_device *mlx5_get_aux_ibv_device(const struct rte_auxiliary_device *); #ifdef __cplusplus diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map index 33eb7f09bc..afa52ec6bb 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; - mlx5_dev_to_pci_addr; # WINDOWS_NO_EXPORT + mlx5_dev_to_pci_str; mlx5_devx_alloc_uar; # WINDOWS_NO_EXPORT @@ -77,6 +77,7 @@ INTERNAL { mlx5_get_ibv_device; # WINDOWS_NO_EXPORT 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 e8e6b0d5c9..4f16230fa5 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -1857,7 +1857,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; @@ -2026,8 +2026,7 @@ 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