Skip to contentSkip to conversation

drivers/net: fix mlx* glue libraries ABI version

PATCH Superseded David Marchand 4 participants 9 messages Dec 4, 2019 – Nov 1, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/net: fix mlx* glue libraries ABI version

Those libraries have been missed when switching to global ABI version.

Fixes cba806e07d6f ("build: change ABI versioning to global")
---
 drivers/net/mlx4/Makefile    | 2 +-
 drivers/net/mlx4/meson.build | 2 +-
 drivers/net/mlx5/Makefile    | 2 +-
 drivers/net/mlx5/meson.build | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/mlx4/Makefile +1 -1
index 329569dc10..dac5c5f64c 100644
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 LIB = librte_pmd_mlx4.a
 LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
 LIB_GLUE_BASE = librte_pmd_mlx4_glue.so
-LIB_GLUE_VERSION = 18.02.0
+LIB_GLUE_VERSION = $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
 
 # Sources.
 SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c
drivers/net/mlx4/meson.build +1 -1
index 9eb4988420..3ef946fef0 100644
@@ -11,7 +11,7 @@ build = true
 
 pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION = '18.02.0'
+LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if pmd_dlopen
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
drivers/net/mlx5/Makefile +1 -1
index c5cf4397ac..90a9eeb61f 100644
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 LIB = librte_pmd_mlx5.a
 LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
 LIB_GLUE_BASE = librte_pmd_mlx5_glue.so
-LIB_GLUE_VERSION = 19.08.0
+LIB_GLUE_VERSION = $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
 
 # Sources.
 SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c
drivers/net/mlx5/meson.build +1 -1
index d6b32db794..0216c22573 100644
@@ -11,7 +11,7 @@ build = true
 
 pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
-LIB_GLUE_VERSION = '19.08.0'
+LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if pmd_dlopen
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
Signature · 1 line
2.23.0
#1 lore raw

04/12/2019 11:05, David Marchand:

Quoted 1 line

Those libraries have been missed when switching to global ABI version.

The versioning of the glue libraries are for compatibility checks between the PMD and its dependency (rdma-core) packaged as a plugin, called glue library.

This versioning is updated when there is a change in the verbs glue interface, in order to avoid issues in case of PMD and glue updated separately with a non-compatible version.
I don't think the mlx glue libraries are part of the ABI policy which acts at the application level.

Am I missing something?

#2 lore raw
Quoted 8 lines · Thomas Monjalon

04/12/2019 11:05, David Marchand:

Quoted 1 line

Those libraries have been missed when switching to global ABI version.

The versioning of the glue libraries are for compatibility checks between the PMD and its dependency (rdma-core) packaged as a plugin, called glue library.

Quoted 7 lines

This versioning is updated when there is a change in the verbs glue interface, in order to avoid issues in case of PMD and glue updated separately with a non-compatible version.
I don't think the mlx glue libraries are part of the ABI policy which acts at the application level.

Am I missing something?

Sorry, this patch fell into the cracks.

I agree that this is not part of the ABI policy.
This version only indicates something internal.

But what I am proposing here is just to remove this special case. What is the point of exposing a special version, while the net drivers are the only one depending on those glue libs?
Do you expect separate packaging for the net driver and its associated glue lib?

This special version also makes it impossible to install two versions of dpdk if those versions of dpdk need the same glue version.

I still think it is better to align to the version of dpdk, though the commitlog needs some work.

Signature · 1 line
David Marchand
#3 lore raw

07/05/2020 14:35, David Marchand:

Quoted 22 lines · Thomas Monjalon
Quoted 8 lines

04/12/2019 11:05, David Marchand:

Quoted 1 line

Those libraries have been missed when switching to global ABI version.

The versioning of the glue libraries are for compatibility checks between the PMD and its dependency (rdma-core) packaged as a plugin, called glue library.

Quoted 7 lines

This versioning is updated when there is a change in the verbs glue interface, in order to avoid issues in case of PMD and glue updated separately with a non-compatible version.
I don't think the mlx glue libraries are part of the ABI policy which acts at the application level.

Am I missing something?

Sorry, this patch fell into the cracks.

I agree that this is not part of the ABI policy.
This version only indicates something internal.

Quoted 7 lines

But what I am proposing here is just to remove this special case. What is the point of exposing a special version, while the net drivers are the only one depending on those glue libs?
Do you expect separate packaging for the net driver and its associated glue lib?

This special version also makes it impossible to install two versions of dpdk if those versions of dpdk need the same glue version.

