[dpdk-stable] patch 'drivers/crypto: fix log type variables for -fno-common' has been queued to LTS release 18.11.9

Kevin Traynor ktraynor at redhat.com
Thu May 28 18:22:24 CEST 2020
Previous message: [dpdk-stable] patch 'drivers: fix log type variables for -fno-common' has been queued to LTS release 18.11.9
Next message: [dpdk-stable] patch 'test/crypto: fix flag check' has been queued to LTS release 18.11.9
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/03/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/24219cd4b64cc7944c016ff1c98b883bc9c7f371

Thanks.

Kevin.

---
>From 24219cd4b64cc7944c016ff1c98b883bc9c7f371 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Date: Wed, 15 Apr 2020 08:22:16 +0200
Subject: [PATCH] drivers/crypto: fix log type variables for -fno-common

[ upstream commit 6da6baf7631b53dd53d3a4c4c7d62d39da4921b6 ]

The four crypto drivers: kasumi, mvsam, snow3g and zuc define logtype
variables in their header file. As the header files are included
in more than one compilation unit, it might cause appearance
of multiple instances of the variable and a linker error.
Such situation can occur, when no common section is allowed
by the compiler settings and tentative definitions are placed
in BSS section.

Fixes: 2cba3814932e ("crypto/kasumi: add dynamic logging")
Fixes: a05a450f42fd ("crypto/mvsam: add dynamic logging")
Fixes: f3af5f9d1325 ("crypto/zuc: add dynamic logging")
Fixes: a3277ad47feb ("cryptodev: remove crypto device driver name")

Signed-off-by: Lukasz Wojciechowski <l.wojciechow at partner.samsung.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
 drivers/crypto/kasumi/rte_kasumi_pmd.c         | 1 +
 drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
 drivers/crypto/mvsam/rte_mrvl_pmd.c            | 1 +
 drivers/crypto/mvsam/rte_mrvl_pmd_private.h    | 2 +-
 drivers/crypto/snow3g/rte_snow3g_pmd.c         | 1 +
 drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 2 +-
 drivers/crypto/zuc/rte_zuc_pmd.c               | 1 +
 drivers/crypto/zuc/rte_zuc_pmd_private.h       | 4 ++--
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 239a1cf441..2d33f14e76 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -18,4 +18,5 @@
 #define BYTE_LEN 8
 
+int kasumi_logtype_driver;
 static uint8_t cryptodev_driver_id;
 
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
index 488777ca87..bb34a16f7c 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
@@ -12,5 +12,5 @@
 
 /** KASUMI PMD LOGTYPE DRIVER */
-int kasumi_logtype_driver;
+extern int kasumi_logtype_driver;
 
 #define KASUMI_LOG(level, fmt, ...)  \
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c
index 41301d7ec0..661e187e37 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c
@@ -20,4 +20,5 @@
 #define MRVL_PMD_DEFAULT_MAX_NB_SESSIONS	2048
 
+int mrvl_logtype_driver;
 static uint8_t cryptodev_driver_id;
 
diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_private.h b/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
index 6f8cf56248..200254cca6 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
@@ -14,5 +14,5 @@
 
 /** MRVL PMD LOGTYPE DRIVER */
-int mrvl_logtype_driver;
+extern int mrvl_logtype_driver;
 
 #define MRVL_LOG(level, fmt, ...) \
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index a17536b777..aa3277ff57 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -17,4 +17,5 @@
 #define BYTE_LEN 8
 
+int snow3g_logtype_driver;
 static uint8_t cryptodev_driver_id;
 
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
index b7807b6216..debe0516b0 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
@@ -12,5 +12,5 @@
 
 /** SNOW 3G PMD LOGTYPE DRIVER */
-int snow3g_logtype_driver;
+extern int snow3g_logtype_driver;
 
 #define SNOW3G_LOG(level, fmt, ...)  \
diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c
index 313f4590bf..64a0d7a812 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd.c
@@ -15,4 +15,5 @@
 #define BYTE_LEN 8
 
+int zuc_logtype_driver;
 static uint8_t cryptodev_driver_id;
 
diff --git a/drivers/crypto/zuc/rte_zuc_pmd_private.h b/drivers/crypto/zuc/rte_zuc_pmd_private.h
index 5e5906ddb5..3d827052a5 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd_private.h
+++ b/drivers/crypto/zuc/rte_zuc_pmd_private.h
@@ -9,8 +9,8 @@
 
 #define CRYPTODEV_NAME_ZUC_PMD		crypto_zuc
-/**< KASUMI PMD device name */
+/**< ZUC PMD device name */
 
 /** ZUC PMD LOGTYPE DRIVER */
