From patchwork Tue Jul 28 09:24:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 74928 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC5E9A052B; Tue, 28 Jul 2020 11:24:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CBCA61C10A; Tue, 28 Jul 2020 11:24:52 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 3A3091C0DB; Tue, 28 Jul 2020 11:24:51 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AF5F830E; Tue, 28 Jul 2020 02:24:50 -0700 (PDT) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.210.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1D17F3F66E; Tue, 28 Jul 2020 02:24:47 -0700 (PDT) From: Ruifeng Wang To: Thomas Monjalon , Ruifeng Wang Cc: akhil.goyal@nxp.com, david.marchand@redhat.com, dev@dpdk.org, honnappa.nagarahalli@arm.com, nd@arm.com, stable@dpdk.org Date: Tue, 28 Jul 2020 17:24:04 +0800 Message-Id: <20200728092406.9259-2-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200728092406.9259-1-ruifeng.wang@arm.com> References: <20200727085810.168970-1-ruifeng.wang@arm.com> <20200728092406.9259-1-ruifeng.wang@arm.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/3] crypto/armv8: remove log debug option 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" Typo in debug log switch macro caused debug log cannot be enabled. Since no log used in data path, remove the debug option entirely and have logs always enabled. Resolved compilation error when debug log is enabled: rte_armv8_pmd.c: In function ‘process_armv8_chained_op’: rte_armv8_pmd.c:633:22: error: expected ‘)’ before ‘crypto_func’ ARMV8_CRYPTO_ASSERT(crypto_func != NULL); ^ Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors") Cc: stable@dpdk.org Reported-by: David Marchand Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- config/common_base | 1 - drivers/crypto/armv8/armv8_pmd_private.h | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base index f76585f16..c70b8f68b 100644 --- a/config/common_base +++ b/config/common_base @@ -605,7 +605,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 # Compile PMD for ARMv8 Crypto device # CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n # # Compile NXP CAAM JR crypto Driver diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h index e08d0df78..19940809b 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -15,7 +15,6 @@ RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \ __func__, __LINE__, ## args) -#ifdef RTE_LIBRTE_ARMV8_CRYPTO_DEBUG #define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \ RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \ @@ -29,17 +28,11 @@ #define ARMV8_CRYPTO_ASSERT(con) \ do { \ if (!(con)) { \ - rte_panic("%s(): " \ - con "condition failed, line %u", __func__); \ + rte_panic("condition failed, line %u", \ + __LINE__); \ } \ } while (0) -#else -#define ARMV8_CRYPTO_LOG_INFO(fmt, args...) -#define ARMV8_CRYPTO_LOG_DBG(fmt, args...) -#define ARMV8_CRYPTO_ASSERT(con) -#endif - #define NBBY 8 /* Number of bits in a byte */ #define BYTE_LENGTH(x) ((x) / NBBY) /* Number of bytes in x (round down) */ From patchwork Tue Jul 28 09:24:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 74929 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 04F2CA052B; Tue, 28 Jul 2020 11:25:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB6FB1C120; Tue, 28 Jul 2020 11:25:09 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id E973C1C113; Tue, 28 Jul 2020 11:25:06 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 74B8730E; Tue, 28 Jul 2020 02:25:06 -0700 (PDT) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.210.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 20E623F66E; Tue, 28 Jul 2020 02:25:03 -0700 (PDT) From: Ruifeng Wang To: Ruifeng Wang Cc: akhil.goyal@nxp.com, david.marchand@redhat.com, dev@dpdk.org, honnappa.nagarahalli@arm.com, nd@arm.com, stable@dpdk.org Date: Tue, 28 Jul 2020 17:24:05 +0800 Message-Id: <20200728092406.9259-3-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200728092406.9259-1-ruifeng.wang@arm.com> References: <20200727085810.168970-1-ruifeng.wang@arm.com> <20200728092406.9259-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v2 2/3] crypto/armv8: use dedicated log type 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" 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") Cc: stable@dpdk.org Suggested-by: David Marchand Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- 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 19940809b..709b3d536 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -10,19 +10,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 8b212772f..a2b08d818 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 = { 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, From patchwork Tue Jul 28 09:24:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruifeng Wang X-Patchwork-Id: 74930 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E00DCA052B; Tue, 28 Jul 2020 11:25:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 65B191C0D7; Tue, 28 Jul 2020 11:25:16 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 5DF4F1BFF3 for ; Tue, 28 Jul 2020 11:25:15 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C8453D6E; Tue, 28 Jul 2020 02:25:14 -0700 (PDT) Received: from net-arm-thunderx2-02.shanghai.arm.com (net-arm-thunderx2-02.shanghai.arm.com [10.169.210.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B33A63F66E; Tue, 28 Jul 2020 02:25:12 -0700 (PDT) From: Ruifeng Wang To: Ruifeng Wang Cc: akhil.goyal@nxp.com, david.marchand@redhat.com, dev@dpdk.org, honnappa.nagarahalli@arm.com, nd@arm.com Date: Tue, 28 Jul 2020 17:24:06 +0800 Message-Id: <20200728092406.9259-4-ruifeng.wang@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200728092406.9259-1-ruifeng.wang@arm.com> References: <20200727085810.168970-1-ruifeng.wang@arm.com> <20200728092406.9259-1-ruifeng.wang@arm.com> Subject: [dpdk-dev] [PATCH v2 3/3] crypto/armv8: remove redundant assert definition 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" No need to define assert function in PMD since RTE provides the same. Remove private definition and use RTE_VERIFY instead. Suggested-by: David Marchand Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- drivers/crypto/armv8/armv8_pmd_private.h | 8 -------- drivers/crypto/armv8/rte_armv8_pmd.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h index 709b3d536..66b03fb92 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -30,14 +30,6 @@ extern int crypto_armv8_log_type; RTE_STR(CRYPTODEV_NAME_ARMV8_PMD), \ __func__, __LINE__, ## args) -#define ARMV8_CRYPTO_ASSERT(con) \ -do { \ - if (!(con)) { \ - rte_panic("condition failed, line %u", \ - __LINE__); \ - } \ -} while (0) - #define NBBY 8 /* Number of bits in a byte */ #define BYTE_LENGTH(x) ((x) / NBBY) /* Number of bytes in x (round down) */ diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index a2b08d818..c95729db5 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -630,7 +630,7 @@ process_armv8_chained_op(struct armv8_crypto_qp *qp, struct rte_crypto_op *op, arg.cipher.key = sess->cipher.key.data; /* Acquire combined mode function */ crypto_func = sess->crypto_func; - ARMV8_CRYPTO_ASSERT(crypto_func != NULL); + RTE_VERIFY(crypto_func != NULL); error = crypto_func(csrc, cdst, clen, asrc, adst, alen, &arg); if (error != 0) { op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;