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 BDD21A0351 for ; Thu, 6 Aug 2020 11:58:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6C931C0CC; Thu, 6 Aug 2020 11:58:01 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 4F6741C0C2 for ; Thu, 6 Aug 2020 11:58:00 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id 88so43354831wrh.3 for ; Thu, 06 Aug 2020 02:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o+hvVcmGgQP70OPlwtEJsG+d30TCLjS1hsRdDwJd21A=; b=S7J1YuB1EldZ1/KcZgWiSFKjWZgHI9SFoU0ZCGDybuvpmFoemzU6xyZwkvl9DQ6pvJ 16iSfOadNpLp/q8kzJN5Nb2HcUWRcSJL2bZ+mJ7h6/dUrD2fpu1aV6NCWSpXsDtuk4XN pbT0ph6kfPjg07q7uJ5JEC6G22H0xvh/zQ5dkT+bH9rah+LH9Re5RHrdjnPW7CUMBj+Z Q7Eux11kBC9HEt1m7yodEyhvo6N3C1cHrwBBfX4MKXD7ROTL6Ewavajyjo1xutU/Q6hr 4lOD8E9ohm+wJHy1yRzjX53elt5rfehiUJWQteZpf8tMSsnQ16BFkOmryjQ/D8ieu9Zm eAyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o+hvVcmGgQP70OPlwtEJsG+d30TCLjS1hsRdDwJd21A=; b=CfuycsxA+N5uqpdVPAaRoIONAka7fkuDhsVQiwuw9sP/rGaEtjYIoeIi8htae8wcDm wLwKMMNSUsLffRJDOGXVgnc1DdQMrUuVkhL++ILDD/EBKY7YNTzXaq3w+p9vZyEUrUtr EKjYkALWlTqLQcDvETciuXr+oZALUE1Os8UkaGGim+7gAqZosbpgIbT4cVYV1BqKl3H4 lCo9ZkrsU9ysmtSxiJ9SlhRbzpVmB4BRXFKE/qjBiSKB86PTYwnFzBgTni4VkZNyqJBk SiWL9aO7qbDIv7OVZ+8Si9miylnTfAPyIBJhFQj80qyoCHJsltWNu5YYZCvylXnyMPDO 4CCQ== X-Gm-Message-State: AOAM5312U3/7JL7PMbEKAhCuwpyUcmmq0O+K9SZqAMXcj/z2/dQmitKU qS51aF2LDbuQ+lm7cL9fGF+DaGuzYto= X-Google-Smtp-Source: ABdhPJwRsJkpmQssIx5WqQxF4vTZDWgl3659iMj2WTfqHgXGIVKe9LedVSYzxGlJM2wUpkF8uoKB7A== X-Received: by 2002:adf:fac8:: with SMTP id a8mr6722320wrs.368.1596707880007; Thu, 06 Aug 2020 02:58:00 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r206sm5967847wma.6.2020.08.06.02.57.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:57:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: David Marchand , Akhil Goyal , dpdk stable Date: Thu, 6 Aug 2020 10:53:36 +0100 Message-Id: <20200806095411.774624-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: remove debug option' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 6255874ccec385cdf7f258b9a05623dcb7fc6f5a Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 28 Jul 2020 17:24:04 +0800 Subject: [PATCH] crypto/armv8: remove debug option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ] 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") 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 861f7d1a0..340614637 100644 --- a/config/common_base +++ b/config/common_base @@ -572,7 +572,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 24040dda2..30be0f594 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -13,7 +13,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), \ @@ -27,17 +26,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) */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.102677978 +0100 +++ 0008-crypto-armv8-remove-debug-option.patch 2020-08-06 10:53:15.708595580 +0100 @@ -1,4 +1,4 @@ -From cc9035ffbb8a050780e202047500b1580abed0c9 Mon Sep 17 00:00:00 2001 +From 6255874ccec385cdf7f258b9a05623dcb7fc6f5a Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 28 Jul 2020 17:24:04 +0800 Subject: [PATCH] crypto/armv8: remove debug option @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ] + 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. @@ -17,7 +19,6 @@ ^ Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors") -Cc: stable@dpdk.org Reported-by: David Marchand Signed-off-by: Ruifeng Wang @@ -28,10 +29,10 @@ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base -index f76585f16..c70b8f68b 100644 +index 861f7d1a0..340614637 100644 --- a/config/common_base +++ b/config/common_base -@@ -605,7 +605,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 +@@ -572,7 +572,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 # Compile PMD for ARMv8 Crypto device # CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n @@ -40,10 +41,10 @@ # # 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 +index 24040dda2..30be0f594 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h -@@ -15,7 +15,6 @@ +@@ -13,7 +13,6 @@ RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \ __func__, __LINE__, ## args) @@ -51,7 +52,7 @@ #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 @@ +@@ -27,17 +26,11 @@ #define ARMV8_CRYPTO_ASSERT(con) \ do { \ if (!(con)) { \