Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96030/?format=api
{ "id": 96030, "url": "http://patches.dpdk.org/api/patches/96030/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210719025410.15483-7-xuemingl@nvidia.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210719025410.15483-7-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210719025410.15483-7-xuemingl@nvidia.com", "date": "2021-07-19T02:54:01", "name": "[v3,06/15] net/mlx5: remove PCI dependency", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9b69eb5172b1cc35119bb10ab0975dc23140e34c", "submitter": { "id": 1904, "url": "http://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@nvidia.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210719025410.15483-7-xuemingl@nvidia.com/mbox/", "series": [ { "id": 17884, "url": "http://patches.dpdk.org/api/series/17884/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17884", "date": "2021-07-19T02:53:55", "name": "net/mlx5: support Sub-Function", "version": 3, "mbox": "http://patches.dpdk.org/series/17884/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/96030/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/96030/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id DB955A0C45;\n\tMon, 19 Jul 2021 04:55:33 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C521841197;\n\tMon, 19 Jul 2021 04:55:28 +0200 (CEST)", "from NAM02-BN1-obe.outbound.protection.outlook.com\n (mail-bn1nam07on2056.outbound.protection.outlook.com [40.107.212.56])\n by mails.dpdk.org (Postfix) with ESMTP id D2EF540E46\n for <dev@dpdk.org>; Mon, 19 Jul 2021 04:55:26 +0200 (CEST)", "from MW4PR04CA0074.namprd04.prod.outlook.com (2603:10b6:303:6b::19)\n by MN2PR12MB4991.namprd12.prod.outlook.com (2603:10b6:208:a4::15)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Mon, 19 Jul\n 2021 02:55:25 +0000", "from CO1NAM11FT006.eop-nam11.prod.protection.outlook.com\n (2603:10b6:303:6b:cafe::95) by MW4PR04CA0074.outlook.office365.com\n (2603:10b6:303:6b::19) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend\n Transport; Mon, 19 Jul 2021 02:55:25 +0000", "from mail.nvidia.com (216.228.112.34) by\n CO1NAM11FT006.mail.protection.outlook.com (10.13.174.246) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 02:55:25 +0000", "from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 19 Jul\n 2021 02:55:22 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=YCnFTyJvuaGbktzFXdRlSmsjDXv1IngtLJ1dauKKcMPIix+BURUKV1PmnBTyPwyqon/3cbKfcRPZoIgaKZBpkZBYxEyJM6x8H+8404RkOqs60CxoRf0eEXUfAtXGMLbVrxaibjQcVnzCcuOxTx1J5n5co8+JWPTud3KzJGdXKiSBMHIEvNt3vtIt9uXxSfqMQC93PcpXO4QeD5hpKg+knnz/zY2CIXmr5nJp59Y0yEfvl5BebMC5MrBmDNvKtFaLI6UUmapi25a1NXVK3f8RE7oa0u9deh0lQarqxWwogSw7EACfycBxoKvM3OPL07QWQusDhsnxiYLcSGS2LtZdPg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Sa13M3HbgIQGmnDQSjt9+vj1WEPOrdIPlrOuxLd3Glw=;\n b=W1oB9DkXmtUgFLn8rGAXv+kBzBu5i/dmAZO2zsR67CnIdABLhPJhjCjIp95E7gu+G5rB76EaeCcV51jQBnIOSd4tc/A0Effvh5BGsZz/dU6AZaPPmg2B2J5hjZTtYEoPivFQyOu0iOyb5lB9OR1XJJTQOLSxXFh5OhvAwXAuVrYI1b4dAvp3nXR6psJNLwLmAZIESgG9bn0EZHmXHdEKbPvPZJXCGVX+qJ5/m0n70PlFF97j6NvJs6mBFR0ASFe9ilU4r94JSCAUOiGseA+EjA9ZuDCw/6KAFxfhFzuXppifg7nks2VuFJfR4vk5LDqGNzdCY6kzTNElwXs5BoHDyQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=Sa13M3HbgIQGmnDQSjt9+vj1WEPOrdIPlrOuxLd3Glw=;\n b=auEnLTHRVwHClI7YgPZkL0dfXr7osFzANGCmoKVzwF0KJbM+pFYII2j9RLbnOH3Qem/JwiWuCRf2rOguQSqXNqXQlmkmFBPKALzCyDH061NdLyVakHOpY2Qlbd5ZQAjqeu+HrRprUGAh9941azIARG0FHHxZ0ipEIJ5UsdiywFHb33+yYobTu5gJaWklqbvW9BMStiDlfQJsUOobNYffPiPxk8868RCaAr8QxXPiUd8L23f6NBXopUEXtbPdGKHAugQnIpnwgHD2Bm61xOHJwKup1niU/+AgX6xtT6dX6U96w4z+mJOs+mCkH+Af1LRyUymmrgbBxJ/789RiEjVHOA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Xueming Li <xuemingl@nvidia.com>", "To": "Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "CC": "<dev@dpdk.org>, <xuemingl@nvidia.com>, Matan Azrad <matan@nvidia.com>,\n Shahaf Shuler <shahafs@nvidia.com>", "Date": "Mon, 19 Jul 2021 10:54:01 +0800", "Message-ID": "<20210719025410.15483-7-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210713131437.30170-2-xuemingl@nvidia.com>", "References": "<20210713131437.30170-2-xuemingl@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL105.nvidia.com (172.20.187.12) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "5f9332d6-a746-4dcc-cbff-08d94a60a85a", "X-MS-TrafficTypeDiagnostic": "MN2PR12MB4991:", "X-Microsoft-Antispam-PRVS": "\n <MN2PR12MB49911C2D8DEEBE1ACF4E3FA2A1E19@MN2PR12MB4991.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:48;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Hx682b6Jkh+eN022cEHVe/bZv/svYbMKOFmbxohcIfWuP1aQwNcERLQl+u+eoBIeJNYpbs03Ieh5cXXgzJLRhfneuTkaLFmN2oHaI3bAoOjduIZi6yw/gtLZz/FjtqSpx6PD6dpo6Sfn4QcKBu9qyGzKCAx0GXfLeuaICVf4YwRNx+/riE/MVsfC0+CjUaLcc8BpTx7QK2oFfSMFxrP+8XlAnVQLSWS194Yu9haW1CML+XRRJtwRmSKhSD8Yb3dUNce+iZNwShEzyV78Xm9USY57kMil+rP0ed8jdDQM6Mz6VIZpj4w0+ZHYQ+l3ilFzgMFkxFjLdMiqg9KiWO1tEkmunVtYLffQq82RiYMJJcPUKMP4lnHkugnm0nUdvKp5FUNVc5FXJ5CIcGcv2HgkDedKQ355B6t+8S4hjVS0k2fxXUvpjoMgmTLrWeFq4tQItcF6s/gNJHeRsrTQbMvLG8KH/rGUB51uy0zo+/IM10pYhcqqdTPQBkLzHUgsmKaL1We1OQsAn6gW3/ebEgrDqJvDFwykZKuaRj484Uro07Fuxy/u53HeilXFdOPgxjfdHz6KWvpiGuYty9EsaJNyHZU5AbU3MccrQBxQZs51uIdBa8IeMhBmIbaMyoaBIr/cnsKmRFFiiC01lmWYIZ1wUJzIedJHGTRVZA2qQ8OV0UoHwsZ4MglE7+si+9Y1/qNoPZvZw8Lc7PvQ6yV6EJZKqQ==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(46966006)(36840700001)(186003)(16526019)(7696005)(8936002)(86362001)(6286002)(36860700001)(83380400001)(6636002)(6862004)(4326008)(55016002)(6666004)(26005)(356005)(2906002)(82740400003)(107886003)(30864003)(426003)(5660300002)(2616005)(70206006)(82310400003)(36756003)(37006003)(54906003)(316002)(8676002)(36906005)(47076005)(1076003)(7636003)(70586007)(336012)(478600001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Jul 2021 02:55:25.0335 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 5f9332d6-a746-4dcc-cbff-08d94a60a85a", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CO1NAM11FT006.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR12MB4991", "Subject": "[dpdk-dev] [PATCH v3 06/15] net/mlx5: remove PCI dependency", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "To support more bus types, remove PCI dependency where possible.\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\n---\n drivers/net/mlx5/linux/mlx5_ethdev_os.c | 2 +-\n drivers/net/mlx5/linux/mlx5_os.c | 4 +--\n drivers/net/mlx5/mlx5.c | 45 ++++++++++++++-----------\n drivers/net/mlx5/mlx5.h | 9 ++---\n drivers/net/mlx5/mlx5_ethdev.c | 2 +-\n drivers/net/mlx5/mlx5_mr.c | 14 ++++----\n drivers/net/mlx5/mlx5_trigger.c | 12 +++----\n drivers/net/mlx5/mlx5_txq.c | 3 +-\n drivers/net/mlx5/windows/mlx5_os.c | 3 +-\n 9 files changed, 51 insertions(+), 43 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\nindex ddc1371aa9..b05b9fc950 100644\n--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n@@ -346,7 +346,7 @@ mlx5_find_master_dev(struct rte_eth_dev *dev)\n \tpriv = dev->data->dev_private;\n \tdomain_id = priv->domain_id;\n \tMLX5_ASSERT(priv->representor);\n-\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\tMLX5_ETH_FOREACH_DEV(port_id, dev->device) {\n \t\tstruct mlx5_priv *opriv =\n \t\t\trte_eth_devices[port_id].data->dev_private;\n \t\tif (opriv &&\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 05b1761f6b..4ab30fd244 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -1252,7 +1252,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t * Look for sibling devices in order to reuse their switch domain\n \t * if any, otherwise allocate one.\n \t */\n-\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\tMLX5_ETH_FOREACH_DEV(port_id, NULL) {\n \t\tconst struct mlx5_priv *opriv =\n \t\t\trte_eth_devices[port_id].data->dev_private;\n \n@@ -2511,6 +2511,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t\tdev_config.decap_en = 1;\n \t\tdev_config.log_hp_size = MLX5_ARG_UNSET;\n \t\tdev_config.allow_duplicate_pattern = 1;\n+\t\tlist[i].numa_node = pci_dev->device.numa_node;\n \t\tlist[i].eth_dev = mlx5_dev_spawn(&pci_dev->device,\n \t\t\t\t\t\t &list[i],\n \t\t\t\t\t\t &dev_config,\n@@ -2708,7 +2709,6 @@ mlx5_os_open_device(const struct mlx5_dev_spawn_data *spawn,\n \tint dbmap_env;\n \tint err = 0;\n \n-\tsh->numa_node = spawn->pci_dev->device.numa_node;\n \tpthread_mutex_init(&sh->txpp.mutex, NULL);\n \t/*\n \t * Configure environment variable \"MLX5_BF_SHUT_UP\"\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex d9c90d5ef9..8e64bf955b 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -1120,6 +1120,7 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,\n \t\trte_errno = ENOMEM;\n \t\tgoto exit;\n \t}\n+\tsh->numa_node = spawn->numa_node;\n \tif (spawn->bond_info)\n \t\tsh->bond = *spawn->bond_info;\n \terr = mlx5_os_open_device(spawn, config, sh);\n@@ -1197,7 +1198,7 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,\n \t */\n \terr = mlx5_mr_btree_init(&sh->share_cache.cache,\n \t\t\t\t MLX5_MR_BTREE_CACHE_N * 2,\n-\t\t\t\t spawn->pci_dev->device.numa_node);\n+\t\t\t\t sh->numa_node);\n \tif (err) {\n \t\terr = rte_errno;\n \t\tgoto error;\n@@ -1635,7 +1636,7 @@ mlx5_dev_close(struct rte_eth_dev *dev)\n \t\tunsigned int c = 0;\n \t\tuint16_t port_id;\n \n-\t\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\t\tMLX5_ETH_FOREACH_DEV(port_id, dev->device) {\n \t\t\tstruct mlx5_priv *opriv =\n \t\t\t\trte_eth_devices[port_id].data->dev_private;\n \n@@ -2077,18 +2078,20 @@ mlx5_set_min_inline(struct mlx5_dev_spawn_data *spawn,\n {\n \tif (config->txq_inline_min != MLX5_ARG_UNSET) {\n \t\t/* Application defines size of inlined data explicitly. */\n-\t\tswitch (spawn->pci_dev->id.device_id) {\n-\t\tcase PCI_DEVICE_ID_MELLANOX_CONNECTX4:\n-\t\tcase PCI_DEVICE_ID_MELLANOX_CONNECTX4VF:\n-\t\t\tif (config->txq_inline_min <\n-\t\t\t\t (int)MLX5_INLINE_HSIZE_L2) {\n-\t\t\t\tDRV_LOG(DEBUG,\n-\t\t\t\t\t\"txq_inline_mix aligned to minimal\"\n-\t\t\t\t\t\" ConnectX-4 required value %d\",\n-\t\t\t\t\t(int)MLX5_INLINE_HSIZE_L2);\n-\t\t\t\tconfig->txq_inline_min = MLX5_INLINE_HSIZE_L2;\n+\t\tif (spawn->pci_dev != NULL) {\n+\t\t\tswitch (spawn->pci_dev->id.device_id) {\n+\t\t\tcase PCI_DEVICE_ID_MELLANOX_CONNECTX4:\n+\t\t\tcase PCI_DEVICE_ID_MELLANOX_CONNECTX4VF:\n+\t\t\t\tif (config->txq_inline_min <\n+\t\t\t\t\t (int)MLX5_INLINE_HSIZE_L2) {\n+\t\t\t\t\tDRV_LOG(DEBUG,\n+\t\t\t\t\t\t\"txq_inline_mix aligned to minimal ConnectX-4 required value %d\",\n+\t\t\t\t\t\t(int)MLX5_INLINE_HSIZE_L2);\n+\t\t\t\t\tconfig->txq_inline_min =\n+\t\t\t\t\t\t\tMLX5_INLINE_HSIZE_L2;\n+\t\t\t\t}\n+\t\t\t\tbreak;\n \t\t\t}\n-\t\t\tbreak;\n \t\t}\n \t\tgoto exit;\n \t}\n@@ -2142,6 +2145,10 @@ mlx5_set_min_inline(struct mlx5_dev_spawn_data *spawn,\n \t\t\t}\n \t\t}\n \t}\n+\tif (spawn->pci_dev == NULL) {\n+\t\tconfig->txq_inline_min = MLX5_INLINE_HSIZE_NONE;\n+\t\tgoto exit;\n+\t}\n \t/*\n \t * We get here if we are unable to deduce\n \t * inline data size with DevX. Try PCI ID\n@@ -2276,7 +2283,7 @@ mlx5_dev_check_sibling_config(struct mlx5_priv *priv,\n \tif (sh->refcnt == 1)\n \t\treturn 0;\n \t/* Find the device with shared context. */\n-\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\tMLX5_ETH_FOREACH_DEV(port_id, NULL) {\n \t\tstruct mlx5_priv *opriv =\n \t\t\trte_eth_devices[port_id].data->dev_private;\n \n@@ -2307,25 +2314,25 @@ mlx5_dev_check_sibling_config(struct mlx5_priv *priv,\n *\n * @param[in] port_id\n * port_id to start looking for device.\n- * @param[in] pci_dev\n- * Pointer to the hint PCI device. When device is being probed\n+ * @param[in] odev\n+ * Pointer to the hint device. When device is being probed\n * the its siblings (master and preceding representors might\n * not have assigned driver yet (because the mlx5_os_pci_probe()\n- * is not completed yet, for this case match on hint PCI\n+ * is not completed yet, for this case match on hint\n * device may be used to detect sibling device.\n *\n * @return\n * port_id of found device, RTE_MAX_ETHPORT if not found.\n */\n uint16_t\n-mlx5_eth_find_next(uint16_t port_id, struct rte_pci_device *pci_dev)\n+mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev)\n {\n \twhile (port_id < RTE_MAX_ETHPORTS) {\n \t\tstruct rte_eth_dev *dev = &rte_eth_devices[port_id];\n \n \t\tif (dev->state != RTE_ETH_DEV_UNUSED &&\n \t\t dev->device &&\n-\t\t (dev->device == &pci_dev->device ||\n+\t\t (dev->device == odev ||\n \t\t (dev->device->driver &&\n \t\t dev->device->driver->name &&\n \t\t !strcmp(dev->device->driver->name, MLX5_PCI_DRIVER_NAME))))\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 94618e10fa..749a9e95d4 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -134,6 +134,7 @@ struct mlx5_dev_spawn_data {\n \tuint32_t max_port; /**< Device maximal port index. */\n \tuint32_t phys_port; /**< Device physical port index. */\n \tint pf_bond; /**< bonding device PF index. < 0 - no bonding */\n+\tint numa_node; /**< Device numa node. */\n \tstruct mlx5_switch_info info; /**< Switch information. */\n \tvoid *phys_dev; /**< Associated physical device. */\n \tstruct rte_eth_dev *eth_dev; /**< Associated Ethernet device. */\n@@ -1462,16 +1463,16 @@ int mlx5_proc_priv_init(struct rte_eth_dev *dev);\n void mlx5_proc_priv_uninit(struct rte_eth_dev *dev);\n int mlx5_udp_tunnel_port_add(struct rte_eth_dev *dev,\n \t\t\t struct rte_eth_udp_tunnel *udp_tunnel);\n-uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_pci_device *pci_dev);\n+uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev);\n int mlx5_dev_close(struct rte_eth_dev *dev);\n bool mlx5_is_hpf(struct rte_eth_dev *dev);\n void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh);\n \n /* Macro to iterate over all valid ports for mlx5 driver. */\n-#define MLX5_ETH_FOREACH_DEV(port_id, pci_dev) \\\n-\tfor (port_id = mlx5_eth_find_next(0, pci_dev); \\\n+#define MLX5_ETH_FOREACH_DEV(port_id, dev) \\\n+\tfor (port_id = mlx5_eth_find_next(0, dev); \\\n \t port_id < RTE_MAX_ETHPORTS; \\\n-\t port_id = mlx5_eth_find_next(port_id + 1, pci_dev))\n+\t port_id = mlx5_eth_find_next(port_id + 1, dev))\n int mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs);\n struct mlx5_dev_ctx_shared *\n mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,\ndiff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c\nindex c32eeefd88..82e2284d98 100644\n--- a/drivers/net/mlx5/mlx5_ethdev.c\n+++ b/drivers/net/mlx5/mlx5_ethdev.c\n@@ -335,7 +335,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)\n \tif (priv->representor) {\n \t\tuint16_t port_id;\n \n-\t\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\t\tMLX5_ETH_FOREACH_DEV(port_id, dev->device) {\n \t\t\tstruct mlx5_priv *opriv =\n \t\t\t\trte_eth_devices[port_id].data->dev_private;\n \ndiff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c\nindex 89c43fc9e9..87fb4371a4 100644\n--- a/drivers/net/mlx5/mlx5_mr.c\n+++ b/drivers/net/mlx5/mlx5_mr.c\n@@ -199,23 +199,23 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,\n }\n \n /**\n- * Finds the first ethdev that match the pci device.\n+ * Finds the first ethdev that match the device.\n * The existence of multiple ethdev per pci device is only with representors.\n * On such case, it is enough to get only one of the ports as they all share\n * the same ibv context.\n *\n- * @param pdev\n- * Pointer to the PCI device.\n+ * @param dev\n+ * Pointer to the device.\n *\n * @return\n * Pointer to the ethdev if found, NULL otherwise.\n */\n static struct rte_eth_dev *\n-pci_dev_to_eth_dev(struct rte_pci_device *pdev)\n+dev_to_eth_dev(struct rte_device *dev)\n {\n \tuint16_t port_id;\n \n-\tport_id = rte_eth_find_next_of(0, &pdev->device);\n+\tport_id = rte_eth_find_next_of(0, dev);\n \tif (port_id == RTE_MAX_ETHPORTS)\n \t\treturn NULL;\n \treturn &rte_eth_devices[port_id];\n@@ -245,7 +245,7 @@ mlx5_dma_map(struct rte_pci_device *pdev, void *addr,\n \tstruct mlx5_priv *priv;\n \tstruct mlx5_dev_ctx_shared *sh;\n \n-\tdev = pci_dev_to_eth_dev(pdev);\n+\tdev = dev_to_eth_dev(&pdev->device);\n \tif (!dev) {\n \t\tDRV_LOG(WARNING, \"unable to find matching ethdev \"\n \t\t\t\t \"to PCI device %p\", (void *)pdev);\n@@ -295,7 +295,7 @@ mlx5_dma_unmap(struct rte_pci_device *pdev, void *addr,\n \tstruct mlx5_mr *mr;\n \tstruct mr_cache_entry entry;\n \n-\tdev = pci_dev_to_eth_dev(pdev);\n+\tdev = dev_to_eth_dev(&pdev->device);\n \tif (!dev) {\n \t\tDRV_LOG(WARNING, \"unable to find matching ethdev \"\n \t\t\t\t \"to PCI device %p\", (void *)pdev);\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 7cb8920d6b..6d2351f5a8 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -697,7 +697,7 @@ mlx5_hairpin_bind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)\n \tuint32_t explicit;\n \tuint16_t rx_queue;\n \n-\tif (mlx5_eth_find_next(rx_port, priv->pci_dev) != rx_port) {\n+\tif (mlx5_eth_find_next(rx_port, dev->device) != rx_port) {\n \t\trte_errno = ENODEV;\n \t\tDRV_LOG(ERR, \"Rx port %u does not belong to mlx5\", rx_port);\n \t\treturn -rte_errno;\n@@ -835,7 +835,7 @@ mlx5_hairpin_unbind_single_port(struct rte_eth_dev *dev, uint16_t rx_port)\n \tint ret;\n \tuint16_t cur_port = priv->dev_data->port_id;\n \n-\tif (mlx5_eth_find_next(rx_port, priv->pci_dev) != rx_port) {\n+\tif (mlx5_eth_find_next(rx_port, dev->device) != rx_port) {\n \t\trte_errno = ENODEV;\n \t\tDRV_LOG(ERR, \"Rx port %u does not belong to mlx5\", rx_port);\n \t\treturn -rte_errno;\n@@ -893,7 +893,6 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)\n {\n \tint ret = 0;\n \tuint16_t p, pp;\n-\tstruct mlx5_priv *priv = dev->data->dev_private;\n \n \t/*\n \t * If the Rx port has no hairpin configuration with the current port,\n@@ -902,7 +901,7 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)\n \t * information updating.\n \t */\n \tif (rx_port == RTE_MAX_ETHPORTS) {\n-\t\tMLX5_ETH_FOREACH_DEV(p, priv->pci_dev) {\n+\t\tMLX5_ETH_FOREACH_DEV(p, dev->device) {\n \t\t\tret = mlx5_hairpin_bind_single_port(dev, p);\n \t\t\tif (ret != 0)\n \t\t\t\tgoto unbind;\n@@ -912,7 +911,7 @@ mlx5_hairpin_bind(struct rte_eth_dev *dev, uint16_t rx_port)\n \t\treturn mlx5_hairpin_bind_single_port(dev, rx_port);\n \t}\n unbind:\n-\tMLX5_ETH_FOREACH_DEV(pp, priv->pci_dev)\n+\tMLX5_ETH_FOREACH_DEV(pp, dev->device)\n \t\tif (pp < p)\n \t\t\tmlx5_hairpin_unbind_single_port(dev, pp);\n \treturn ret;\n@@ -927,10 +926,9 @@ mlx5_hairpin_unbind(struct rte_eth_dev *dev, uint16_t rx_port)\n {\n \tint ret = 0;\n \tuint16_t p;\n-\tstruct mlx5_priv *priv = dev->data->dev_private;\n \n \tif (rx_port == RTE_MAX_ETHPORTS)\n-\t\tMLX5_ETH_FOREACH_DEV(p, priv->pci_dev) {\n+\t\tMLX5_ETH_FOREACH_DEV(p, dev->device) {\n \t\t\tret = mlx5_hairpin_unbind_single_port(dev, p);\n \t\t\tif (ret != 0)\n \t\t\t\treturn ret;\ndiff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c\nindex 3e5e94444b..11770aeeef 100644\n--- a/drivers/net/mlx5/mlx5_txq.c\n+++ b/drivers/net/mlx5/mlx5_txq.c\n@@ -16,6 +16,7 @@\n #include <rte_bus_pci.h>\n #include <rte_common.h>\n #include <rte_eal_paging.h>\n+#include <rte_bus_pci.h>\n \n #include <mlx5_common.h>\n #include <mlx5_common_mr.h>\n@@ -816,7 +817,7 @@ txq_set_params(struct mlx5_txq_ctrl *txq_ctrl)\n \tif (config->txqs_inline == MLX5_ARG_UNSET)\n \t\ttxqs_inline =\n #if defined(RTE_ARCH_ARM64)\n-\t\t(priv->pci_dev->id.device_id ==\n+\t\t(priv->pci_dev && priv->pci_dev->id.device_id ==\n \t\t\tPCI_DEVICE_ID_MELLANOX_CONNECTX5BF) ?\n \t\t\tMLX5_INLINE_MAX_TXQS_BLUEFIELD :\n #endif\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex 5da362a9d5..bf20adaa30 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -391,7 +391,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t * Look for sibling devices in order to reuse their switch domain\n \t * if any, otherwise allocate one.\n \t */\n-\tMLX5_ETH_FOREACH_DEV(port_id, priv->pci_dev) {\n+\tMLX5_ETH_FOREACH_DEV(port_id, NULL) {\n \t\tconst struct mlx5_priv *opriv =\n \t\t\trte_eth_devices[port_id].data->dev_private;\n \n@@ -1080,6 +1080,7 @@ mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \tdev_config.dv_flow_en = 1;\n \tdev_config.decap_en = 0;\n \tdev_config.log_hp_size = MLX5_ARG_UNSET;\n+\tlist[ns].numa_node = pci_dev->device.numa_node;\n \tlist[ns].eth_dev = mlx5_dev_spawn(&pci_dev->device,\n \t\t\t\t\t &list[ns],\n \t\t\t\t\t &dev_config);\n", "prefixes": [ "v3", "06/15" ] }