Skip to contentSkip to conversation

common/mlx5: fix link with ibverbs glue dlopen option

PATCH In review Thomas Monjalon 3 participants 3 messages Jul 13, 2020 – Jul 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/mlx5: fix link with ibverbs glue dlopen option

In case the ibverbs glue is a separate library to dlopen, the PMD library must allocate a glue structure to be filled by dlopen.

The glue management was in mlx5_common.c and moved to mlx5_common_os.c, but the variable allocation was not removed from the original file. The consequence was a link failure, if ibverbs dlopen option is enabled, because of the redefinition of the variable (with GCC 10):
multiple definition of 'mlx5_glue'

The original definition is removed to keep only the one moved in the Linux sub-directory.

Fixes 79aa430721b1 ("common/mlx5: split common file under Linux directory")
---
 drivers/common/mlx5/mlx5_common.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/common/mlx5/mlx5_common.c +0 -4
index 693e2c68c8..341239d164 100644
@@ -16,10 +16,6 @@
 
 int mlx5_common_logtype;
 
-#ifdef MLX5_GLUE
-const struct mlx5_glue *mlx5_glue;
-#endif
-
 uint8_t haswell_broadwell_cpu;
 
 static int
Signature · 1 line
2.27.0
Acked-by on v1 1/1
#1 lore raw

From: Thomas Monjalon

Quoted 10 lines

In case the ibverbs glue is a separate library to dlopen, the PMD library must allocate a glue structure to be filled by dlopen.

The glue management was in mlx5_common.c and moved to mlx5_common_os.c, but the variable allocation was not removed from the original file.
The consequence was a link failure, if ibverbs dlopen option is enabled, because of the redefinition of the variable (with GCC 10):
multiple definition of 'mlx5_glue'

Quoted 8 lines

The original definition is removed to keep only the one moved in the Linux sub-directory.

Fixes 79aa430721b1 ("common/mlx5: split common file under Linux

directory")
Cc: [email protected]

Quoted 22 lines
---
 drivers/common/mlx5/mlx5_common.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/common/mlx5/mlx5_common.c +0 -5
index 693e2c68c8..341239d164 100644
@@ -16,10 +16,6 @@
 
 int mlx5_common_logtype;
 
-#ifdef MLX5_GLUE
-const struct mlx5_glue *mlx5_glue;
-#endif
-
 uint8_t haswell_broadwell_cpu;
 
 static int
--

2.27.0

#2 lore raw
In reply to Thomas Monjalon

Him

Quoted 49 lines

-----Original Message-----
From: Thomas Monjalon <[email protected]>
Sent: Monday, July 13, 2020 6:37 PM
To: [email protected]
Cc: Raslan Darawsheh <[email protected]>; Ophir Munk <[email protected]>; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>
Subject: [PATCH] common/mlx5: fix link with ibverbs glue dlopen option

In case the ibverbs glue is a separate library to dlopen, the PMD library must allocate a glue structure to be filled by dlopen.

The glue management was in mlx5_common.c and moved to mlx5_common_os.c,
but the variable allocation was not removed from the original file. The consequence was a link failure, if ibverbs dlopen option is enabled, because of the redefinition of the variable (with GCC 10):
multiple definition of 'mlx5_glue'

The original definition is removed to keep only the one moved in the Linux sub-directory.

Fixes 79aa430721b1 ("common/mlx5: split common file under Linux

directory")
Cc: [email protected]

---
 drivers/common/mlx5/mlx5_common.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/common/mlx5/mlx5_common.c +0 -5
index 693e2c68c8..341239d164 100644
@@ -16,10 +16,6 @@
 
 int mlx5_common_logtype;
 
-#ifdef MLX5_GLUE
-const struct mlx5_glue *mlx5_glue;
-#endif
-
 uint8_t haswell_broadwell_cpu;
 
 static int
--
Quoted 1 line

2.27.0

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh