From patchwork Tue Jun 16 09:44:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ophir Munk X-Patchwork-Id: 71634 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ADBAEA04A3; Tue, 16 Jun 2020 11:45:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9E2941BF5B; Tue, 16 Jun 2020 11:45:03 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70057.outbound.protection.outlook.com [40.107.7.57]) by dpdk.org (Postfix) with ESMTP id 5B7A11BEE6 for ; Tue, 16 Jun 2020 11:44:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WOhzpCjU0FeW3nqvfaGubQjHSIvDse6q1Q0wTDXOSSfeMOtBJkOqAtFtXfsiwFLWW3PhoDxyVc29yktt3mFdgzrHnLxN7Lx6+4o60akR4MiiYWTE1ypOjg7/u8Iitvo+zL/D89AYmBgtuzsYH7BwePxx5X1NJo1eUmWpAI7gRZIyBNIwEJF8oxyPWvAn431rybM7Pnwl0Gn6lFsLz0OKKpVXstwouhenLCw5oW94+di7YMVYCLEVQj2kP9eXl99b6p7WkFV2qhj4U1e/VmqN5e4OayK+AyvtHQygHMxlArn/3M6EZi9+PIiop1zbBS8XGHlnpoFFZqX/nsi50WZwvw== 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=wxlhIKKhNpDTJKBTVw5eJgwjtf1PYj9EXElX4sUkbGQ=; b=L4RAAKXk8IumKO+DrcL8b2vqOKQeR1tCWhRDR++Q7f1X48i67dliK2R5Owgon4fmNpEgS/c4pEWEr75NLg8dbyRAthwCBJnYFNqSitT11jY++S7JTnBbJiXaASJMQlT4c+4j1l10SfaRKibJmA2m4KKVOMCri8iRRWUQe5X/tjQW8uGgNei0/K7cT2on1R19cUDqKdWgKxRX3qMk1MVS7t9RxTx7984p6e7G96Pt6ZnfxY96Bibzgg/sy0trpM9suGR+tRQSdOzPnVsrnGSFl/T6QmVcJbvFcrxzD7UARkuTmOmExvdurxV8ugP+t3pf5NX6EoHQCVM4O3u6K41A3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wxlhIKKhNpDTJKBTVw5eJgwjtf1PYj9EXElX4sUkbGQ=; b=P6zuYTzTK8Ca8mF7oZM8D7PrDcwbxlsOyFh7wIQewaMC5LVMYEwpq3j3FZHflIvITZZIm/JAFfsfEf+qrfRIHuqN26iQ7Lxm3btUWStAie4/VwTv2hdbebSWXvLpPfXTk/Cp/Ek7XKWP4PMrgIBT+66wncVzex3oZwXW/e4kM2k= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=mellanox.com; Received: from AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22) by AM0PR05MB5172.eurprd05.prod.outlook.com (2603:10a6:208:f3::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.26; Tue, 16 Jun 2020 09:44:55 +0000 Received: from AM0PR05MB4209.eurprd05.prod.outlook.com ([fe80::1068:89a9:41d3:b14a]) by AM0PR05MB4209.eurprd05.prod.outlook.com ([fe80::1068:89a9:41d3:b14a%3]) with mapi id 15.20.3088.028; Tue, 16 Jun 2020 09:44:55 +0000 From: Ophir Munk To: dev@dpdk.org, Matan Azrad , Raslan Darawsheh Cc: Ophir Munk Date: Tue, 16 Jun 2020 09:44:45 +0000 Message-Id: <20200616094446.7152-4-ophirmu@mellanox.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20200616094446.7152-1-ophirmu@mellanox.com> References: <20200616094446.7152-1-ophirmu@mellanox.com> X-ClientProxiedBy: ZRAP278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::16) To AM0PR05MB4209.eurprd05.prod.outlook.com (2603:10a6:208:61::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from mellanox.com (37.142.13.130) by ZRAP278CA0006.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3088.19 via Frontend Transport; Tue, 16 Jun 2020 09:44:54 +0000 X-Mailer: git-send-email 2.8.4 X-Originating-IP: [37.142.13.130] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a6f0a2ef-345a-4374-975a-08d811d9ecde X-MS-TrafficTypeDiagnostic: AM0PR05MB5172: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2; X-Forefront-PRVS: 04362AC73B X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h/bly2IoDkvR7WVwvr01tlO9FzYmj1Q+1nB6L5Bl8/WULqDWUphWXTxKs1geAu7Pyajg2sGZ1SPPomgd6ufaoOe6n63rXOJ9v55awlENh47x2vD1oHOHWPuVVjtUcsjg5Af/X53B0b9geA2bxVx5R5XSV4vXojsPqk8ElujjoL4d3/CA3+Q51fFVh6bP06/NmQK0+bjktVggOOHuj00aI6BP8lKGQ03hsQzyJBwrEKAeRb+zNj9ehQYWlmS3YsjJHm245lB2/3rkcR/2e5X/BtMyIlO7OrRGg2FZnp66txHUsrP1sunLa6OWtDWqm6VtnDDJ8oM1+dE6Xw5+HUjs+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB4209.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(39860400002)(136003)(346002)(366004)(376002)(55016002)(186003)(956004)(16526019)(2616005)(5660300002)(8676002)(26005)(2906002)(8936002)(36756003)(6636002)(8886007)(66946007)(110136005)(316002)(86362001)(66476007)(6666004)(83380400001)(7696005)(45080400002)(4326008)(52116002)(107886003)(66556008)(478600001)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Bon+qWb35znCrg1O/0aPZ7eSzKar7XMryuFfKczL9FOiSi1cpVxbdBH+MMA2qJwULV9mMi0dEVbYzON0a4jzG3dNigguFo+cv8RxmolDnJqyqlPZWIAA6TEHELJtamsSMGgOXTMk3iZAkBZHkpxUK+RLwDsg8fFiqMkBNuwJzeaQfbxuUCYujLQeQEnm42gPv9Ufl4/8Yj9y6PSbAN/p8NE6cw+yyqYaHkLcKAyZpd2T9Bb1PUvitSKpVq3UJ21JV48yE4weylSYtns5DC7VHhl1lhMi0gGxihcMRH0S/9rIglov1jvWV4ZGi2OByRCZ+JOTy46HaSV/pgc9NOhOgcFqBWfYOTff1t31HXTGYhZypU+SjDzMaz2F3Uk6dUfgn0/N71LNV+2V9QY2wlIXwTCix7g2h1LfSF3wkpSJ95kWIvRZmQIqcTtPiNHnAcmGFoc0X8Fnb3zm5em74APsgOtgy5jJ/kFdcJ80pV0Qq63Lj0m52Fvut/SL9IYGHA3/ X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6f0a2ef-345a-4374-975a-08d811d9ecde X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2020 09:44:55.4959 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KUul4gJ4D602SYBbH0m2JPBBcIZyycGcUWXXjzk51KvzvXGtt0h89WX+hEBaR6LBJqgTOS6sivxIKVDawnqAxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5172 Subject: [dpdk-dev] [PATCH v1 3/4] net/mlx5: add MR callbacks in per-device cache X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Prior to this commit MR operations were verbs based and hard coded under common/mlx5/linux directory. This commit enables upper layers (e.g. net/mlx5) to determine which MR operations to use. For example the net layer could set devx based MR operations in non-Linux environments. The reg_mr and dereg_mr callbacks are added to the global per-device MR cache 'struct mlx5_mr_share_cache'. Signed-off-by: Ophir Munk Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common_mr.c | 23 ++++++++++++----------- drivers/common/mlx5/mlx5_common_mr.h | 14 ++++++++++++-- drivers/net/mlx5/linux/mlx5_os.c | 18 ++++++++++++++++++ drivers/net/mlx5/mlx5.c | 2 ++ drivers/net/mlx5/mlx5.h | 2 ++ drivers/net/mlx5/mlx5_mr.c | 6 ++++-- 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c index 4ce7975..564d618 100644 --- a/drivers/common/mlx5/mlx5_common_mr.c +++ b/drivers/common/mlx5/mlx5_common_mr.c @@ -435,12 +435,12 @@ mlx5_mr_lookup_cache(struct mlx5_mr_share_cache *share_cache, * Pointer to MR to free. */ static void -mr_free(struct mlx5_mr *mr) +mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb) { if (mr == NULL) return; DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr); - mlx5_common_verbs_dereg_mr(&mr->pmd_mr); + dereg_mr_cb(&mr->pmd_mr); if (mr->ms_bmp != NULL) rte_bitmap_free(mr->ms_bmp); rte_free(mr); @@ -490,7 +490,7 @@ mlx5_mr_garbage_collect(struct mlx5_mr_share_cache *share_cache) struct mlx5_mr *mr = mr_next; mr_next = LIST_NEXT(mr, mr); - mr_free(mr); + mr_free(mr, share_cache->dereg_mr_cb); } } @@ -702,7 +702,7 @@ mlx5_mr_create_primary(void *pd, data.start = RTE_ALIGN_FLOOR(addr, msl->page_sz); data.end = data.start + msl->page_sz; rte_mcfg_mem_read_unlock(); - mr_free(mr); + mr_free(mr, share_cache->dereg_mr_cb); goto alloc_resources; } MLX5_ASSERT(data.msl == data_re.msl); @@ -725,7 +725,7 @@ mlx5_mr_create_primary(void *pd, * Must be unlocked before calling rte_free() because * mlx5_mr_mem_event_free_cb() can be called inside. */ - mr_free(mr); + mr_free(mr, share_cache->dereg_mr_cb); return entry->lkey; } /* @@ -760,12 +760,12 @@ mlx5_mr_create_primary(void *pd, mr->ms_bmp_n = len / msl->page_sz; MLX5_ASSERT(ms_idx_shift + mr->ms_bmp_n <= ms_n); /* - * Finally create a verbs MR for the memory chunk. ibv_reg_mr() can be - * called with holding the memory lock because it doesn't use + * Finally create an MR for the memory chunk. Verbs: ibv_reg_mr() can + * be called with holding the memory lock because it doesn't use * mlx5_alloc_buf_extern() which eventually calls rte_malloc_socket() * through mlx5_alloc_verbs_buf(). */ - mlx5_common_verbs_reg_mr(pd, (void *)data.start, len, &mr->pmd_mr); + share_cache->reg_mr_cb(pd, (void *)data.start, len, &mr->pmd_mr); if (mr->pmd_mr.obj == NULL) { DEBUG("Fail to create an MR for address (%p)", (void *)addr); @@ -801,7 +801,7 @@ mlx5_mr_create_primary(void *pd, * calling rte_free() because mlx5_mr_mem_event_free_cb() can be called * inside. */ - mr_free(mr); + mr_free(mr, share_cache->dereg_mr_cb); return UINT32_MAX; } @@ -1028,7 +1028,8 @@ mlx5_mr_flush_local_cache(struct mlx5_mr_ctrl *mr_ctrl) * Pointer to MR structure on success, NULL otherwise. */ struct mlx5_mr * -mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id) +mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id, + mlx5_reg_mr_t reg_mr_cb) { struct mlx5_mr *mr = NULL; @@ -1038,7 +1039,7 @@ mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id) RTE_CACHE_LINE_SIZE, socket_id); if (mr == NULL) return NULL; - mlx5_common_verbs_reg_mr(pd, (void *)addr, len, &mr->pmd_mr); + reg_mr_cb(pd, (void *)addr, len, &mr->pmd_mr); if (mr->pmd_mr.obj == NULL) { DRV_LOG(WARNING, "Fail to create MR for address (%p)", diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h index cdb8acf..b23ee66 100644 --- a/drivers/common/mlx5/mlx5_common_mr.h +++ b/drivers/common/mlx5/mlx5_common_mr.h @@ -38,6 +38,14 @@ struct mlx5_pmd_mr { size_t len; void *obj; /* verbs mr object or devx umem object. */ }; + +/** + * mr operations typedef + */ +typedef int (*mlx5_reg_mr_t)(void *pd, void *addr, size_t length, + struct mlx5_pmd_mr *pmd_mr); +typedef void (*mlx5_dereg_mr_t)(struct mlx5_pmd_mr *pmd_mr); + /* Memory Region object. */ struct mlx5_mr { LIST_ENTRY(mlx5_mr) mr; /**< Pointer to the prev/next entry. */ @@ -83,6 +91,8 @@ struct mlx5_mr_share_cache { struct mlx5_mr_btree cache; /* Global MR cache table. */ struct mlx5_mr_list mr_list; /* Registered MR list. */ struct mlx5_mr_list mr_free_list; /* Freed MR list. */ + mlx5_reg_mr_t reg_mr_cb; /* Callback to reg_mr func */ + mlx5_dereg_mr_t dereg_mr_cb; /* Callback to dereg_mr func */ } __rte_packed; /** @@ -155,8 +165,8 @@ mlx5_mr_lookup_list(struct mlx5_mr_share_cache *share_cache, struct mr_cache_entry *entry, uintptr_t addr); __rte_internal struct mlx5_mr * -mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, - int socket_id); +mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id, + mlx5_reg_mr_t reg_mr_cb); __rte_internal uint32_t mlx5_mr_create_primary(void *pd, diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 844c6c0..f498d00 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "mlx5_defs.h" #include "mlx5.h" @@ -2321,6 +2322,23 @@ mlx5_os_stats_init(struct rte_eth_dev *dev) rte_free(strings); } +/** + * Set the reg_mr and dereg_mr call backs + * + * @param reg_mr_cb[out] + * Pointer to reg_mr func + * @param dereg_mr_cb[out] + * Pointer to dereg_mr func + * + */ +void +mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, + mlx5_dereg_mr_t *dereg_mr_cb) +{ + *reg_mr_cb = mlx5_common_verbs_reg_mr; + *dereg_mr_cb = mlx5_common_verbs_dereg_mr; +} + const struct eth_dev_ops mlx5_os_dev_ops = { .dev_configure = mlx5_dev_configure, .dev_start = mlx5_dev_start, diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index b22acbb..5c86f6f 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -713,6 +713,8 @@ mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn, err = rte_errno; goto error; } + mlx5_os_set_reg_mr_cb(&sh->share_cache.reg_mr_cb, + &sh->share_cache.dereg_mr_cb); mlx5_os_dev_shared_handler_install(sh); mlx5_flow_aging_init(sh); mlx5_flow_counters_mng_init(sh); diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 94a3667..5bd5acd 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -940,4 +940,6 @@ int mlx5_os_read_dev_stat(struct mlx5_priv *priv, int mlx5_os_read_dev_counters(struct rte_eth_dev *dev, uint64_t *stats); int mlx5_os_get_stats_n(struct rte_eth_dev *dev); void mlx5_os_stats_init(struct rte_eth_dev *dev); +void mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb, + mlx5_dereg_mr_t *dereg_mr_cb); #endif /* RTE_PMD_MLX5_H_ */ diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c index c91d6a4..adbe07c 100644 --- a/drivers/net/mlx5/mlx5_mr.c +++ b/drivers/net/mlx5/mlx5_mr.c @@ -276,7 +276,8 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque, return; DRV_LOG(DEBUG, "port %u register MR for chunk #%d of mempool (%s)", dev->data->port_id, mem_idx, mp->name); - mr = mlx5_create_mr_ext(sh->pd, addr, len, mp->socket_id); + mr = mlx5_create_mr_ext(sh->pd, addr, len, mp->socket_id, + sh->share_cache.reg_mr_cb); if (!mr) { DRV_LOG(WARNING, "port %u unable to allocate a new MR of" @@ -350,7 +351,8 @@ mlx5_dma_map(struct rte_pci_device *pdev, void *addr, } priv = dev->data->dev_private; sh = priv->sh; - mr = mlx5_create_mr_ext(sh->pd, (uintptr_t)addr, len, SOCKET_ID_ANY); + mr = mlx5_create_mr_ext(sh->pd, (uintptr_t)addr, len, SOCKET_ID_ANY, + sh->share_cache.reg_mr_cb); if (!mr) { DRV_LOG(WARNING, "port %u unable to dma map", dev->data->port_id);