Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/102308/?format=api
{ "id": 102308, "url": "http://patches.dpdk.org/api/patches/102308/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211019205602.3188203-3-michaelba@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": "<20211019205602.3188203-3-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211019205602.3188203-3-michaelba@nvidia.com", "date": "2021-10-19T20:55:46", "name": "[v3,02/18] common/mlx5: share basic probing with the internal drivers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ce17f4224e1e7356b4bed6cef517aaad3cb20dcb", "submitter": { "id": 1949, "url": "http://patches.dpdk.org/api/people/1949/?format=api", "name": "Michael Baum", "email": "michaelba@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/20211019205602.3188203-3-michaelba@nvidia.com/mbox/", "series": [ { "id": 19808, "url": "http://patches.dpdk.org/api/series/19808/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19808", "date": "2021-10-19T20:55:44", "name": "mlx5: sharing global MR cache between drivers", "version": 3, "mbox": "http://patches.dpdk.org/series/19808/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/102308/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/102308/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 CC35BA0C41;\n\tTue, 19 Oct 2021 22:56:49 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4FC3D4111A;\n\tTue, 19 Oct 2021 22:56:42 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2058.outbound.protection.outlook.com [40.107.223.58])\n by mails.dpdk.org (Postfix) with ESMTP id 3631E41100\n for <dev@dpdk.org>; Tue, 19 Oct 2021 22:56:34 +0200 (CEST)", "from BN9PR03CA0917.namprd03.prod.outlook.com (2603:10b6:408:107::22)\n by MWHPR12MB1823.namprd12.prod.outlook.com (2603:10b6:300:112::18)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct\n 2021 20:56:31 +0000", "from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:107:cafe::ba) by BN9PR03CA0917.outlook.office365.com\n (2603:10b6:408:107::22) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17 via Frontend\n Transport; Tue, 19 Oct 2021 20:56:30 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 20:56:30 +0000", "from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 19 Oct\n 2021 20:56:24 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=ks6SuR/qh4TCfnwLtYtANikhc7TVw2UuvxWg8YJpPdyai/VdIJn0I1I82oqHe/SBcDBIBWkP+vp4pPt8C2Kcj5gDhjoOhmD+wg4HZkL5EtCaphxTH8iMtbMT6GZLCpnuw4mAn/ImmRxpqcXor9VsOSS2C4v7T3kNed/6LNOS0QNeXsOEFvcfoa8Y7jijvIHmQilPul93HM/nsYbTKsZoFBbdWS/jK0yqGTi+0GdlhLdFdyLeDP1j9o45nXvwKmTrcWHaAr0hgIcOmV2W8Bj1GR//pBnGD4x+8qrOtTzz31sxNAlhvyyA8Yy695jMGhNXiTt/xkZGFkSXMoAks6HBcA==", "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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=J8WsUGCa3ePrswkVTzy5/Yao0sF2200HlwHlcaH0InA=;\n b=Sa+Qya7P3+rGoev6EZkOJXtIoZFko1kq6m9bn0DbwC3rUJ985NzgCXisvWWamwf6wut61shpGuio7HlwZMhX39g745ntKGzh2Y/kVbXHrKijYahm+aRCmwIltRTuSf6DkKz5H6hi0H2P22YP4hT8NQIIFUHLUIp4T7EZRRt6TMgjH9JhUfQE8pju9RA8qBScJFXqDNzyWX/AxXDX+iV2uXt0bUvsjAbuBzdKxCcKdWlSSsiBVXjr7iKnTt0JUilU2kNgFnX4hlRpwsHxmjpVthmwMUxFLnWTixaioFwdwQbJ5y0/6jF1uHj7aejdnuGuOqyW5/i2qyvnAdn39TzMbQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com;\n dmarc=pass (p=quarantine sp=quarantine pct=100) action=none\n header.from=nvidia.com; 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=J8WsUGCa3ePrswkVTzy5/Yao0sF2200HlwHlcaH0InA=;\n b=I2iGkLN0q4Mqfq1J4ygb9GOmuYsAySOQXY90mxAjnPGwMZgxCFmcqnarJeBH6QT/XOVFKVp5Ai1GC84KMS3gdI6bvNiCCCVQpcZpNgXXC/VBNFGfSQMAz8WiHdjkqhYHKVcAAyhmeghecUgwRpkuOXuKVR3c3DC97jF+U2r/6PbE71S+410JjeWUGUubkBO3H9mLZtSCeupKv4X8A0QtfM8fSOoqA54WUldPatQ8h5o6zWklr3EQIEbPlQazr2PTJyLY/nNSD3QL3/c+xFPl6AvaIkGVwCVzrQ1o+arA/LnfDw3VktA8/gHG/2ZBUYwi9AQFktg5uFiaZS+pzn7Vkw==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed)\n header.d=none;monjalon.net; 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": "<michaelba@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "Matan Azrad <matan@nvidia.com>, Thomas Monjalon <thomas@monjalon.net>,\n Michael Baum <michaelba@oss.nvidia.com>", "Date": "Tue, 19 Oct 2021 23:55:46 +0300", "Message-ID": "<20211019205602.3188203-3-michaelba@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211019205602.3188203-1-michaelba@nvidia.com>", "References": "<20211006220350.2357487-1-michaelba@nvidia.com>\n <20211019205602.3188203-1-michaelba@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.6]", "X-ClientProxiedBy": "HQMAIL101.nvidia.com (172.20.187.10) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "5d9e8511-9ca8-4e50-7a2d-08d99342ed0f", "X-MS-TrafficTypeDiagnostic": "MWHPR12MB1823:", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <MWHPR12MB1823060F2E1D7717E86B35BACCBD9@MWHPR12MB1823.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:229;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n Rv1elA7f+bfTjM1mKwf4rQZQIqFneMynz/jcygSj7yUKyjU876+FWxHyfrh2I0zWxZxz5AOlRQAAoHXpfiRK8+cVCUopxkuyoKoftXGa+4CkyAHbXBv+d8/tX18X0l0GhRB5wsY6G8FTbIjpRH9vqUJypOBbplordcLb0OnDQ1EbnU0YRXtul1xouXiN67k96e6f2Bje6hp51BDad+z5wmS6BdexNBvI/21u9om4Lb+gkLLJz4uiHPbQZ4SGby4miatTzQuI2RRqhuSUdn/5WDrttIaC926q7r35pOqQP0FYqmcGpDi5MdoKVpBRlT2HwHOIQxW2sfRNDyVQkyr7rWpRPCKutvbJFmj9DQR9f8VA7tHS6ntNqdh0z0zWJhEodbD6I4PdiTw14jKnKdZOcEmFrRUJX1Y48c45kG0qyJdUDS6qCdNH2gaiGpY6I0HsXIP3a4AT0Wr/x2fqaYVC6e9kIyIAlMoU3Mk3z06BSrjAVQ9jbp4FxCqW0SMGzBOXdekPbF61TguzwUQBjnxfG5bediIx5LqdJq4KRU5/V0fZX4Xoh96fHVDtB7akL76eWUhkccOLVxvuLRkpbxJVvoIRH9c4Rf773t0ym9mcLHyXqJNGpYDMk2rBrxjM3GlSEVqJdlcVRP3q7UYdrfxev8G+11qAR73UOahsls8hq1TkL9f3Ay3iV4k19x3zBRHqSa/KdXkG5+RQp5LsXkpT1g==", "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)(46966006)(36840700001)(5660300002)(26005)(83380400001)(107886003)(86362001)(2906002)(186003)(316002)(336012)(36860700001)(30864003)(47076005)(82310400003)(4326008)(7696005)(2616005)(426003)(2876002)(55016002)(6666004)(6286002)(70586007)(356005)(508600001)(6916009)(16526019)(8676002)(7636003)(8936002)(70206006)(1076003)(36756003)(54906003);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Oct 2021 20:56:30.1266 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 5d9e8511-9ca8-4e50-7a2d-08d99342ed0f", "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 BN8NAM11FT035.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MWHPR12MB1823", "Subject": "[dpdk-dev] [PATCH v3 02/18] common/mlx5: share basic probing with\n the internal drivers", "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": "From: Michael Baum <michaelba@oss.nvidia.com>\n\nCreate common probing structure that includes, for now, basic probing\ninformation detected by the common driver and share it with all the\ninternal drivers.\n\nSigned-off-by: Michael Baum <michaelba@oss.nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/common/mlx5/mlx5_common.c | 4 +-\n drivers/common/mlx5/mlx5_common.h | 10 ++++-\n drivers/common/mlx5/mlx5_common_private.h | 6 ---\n drivers/compress/mlx5/mlx5_compress.c | 38 ++++++++---------\n drivers/crypto/mlx5/mlx5_crypto.c | 16 +++----\n drivers/net/mlx5/linux/mlx5_os.c | 52 ++++++++++++-----------\n drivers/net/mlx5/mlx5.c | 9 ++--\n drivers/net/mlx5/mlx5.h | 7 +--\n drivers/net/mlx5/windows/mlx5_os.c | 14 +++---\n drivers/regex/mlx5/mlx5_regex.c | 12 +++---\n drivers/vdpa/mlx5/mlx5_vdpa.c | 18 ++++----\n 11 files changed, 94 insertions(+), 92 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c\nindex 6885bbb1d2..91de7b3e2c 100644\n--- a/drivers/common/mlx5/mlx5_common.c\n+++ b/drivers/common/mlx5/mlx5_common.c\n@@ -241,7 +241,7 @@ drivers_remove(struct mlx5_common_device *dev, uint32_t enabled_classes)\n \twhile (enabled_classes) {\n \t\tdriver = driver_get(RTE_BIT64(i));\n \t\tif (driver != NULL) {\n-\t\t\tlocal_ret = driver->remove(dev->dev);\n+\t\t\tlocal_ret = driver->remove(dev);\n \t\t\tif (local_ret == 0)\n \t\t\t\tdev->classes_loaded &= ~RTE_BIT64(i);\n \t\t\telse if (ret == 0)\n@@ -275,7 +275,7 @@ drivers_probe(struct mlx5_common_device *dev, uint32_t user_classes)\n \t\t\tret = -EEXIST;\n \t\t\tgoto probe_err;\n \t\t}\n-\t\tret = driver->probe(dev->dev);\n+\t\tret = driver->probe(dev);\n \t\tif (ret < 0) {\n \t\t\tDRV_LOG(ERR, \"Failed to load driver %s\",\n \t\t\t\tdriver->name);\ndiff --git a/drivers/common/mlx5/mlx5_common.h b/drivers/common/mlx5/mlx5_common.h\nindex a772371200..b7e2ad1a82 100644\n--- a/drivers/common/mlx5/mlx5_common.h\n+++ b/drivers/common/mlx5/mlx5_common.h\n@@ -324,15 +324,21 @@ void mlx5_common_init(void);\n * from devargs, locating target RDMA device and probing with it.\n */\n \n+struct mlx5_common_device {\n+\tstruct rte_device *dev;\n+\tTAILQ_ENTRY(mlx5_common_device) next;\n+\tuint32_t classes_loaded;\n+};\n+\n /**\n * Initialization function for the driver called during device probing.\n */\n-typedef int (mlx5_class_driver_probe_t)(struct rte_device *dev);\n+typedef int (mlx5_class_driver_probe_t)(struct mlx5_common_device *dev);\n \n /**\n * Uninitialization function for the driver called during hot-unplugging.\n */\n-typedef int (mlx5_class_driver_remove_t)(struct rte_device *dev);\n+typedef int (mlx5_class_driver_remove_t)(struct mlx5_common_device *dev);\n \n /**\n * Driver-specific DMA mapping. After a successful call the device\ndiff --git a/drivers/common/mlx5/mlx5_common_private.h b/drivers/common/mlx5/mlx5_common_private.h\nindex a038330375..04c0af3763 100644\n--- a/drivers/common/mlx5/mlx5_common_private.h\n+++ b/drivers/common/mlx5/mlx5_common_private.h\n@@ -16,12 +16,6 @@ extern \"C\" {\n \n /* Common bus driver: */\n \n-struct mlx5_common_device {\n-\tstruct rte_device *dev;\n-\tTAILQ_ENTRY(mlx5_common_device) next;\n-\tuint32_t classes_loaded;\n-};\n-\n int mlx5_common_dev_probe(struct rte_device *eal_dev);\n int mlx5_common_dev_remove(struct rte_device *eal_dev);\n int mlx5_common_dev_dma_map(struct rte_device *dev, void *addr, uint64_t iova,\ndiff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c\nindex 5c5aa87a18..75a07e5380 100644\n--- a/drivers/compress/mlx5/mlx5_compress.c\n+++ b/drivers/compress/mlx5/mlx5_compress.c\n@@ -36,7 +36,7 @@ struct mlx5_compress_xform {\n struct mlx5_compress_priv {\n \tTAILQ_ENTRY(mlx5_compress_priv) next;\n \tstruct ibv_context *ctx; /* Device context. */\n-\tstruct rte_compressdev *cdev;\n+\tstruct rte_compressdev *compressdev;\n \tvoid *uar;\n \tuint32_t pdn; /* Protection Domain number. */\n \tuint8_t min_block_size;\n@@ -790,16 +790,16 @@ mlx5_compress_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,\n }\n \n static int\n-mlx5_compress_dev_probe(struct rte_device *dev)\n+mlx5_compress_dev_probe(struct mlx5_common_device *cdev)\n {\n \tstruct ibv_device *ibv;\n-\tstruct rte_compressdev *cdev;\n+\tstruct rte_compressdev *compressdev;\n \tstruct ibv_context *ctx;\n \tstruct mlx5_compress_priv *priv;\n \tstruct mlx5_hca_attr att = { 0 };\n \tstruct rte_compressdev_pmd_init_params init_params = {\n \t\t.name = \"\",\n-\t\t.socket_id = dev->numa_node,\n+\t\t.socket_id = cdev->dev->numa_node,\n \t};\n \n \tif (rte_eal_process_type() != RTE_PROC_PRIMARY) {\n@@ -807,7 +807,7 @@ mlx5_compress_dev_probe(struct rte_device *dev)\n \t\trte_errno = ENOTSUP;\n \t\treturn -rte_errno;\n \t}\n-\tibv = mlx5_os_get_ibv_dev(dev);\n+\tibv = mlx5_os_get_ibv_dev(cdev->dev);\n \tif (ibv == NULL)\n \t\treturn -rte_errno;\n \tctx = mlx5_glue->dv_open_device(ibv);\n@@ -826,20 +826,20 @@ mlx5_compress_dev_probe(struct rte_device *dev)\n \t\trte_errno = ENOTSUP;\n \t\treturn -ENOTSUP;\n \t}\n-\tcdev = rte_compressdev_pmd_create(ibv->name, dev,\n-\t\t\t\t\t sizeof(*priv), &init_params);\n-\tif (cdev == NULL) {\n+\tcompressdev = rte_compressdev_pmd_create(ibv->name, cdev->dev,\n+\t\t\t\t\t\t sizeof(*priv), &init_params);\n+\tif (compressdev == NULL) {\n \t\tDRV_LOG(ERR, \"Failed to create device \\\"%s\\\".\", ibv->name);\n \t\tclaim_zero(mlx5_glue->close_device(ctx));\n \t\treturn -ENODEV;\n \t}\n \tDRV_LOG(INFO,\n \t\t\"Compress device %s was created successfully.\", ibv->name);\n-\tcdev->dev_ops = &mlx5_compress_ops;\n-\tcdev->dequeue_burst = mlx5_compress_dequeue_burst;\n-\tcdev->enqueue_burst = mlx5_compress_enqueue_burst;\n-\tcdev->feature_flags = RTE_COMPDEV_FF_HW_ACCELERATED;\n-\tpriv = cdev->data->dev_private;\n+\tcompressdev->dev_ops = &mlx5_compress_ops;\n+\tcompressdev->dequeue_burst = mlx5_compress_dequeue_burst;\n+\tcompressdev->enqueue_burst = mlx5_compress_enqueue_burst;\n+\tcompressdev->feature_flags = RTE_COMPDEV_FF_HW_ACCELERATED;\n+\tpriv = compressdev->data->dev_private;\n \tpriv->mmo_decomp_sq = att.mmo_decompress_sq_en;\n \tpriv->mmo_decomp_qp = att.mmo_decompress_qp_en;\n \tpriv->mmo_comp_sq = att.mmo_compress_sq_en;\n@@ -847,11 +847,11 @@ mlx5_compress_dev_probe(struct rte_device *dev)\n \tpriv->mmo_dma_sq = att.mmo_dma_sq_en;\n \tpriv->mmo_dma_qp = att.mmo_dma_qp_en;\n \tpriv->ctx = ctx;\n-\tpriv->cdev = cdev;\n+\tpriv->compressdev = compressdev;\n \tpriv->min_block_size = att.compress_min_block_size;\n \tpriv->qp_ts_format = att.qp_ts_format;\n \tif (mlx5_compress_hw_global_prepare(priv) != 0) {\n-\t\trte_compressdev_pmd_destroy(priv->cdev);\n+\t\trte_compressdev_pmd_destroy(priv->compressdev);\n \t\tclaim_zero(mlx5_glue->close_device(priv->ctx));\n \t\treturn -1;\n \t}\n@@ -859,7 +859,7 @@ mlx5_compress_dev_probe(struct rte_device *dev)\n \t\t\t MLX5_MR_BTREE_CACHE_N * 2, rte_socket_id()) != 0) {\n \t\tDRV_LOG(ERR, \"Failed to allocate shared cache MR memory.\");\n \t\tmlx5_compress_hw_global_release(priv);\n-\t\trte_compressdev_pmd_destroy(priv->cdev);\n+\t\trte_compressdev_pmd_destroy(priv->compressdev);\n \t\tclaim_zero(mlx5_glue->close_device(priv->ctx));\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n@@ -878,13 +878,13 @@ mlx5_compress_dev_probe(struct rte_device *dev)\n }\n \n static int\n-mlx5_compress_dev_remove(struct rte_device *dev)\n+mlx5_compress_dev_remove(struct mlx5_common_device *cdev)\n {\n \tstruct mlx5_compress_priv *priv = NULL;\n \n \tpthread_mutex_lock(&priv_list_lock);\n \tTAILQ_FOREACH(priv, &mlx5_compress_priv_list, next)\n-\t\tif (priv->cdev->device == dev)\n+\t\tif (priv->compressdev->device == cdev->dev)\n \t\t\tbreak;\n \tif (priv)\n \t\tTAILQ_REMOVE(&mlx5_compress_priv_list, priv, next);\n@@ -895,7 +895,7 @@ mlx5_compress_dev_remove(struct rte_device *dev)\n \t\t\t\t\t\t\t NULL);\n \t\tmlx5_mr_release_cache(&priv->mr_scache);\n \t\tmlx5_compress_hw_global_release(priv);\n-\t\trte_compressdev_pmd_destroy(priv->cdev);\n+\t\trte_compressdev_pmd_destroy(priv->compressdev);\n \t\tclaim_zero(mlx5_glue->close_device(priv->ctx));\n \t}\n \treturn 0;\ndiff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c\nindex 6a2f8b6ac6..d9762a964d 100644\n--- a/drivers/crypto/mlx5/mlx5_crypto.c\n+++ b/drivers/crypto/mlx5/mlx5_crypto.c\n@@ -951,7 +951,7 @@ mlx5_crypto_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,\n }\n \n static int\n-mlx5_crypto_dev_probe(struct rte_device *dev)\n+mlx5_crypto_dev_probe(struct mlx5_common_device *cdev)\n {\n \tstruct ibv_device *ibv;\n \tstruct rte_cryptodev *crypto_dev;\n@@ -963,7 +963,7 @@ mlx5_crypto_dev_probe(struct rte_device *dev)\n \tstruct rte_cryptodev_pmd_init_params init_params = {\n \t\t.name = \"\",\n \t\t.private_data_size = sizeof(struct mlx5_crypto_priv),\n-\t\t.socket_id = dev->numa_node,\n+\t\t.socket_id = cdev->dev->numa_node,\n \t\t.max_nb_queue_pairs =\n \t\t\t\tRTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS,\n \t};\n@@ -975,7 +975,7 @@ mlx5_crypto_dev_probe(struct rte_device *dev)\n \t\trte_errno = ENOTSUP;\n \t\treturn -rte_errno;\n \t}\n-\tibv = mlx5_os_get_ibv_dev(dev);\n+\tibv = mlx5_os_get_ibv_dev(cdev->dev);\n \tif (ibv == NULL)\n \t\treturn -rte_errno;\n \tctx = mlx5_glue->dv_open_device(ibv);\n@@ -992,7 +992,7 @@ mlx5_crypto_dev_probe(struct rte_device *dev)\n \t\trte_errno = ENOTSUP;\n \t\treturn -ENOTSUP;\n \t}\n-\tret = mlx5_crypto_parse_devargs(dev->devargs, &devarg_prms);\n+\tret = mlx5_crypto_parse_devargs(cdev->dev->devargs, &devarg_prms);\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"Failed to parse devargs.\");\n \t\tclaim_zero(mlx5_glue->close_device(ctx));\n@@ -1005,8 +1005,8 @@ mlx5_crypto_dev_probe(struct rte_device *dev)\n \t\tclaim_zero(mlx5_glue->close_device(ctx));\n \t\treturn -rte_errno;\n \t}\n-\tcrypto_dev = rte_cryptodev_pmd_create(ibv->name, dev,\n-\t\t\t\t\t&init_params);\n+\tcrypto_dev = rte_cryptodev_pmd_create(ibv->name, cdev->dev,\n+\t\t\t\t\t &init_params);\n \tif (crypto_dev == NULL) {\n \t\tDRV_LOG(ERR, \"Failed to create device \\\"%s\\\".\", ibv->name);\n \t\tclaim_zero(mlx5_glue->close_device(ctx));\n@@ -1065,13 +1065,13 @@ mlx5_crypto_dev_probe(struct rte_device *dev)\n }\n \n static int\n-mlx5_crypto_dev_remove(struct rte_device *dev)\n+mlx5_crypto_dev_remove(struct mlx5_common_device *cdev)\n {\n \tstruct mlx5_crypto_priv *priv = NULL;\n \n \tpthread_mutex_lock(&priv_list_lock);\n \tTAILQ_FOREACH(priv, &mlx5_crypto_priv_list, next)\n-\t\tif (priv->crypto_dev->device == dev)\n+\t\tif (priv->crypto_dev->device == cdev->dev)\n \t\t\tbreak;\n \tif (priv)\n \t\tTAILQ_REMOVE(&mlx5_crypto_priv_list, priv, next);\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex e036ed1435..0aad08aba4 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -2148,8 +2148,8 @@ mlx5_os_config_default(struct mlx5_dev_config *config)\n * This function spawns Ethernet devices out of a given PCI device and\n * bonding owner PF index.\n *\n- * @param[in] pci_dev\n- * PCI device information.\n+ * @param[in] cdev\n+ * Pointer to common mlx5 device structure.\n * @param[in] req_eth_da\n * Requested ethdev device argument.\n * @param[in] owner_id\n@@ -2159,7 +2159,7 @@ mlx5_os_config_default(struct mlx5_dev_config *config)\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n+mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,\n \t\t struct rte_eth_devargs *req_eth_da,\n \t\t uint16_t owner_id)\n {\n@@ -2188,6 +2188,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t * >= 0 - bonding device (value is slave PF index)\n \t */\n \tint bd = -1;\n+\tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(cdev->dev);\n \tstruct mlx5_dev_spawn_data *list = NULL;\n \tstruct mlx5_dev_config dev_config;\n \tunsigned int dev_config_vf;\n@@ -2320,6 +2321,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t\t\tlist[ns].phys_dev = ibv_match[0];\n \t\t\tlist[ns].eth_dev = NULL;\n \t\t\tlist[ns].pci_dev = pci_dev;\n+\t\t\tlist[ns].cdev = cdev;\n \t\t\tlist[ns].pf_bond = bd;\n \t\t\tlist[ns].ifindex = mlx5_nl_ifindex\n \t\t\t\t(nl_rdma,\n@@ -2418,6 +2420,7 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t\t\tlist[ns].phys_dev = ibv_match[i];\n \t\t\tlist[ns].eth_dev = NULL;\n \t\t\tlist[ns].pci_dev = pci_dev;\n+\t\t\tlist[ns].cdev = cdev;\n \t\t\tlist[ns].pf_bond = -1;\n \t\t\tlist[ns].ifindex = 0;\n \t\t\tif (nl_rdma >= 0)\n@@ -2562,11 +2565,8 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t\t/* Default configuration. */\n \t\tmlx5_os_config_default(&dev_config);\n \t\tdev_config.vf = dev_config_vf;\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-\t\t\t\t\t\t ð_da);\n+\t\tlist[i].eth_dev = mlx5_dev_spawn(cdev->dev, &list[i],\n+\t\t\t\t\t\t &dev_config, ð_da);\n \t\tif (!list[i].eth_dev) {\n \t\t\tif (rte_errno != EBUSY && rte_errno != EEXIST)\n \t\t\t\tbreak;\n@@ -2678,27 +2678,28 @@ mlx5_os_parse_eth_devargs(struct rte_device *dev,\n *\n * This function spawns Ethernet devices out of a given PCI device.\n *\n- * @param[in] pci_dev\n- * PCI device information.\n+ * @param[in] cdev\n+ * Pointer to common mlx5 device structure.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n static int\n-mlx5_os_pci_probe(struct rte_pci_device *pci_dev)\n+mlx5_os_pci_probe(struct mlx5_common_device *cdev)\n {\n+\tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(cdev->dev);\n \tstruct rte_eth_devargs eth_da = { .nb_ports = 0 };\n \tint ret = 0;\n \tuint16_t p;\n \n-\tret = mlx5_os_parse_eth_devargs(&pci_dev->device, ð_da);\n+\tret = mlx5_os_parse_eth_devargs(cdev->dev, ð_da);\n \tif (ret != 0)\n \t\treturn ret;\n \n \tif (eth_da.nb_ports > 0) {\n \t\t/* Iterate all port if devargs pf is range: \"pf[0-1]vf[...]\". */\n \t\tfor (p = 0; p < eth_da.nb_ports; p++) {\n-\t\t\tret = mlx5_os_pci_probe_pf(pci_dev, ð_da,\n+\t\t\tret = mlx5_os_pci_probe_pf(cdev, ð_da,\n \t\t\t\t\t\t eth_da.ports[p]);\n \t\t\tif (ret)\n \t\t\t\tbreak;\n@@ -2709,21 +2710,22 @@ mlx5_os_pci_probe(struct rte_pci_device *pci_dev)\n \t\t\t\tpci_dev->addr.domain, pci_dev->addr.bus,\n \t\t\t\tpci_dev->addr.devid, pci_dev->addr.function,\n \t\t\t\teth_da.ports[p]);\n-\t\t\tmlx5_net_remove(&pci_dev->device);\n+\t\t\tmlx5_net_remove(cdev);\n \t\t}\n \t} else {\n-\t\tret = mlx5_os_pci_probe_pf(pci_dev, ð_da, 0);\n+\t\tret = mlx5_os_pci_probe_pf(cdev, ð_da, 0);\n \t}\n \treturn ret;\n }\n \n /* Probe a single SF device on auxiliary bus, no representor support. */\n static int\n-mlx5_os_auxiliary_probe(struct rte_device *dev)\n+mlx5_os_auxiliary_probe(struct mlx5_common_device *cdev)\n {\n \tstruct rte_eth_devargs eth_da = { .nb_ports = 0 };\n \tstruct mlx5_dev_config config;\n \tstruct mlx5_dev_spawn_data spawn = { .pf_bond = -1 };\n+\tstruct rte_device *dev = cdev->dev;\n \tstruct rte_auxiliary_device *adev = RTE_DEV_TO_AUXILIARY(dev);\n \tstruct rte_eth_dev *eth_dev;\n \tint ret = 0;\n@@ -2747,7 +2749,7 @@ mlx5_os_auxiliary_probe(struct rte_device *dev)\n \t\treturn ret;\n \t}\n \tspawn.ifindex = ret;\n-\tspawn.numa_node = dev->numa_node;\n+\tspawn.cdev = cdev;\n \t/* Spawn device. */\n \teth_dev = mlx5_dev_spawn(dev, &spawn, &config, ð_da);\n \tif (eth_dev == NULL)\n@@ -2768,14 +2770,14 @@ mlx5_os_auxiliary_probe(struct rte_device *dev)\n *\n * This function probe PCI bus device(s) or a single SF on auxiliary bus.\n *\n- * @param[in] dev\n- * Pointer to the generic device.\n+ * @param[in] cdev\n+ * Pointer to the common mlx5 device.\n *\n * @return\n- * 0 on success, the function cannot fail.\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n int\n-mlx5_os_net_probe(struct rte_device *dev)\n+mlx5_os_net_probe(struct mlx5_common_device *cdev)\n {\n \tint ret;\n \n@@ -2783,14 +2785,14 @@ mlx5_os_net_probe(struct rte_device *dev)\n \t\tmlx5_pmd_socket_init();\n \tret = mlx5_init_once();\n \tif (ret) {\n-\t\tDRV_LOG(ERR, \"unable to init PMD global data: %s\",\n+\t\tDRV_LOG(ERR, \"Unable to init PMD global data: %s\",\n \t\t\tstrerror(rte_errno));\n \t\treturn -rte_errno;\n \t}\n-\tif (mlx5_dev_is_pci(dev))\n-\t\treturn mlx5_os_pci_probe(RTE_DEV_TO_PCI(dev));\n+\tif (mlx5_dev_is_pci(cdev->dev))\n+\t\treturn mlx5_os_pci_probe(cdev);\n \telse\n-\t\treturn mlx5_os_auxiliary_probe(dev);\n+\t\treturn mlx5_os_auxiliary_probe(cdev);\n }\n \n static int\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 1e1b8b736b..e39e77aa9d 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -1279,7 +1279,8 @@ 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+\tsh->numa_node = spawn->cdev->dev->numa_node;\n+\tsh->cdev = spawn->cdev;\n \tif (spawn->bond_info)\n \t\tsh->bond = *spawn->bond_info;\n \terr = mlx5_os_open_device(spawn, config, sh);\n@@ -2537,19 +2538,19 @@ mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev)\n *\n * This function removes all Ethernet devices belong to a given device.\n *\n- * @param[in] dev\n+ * @param[in] cdev\n * Pointer to the generic device.\n *\n * @return\n * 0 on success, the function cannot fail.\n */\n int\n-mlx5_net_remove(struct rte_device *dev)\n+mlx5_net_remove(struct mlx5_common_device *cdev)\n {\n \tuint16_t port_id;\n \tint ret = 0;\n \n-\tRTE_ETH_FOREACH_DEV_OF(port_id, dev) {\n+\tRTE_ETH_FOREACH_DEV_OF(port_id, cdev->dev) {\n \t\t/*\n \t\t * mlx5_dev_close() is not registered to secondary process,\n \t\t * call the close function explicitly for secondary process.\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex fe533fcc81..f441352a63 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -134,11 +134,11 @@ 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 \tstruct rte_pci_device *pci_dev; /**< Backend PCI device. */\n+\tstruct mlx5_common_device *cdev; /**< Backend common device. */\n \tstruct mlx5_bond_info *bond_info;\n };\n \n@@ -1148,6 +1148,7 @@ struct mlx5_dev_ctx_shared {\n \tuint32_t reclaim_mode:1; /* Reclaim memory. */\n \tuint32_t max_port; /* Maximal IB device port index. */\n \tstruct mlx5_bond_info bond; /* Bonding information. */\n+\tstruct mlx5_common_device *cdev; /* Backend mlx5 device. */\n \tvoid *ctx; /* Verbs/DV/DevX context. */\n \tvoid *pd; /* Protection Domain. */\n \tuint32_t pdn; /* Protection Domain number. */\n@@ -1492,7 +1493,7 @@ 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_device *odev);\n int mlx5_dev_close(struct rte_eth_dev *dev);\n-int mlx5_net_remove(struct rte_device *dev);\n+int mlx5_net_remove(struct mlx5_common_device *cdev);\n bool mlx5_is_hpf(struct rte_eth_dev *dev);\n bool mlx5_is_sf_repr(struct rte_eth_dev *dev);\n void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh);\n@@ -1782,7 +1783,7 @@ int mlx5_os_open_device(const struct mlx5_dev_spawn_data *spawn,\n \t\t\t const struct mlx5_dev_config *config,\n \t\t\t struct mlx5_dev_ctx_shared *sh);\n int mlx5_os_get_pdn(void *pd, uint32_t *pdn);\n-int mlx5_os_net_probe(struct rte_device *dev);\n+int mlx5_os_net_probe(struct mlx5_common_device *cdev);\n void mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh);\n void mlx5_os_dev_shared_handler_uninstall(struct mlx5_dev_ctx_shared *sh);\n void mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex 459414d5c2..8ffbb9ff54 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -337,7 +337,7 @@ mlx5_flow_counter_mode_config(struct rte_eth_dev *dev __rte_unused)\n }\n \n /**\n- * Spawn an Ethernet device from Verbs information.\n+ * Spawn an Ethernet device from DevX information.\n *\n * @param dpdk_dev\n * Backing DPDK device.\n@@ -982,15 +982,15 @@ mlx5_match_devx_devices_to_addr(struct devx_device_bdf *devx_bdf,\n * This function spawns Ethernet devices out of a given device.\n *\n * @param[in] dev\n- * Pointer to the generic device.\n+ * Pointer to the common device.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n int\n-mlx5_os_net_probe(struct rte_device *dev)\n+mlx5_os_net_probe(struct mlx5_common_device *cdev)\n {\n-\tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev);\n+\tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(cdev->dev);\n \tstruct devx_device_bdf *devx_bdf_devs, *orig_devx_bdf_devs;\n \t/*\n \t * Number of found IB Devices matching with requested PCI BDF.\n@@ -1092,6 +1092,7 @@ mlx5_os_net_probe(struct rte_device *dev)\n \tlist[ns].phys_dev = devx_bdf_match[ns];\n \tlist[ns].eth_dev = NULL;\n \tlist[ns].pci_dev = pci_dev;\n+\tlist[ns].cdev = cdev;\n \tlist[ns].pf_bond = bd;\n \tlist[ns].ifindex = -1; /* Spawn will assign */\n \tlist[ns].info =\n@@ -1136,10 +1137,7 @@ mlx5_os_net_probe(struct rte_device *dev)\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+\tlist[ns].eth_dev = mlx5_dev_spawn(cdev->dev, &list[ns], &dev_config);\n \tif (!list[ns].eth_dev)\n \t\tgoto exit;\n \trestore = list[ns].eth_dev->data->dev_flags;\ndiff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c\nindex 5aa988be6d..399c24a20c 100644\n--- a/drivers/regex/mlx5/mlx5_regex.c\n+++ b/drivers/regex/mlx5/mlx5_regex.c\n@@ -121,7 +121,7 @@ mlx5_regex_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,\n }\n \n static int\n-mlx5_regex_dev_probe(struct rte_device *rte_dev)\n+mlx5_regex_dev_probe(struct mlx5_common_device *cdev)\n {\n \tstruct ibv_device *ibv;\n \tstruct mlx5_regex_priv *priv = NULL;\n@@ -131,7 +131,7 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)\n \tint ret;\n \tuint32_t val;\n \n-\tibv = mlx5_os_get_ibv_dev(rte_dev);\n+\tibv = mlx5_os_get_ibv_dev(cdev->dev);\n \tif (ibv == NULL)\n \t\treturn -rte_errno;\n \tDRV_LOG(INFO, \"Probe device \\\"%s\\\".\", ibv->name);\n@@ -180,7 +180,7 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)\n \t\tpriv->is_bf2 = 1;\n \t/* Default RXP programming mode to Shared. */\n \tpriv->prog_mode = MLX5_RXP_SHARED_PROG_MODE;\n-\tmlx5_regex_get_name(name, rte_dev);\n+\tmlx5_regex_get_name(name, cdev->dev);\n \tpriv->regexdev = rte_regexdev_register(name);\n \tif (priv->regexdev == NULL) {\n \t\tDRV_LOG(ERR, \"Failed to register RegEx device.\");\n@@ -214,7 +214,7 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)\n \t\tpriv->regexdev->enqueue = mlx5_regexdev_enqueue_gga;\n #endif\n \tpriv->regexdev->dequeue = mlx5_regexdev_dequeue;\n-\tpriv->regexdev->device = rte_dev;\n+\tpriv->regexdev->device = cdev->dev;\n \tpriv->regexdev->data->dev_private = priv;\n \tpriv->regexdev->state = RTE_REGEXDEV_READY;\n \tpriv->mr_scache.reg_mr_cb = mlx5_common_verbs_reg_mr;\n@@ -256,13 +256,13 @@ mlx5_regex_dev_probe(struct rte_device *rte_dev)\n }\n \n static int\n-mlx5_regex_dev_remove(struct rte_device *rte_dev)\n+mlx5_regex_dev_remove(struct mlx5_common_device *cdev)\n {\n \tchar name[RTE_REGEXDEV_NAME_MAX_LEN];\n \tstruct rte_regexdev *dev;\n \tstruct mlx5_regex_priv *priv = NULL;\n \n-\tmlx5_regex_get_name(name, rte_dev);\n+\tmlx5_regex_get_name(name, cdev->dev);\n \tdev = rte_regexdev_get_device_by_name(name);\n \tif (!dev)\n \t\treturn 0;\ndiff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c\nindex 6d17d7a6f3..d7ef303cfe 100644\n--- a/drivers/vdpa/mlx5/mlx5_vdpa.c\n+++ b/drivers/vdpa/mlx5/mlx5_vdpa.c\n@@ -630,7 +630,7 @@ mlx5_vdpa_config_get(struct rte_devargs *devargs, struct mlx5_vdpa_priv *priv)\n }\n \n static int\n-mlx5_vdpa_dev_probe(struct rte_device *dev)\n+mlx5_vdpa_dev_probe(struct mlx5_common_device *cdev)\n {\n \tstruct ibv_device *ibv;\n \tstruct mlx5_vdpa_priv *priv = NULL;\n@@ -639,14 +639,14 @@ mlx5_vdpa_dev_probe(struct rte_device *dev)\n \tint retry;\n \tint ret;\n \n-\tif (mlx5_vdpa_roce_disable(dev) != 0) {\n+\tif (mlx5_vdpa_roce_disable(cdev->dev) != 0) {\n \t\tDRV_LOG(WARNING, \"Failed to disable ROCE for \\\"%s\\\".\",\n-\t\t\tdev->name);\n+\t\t\tcdev->dev->name);\n \t\treturn -rte_errno;\n \t}\n \t/* Wait for the IB device to appear again after reload. */\n \tfor (retry = MLX5_VDPA_MAX_RETRIES; retry > 0; --retry) {\n-\t\tibv = mlx5_os_get_ibv_dev(dev);\n+\t\tibv = mlx5_os_get_ibv_dev(cdev->dev);\n \t\tif (ibv != NULL)\n \t\t\tbreak;\n \t\tusleep(MLX5_VDPA_USEC);\n@@ -654,7 +654,7 @@ mlx5_vdpa_dev_probe(struct rte_device *dev)\n \tif (ibv == NULL) {\n \t\tDRV_LOG(ERR, \"Cannot get IB device after disabling RoCE for \"\n \t\t\t\t\"\\\"%s\\\", retries exceed %d.\",\n-\t\t\t\tdev->name, MLX5_VDPA_MAX_RETRIES);\n+\t\t\t\tcdev->dev->name, MLX5_VDPA_MAX_RETRIES);\n \t\trte_errno = EAGAIN;\n \t\treturn -rte_errno;\n \t}\n@@ -698,13 +698,13 @@ mlx5_vdpa_dev_probe(struct rte_device *dev)\n \t\tDRV_LOG(ERR, \"Failed to allocate VAR %u.\", errno);\n \t\tgoto error;\n \t}\n-\tpriv->vdev = rte_vdpa_register_device(dev, &mlx5_vdpa_ops);\n+\tpriv->vdev = rte_vdpa_register_device(cdev->dev, &mlx5_vdpa_ops);\n \tif (priv->vdev == NULL) {\n \t\tDRV_LOG(ERR, \"Failed to register vDPA device.\");\n \t\trte_errno = rte_errno ? rte_errno : EINVAL;\n \t\tgoto error;\n \t}\n-\tmlx5_vdpa_config_get(dev->devargs, priv);\n+\tmlx5_vdpa_config_get(cdev->dev->devargs, priv);\n \tSLIST_INIT(&priv->mr_list);\n \tpthread_mutex_init(&priv->vq_config_lock, NULL);\n \tpthread_mutex_lock(&priv_list_lock);\n@@ -724,14 +724,14 @@ mlx5_vdpa_dev_probe(struct rte_device *dev)\n }\n \n static int\n-mlx5_vdpa_dev_remove(struct rte_device *dev)\n+mlx5_vdpa_dev_remove(struct mlx5_common_device *cdev)\n {\n \tstruct mlx5_vdpa_priv *priv = NULL;\n \tint found = 0;\n \n \tpthread_mutex_lock(&priv_list_lock);\n \tTAILQ_FOREACH(priv, &priv_list, next) {\n-\t\tif (priv->vdev->device == dev) {\n+\t\tif (priv->vdev->device == cdev->dev) {\n \t\t\tfound = 1;\n \t\t\tbreak;\n \t\t}\n", "prefixes": [ "v3", "02/18" ] }