drivers/crypto: move logtype variables to source files
Checks
Commit Message
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")
Cc: naga.sureshx.somarowthu@intel.com
Fixes: a05a450f42fd ("crypto/mvsam: add dynamic logging")
Cc: tdu@semihalf.com
Fixes: f3af5f9d1325 ("crypto/zuc: add dynamic logging")
Cc: agalyax.babu.radhakrishnan@intel.com
Fixes: a3277ad47feb ("cryptodev: remove crypto device driver name")
Cc: slawomirx.mrozowicz@intel.com
Cc: stable@dpdk.org
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
---
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 ++--
8 files changed, 9 insertions(+), 5 deletions(-)
Comments
> -----Original Message-----
> From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
> Sent: Wednesday, April 15, 2020 7:22 AM
> To: De Lara Guarch, Pablo <pablo.de.lara.guarch@intel.com>; Tomasz Duszynski
> <tdu@semihalf.com>; Michael Shamis <michaelsh@marvell.com>; Liron Himi
> <lironh@marvell.com>; Pattan, Reshma <reshma.pattan@intel.com>; Naga
> Suresh Somarowthu <naga.sureshx.somarowthu@intel.com>; Agalya Babu
> RadhaKrishnan <agalyax.babu.radhakrishnan@intel.com>; Mrozowicz,
> SlawomirX <slawomirx.mrozowicz@intel.com>; Doherty, Declan
> <declan.doherty@intel.com>
> Cc: dev@dpdk.org; Richardson, Bruce <bruce.richardson@intel.com>;
> stable@dpdk.org
> Subject: [PATCH] drivers/crypto: move logtype variables to source files
>
> 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")
> Cc: naga.sureshx.somarowthu@intel.com
> Fixes: a05a450f42fd ("crypto/mvsam: add dynamic logging")
> Cc: tdu@semihalf.com
> Fixes: f3af5f9d1325 ("crypto/zuc: add dynamic logging")
> Cc: agalyax.babu.radhakrishnan@intel.com
> Fixes: a3277ad47feb ("cryptodev: remove crypto device driver name")
> Cc: slawomirx.mrozowicz@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > 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")
> > Cc: naga.sureshx.somarowthu@intel.com
> > Fixes: a05a450f42fd ("crypto/mvsam: add dynamic logging")
> > Cc: tdu@semihalf.com
> > Fixes: f3af5f9d1325 ("crypto/zuc: add dynamic logging")
> > Cc: agalyax.babu.radhakrishnan@intel.com
> > Fixes: a3277ad47feb ("cryptodev: remove crypto device driver name")
> > Cc: slawomirx.mrozowicz@intel.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
>
> Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Applied to dpdk-next-crypto
Thanks.
@@ -11,7 +11,7 @@
/**< KASUMI PMD device name */
/** KASUMI PMD LOGTYPE DRIVER */
-int kasumi_logtype_driver;
+extern int kasumi_logtype_driver;
#define KASUMI_LOG(level, fmt, ...) \
rte_log(RTE_LOG_ ## level, kasumi_logtype_driver, \
@@ -17,6 +17,7 @@
#define KASUMI_MAX_BURST 4
#define BYTE_LEN 8
+int kasumi_logtype_driver;
static uint8_t cryptodev_driver_id;
/** Get xform chain order. */
@@ -13,7 +13,7 @@
/**< Marvell PMD device name */
/** MRVL PMD LOGTYPE DRIVER */
-int mrvl_logtype_driver;
+extern int mrvl_logtype_driver;
#define MRVL_LOG(level, fmt, ...) \
rte_log(RTE_LOG_ ## level, mrvl_logtype_driver, \
@@ -19,6 +19,7 @@
#define MRVL_PMD_MAX_NB_SESS_ARG ("max_nb_sessions")
#define MRVL_PMD_DEFAULT_MAX_NB_SESSIONS 2048
+int mrvl_logtype_driver;
static uint8_t cryptodev_driver_id;
struct mrvl_pmd_init_params {
@@ -16,6 +16,7 @@
#define SNOW3G_MAX_BURST 8
#define BYTE_LEN 8
+int snow3g_logtype_driver;
static uint8_t cryptodev_driver_id;
/** Get xform chain order. */
@@ -11,7 +11,7 @@
/**< SNOW 3G PMD device name */
/** SNOW 3G PMD LOGTYPE DRIVER */
-int snow3g_logtype_driver;
+extern int snow3g_logtype_driver;
#define SNOW3G_LOG(level, fmt, ...) \
rte_log(RTE_LOG_ ## level, snow3g_logtype_driver, \
@@ -14,6 +14,7 @@
#define ZUC_MAX_BURST 16
#define BYTE_LEN 8
+int zuc_logtype_driver;
static uint8_t cryptodev_driver_id;
/** Get xform chain order. */
@@ -8,10 +8,10 @@
#include <intel-ipsec-mb.h>
#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, \
"%s()... line %u: " fmt "\n", __func__, __LINE__, \