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 84EF8A04B1 for ; Fri, 28 Aug 2020 12:14:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7BDF3A3; Fri, 28 Aug 2020 12:14:21 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 2D5131C114 for ; Fri, 28 Aug 2020 12:14:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609659; 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=dMydDGa68Sj4euuARn2/ZJOTX2Deq4o5Uy2XPyOe73A=; b=KJpuluWhdqbwwNebhccRehgXHqDKcYZSnYbnv0FLut7raU+gDkKvBiL87m/eLaIFaFqp4z gUkVszivEh5+NmQVdUMEu4VUDv2pCNxJC/f1f+9TyTohdIim1ShB4K4/1tDsz/9Zb//nHh ukE6Kyyv31x2zBTC5M4E8ILgIcDDxLc= 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-516-XtZChEyZN1-AA3uD-SGDRA-1; Fri, 28 Aug 2020 06:14:16 -0400 X-MC-Unique: XtZChEyZN1-AA3uD-SGDRA-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 BA19E1DDFF; Fri, 28 Aug 2020 10:14:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87DB619D7C; Fri, 28 Aug 2020 10:14:14 +0000 (UTC) From: Kevin Traynor To: Ruifeng Wang Cc: David Marchand , Akhil Goyal , dpdk stable Date: Fri, 28 Aug 2020 11:12:52 +0100 Message-Id: <20200828101308.223767-26-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.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: use dedicated log type' 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/16147e7969ad44f020c1ed320869866816c6453a Thanks. Kevin. --- >From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001 From: Ruifeng Wang 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 Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- drivers/crypto/armv8/rte_armv8_pmd.c | 2 ++ drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index efdde399de..440417c65f 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -851,4 +851,6 @@ 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); diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h index 04ce1cc0e4..daad14b8da 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_private.h +++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h @@ -9,17 +9,22 @@ /**< 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) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.544052543 +0100 +++ 0026-crypto-armv8-use-dedicated-log-type.patch 2020-08-28 11:03:25.951955670 +0100 @@ -1 +1 @@ -From 28b0514504cf0f71f822f0aed5aacc83eb8ada12 Mon Sep 17 00:00:00 2001 +From 16147e7969ad44f020c1ed320869866816c6453a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 28b0514504cf0f71f822f0aed5aacc83eb8ada12 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19,2 +20,2 @@ - drivers/crypto/armv8/armv8_pmd_private.h | 23 ++++++++++++++--------- - drivers/crypto/armv8/rte_armv8_pmd.c | 2 ++ + drivers/crypto/armv8/rte_armv8_pmd.c | 2 ++ + drivers/crypto/armv8/rte_armv8_pmd_private.h | 23 ++++++++++++-------- @@ -23,5 +24,16 @@ -diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h -index 19940809bc..709b3d5360 100644 ---- a/drivers/crypto/armv8/armv8_pmd_private.h -+++ b/drivers/crypto/armv8/armv8_pmd_private.h -@@ -11,17 +11,22 @@ +diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c +index efdde399de..440417c65f 100644 +--- a/drivers/crypto/armv8/rte_armv8_pmd.c ++++ b/drivers/crypto/armv8/rte_armv8_pmd.c +@@ -851,4 +851,6 @@ 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); +diff --git a/drivers/crypto/armv8/rte_armv8_pmd_private.h b/drivers/crypto/armv8/rte_armv8_pmd_private.h +index 04ce1cc0e4..daad14b8da 100644 +--- a/drivers/crypto/armv8/rte_armv8_pmd_private.h ++++ b/drivers/crypto/armv8/rte_armv8_pmd_private.h +@@ -9,17 +9,22 @@ @@ -59,11 +70,0 @@ -diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c -index 8b212772fa..a2b08d8180 100644 ---- a/drivers/crypto/armv8/rte_armv8_pmd.c -+++ b/drivers/crypto/armv8/rte_armv8_pmd.c -@@ -862,4 +862,6 @@ 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);