[dpdk-stable] patch 'crypto/armv8: use dedicated log type' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 641a749ab6e4e0579b3eff8dcbccbca09f659d77 Mon Sep 17 00:00:00 2001
From: Ruifeng Wang <ruifeng.wang at arm.com>
Date: Tue, 28 Jul 2020 17:24:05 +0800
Subject: [PATCH] crypto/armv8: use dedicated log type

[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]

armv8 crypto PMD used CRYPTODEV general log type.
Create a dedicated log type for the PMD to not pollute CRYPTODEV log type.

Typo in crypto dev name macro caused unexpected device name in log.
Fixed the typo to log with correct device name.

Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")

Suggested-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/armv8/armv8_pmd_private.h | 23 ++++++++++++++---------
 drivers/crypto/armv8/rte_armv8_pmd.c     |  2 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
index 30be0f594..aeda47b1b 100644
--- a/drivers/crypto/armv8/armv8_pmd_private.h
+++ b/drivers/crypto/armv8/armv8_pmd_private.h
@@ -8,19 +8,24 @@
 #define CRYPTODEV_NAME_ARMV8_PMD	crypto_armv8
 /**< ARMv8 Crypto PMD device name */
 
-#define ARMV8_CRYPTO_LOG_ERR(fmt, args...) \
-	RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n",  \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+extern int crypto_armv8_log_type;
+
+#define ARMV8_CRYPTO_LOG_ERR(fmt, args...)			\
+	rte_log(RTE_LOG_ERR, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \
-	RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_INFO(fmt, args...)			\
+	rte_log(RTE_LOG_INFO, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
-#define ARMV8_CRYPTO_LOG_DBG(fmt, args...) \
-	RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \
-			RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \
+#define ARMV8_CRYPTO_LOG_DBG(fmt, args...)			\
+	rte_log(RTE_LOG_DEBUG, crypto_armv8_log_type,		\
+			"[%s] %s() line %u: " fmt "\n",		\
+			RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),	\
 			__func__, __LINE__, ## args)
 
 #define ARMV8_CRYPTO_ASSERT(con)				\
diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
index fd3093315..bc897ac71 100644
--- a/drivers/crypto/armv8/rte_armv8_pmd.c
+++ b/drivers/crypto/armv8/rte_armv8_pmd.c
@@ -852,6 +852,8 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
 
 static struct cryptodev_driver armv8_crypto_drv;
 
+RTE_LOG_REGISTER(crypto_armv8_log_type, pmd.crypto.armv8, ERR);
+
 RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv);
 RTE_PMD_REGISTER_ALIAS(CRYPTODEV_NAME_ARMV8_PMD, cryptodev_armv8_pmd);
 RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ARMV8_PMD,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.137759582 +0100
+++ 0009-crypto-armv8-use-dedicated-log-type.patch	2020-08-06 10:53:15.708595580 +0100
@@ -1,8 +1,10 @@
-From 28b0514504cf0f71f822f0aed5aacc83eb8ada12 Mon Sep 17 00:00:00 2001
+From 641a749ab6e4e0579b3eff8dcbccbca09f659d77 Mon Sep 17 00:00:00 2001
 From: Ruifeng Wang <ruifeng.wang at arm.com>
 Date: Tue, 28 Jul 2020 17:24:05 +0800
 Subject: [PATCH] crypto/armv8: use dedicated log type
 
+[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ]
+
 armv8 crypto PMD used CRYPTODEV general log type.
 Create a dedicated log type for the PMD to not pollute CRYPTODEV log type.
 
@@ -10,7 +12,6 @@
 Fixed the typo to log with correct device name.
 
 Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors")
-Cc: stable at dpdk.org
 
 Suggested-by: David Marchand <david.marchand at redhat.com>
 Signed-off-by: Ruifeng Wang <ruifeng.wang at arm.com>
@@ -21,10 +22,10 @@
  2 files changed, 16 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h
-index 19940809b..709b3d536 100644
+index 30be0f594..aeda47b1b 100644
 --- a/drivers/crypto/armv8/armv8_pmd_private.h
 +++ b/drivers/crypto/armv8/armv8_pmd_private.h
-@@ -10,19 +10,24 @@
+@@ -8,19 +8,24 @@
  #define CRYPTODEV_NAME_ARMV8_PMD	crypto_armv8
  /**< ARMv8 Crypto PMD device name */
  
@@ -59,10 +60,10 @@
  
  #define ARMV8_CRYPTO_ASSERT(con)				\
 diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c
-index 8b212772f..a2b08d818 100644
+index fd3093315..bc897ac71 100644
 --- a/drivers/crypto/armv8/rte_armv8_pmd.c
 +++ b/drivers/crypto/armv8/rte_armv8_pmd.c
-@@ -861,6 +861,8 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
+@@ -852,6 +852,8 @@ static struct rte_vdev_driver armv8_crypto_pmd_drv = {
  
  static struct cryptodev_driver armv8_crypto_drv;