From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9270DA0588;
Wed, 8 Apr 2020 01:07:01 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id B0B631C021;
Wed, 8 Apr 2020 01:06:55 +0200 (CEST)
Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com
[66.111.4.29]) by dpdk.org (Postfix) with ESMTP id F0E431BFE8
for <dev@dpdk.org>; Wed, 8 Apr 2020 01:06:53 +0200 (CEST)
Received: from compute7.internal (compute7.nyi.internal [10.202.2.47])
by mailout.nyi.internal (Postfix) with ESMTP id 9218B5C01AF;
Tue, 7 Apr 2020 19:06:53 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute7.internal (MEProxy); Tue, 07 Apr 2020 19:06:53 -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=lxTuy4PZdr
EePoVIPYW290Pe7g8hIblldsCk21Eyh6s=; b=qnNhIt22zv+KbmSyroI87zKvdA
897yyoPkAFCyF3YVTs9oEb/W1FA/EZ2UagdMYmxiXEkl9Atz01B7OYuLR6vuXJsq
9xtgvDLGJAlKlgDI6YAzw0L94lyip8BZeSXTBJTQTydWu7kMFqZuqxzpIHSM/M/u
48FKUglQ54yvw3p6g=
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=lxTuy4PZdrEePoVIPYW290Pe7g8hIblldsCk21Eyh6s=; b=S6xzJnMv
P9MaPbfbzF1EYWptACtSc9DpQrc95ZOX4wlYTYv/uJOuXHeLau4EVGvkgTt9M7qc
ZDxVbTsoyvPdSVum3XZO+1tkUwFguX+C0ibHSuzKYl3ezOdNyP/zdoNmXkRvu9qA
XoutceP8IpAvD7VRGKmWPKT8K40D8HXSPzebG+xCrW/EyWNoS0dBPfi9iP1xOZ9v
ZO7UDnbjM+3ftzJv2f9HELEri52oLYp59oILU8SdAaa2eSkoX2WxaHFGCJY/T4/X
Z9Q3L2VVvdaQs4IKREy0nz71Jn35xQq//4Dk4mzd/fcMnnyL4Pp3/45YG+nELF+A
T3/ICcG2sUCx6A==
X-ME-Sender: <xms:jQeNXgj3yYoFD0k0kxco1P0auWMlR1IBz3HQixRwvMykj8YgZSY3Dw>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudeigddujecutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs
ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph
epjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr
rghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth
X-ME-Proxy: <xmx:jQeNXjtk_BXsF1QmZmgFZklKyqsVL1liWj0qkd_ObaTkVkJmx4yp2g>
<xmx:jQeNXgx5aVzxhZYBZHMGEcQBrr8e3ApQNU2IRjKmNHDEHy9ofqti8g>
<xmx:jQeNXob0rtR-3bwIritmuJyLb6XDYB_i8qfEnKaOH8XayXkPCfPjxA>
<xmx:jQeNXl52sYlztogpgMagZOBWoNiEfDhcl9Omjjw7T8X7OLb3sZZHJg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id B07C7306D625;
Tue, 7 Apr 2020 19:06:52 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: Matan Azrad <matan@mellanox.com>, Shahaf Shuler <shahafs@mellanox.com>,
Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Date: Wed, 8 Apr 2020 01:06:45 +0200
Message-Id: <20200407230647.59478-2-thomas@monjalon.net>
X-Mailer: git-send-email 2.26.0
In-Reply-To: <20200407230647.59478-1-thomas@monjalon.net>
References: <20200210103216.1168439-1-thomas@monjalon.net>
<20200407230647.59478-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 <thomas@monjalon.net>
Acked-by: Matan Azrad <matan@mellanox.com>
---
drivers/common/mlx5/mlx5_common.c | 75 ++++++++++++++++++-------------
1 file changed, 45 insertions(+), 30 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 046339c46f..9a30e6e0aa 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,32 +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)
{
- mlx5_common_logtype = rte_log_register_type_and_pick_level("pmd.common.mlx5", 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;
@@ -301,7 +279,47 @@ 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_type_and_pick_level("pmd.common.mlx5", 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. */
{
@@ -319,11 +337,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