d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common/mlx5: fix build without dlopen option

Browse Source 
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: 7b4f1e6bd3 ("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>
Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Tonghao Zhang 2020-03-06 22:27:19 +08:00 committed by Ferruh Yigit
parent e8e5fdfdd6
commit a6e7cd81fa
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/common/mlx5/mlx5_common.c
View File

@ -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 @@ mlx5_glue_path(char *buf, size_t size)
*/
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 @@ RTE_INIT_PRIO(mlx5_glue_init, 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 @@ 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)");

4
drivers/net/mlx4/mlx4.c
View File

@ -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