[dpdk-stable] patch 'net/mlx: rename meson variable for dlopen option' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 5ae81a0f9dec5e7ede7eeda24159d4e72486184f Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 12 Feb 2020 23:07:07 +0100
Subject: [PATCH] net/mlx: rename meson variable for dlopen option

[ upstream commit 76c72a34bb0aa174fea2fa4978550603e154357f ]

The name of the variable pmd_dlopen is confusing because
it can be understood as true if the PMD is dlopen,
whereas it means the ibverbs glue layer is a dlopen library.
That's why it is renamed dlopen_ibverbs.

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/mlx4/meson.build | 8 ++++----
 drivers/net/mlx5/meson.build | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 9eb4988420..4f16950a4a 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -9,11 +9,11 @@ if not is_linux
 endif
 build = true
 
-pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
+dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
 LIB_GLUE_VERSION = '18.02.0'
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
-if pmd_dlopen
+if dlopen_ibverbs
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
 	cflags += [
 		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
@@ -51,7 +51,7 @@ if build
 		'mlx4_txq.c',
 		'mlx4_utils.c',
 	)
-	if not pmd_dlopen
+	if not dlopen_ibverbs
 		sources += files('mlx4_glue.c')
 	endif
 	cflags_options = [
@@ -103,7 +103,7 @@ if build
 	configure_file(output : 'mlx4_autoconf.h', configuration : config)
 endif
 # Build Glue Library
-if pmd_dlopen and build
+if dlopen_ibverbs and build
 	dlopen_name = 'mlx4_glue'
 	dlopen_lib_name = driver_name_fmt.format(dlopen_name)
 	dlopen_so_version = LIB_GLUE_VERSION
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index d6b32db794..1b4f6cf831 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -9,11 +9,11 @@ if not is_linux
 endif
 build = true
 
-pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
+dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
 LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
 LIB_GLUE_VERSION = '19.08.0'
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
-if pmd_dlopen
+if dlopen_ibverbs
 	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
 	cflags += [
 		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
@@ -67,7 +67,7 @@ if build
 		or dpdk_conf.has('RTE_ARCH_PPC_64'))
 		sources += files('mlx5_rxtx_vec.c')
 	endif
-	if not pmd_dlopen
+	if not dlopen_ibverbs
 		sources += files('mlx5_glue.c')
 	endif
 	cflags_options = [
@@ -200,7 +200,7 @@ if build
 	configure_file(output : 'mlx5_autoconf.h', configuration : config)
 endif
 # Build Glue Library
-if pmd_dlopen and build
+if dlopen_ibverbs and build
 	dlopen_name = 'mlx5_glue'
 	dlopen_lib_name = driver_name_fmt.format(dlopen_name)
 	dlopen_so_version = LIB_GLUE_VERSION
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.244606857 +0000
+++ 0033-net-mlx-rename-meson-variable-for-dlopen-option.patch	2020-02-17 17:00:15.351951079 +0000
@@ -1,8 +1,10 @@
-From 76c72a34bb0aa174fea2fa4978550603e154357f Mon Sep 17 00:00:00 2001
+From 5ae81a0f9dec5e7ede7eeda24159d4e72486184f Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Wed, 12 Feb 2020 23:07:07 +0100
 Subject: [PATCH] net/mlx: rename meson variable for dlopen option
 
+[ upstream commit 76c72a34bb0aa174fea2fa4978550603e154357f ]
+
 The name of the variable pmd_dlopen is confusing because
 it can be understood as true if the PMD is dlopen,
 whereas it means the ibverbs glue layer is a dlopen library.
@@ -11,80 +13,80 @@
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
 ---
- drivers/common/mlx5/meson.build | 8 ++++----
- drivers/net/mlx4/meson.build    | 8 ++++----
+ drivers/net/mlx4/meson.build | 8 ++++----
+ drivers/net/mlx5/meson.build | 8 ++++----
  2 files changed, 8 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
-index 089494e1f8..ea98e61fcd 100644
---- a/drivers/common/mlx5/meson.build
-+++ b/drivers/common/mlx5/meson.build
-@@ -8,11 +8,11 @@ if not is_linux
+diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
+index 9eb4988420..4f16950a4a 100644
+--- a/drivers/net/mlx4/meson.build
++++ b/drivers/net/mlx4/meson.build
+@@ -9,11 +9,11 @@ if not is_linux
  endif
+ build = true
  
- static_ibverbs = (get_option('ibverbs_link') == 'static')
 -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 +dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
- LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
- LIB_GLUE_VERSION = '20.02.0'
+ LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
+ LIB_GLUE_VERSION = '18.02.0'
  LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 -if pmd_dlopen
 +if dlopen_ibverbs
  	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
  	cflags += [
- 		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
-@@ -54,7 +54,7 @@ sources = files(
- 	'mlx5_common.c',
- 	'mlx5_nl.c',
- )
--if not pmd_dlopen
-+if not dlopen_ibverbs
- 	sources += files('mlx5_glue.c')
+ 		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
+@@ -51,7 +51,7 @@ if build
+ 		'mlx4_txq.c',
+ 		'mlx4_utils.c',
+ 	)
+-	if not pmd_dlopen
++	if not dlopen_ibverbs
+ 		sources += files('mlx4_glue.c')
+ 	endif
+ 	cflags_options = [
+@@ -103,7 +103,7 @@ if build
+ 	configure_file(output : 'mlx4_autoconf.h', configuration : config)
  endif
- cflags_options = [
-@@ -193,7 +193,7 @@ endforeach
- configure_file(output : 'mlx5_autoconf.h', configuration : config)
- 
  # Build Glue Library
--if pmd_dlopen
-+if dlopen_ibverbs
- 	dlopen_name = 'mlx5_glue'
- 	dlopen_lib_name = 'rte_pmd_ at 0@'.format(dlopen_name)
+-if pmd_dlopen and build
++if dlopen_ibverbs and build
+ 	dlopen_name = 'mlx4_glue'
+ 	dlopen_lib_name = driver_name_fmt.format(dlopen_name)
  	dlopen_so_version = LIB_GLUE_VERSION
-diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
-index 290bd1e268..f66e70f4d1 100644
---- a/drivers/net/mlx4/meson.build
-+++ b/drivers/net/mlx4/meson.build
+diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
+index d6b32db794..1b4f6cf831 100644
+--- a/drivers/net/mlx5/meson.build
++++ b/drivers/net/mlx5/meson.build
 @@ -9,11 +9,11 @@ if not is_linux
  endif
+ build = true
  
- static_ibverbs = (get_option('ibverbs_link') == 'static')
 -pmd_dlopen = (get_option('ibverbs_link') == 'dlopen')
 +dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen')
- LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
- LIB_GLUE_VERSION = '18.02.0'
+ LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
+ LIB_GLUE_VERSION = '19.08.0'
  LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 -if pmd_dlopen
 +if dlopen_ibverbs
  	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
  	cflags += [
- 		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
-@@ -61,7 +61,7 @@ sources = files(
- 	'mlx4_txq.c',
- 	'mlx4_utils.c',
- )
--if not pmd_dlopen
-+if not dlopen_ibverbs
- 	sources += files('mlx4_glue.c')
+ 		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
+@@ -67,7 +67,7 @@ if build
+ 		or dpdk_conf.has('RTE_ARCH_PPC_64'))
+ 		sources += files('mlx5_rxtx_vec.c')
+ 	endif
+-	if not pmd_dlopen
++	if not dlopen_ibverbs
+ 		sources += files('mlx5_glue.c')
+ 	endif
+ 	cflags_options = [
+@@ -200,7 +200,7 @@ if build
+ 	configure_file(output : 'mlx5_autoconf.h', configuration : config)
  endif
- cflags_options = [
-@@ -113,7 +113,7 @@ endforeach
- configure_file(output : 'mlx4_autoconf.h', configuration : config)
- 
  # Build Glue Library
--if pmd_dlopen
-+if dlopen_ibverbs
- 	dlopen_name = 'mlx4_glue'
+-if pmd_dlopen and build
++if dlopen_ibverbs and build
+ 	dlopen_name = 'mlx5_glue'
  	dlopen_lib_name = driver_name_fmt.format(dlopen_name)
  	dlopen_so_version = LIB_GLUE_VERSION
 --