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 75A06A04B1 for ; Fri, 28 Aug 2020 12:14:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6C81CA3; Fri, 28 Aug 2020 12:14:19 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 76D7C1C10A for ; Fri, 28 Aug 2020 12:14:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k4WEE/u8H9BCCGdSzntesAz2nOPIHC+YAKcKKYYx/cI=; b=BcMFdNtb/4Ph3uFbP02hwbl5x3IAxTfucWeBviz/0KiO+/GFtYmq9e+gHFJmk3h4pFqT5J nHJ0DdmsakfIEKcp9CuevSZQdfwhHMYNkU0rdITQZOD79q6Zp7WnvwybGZKwmVSSbELFto yX6dmgQX25aH1wAhs56Xh0ailMFoNVo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-226-1RANv9ebMfK5d-_2ULoC4w-1; Fri, 28 Aug 2020 06:14:15 -0400 X-MC-Unique: 1RANv9ebMfK5d-_2ULoC4w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 374178015A8; Fri, 28 Aug 2020 10:14:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58F6D19D7C; Fri, 28 Aug 2020 10:14:10 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: David Marchand , Akhil Goyal , dpdk stable Date: Fri, 28 Aug 2020 11:12:51 +0100 Message-Id: <20200828101308.223767-25-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: remove debug option' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/249035bb4843ea7d3b23ab931dd4ecb76d621b56 Thanks. Kevin. --- >From 249035bb4843ea7d3b23ab931dd4ecb76d621b56 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/rte_armv8_pmd_private.h | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base index 6bce2c97ff..401388188c 100644 --- a/config/common_base +++ b/config/common_base @@ -503,5 +503,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 # CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n # diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h index 7feb021db5..04ce1cc0e4 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_private.h +++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h @@ -14,5 +14,4 @@ __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", \ @@ -28,15 +27,9 @@ 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.522811579 +0100 +++ 0025-crypto-armv8-remove-debug-option.patch 2020-08-28 11:03:25.950955663 +0100 @@ -1 +1 @@ -From cc9035ffbb8a050780e202047500b1580abed0c9 Mon Sep 17 00:00:00 2001 +From 249035bb4843ea7d3b23ab931dd4ecb76d621b56 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit cc9035ffbb8a050780e202047500b1580abed0c9 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -26,2 +27,2 @@ - config/common_base | 1 - - drivers/crypto/armv8/armv8_pmd_private.h | 11 ++--------- + config/common_base | 1 - + drivers/crypto/armv8/rte_armv8_pmd_private.h | 11 ++--------- @@ -31 +32 @@ -index f76585f165..c70b8f68bf 100644 +index 6bce2c97ff..401388188c 100644 @@ -34 +35 @@ -@@ -606,5 +606,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 +@@ -503,5 +503,4 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 @@ -40,5 +41,5 @@ -diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h -index e08d0df781..19940809bc 100644 ---- a/drivers/crypto/armv8/armv8_pmd_private.h -+++ b/drivers/crypto/armv8/armv8_pmd_private.h -@@ -16,5 +16,4 @@ +diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h +index 7feb021db5..04ce1cc0e4 100644 +--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h ++++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h +@@ -14,5 +14,4 @@ @@ -50 +51 @@ -@@ -30,15 +29,9 @@ +@@ -28,15 +27,9 @@