From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 29E55A0553
for <public@inbox.dpdk.org>; Mon, 17 Feb 2020 18:46:44 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 22F781DAB4;
Mon, 17 Feb 2020 18:46:44 +0100 (CET)
Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com
[209.85.221.44]) by dpdk.org (Postfix) with ESMTP id 677C21DAB4
for <stable@dpdk.org>; Mon, 17 Feb 2020 18:46:43 +0100 (CET)
Received: by mail-wr1-f44.google.com with SMTP id y17so20780628wrh.5
for <stable@dpdk.org>; Mon, 17 Feb 2020 09:46:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=SdI9UR1r42FZCudccbGlJ1bz+dr/JvRexTE0M3fCkh0=;
b=aMI8vVlP4R7sfD8DDWy4Tc8wITgRjriHrP/bgNZB7rxN/c2bYfUmYHPg5hKUr/GJhg
TO2WDv9f2W8peIuN4TH3ppnqsvwRXl2lNZBl6bDDDMTZZoMjIMiMBUdq9KJfE8Vj+4kl
Ml+7exqyh67m4zvnyciFUkj+x+7f/zyJJVkRiTYRXixX5wjLLciybuDg177k89HRtPdF
/QkZ9+OCzC6r6TsiDHvFbXWBga/lQfsz51eAePfbxV0H6rM0MyfcKHmzQQeeMivq7pa9
k4+eYB1Il3NuTeHYrmJRcxNX1yrvYww7mvhQADsN+Sx9B8O5+yskgpMlaK8Gdwf18XBD
q3Fw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=SdI9UR1r42FZCudccbGlJ1bz+dr/JvRexTE0M3fCkh0=;
b=CVC3so24e2pMZdnd56+6UkDnbiYc3Uh/DqZAxBT3pJvZnDKd26wkqP+2JrRyyPZCAV
2IYOVmzb/xvWM5oMWilNEvXYsUM86QW748yguPWQUpS58DmwMfvipep/vaOQf6KtSgdo
e9tEAMS2fMq7i+9dtKPPSsvYvr5P3Tx8E92uUgHGIks8ehAcC3rcwE22rmAFIfghbcbz
HaMHiTVdOuJa3554VjQuQoqCunMv9ru9SWsdUQOZWyyrbFUu4ftFL6g6jTQKme4vVeAy
hYOs42BOVFwhIDjJsLIHMmqDCOXfCBXPQRwEfQHDUREjLV64+ERqzgh/ebn9rd8IQsi9
/e8A==
X-Gm-Message-State: APjAAAVfIXkdVEWJEmk1VbasxVufyo/+NEG7hQ2cBCE/XEP4OjQsui2q
zSNP6cd2VV7PTXX2YYzn0n8=
X-Google-Smtp-Source: APXvYqyvbnPpsyl0hYtXIH/+YM4uaTn73i7tQPMaGCI0TOu9dsVGQtfDLr/oseq+y/IY39GlfqpXfQ==
X-Received: by 2002:a5d:6a0f:: with SMTP id m15mr24415890wru.40.1581961603135;
Mon, 17 Feb 2020 09:46:43 -0800 (PST)
Received: from localhost (userh634.uk.uudial.com. [194.69.103.7])
by smtp.gmail.com with ESMTPSA id a13sm1886674wrp.93.2020.02.17.09.46.42
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 17 Feb 2020 09:46:42 -0800 (PST)
From: luca.boccassi@gmail.com
To: Thomas Monjalon <thomas@monjalon.net>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Mon, 17 Feb 2020 17:45:25 +0000
Message-Id: <20200217174546.25334-33-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-190-luca.boccassi@gmail.com>
<20200217174546.25334-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/mlx: rename meson variable for dlopen
option' has been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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@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@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@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@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@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@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_@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
--