From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 452DFA058B; Wed, 8 Apr 2020 02:09:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9B5D21BFBA; Wed, 8 Apr 2020 02:09:13 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id A60D91BF26 for ; Wed, 8 Apr 2020 02:09:11 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 4781A5C01AC; Tue, 7 Apr 2020 20:09:11 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 07 Apr 2020 20:09:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=s5jROJ8vMA COiZTnkKHoqsDPq85Chd9b4i048gkGJTY=; b=nWfWoGpZvUEwLmtPK4v8TTtsmi Bo4zVj0ZdEQcMmcX0Q6hx7TdpUWk2UQSgFBGVWcJgTtww+RV7r98uuoF/yVqCupW SlyoAWV61vdrQl0M0nGvbHqV4Q5V0YBnU4tkPVemPbelXf5HEx+QHYe3Q+rjyE0G MDfykLqLvnz4c4aww= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=s5jROJ8vMACOiZTnkKHoqsDPq85Chd9b4i048gkGJTY=; b=CAptYb9J e3coPW2yiGpOib6UYlsCO4QYiE8XM4D8zURXv+iGyEDp+OoTfn2Te/J3H1Y7YG8N v9XrGAH+bgupO1HVSP4BmvKaYFYrkd422+Q3CiM8T10p3atD0XZbx0a8J8QxcGyZ fPOYBIzBE+asYnCqRwLyAP0u2U8qEGks+co5k7TOYemgJD50ioWmbVjxVUIEblqz kKJ3/4ao+P+atJEDx5a/hdkt7o1RvKWeMIMKsYXWwWPFPYCoaciTIF+V5YBox6na atclk9vC20qSfDAoAvhOavZsaTPX++8oVzs02WXqdZtWUpvMRvkg5HKQXBh7Bh/Q TF8gjTYRim1/RQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeigdefudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 5F121306D613; Tue, 7 Apr 2020 20:09:10 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Date: Wed, 8 Apr 2020 02:08:58 +0200 Message-Id: <20200408000900.61896-2-thomas@monjalon.net> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200408000900.61896-1-thomas@monjalon.net> References: <20200210103216.1168439-1-thomas@monjalon.net> <20200408000900.61896-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 1/3] common/mlx5: split glue initialization 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" The function mlx5_glue_init was doing three things: - initialize logs - load glue library if in dlopen mode - initialize glue layer They are split in three functions for clarity. The config option RTE_IBVERBS_LINK_DLOPEN is not used anymore outside of make and meson files. It is replaced with MLX5_GLUE, which is defined in the same condition and is already used with dlopen. Signed-off-by: Thomas Monjalon Acked-by: Matan Azrad --- drivers/common/mlx5/mlx5_common.c | 79 ++++++++++++++++++------------- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c index 9ea56f2ef2..d8c01a5d14 100644 --- a/drivers/common/mlx5/mlx5_common.c +++ b/drivers/common/mlx5/mlx5_common.c @@ -162,7 +162,7 @@ mlx5_translate_port_name(const char *port_name_in, return; } -#ifdef RTE_IBVERBS_LINK_DLOPEN +#ifdef MLX5_GLUE /** * Suffix RTE_EAL_PMD_PATH with "-glue". @@ -204,34 +204,10 @@ mlx5_glue_path(char *buf, size_t size) " re-configure DPDK"); return NULL; } -#endif -/** - * Initialization routine for run-time dependency on rdma-core. - */ -RTE_INIT_PRIO(mlx5_glue_init, CLASS) +static int +mlx5_glue_dlopen(void) { - /* Initialize common log type. */ - mlx5_common_logtype = rte_log_register("pmd.common.mlx5"); - if (mlx5_common_logtype >= 0) - rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE); - /* - * RDMAV_HUGEPAGES_SAFE tells ibv_fork_init() we intend to use - * huge pages. Calling ibv_fork_init() during init allows - * applications to use fork() safely for purposes other than - * using this PMD, which is not supported in forked processes. - */ - setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); - /* Match the size of Rx completion entry to the size of a cacheline. */ - if (RTE_CACHE_LINE_SIZE == 128) - setenv("MLX5_CQE_SIZE", "128", 0); - /* - * MLX5_DEVICE_FATAL_CLEANUP tells ibv_destroy functions to - * cleanup all the Verbs resources even when the device was removed. - */ - setenv("MLX5_DEVICE_FATAL_CLEANUP", "1", 1); - /* The glue initialization was done earlier by mlx5 common library. */ -#ifdef RTE_IBVERBS_LINK_DLOPEN char glue_path[sizeof(RTE_EAL_PMD_PATH) - 1 + sizeof("-glue")]; void *handle = NULL; @@ -303,7 +279,49 @@ RTE_INIT_PRIO(mlx5_glue_init, CLASS) goto glue_error; } mlx5_glue = *sym; -#endif /* RTE_IBVERBS_LINK_DLOPEN */ + return 0; + +glue_error: + if (handle) + dlclose(handle); + return -1; +} + +#endif + +RTE_INIT_PRIO(mlx5_log_init, LOG) +{ + mlx5_common_logtype = rte_log_register("pmd.common.mlx5"); + if (mlx5_common_logtype >= 0) + rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE); +} + +/** + * Initialization routine for run-time dependency on rdma-core. + */ +RTE_INIT_PRIO(mlx5_glue_init, CLASS) +{ + /* + * RDMAV_HUGEPAGES_SAFE tells ibv_fork_init() we intend to use + * huge pages. Calling ibv_fork_init() during init allows + * applications to use fork() safely for purposes other than + * using this PMD, which is not supported in forked processes. + */ + setenv("RDMAV_HUGEPAGES_SAFE", "1", 1); + /* Match the size of Rx completion entry to the size of a cacheline. */ + if (RTE_CACHE_LINE_SIZE == 128) + setenv("MLX5_CQE_SIZE", "128", 0); + /* + * MLX5_DEVICE_FATAL_CLEANUP tells ibv_destroy functions to + * cleanup all the Verbs resources even when the device was removed. + */ + setenv("MLX5_DEVICE_FATAL_CLEANUP", "1", 1); + +#ifdef MLX5_GLUE + if (mlx5_glue_dlopen() != 0) + goto glue_error; +#endif + #ifdef RTE_LIBRTE_MLX5_DEBUG /* Glue structure must not contain any NULL pointers. */ { @@ -321,11 +339,8 @@ RTE_INIT_PRIO(mlx5_glue_init, CLASS) } mlx5_glue->fork_init(); return; + glue_error: -#ifdef RTE_IBVERBS_LINK_DLOPEN - if (handle) - dlclose(handle); -#endif DRV_LOG(WARNING, "Cannot initialize MLX5 common due to missing" " run-time dependency on rdma-core libraries (libibverbs," " libmlx5)"); -- 2.26.0