Yes I'm OK with using DPDK version for glue versioning.

#4 lore raw

PATCH v2 1/1 drivers: remove mlx* glue libraries separate ABI version

In reply to David Marchand

The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them.

Keeping a separate ABI version prevents us from installing two versions of dpdk.
Maintaining this separate version just adds confusion.
Align the glue library ABI version to the global ABI version.

---
 drivers/common/mlx5/linux/meson.build | 2 +-
 drivers/common/mlx5/linux/mlx5_glue.h | 1 -
 drivers/net/mlx4/meson.build          | 2 +-
 drivers/net/mlx4/mlx4_glue.h          | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
drivers/common/mlx5/linux/meson.build +1 -1
index 9ef8e181d7..483df0e181 100644
@@ -6,7 +6,7 @@ includes += include_directories('.')
 static_ibverbs = (get_option('ibverbs_link') == 'static')
 dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
-LIB_GLUE_VERSION = '20.02.0'
+LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
drivers/common/mlx5/linux/mlx5_glue.h +0 -1
index 42b2f61523..ace36c6b07 100644
@@ -131,7 +131,6 @@ struct mlx5dv_var { uint32_t page_id; uint32_t length; off_t mmap_off;
 #define IBV_ACCESS_RELAXED_ORDERING 0
 #endif
 
-/* LIB_GLUE_VERSION must be updated every time this structure is modified. */
 struct mlx5_glue {
 	const char *version;
 	int (*fork_init)(void);
drivers/net/mlx4/meson.build +1 -1
index 5a25e11a7b..395776a495 100644
@@ -11,7 +11,7 @@ endif
 static_ibverbs = (get_option('ibverbs_link') == 'static')
 dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION = '18.02.0'
+LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
drivers/net/mlx4/mlx4_glue.h +0 -1
index 5d9e985495..96d5cb16b4 100644
@@ -23,7 +23,6 @@
 #define MLX4_GLUE_VERSION ""
 #endif
 
-/* LIB_GLUE_VERSION must be updated every time this structure is modified. */
 struct mlx4_glue {
 	const char *version;
 	int (*fork_init)(void);
Signature · 1 line
2.23.0
#5 lore raw

Re: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

Quoted 10 lines · David Marchand

The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them.

Keeping a separate ABI version prevents us from installing two versions of dpdk.
Maintaining this separate version just adds confusion.
Align the glue library ABI version to the global ABI version.

Review?

Signature · 1 line
David Marchand
Acked-by on v2 1/1
#6 lore raw

Re: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

In reply to David Marchand

19/10/2020 11:41, David Marchand:

Quoted 9 lines

The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them.

Keeping a separate ABI version prevents us from installing two versions of dpdk.
Maintaining this separate version just adds confusion.
Align the glue library ABI version to the global ABI version.

There was no comment after 2 weeks, it should be merged.

#7 lore raw

Re: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

Quoted 19 lines

-----Original Message-----
From: Thomas Monjalon <[email protected]>
Sent: Sunday, November 1, 2020 16:49
To: David Marchand <[email protected]>
Cc: [email protected]; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>; Raslan Darawsheh <[email protected]>; Asaf Penso <[email protected]>
Subject: Re: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

19/10/2020 11:41, David Marchand:

Quoted 8 lines

The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them.

Keeping a separate ABI version prevents us from installing two versions of dpdk.
Maintaining this separate version just adds confusion. Align the glue library ABI version to the global ABI version.

Quoted 6 lines
Quoted 1 line

There was no comment after 2 weeks, it should be merged.

Looks safe and provides an automatic ABI version update for mlx*_glue modules.

#8 lore raw

Re: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

In reply to David Marchand

Hi,

Quoted 18 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of David Marchand
Sent: Monday, October 19, 2020 12:42 PM
To: [email protected]
Cc: NBU-Contact-Thomas Monjalon <[email protected]>; Matan Azrad <[email protected]>; Shahaf Shuler <[email protected]>; Slava Ovsiienko <[email protected]>
Subject: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version

The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them.

Keeping a separate ABI version prevents us from installing two versions of dpdk.
Maintaining this separate version just adds confusion.
Align the glue library ABI version to the global ABI version.

Quoted 7 lines
---
 drivers/common/mlx5/linux/meson.build | 2 +-
 drivers/common/mlx5/linux/mlx5_glue.h | 1 -
 drivers/net/mlx4/meson.build          | 2 +-
 drivers/net/mlx4/mlx4_glue.h          | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

Patch applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh