From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BDF7AA0598; Fri, 10 Apr 2020 19:32:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 346031D61B; Fri, 10 Apr 2020 19:32:14 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 0259A1D613; Fri, 10 Apr 2020 19:32:11 +0200 (CEST) IronPort-SDR: t+t/4qj1QBcW62Att/9jOedoLsjlK6YTTl3Q67FQy1aHsRMQ+Hg59We0Hzk4t0C9YNX2l5dyJB 8fJuIcF3pZZA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2020 10:32:10 -0700 IronPort-SDR: SwOjChulkyT3QHSlryYrgm/3Wo+YLIImnvxqb/m8/ZwrXd+BO/pKV5pmEcZLNWg/h1QEtY8VWL Rs4IuCUPERxQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,367,1580803200"; d="scan'208";a="398976697" Received: from silpixa00399126.ir.intel.com ([10.237.222.218]) by orsmga004.jf.intel.com with ESMTP; 10 Apr 2020 10:32:09 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , ashish.gupta@caviumnetworks.com, tallurix.chaitanya.babu@intel.com, naga.sureshx.somarowthu@intel.com, pablo.de.lara.guarch@intel.com, stable@dpdk.org Date: Fri, 10 Apr 2020 18:27:56 +0100 Message-Id: <20200410172756.20721-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] drivers: fix gcc 10 errors due to logtype var in header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The zlib compression driver, as well as the aesni-gcm, aesni-mb and openssl crypto drivers all defined the logtype variable in the header file directly. This gives errors with gcc 10, due to -fno-common being the default, so we need to apply the same fix in all cases: * move the variable definition to a suitable .c file * mark the forward declaration of the variable in the header as "extern" Fixes: 0c4e4c16b004 ("compress/zlib: introduce zlib PMD") Cc: ashish.gupta@caviumnetworks.com Fixes: 90c8a2d02a31 ("crypto/aesni_gcm: add dynamic logging") Cc: tallurix.chaitanya.babu@intel.com Fixes: 276624ae2ef6 ("crypto/aesni_mb: add dynamic logging") Fixes: 094b2386f461 ("crypto/openssl: add dynamic logging") Cc: naga.sureshx.somarowthu@intel.com Cc: pablo.de.lara.guarch@intel.com Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- drivers/compress/zlib/zlib_pmd.c | 2 ++ drivers/compress/zlib/zlib_pmd_private.h | 2 +- drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 2 ++ drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h | 2 +- drivers/crypto/aesni_mb/aesni_mb_pmd_private.h | 2 +- drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c | 2 ++ drivers/crypto/openssl/openssl_pmd_private.h | 2 +- drivers/crypto/openssl/rte_openssl_pmd.c | 1 + 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/compress/zlib/zlib_pmd.c b/drivers/compress/zlib/zlib_pmd.c index 19f9200c2..e39be2ed8 100644 --- a/drivers/compress/zlib/zlib_pmd.c +++ b/drivers/compress/zlib/zlib_pmd.c @@ -7,6 +7,8 @@ #include "zlib_pmd_private.h" +int zlib_logtype_driver; + /** Compute next mbuf in the list, assign data buffer and length, * returns 0 if mbuf is NULL */ diff --git a/drivers/compress/zlib/zlib_pmd_private.h b/drivers/compress/zlib/zlib_pmd_private.h index bda49759d..e36c5dc61 100644 --- a/drivers/compress/zlib/zlib_pmd_private.h +++ b/drivers/compress/zlib/zlib_pmd_private.h @@ -14,7 +14,7 @@ #define DEF_MEM_LEVEL 8 -int zlib_logtype_driver; +extern int zlib_logtype_driver; #define ZLIB_PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, zlib_logtype_driver, "%s(): "fmt "\n", \ __func__, ##args) diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c index a1caab993..475d523ae 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c @@ -13,6 +13,8 @@ #include "aesni_gcm_pmd_private.h" +int aesni_gcm_logtype_driver; + static uint8_t cryptodev_driver_id; /* setup session handlers */ diff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h index 080d4f7e4..2763d1c49 100644 --- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h +++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd_private.h @@ -20,7 +20,7 @@ /**< AES-NI GCM PMD device name */ /** AES-NI GCM PMD LOGTYPE DRIVER */ -int aesni_gcm_logtype_driver; +extern int aesni_gcm_logtype_driver; #define AESNI_GCM_LOG(level, fmt, ...) \ rte_log(RTE_LOG_ ## level, aesni_gcm_logtype_driver, \ "%s() line %u: "fmt "\n", __func__, __LINE__, \ diff --git a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h index 3456693c2..b3cb2f1cf 100644 --- a/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h +++ b/drivers/crypto/aesni_mb/aesni_mb_pmd_private.h @@ -19,7 +19,7 @@ enum aesni_mb_vector_mode { /**< AES-NI Multi buffer PMD device name */ /** AESNI_MB PMD LOGTYPE DRIVER */ -int aesni_mb_logtype_driver; +extern int aesni_mb_logtype_driver; #define AESNI_MB_LOG(level, fmt, ...) \ rte_log(RTE_LOG_ ## level, aesni_mb_logtype_driver, \ diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c index 33f416745..40feae3c6 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c @@ -14,6 +14,8 @@ #include "aesni_mb_pmd_private.h" +int aesni_mb_logtype_driver; + #define AES_CCM_DIGEST_MIN_LEN 4 #define AES_CCM_DIGEST_MAX_LEN 16 #define HMAC_MAX_BLOCK_SIZE 128 diff --git a/drivers/crypto/openssl/openssl_pmd_private.h b/drivers/crypto/openssl/openssl_pmd_private.h index 43ac3813d..b2054b375 100644 --- a/drivers/crypto/openssl/openssl_pmd_private.h +++ b/drivers/crypto/openssl/openssl_pmd_private.h @@ -16,7 +16,7 @@ /**< Open SSL Crypto PMD device name */ /** OPENSSL PMD LOGTYPE DRIVER */ -int openssl_logtype_driver; +extern int openssl_logtype_driver; #define OPENSSL_LOG(level, fmt, ...) \ rte_log(RTE_LOG_ ## level, openssl_logtype_driver, \ "%s() line %u: " fmt "\n", __func__, __LINE__, \ diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 199097bf8..b820f6171 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -18,6 +18,7 @@ #define DES_BLOCK_SIZE 8 +int openssl_logtype_driver; static uint8_t cryptodev_driver_id; #if (OPENSSL_VERSION_NUMBER < 0x10100000L) -- 2.20.1