-int zuc_logtype_driver;
+extern int zuc_logtype_driver;
 #define ZUC_LOG(level, fmt, ...)  \
 	rte_log(RTE_LOG_ ## level, zuc_logtype_driver,  \
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:01.066758625 +0100
+++ 0037-drivers-crypto-fix-log-type-variables-for-fno-common.patch	2020-05-28 17:12:59.105556310 +0100
@@ -1 +1 @@
-From 6da6baf7631b53dd53d3a4c4c7d62d39da4921b6 Mon Sep 17 00:00:00 2001
+From 24219cd4b64cc7944c016ff1c98b883bc9c7f371 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6da6baf7631b53dd53d3a4c4c7d62d39da4921b6 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -23,8 +24,8 @@
- drivers/crypto/kasumi/kasumi_pmd_private.h | 2 +-
- drivers/crypto/kasumi/rte_kasumi_pmd.c     | 1 +
- drivers/crypto/mvsam/mrvl_pmd_private.h    | 2 +-
- drivers/crypto/mvsam/rte_mrvl_pmd.c        | 1 +
- drivers/crypto/snow3g/rte_snow3g_pmd.c     | 1 +
- drivers/crypto/snow3g/snow3g_pmd_private.h | 2 +-
- drivers/crypto/zuc/rte_zuc_pmd.c           | 1 +
- drivers/crypto/zuc/zuc_pmd_private.h       | 4 ++--
+ drivers/crypto/kasumi/rte_kasumi_pmd.c         | 1 +
+ drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
+ drivers/crypto/mvsam/rte_mrvl_pmd.c            | 1 +
+ drivers/crypto/mvsam/rte_mrvl_pmd_private.h    | 2 +-
+ drivers/crypto/snow3g/rte_snow3g_pmd.c         | 1 +
+ drivers/crypto/snow3g/rte_snow3g_pmd_private.h | 2 +-
+ drivers/crypto/zuc/rte_zuc_pmd.c               | 1 +
+ drivers/crypto/zuc/rte_zuc_pmd_private.h       | 4 ++--
@@ -33,11 +33,0 @@
-diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h
-index 3b3a6958fd..b7f1c428b4 100644
---- a/drivers/crypto/kasumi/kasumi_pmd_private.h
-+++ b/drivers/crypto/kasumi/kasumi_pmd_private.h
-@@ -12,5 +12,5 @@
- 
- /** KASUMI PMD LOGTYPE DRIVER */
--int kasumi_logtype_driver;
-+extern int kasumi_logtype_driver;
- 
- #define KASUMI_LOG(level, fmt, ...)  \
@@ -45 +35 @@
-index baad5b4e77..d672648420 100644
+index 239a1cf441..2d33f14e76 100644
@@ -54,5 +44,5 @@
-diff --git a/drivers/crypto/mvsam/mrvl_pmd_private.h b/drivers/crypto/mvsam/mrvl_pmd_private.h
-index 09702b9e3e..e575330ef5 100644
---- a/drivers/crypto/mvsam/mrvl_pmd_private.h
-+++ b/drivers/crypto/mvsam/mrvl_pmd_private.h
-@@ -14,5 +14,5 @@
+diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+index 488777ca87..bb34a16f7c 100644
+--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
++++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+@@ -12,5 +12,5 @@
@@ -60,3 +50,3 @@
- /** MRVL PMD LOGTYPE DRIVER */
--int mrvl_logtype_driver;
-+extern int mrvl_logtype_driver;
+ /** KASUMI PMD LOGTYPE DRIVER */
+-int kasumi_logtype_driver;
++extern int kasumi_logtype_driver;
@@ -64 +54 @@
- #define MRVL_LOG(level, fmt, ...) \
+ #define KASUMI_LOG(level, fmt, ...)  \
@@ -66 +56 @@
-index 3c0fe216f0..63782ce974 100644
+index 41301d7ec0..661e187e37 100644
@@ -74,0 +65,11 @@
+diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_private.h b/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
+index 6f8cf56248..200254cca6 100644
+--- a/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
++++ b/drivers/crypto/mvsam/rte_mrvl_pmd_private.h
+@@ -14,5 +14,5 @@
+ 
+ /** MRVL PMD LOGTYPE DRIVER */
+-int mrvl_logtype_driver;
++extern int mrvl_logtype_driver;
+ 
+ #define MRVL_LOG(level, fmt, ...) \
@@ -76 +77 @@
-index d72112b5f4..8101eaaada 100644
+index a17536b777..aa3277ff57 100644
@@ -85,4 +86,4 @@
-diff --git a/drivers/crypto/snow3g/snow3g_pmd_private.h b/drivers/crypto/snow3g/snow3g_pmd_private.h
-index 2074f3d172..23cf078a9c 100644
---- a/drivers/crypto/snow3g/snow3g_pmd_private.h
-+++ b/drivers/crypto/snow3g/snow3g_pmd_private.h
+diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
+index b7807b6216..debe0516b0 100644
+--- a/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
++++ b/drivers/crypto/snow3g/rte_snow3g_pmd_private.h
@@ -97 +98 @@
-index 9e06ab7c95..f47a7880de 100644
+index 313f4590bf..64a0d7a812 100644
@@ -106,4 +107,4 @@
-diff --git a/drivers/crypto/zuc/zuc_pmd_private.h b/drivers/crypto/zuc/zuc_pmd_private.h
-index 47a8b08dd7..d8684891ee 100644
---- a/drivers/crypto/zuc/zuc_pmd_private.h
-+++ b/drivers/crypto/zuc/zuc_pmd_private.h
+diff --git a/drivers/crypto/zuc/rte_zuc_pmd_private.h b/drivers/crypto/zuc/rte_zuc_pmd_private.h
+index 5e5906ddb5..3d827052a5 100644
+--- a/drivers/crypto/zuc/rte_zuc_pmd_private.h
++++ b/drivers/crypto/zuc/rte_zuc_pmd_private.h
Previous message: [dpdk-stable] patch 'drivers: fix log type variables for -fno-common' has been queued to LTS release 18.11.9
Next message: [dpdk-stable] patch 'test/crypto: fix flag check' has been queued to LTS release 18.11.9
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the stable mailing list