Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/100183/?format=api
{ "id": 100183, "url": "https://patches.dpdk.org/api/patches/100183/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210930172822.1949969-15-michaelba@nvidia.com/", "project": { "id": 1, "url": "https://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": "<20210930172822.1949969-15-michaelba@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210930172822.1949969-15-michaelba@nvidia.com", "date": "2021-09-30T17:28:18", "name": "[14/18] common/mlx5: add global MR cache create function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3663f13bc040ff3d6788add4313e6e1c2ac0b953", "submitter": { "id": 1949, "url": "https://patches.dpdk.org/api/people/1949/?format=api", "name": "Michael Baum", "email": "michaelba@nvidia.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210930172822.1949969-15-michaelba@nvidia.com/mbox/", "series": [ { "id": 19311, "url": "https://patches.dpdk.org/api/series/19311/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=19311", "date": "2021-09-30T17:28:04", "name": "mlx5: sharing global MR cache between drivers", "version": 1, "mbox": "https://patches.dpdk.org/series/19311/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/100183/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/100183/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 BA594A0C43;\n\tThu, 30 Sep 2021 19:41:21 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0122641169;\n\tThu, 30 Sep 2021 19:40:01 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2044.outbound.protection.outlook.com [40.107.94.44])\n by mails.dpdk.org (Postfix) with ESMTP id 76A7F4067E\n for <dev@dpdk.org>; Thu, 30 Sep 2021 19:29:12 +0200 (CEST)", "from BN0PR02CA0055.namprd02.prod.outlook.com (2603:10b6:408:e5::30)\n by MW2PR12MB2377.namprd12.prod.outlook.com (2603:10b6:907:11::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep\n 2021 17:29:10 +0000", "from BN8NAM11FT010.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:e5:cafe::f9) by BN0PR02CA0055.outlook.office365.com\n (2603:10b6:408:e5::30) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17 via Frontend\n Transport; Thu, 30 Sep 2021 17:29:10 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT010.mail.protection.outlook.com (10.13.177.53) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 17:29:09 +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.18; Thu, 30 Sep\n 2021 17:29:04 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=gyFUwqDyFp0lRMwz8Y4M7BfsloMJozAuATUifYphqVorc6zxrr7eRyYZ147Jo4lEy3ij+/Im/cc3bFHJ3Pw3HjC/KMG9MpSLKcedoz8GAe9tE/m6tQA5gDS8NuquPkQhFEXAl10nm07MKKJzmmfr1VlCT2Dkw8+z6BXFgJgk97QYnnQbMrloU1SZwyU8hmt5YF/m9pXCF6myYK7raQ1u9Hc07bIBsWBL0NKC54cY+TucuZ1Ey1ttKVaPd1Fqv7/pwKGFQb+383r65fqpiLdmaG5sDkn4oDpZqNuOcnUsEOunztnG9j8WKqKaQcPqG4hWzHowkchuxUQK+HGPIqLSjg==", "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;\n bh=ooOC9zhuLqFY4e5r18PLaXqrkeQmXAje+iziHXTcEns=;\n b=mdg1mvsKV5A2ZG6qbVDKBa77jTFSjQVlf2zbHyjX3kShc/afY0uhyU0kSOuenHsmQybEff58BehNZxigogDEr4fv8/M2hKt4bZL17HBC5bFBP11xDzn66NH2xRzlfkixFqt4vQC3cuVTAndTCt8Ul9DpuYhXiu8t2LwMmyjYRdKhZ80/rB1C/1SUpDNtVRWTIEZyhxuT80Fyg7oZrbbpH0xYovbi6ikLpzYIEW4TrRaOUz/IdKChz8A0hGELz2intzDUI5NzWAUlb8Db05sg961Awu3l/xCFx+Bf9nccf1UImBAg1glcMqW+JqGULkf0FkPIoCynTNiVQFbaYWDWyQ==", "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=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=ooOC9zhuLqFY4e5r18PLaXqrkeQmXAje+iziHXTcEns=;\n b=D06HRd8hO9+nGCGtFRYLKS9EOpBHWmlHbPQ9k/LwuO/6Jp/sEBsi9BgQyQlmkIH7ETg/cSKjjc6Byxku8ymZb+W0eIeaTNGmLyPuIR8G/9x+789xTC3uFD1ZmUboUPidSd03Bamhz6mfA7XsOs+jwa5EyLHGal71PbNBuzgFot/ZjxJs5x03YDB6S4lEruCncp9b4Q7aT9tw+hT4sxWfW0bwlGTO9mEQCwzc7q+OVIbCpA+xam0l5GRiCmT2nGayedVKn7vkk5HTUw8PaiSbDvyeJLTzMhdQ+DCZ+bYD9FiOyCKZ28Zj3LwYp4lJoaDgoTbjIBCzJDxSxwcEbZ860Q==", "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": "Thu, 30 Sep 2021 20:28:18 +0300", "Message-ID": "<20210930172822.1949969-15-michaelba@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210930172822.1949969-1-michaelba@nvidia.com>", "References": "<20210930172822.1949969-1-michaelba@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL107.nvidia.com (172.20.187.13) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "3250eb0c-f030-480f-0d6e-08d98437d042", "X-MS-TrafficTypeDiagnostic": "MW2PR12MB2377:", "X-LD-Processed": "43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr", "X-Microsoft-Antispam-PRVS": "\n <MW2PR12MB2377FB380C1468786DEAD5D9CCAA9@MW2PR12MB2377.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:3044;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n DQqZpdGih97lUMHygYpf7dTVJGf91YEulQk7MVOm9I7hVFuPmrWXyitJGT0+VAjZoJ5NT3/mCSFef5eMOOOMtxLoCy86tyxvqA58SM6DzspMnQBOmUrCDYvdZVVykQyXS062QYN7oY2kqVQZoxubVmXm44kB7Qqkw/QE1635GEjkp5ObKqTlaZqupUfzphNAeywUyCTCpuy2KVA3Osi62u9FCEpWlzFAkahR2GJMC2ei67rJCjZdZj+N0/NCnp+pnkH7Ga4WRJ5FBXHScIxDKcn/kDLueiY+b6sHVCuR5FyqR94IAST7DAC9rFN8LA1CpXh7X4NuUyqBXS0VSEujwt/Q8OlTdKPYMpqXZcHTLJ7FC3yevoUVbnGxLj08NT1GR+Amf+czHf90ePShQJ4BX+23HrqPc5I9vb3IrnKOwAZNtGmCFpZ05t4j4jxPvccglZ814Ab1iZogDTKF7oD9PCFlx3WHLziEv+m8n3EVACGI28WzmAYDpvoQ3IzH0gjAARxTla71PW74mEMszfTA4LNwnXgsh2DTsQG6PS+VNJNgvEsn/IIE1qUo8ue+za9RZWLYK6xfcVFexfPxhlwaqecQ0GqL5D1yn4LQrD3sZQ4X6i5ZP3Dm0as/+NHPbOmeJBrLzZWgJRIigOw2ab+p/9qHNkqCidL/R/Jlq8WKazAGv/5tvWtRzMRX0XLuXqt6o0w52HcnKeaYIjzErOKb/g==", "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)(36840700001)(46966006)(83380400001)(8936002)(70206006)(6286002)(186003)(6666004)(16526019)(26005)(4326008)(107886003)(8676002)(336012)(426003)(2616005)(1076003)(508600001)(2876002)(2906002)(30864003)(36756003)(86362001)(7636003)(82310400003)(7696005)(70586007)(5660300002)(6916009)(316002)(36906005)(55016002)(36860700001)(47076005)(54906003)(356005);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "30 Sep 2021 17:29:09.9934 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 3250eb0c-f030-480f-0d6e-08d98437d042", "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 BN8NAM11FT010.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW2PR12MB2377", "X-Mailman-Approved-At": "Thu, 30 Sep 2021 19:39:43 +0200", "Subject": "[dpdk-dev] [PATCH 14/18] common/mlx5: add global MR cache create\n function", "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\nAdd function for global shared MR cache structure initialization.\nThis function include:\n - btree initialization.\n - set callbacks for reg and dereg MR.\n\nSigned-off-by: Michael Baum <michaelba@oss.nvidia.com>\nAcked-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/common/mlx5/linux/mlx5_common_verbs.c | 15 +++++++\n drivers/common/mlx5/mlx5_common_mr.c | 25 ++++++++++-\n drivers/common/mlx5/mlx5_common_mr.h | 8 +++-\n drivers/common/mlx5/version.map | 5 +--\n drivers/common/mlx5/windows/mlx5_common_os.c | 20 ++++++++-\n drivers/common/mlx5/windows/mlx5_common_os.h | 6 +--\n drivers/compress/mlx5/mlx5_compress.c | 5 +--\n drivers/crypto/mlx5/mlx5_crypto.c | 5 +--\n drivers/net/mlx5/linux/mlx5_os.c | 17 --------\n drivers/net/mlx5/linux/mlx5_verbs.c | 42 -------------------\n drivers/net/mlx5/linux/mlx5_verbs.h | 2 -\n drivers/net/mlx5/mlx5.c | 6 +--\n drivers/net/mlx5/mlx5.h | 8 ----\n drivers/net/mlx5/windows/mlx5_os.c | 17 --------\n drivers/regex/mlx5/mlx5_regex.c | 6 +--\n 15 files changed, 70 insertions(+), 117 deletions(-)", "diff": "diff --git a/drivers/common/mlx5/linux/mlx5_common_verbs.c b/drivers/common/mlx5/linux/mlx5_common_verbs.c\nindex 519cb8d056..cf2f7ecbf3 100644\n--- a/drivers/common/mlx5/linux/mlx5_common_verbs.c\n+++ b/drivers/common/mlx5/linux/mlx5_common_verbs.c\n@@ -142,3 +142,18 @@ mlx5_common_verbs_dereg_mr(struct mlx5_pmd_mr *pmd_mr)\n \t\tmemset(pmd_mr, 0, sizeof(*pmd_mr));\n \t}\n }\n+\n+/**\n+ * Set the reg_mr and dereg_mr callbacks.\n+ *\n+ * @param[out] reg_mr_cb\n+ * Pointer to reg_mr func\n+ * @param[out] dereg_mr_cb\n+ * Pointer to dereg_mr func\n+ */\n+void\n+mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, mlx5_dereg_mr_t *dereg_mr_cb)\n+{\n+\t*reg_mr_cb = mlx5_common_verbs_reg_mr;\n+\t*dereg_mr_cb = mlx5_common_verbs_dereg_mr;\n+}\ndiff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c\nindex 8fd65484cf..43dc3d88ce 100644\n--- a/drivers/common/mlx5/mlx5_common_mr.c\n+++ b/drivers/common/mlx5/mlx5_common_mr.c\n@@ -199,7 +199,7 @@ mr_btree_insert(struct mlx5_mr_btree *bt, struct mr_cache_entry *entry)\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n-int\n+static int\n mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket)\n {\n \tif (bt == NULL) {\n@@ -1044,6 +1044,29 @@ mlx5_mr_release_cache(struct mlx5_mr_share_cache *share_cache)\n \tmlx5_mr_garbage_collect(share_cache);\n }\n \n+/**\n+ * Initialize global MR cache of a device.\n+ *\n+ * @param share_cache\n+ * Pointer to a global shared MR cache.\n+ * @param socket\n+ * NUMA socket on which memory must be allocated.\n+ *\n+ * @return\n+ * 0 on success, a negative errno value otherwise and rte_errno is set.\n+ */\n+int\n+mlx5_mr_create_cache(struct mlx5_mr_share_cache *share_cache, int socket)\n+{\n+\t/* Set the reg_mr and dereg_mr callback functions */\n+\tmlx5_os_set_reg_mr_cb(&share_cache->reg_mr_cb,\n+\t\t\t &share_cache->dereg_mr_cb);\n+\trte_rwlock_init(&share_cache->rwlock);\n+\t/* Initialize B-tree and allocate memory for global MR cache table. */\n+\treturn mlx5_mr_btree_init(&share_cache->cache,\n+\t\t\t\t MLX5_MR_BTREE_CACHE_N * 2, socket);\n+}\n+\n /**\n * Flush all of the local cache entries.\n *\ndiff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h\nindex 1392d9b55a..36689dfb54 100644\n--- a/drivers/common/mlx5/mlx5_common_mr.h\n+++ b/drivers/common/mlx5/mlx5_common_mr.h\n@@ -128,8 +128,6 @@ __rte_internal\n int mlx5_mr_ctrl_init(struct mlx5_mr_ctrl *mr_ctrl, uint32_t *dev_gen_ptr,\n \t\t int socket);\n __rte_internal\n-int mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket);\n-__rte_internal\n void mlx5_mr_btree_free(struct mlx5_mr_btree *bt);\n __rte_internal\n void mlx5_mr_btree_dump(struct mlx5_mr_btree *bt __rte_unused);\n@@ -145,6 +143,8 @@ uint32_t mlx5_mr_mempool2mr_bh(struct mlx5_mr_share_cache *share_cache,\n __rte_internal\n void mlx5_mr_release_cache(struct mlx5_mr_share_cache *mr_cache);\n __rte_internal\n+int mlx5_mr_create_cache(struct mlx5_mr_share_cache *share_cache, int socket);\n+__rte_internal\n void mlx5_mr_dump_cache(struct mlx5_mr_share_cache *share_cache __rte_unused);\n __rte_internal\n void mlx5_mr_rebuild_cache(struct mlx5_mr_share_cache *share_cache);\n@@ -183,6 +183,10 @@ __rte_internal\n void\n mlx5_common_verbs_dereg_mr(struct mlx5_pmd_mr *pmd_mr);\n \n+__rte_internal\n+void\n+mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, mlx5_dereg_mr_t *dereg_mr_cb);\n+\n __rte_internal\n void\n mlx5_mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb);\ndiff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map\nindex f786287986..cabdc676d5 100644\n--- a/drivers/common/mlx5/version.map\n+++ b/drivers/common/mlx5/version.map\n@@ -106,7 +106,7 @@ INTERNAL {\n \tmlx5_mr_addr2mr_bh;\n \tmlx5_mr_btree_dump;\n \tmlx5_mr_btree_free;\n-\tmlx5_mr_btree_init;\n+\tmlx5_mr_create_cache;\n \tmlx5_mr_create_primary;\n mlx5_mr_ctrl_init;\n \tmlx5_mr_dump_cache;\n@@ -133,10 +133,9 @@ INTERNAL {\n \tmlx5_nl_vlan_vmwa_create; # WINDOWS_NO_EXPORT\n \tmlx5_nl_vlan_vmwa_delete; # WINDOWS_NO_EXPORT\n \n-\tmlx5_os_dereg_mr;\n-\tmlx5_os_reg_mr;\n \tmlx5_os_umem_dereg;\n \tmlx5_os_umem_reg;\n+ mlx5_os_set_reg_mr_cb;\n \n \tmlx5_realloc;\n \ndiff --git a/drivers/common/mlx5/windows/mlx5_common_os.c b/drivers/common/mlx5/windows/mlx5_common_os.c\nindex 4d0f1e92e3..44e8ebec2b 100644\n--- a/drivers/common/mlx5/windows/mlx5_common_os.c\n+++ b/drivers/common/mlx5/windows/mlx5_common_os.c\n@@ -317,7 +317,7 @@ mlx5_os_umem_dereg(void *pumem)\n * @return\n * 0 on successful registration, -1 otherwise\n */\n-int\n+static int\n mlx5_os_reg_mr(void *pd,\n \t void *addr, size_t length, struct mlx5_pmd_mr *pmd_mr)\n {\n@@ -365,7 +365,7 @@ mlx5_os_reg_mr(void *pd,\n * @param[in] pmd_mr\n * Pointer to PMD mr object\n */\n-void\n+static void\n mlx5_os_dereg_mr(struct mlx5_pmd_mr *pmd_mr)\n {\n \tif (pmd_mr && pmd_mr->mkey)\n@@ -374,3 +374,19 @@ mlx5_os_dereg_mr(struct mlx5_pmd_mr *pmd_mr)\n \t\tclaim_zero(mlx5_os_umem_dereg(pmd_mr->obj));\n \tmemset(pmd_mr, 0, sizeof(*pmd_mr));\n }\n+\n+/**\n+ * Set the reg_mr and dereg_mr callbacks.\n+ *\n+ * @param[out] reg_mr_cb\n+ * Pointer to reg_mr func\n+ * @param[out] dereg_mr_cb\n+ * Pointer to dereg_mr func\n+ *\n+ */\n+void\n+mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, mlx5_dereg_mr_t *dereg_mr_cb)\n+{\n+\t*reg_mr_cb = mlx5_os_reg_mr;\n+\t*dereg_mr_cb = mlx5_os_dereg_mr;\n+}\ndiff --git a/drivers/common/mlx5/windows/mlx5_common_os.h b/drivers/common/mlx5/windows/mlx5_common_os.h\nindex c99645aefd..3afce56cd9 100644\n--- a/drivers/common/mlx5/windows/mlx5_common_os.h\n+++ b/drivers/common/mlx5/windows/mlx5_common_os.h\n@@ -253,9 +253,5 @@ __rte_internal\n void *mlx5_os_umem_reg(void *ctx, void *addr, size_t size, uint32_t access);\n __rte_internal\n int mlx5_os_umem_dereg(void *pumem);\n-__rte_internal\n-int mlx5_os_reg_mr(void *pd,\n-\t\t void *addr, size_t length, struct mlx5_pmd_mr *pmd_mr);\n-__rte_internal\n-void mlx5_os_dereg_mr(struct mlx5_pmd_mr *pmd_mr);\n+\n #endif /* RTE_PMD_MLX5_COMMON_OS_H_ */\ndiff --git a/drivers/compress/mlx5/mlx5_compress.c b/drivers/compress/mlx5/mlx5_compress.c\nindex 7e297778ef..6116f5113f 100644\n--- a/drivers/compress/mlx5/mlx5_compress.c\n+++ b/drivers/compress/mlx5/mlx5_compress.c\n@@ -788,16 +788,13 @@ mlx5_compress_dev_probe(struct mlx5_common_device *cdev)\n \t\trte_compressdev_pmd_destroy(priv->compressdev);\n \t\treturn -1;\n \t}\n-\tif (mlx5_mr_btree_init(&priv->mr_scache.cache,\n-\t\t\t MLX5_MR_BTREE_CACHE_N * 2, rte_socket_id()) != 0) {\n+\tif (mlx5_mr_create_cache(&priv->mr_scache, 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->compressdev);\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n \t}\n-\tpriv->mr_scache.reg_mr_cb = mlx5_common_verbs_reg_mr;\n-\tpriv->mr_scache.dereg_mr_cb = mlx5_common_verbs_dereg_mr;\n \t/* Register callback function for global shared MR cache management. */\n \tif (TAILQ_EMPTY(&mlx5_compress_priv_list))\n \t\trte_mem_event_callback_register(\"MLX5_MEM_EVENT_CB\",\ndiff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c\nindex af32e0a2ac..e40c4f1e6c 100644\n--- a/drivers/crypto/mlx5/mlx5_crypto.c\n+++ b/drivers/crypto/mlx5/mlx5_crypto.c\n@@ -1024,16 +1024,13 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *cdev)\n \t\trte_cryptodev_pmd_destroy(priv->crypto_dev);\n \t\treturn -1;\n \t}\n-\tif (mlx5_mr_btree_init(&priv->mr_scache.cache,\n-\t\t\t MLX5_MR_BTREE_CACHE_N * 2, rte_socket_id()) != 0) {\n+\tif (mlx5_mr_create_cache(&priv->mr_scache, rte_socket_id()) != 0) {\n \t\tDRV_LOG(ERR, \"Failed to allocate shared cache MR memory.\");\n \t\tmlx5_crypto_hw_global_release(priv);\n \t\trte_cryptodev_pmd_destroy(priv->crypto_dev);\n \t\trte_errno = ENOMEM;\n \t\treturn -rte_errno;\n \t}\n-\tpriv->mr_scache.reg_mr_cb = mlx5_common_verbs_reg_mr;\n-\tpriv->mr_scache.dereg_mr_cb = mlx5_common_verbs_dereg_mr;\n \tpriv->keytag = rte_cpu_to_be_64(devarg_prms.keytag);\n \tpriv->max_segs_num = devarg_prms.max_segs_num;\n \tpriv->umr_wqe_size = sizeof(struct mlx5_wqe_umr_bsf_seg) +\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 06bde2669c..9e445f2f9b 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -2831,23 +2831,6 @@ mlx5_os_read_dev_stat(struct mlx5_priv *priv, const char *ctr_name,\n \treturn 1;\n }\n \n-/**\n- * Set the reg_mr and dereg_mr call backs\n- *\n- * @param reg_mr_cb[out]\n- * Pointer to reg_mr func\n- * @param dereg_mr_cb[out]\n- * Pointer to dereg_mr func\n- *\n- */\n-void\n-mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,\n-\t\t mlx5_dereg_mr_t *dereg_mr_cb)\n-{\n-\t*reg_mr_cb = mlx5_mr_verbs_ops.reg_mr;\n-\t*dereg_mr_cb = mlx5_mr_verbs_ops.dereg_mr;\n-}\n-\n /**\n * Remove a MAC address from device\n *\ndiff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c\nindex fb10dd0839..4779b37aa6 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.c\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.c\n@@ -26,48 +26,6 @@\n #include <mlx5_utils.h>\n #include <mlx5_malloc.h>\n \n-/**\n- * Register mr. Given protection domain pointer, pointer to addr and length\n- * register the memory region.\n- *\n- * @param[in] pd\n- * Pointer to protection domain context.\n- * @param[in] addr\n- * Pointer to memory start address.\n- * @param[in] length\n- * Length of the memory to register.\n- * @param[out] pmd_mr\n- * pmd_mr struct set with lkey, address, length and pointer to mr object\n- *\n- * @return\n- * 0 on successful registration, -1 otherwise\n- */\n-static int\n-mlx5_reg_mr(void *pd, void *addr, size_t length,\n-\t\t struct mlx5_pmd_mr *pmd_mr)\n-{\n-\treturn mlx5_common_verbs_reg_mr(pd, addr, length, pmd_mr);\n-}\n-\n-/**\n- * Deregister mr. Given the mlx5 pmd MR - deregister the MR\n- *\n- * @param[in] pmd_mr\n- * pmd_mr struct set with lkey, address, length and pointer to mr object\n- *\n- */\n-static void\n-mlx5_dereg_mr(struct mlx5_pmd_mr *pmd_mr)\n-{\n-\tmlx5_common_verbs_dereg_mr(pmd_mr);\n-}\n-\n-/* verbs operations. */\n-const struct mlx5_mr_ops mlx5_mr_verbs_ops = {\n-\t.reg_mr = mlx5_reg_mr,\n-\t.dereg_mr = mlx5_dereg_mr,\n-};\n-\n /**\n * Modify Rx WQ vlan stripping offload\n *\ndiff --git a/drivers/net/mlx5/linux/mlx5_verbs.h b/drivers/net/mlx5/linux/mlx5_verbs.h\nindex f7e8e2fe98..829d9fa738 100644\n--- a/drivers/net/mlx5/linux/mlx5_verbs.h\n+++ b/drivers/net/mlx5/linux/mlx5_verbs.h\n@@ -12,7 +12,5 @@ void mlx5_txq_ibv_obj_release(struct mlx5_txq_obj *txq_obj);\n int mlx5_rxq_ibv_obj_dummy_lb_create(struct rte_eth_dev *dev);\n void mlx5_rxq_ibv_obj_dummy_lb_release(struct rte_eth_dev *dev);\n \n-/* Verbs ops struct */\n-extern const struct mlx5_mr_ops mlx5_mr_verbs_ops;\n extern struct mlx5_obj_ops ibv_obj_ops;\n #endif /* RTE_PMD_MLX5_VERBS_H_ */\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 788c701292..a6c196b368 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -1351,15 +1351,11 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,\n \t * At this point the device is not added to the memory\n \t * event list yet, context is just being created.\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 sh->numa_node);\n+\terr = mlx5_mr_create_cache(&sh->share_cache, sh->numa_node);\n \tif (err) {\n \t\terr = rte_errno;\n \t\tgoto error;\n \t}\n-\tmlx5_os_set_reg_mr_cb(&sh->share_cache.reg_mr_cb,\n-\t\t\t &sh->share_cache.dereg_mr_cb);\n \tmlx5_os_dev_shared_handler_install(sh);\n \tsh->cnt_id_tbl = mlx5_l3t_create(MLX5_L3T_TYPE_DWORD);\n \tif (!sh->cnt_id_tbl) {\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex 96e2cbc644..5c25b94f36 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -1363,12 +1363,6 @@ struct mlx5_obj_ops {\n \n #define MLX5_RSS_HASH_FIELDS_LEN RTE_DIM(mlx5_rss_hash_fields)\n \n-/* MR operations structure. */\n-struct mlx5_mr_ops {\n-\tmlx5_reg_mr_t reg_mr;\n-\tmlx5_dereg_mr_t dereg_mr;\n-};\n-\n struct mlx5_priv {\n \tstruct rte_eth_dev_data *dev_data; /* Pointer to device data. */\n \tstruct mlx5_dev_ctx_shared *sh; /* Shared device context. */\n@@ -1768,8 +1762,6 @@ void mlx5_os_free_shared_dr(struct mlx5_priv *priv);\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,\n-\t\t\t mlx5_dereg_mr_t *dereg_mr_cb);\n void mlx5_os_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index);\n int mlx5_os_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac,\n \t\t\t uint32_t index);\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex 3477f018c1..c3d4b90946 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -926,21 +926,4 @@ mlx5_os_net_probe(struct mlx5_common_device *cdev)\n \treturn 0;\n }\n \n-/**\n- * Set the reg_mr and dereg_mr call backs\n- *\n- * @param reg_mr_cb[out]\n- * Pointer to reg_mr func\n- * @param dereg_mr_cb[out]\n- * Pointer to dereg_mr func\n- *\n- */\n-void\n-mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,\n-\t\t mlx5_dereg_mr_t *dereg_mr_cb)\n-{\n-\t*reg_mr_cb = mlx5_os_reg_mr;\n-\t*dereg_mr_cb = mlx5_os_dereg_mr;\n-}\n-\n const struct mlx5_flow_driver_ops mlx5_flow_verbs_drv_ops = {0};\ndiff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c\nindex 3855b344d4..d95c0b7f2c 100644\n--- a/drivers/regex/mlx5/mlx5_regex.c\n+++ b/drivers/regex/mlx5/mlx5_regex.c\n@@ -191,11 +191,7 @@ mlx5_regex_dev_probe(struct mlx5_common_device *cdev)\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-\tpriv->mr_scache.dereg_mr_cb = mlx5_common_verbs_dereg_mr;\n-\tret = mlx5_mr_btree_init(&priv->mr_scache.cache,\n-\t\t\t\t MLX5_MR_BTREE_CACHE_N * 2,\n-\t\t\t\t rte_socket_id());\n+\tret = mlx5_mr_create_cache(&priv->mr_scache, rte_socket_id());\n \tif (ret) {\n \t\tDRV_LOG(ERR, \"MR init tree failed.\");\n \t rte_errno = ENOMEM;\n", "prefixes": [ "14/18" ] }