From: xiangxia.m.yue@gmail.com
To: matan@mellanox.com, alialnu@mellanox.com
Cc: dev@dpdk.org, Tonghao Zhang <xiangxia.m.yue@gmail.com>, stable@dpdk.org
Subject: [dpdk-dev] [PATCH dpdk-dev v3] common/mlx5: fix dynamic loading reference
Date: Fri, 6 Mar 2020 22:27:19 +0800 [thread overview]
Message-ID: <1583504839-11329-1-git-send-email-xiangxia.m.yue@gmail.com> (raw)
In-Reply-To: <1583146517-7079-1-git-send-email-xiangxia.m.yue@gmail.com>
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
When setting the CONFIG_RTE_BUILD_SHARED_LIB to y,
and build the mlx5 pmd, there is a building error.
To fix it, add RTE_IBVERBS_LINK_DLOPEN to include
relative codes.
mlx5_common.o: In function `mlx5_glue_init':
drivers/common/mlx5/mlx5_common.c:324: undefined reference to `dlclose'
Fixes: 7b4f1e6bd367 ("common/mlx5: introduce common library")
Cc: stable@dpdk.org
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
Tested-by: Ali Alnubani <alialnu@mellanox.com>
---
v3:
* rename the patch title
* mv the dlfcn.h to define area
* tested: https://travis-ci.com/ovn-open-virtual-networks/dpdk-next-net/builds/151882661
v2:
* change the patch title
---
drivers/common/mlx5/mlx5_common.c | 10 +++++++---
drivers/net/mlx4/mlx4.c | 4 +++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 610fb48..9ea56f2 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -2,10 +2,12 @@
* Copyright 2019 Mellanox Technologies, Ltd
*/
-#include <dlfcn.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
+#ifdef RTE_IBVERBS_LINK_DLOPEN
+#include <dlfcn.h>
+#endif
#include <rte_errno.h>
@@ -209,8 +211,6 @@ enum mlx5_class
*/
RTE_INIT_PRIO(mlx5_glue_init, CLASS)
{
- void *handle = NULL;
-
/* Initialize common log type. */
mlx5_common_logtype = rte_log_register("pmd.common.mlx5");
if (mlx5_common_logtype >= 0)
@@ -233,6 +233,8 @@ enum mlx5_class
/* 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;
+
const char *path[] = {
/*
* A basic security check is necessary before trusting
@@ -320,8 +322,10 @@ enum mlx5_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)");
diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index a1dd658..8e29878 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -8,7 +8,6 @@
* mlx4 driver initialization.
*/
-#include <dlfcn.h>
#include <errno.h>
#include <inttypes.h>
#include <stddef.h>
@@ -18,6 +17,9 @@
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
+#ifdef RTE_IBVERBS_LINK_DLOPEN
+#include <dlfcn.h>
+#endif
/* Verbs headers do not support -pedantic. */
#ifdef PEDANTIC
--
1.8.3.1
next prev parent reply other threads:[~2020-03-06 14:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-02 10:55 [dpdk-dev] [PATCH dpdk-dev v2] common/mlx5: fix possible building error xiangxia.m.yue
2020-03-03 7:15 ` Matan Azrad
2020-03-04 13:55 ` Tonghao Zhang
2020-03-04 14:25 ` Matan Azrad
2020-03-04 15:13 ` Tonghao Zhang
2020-03-04 16:03 ` Matan Azrad
2020-03-05 6:59 ` Tonghao Zhang
2020-03-06 14:27 ` xiangxia.m.yue [this message]
2020-03-08 6:39 ` [dpdk-dev] [PATCH dpdk-dev v3] common/mlx5: fix dynamic loading reference Matan Azrad
2020-03-09 9:10 ` Raslan Darawsheh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1583504839-11329-1-git-send-email-xiangxia.m.yue@gmail.com \
--to=xiangxia.m.yue@gmail.com \
--cc=alialnu@mellanox.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).