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 D1F96A0351 for ; Thu, 6 Aug 2020 11:58:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC2D31C0D1; Thu, 6 Aug 2020 11:58:02 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by dpdk.org (Postfix) with ESMTP id 8247D1C0CC for ; Thu, 6 Aug 2020 11:58:01 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id f7so43419795wrw.1 for ; Thu, 06 Aug 2020 02:58:01 -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=PErFZCw/f4FuvTRwMuk2kB61K7C7+88bbcoB6IDjcos=; b=TIVHejglYo/FnQ8z7Pswd/R0c/0UNw0p5AwZWbAVddWZTYMbJIquMHVftpeC3U/Mia I+qt78s3gYeeRuvpLPAnVVHZpaYRQXbnn4w3VN4GgC6rB6q5hAgn7OUqI/mVAi8nR8+L hwkSesBlcngSzjc7k+JEHAPrBAtXJxL08Ni/8kIUT6v281uMDmfWUJz1cckf+OZVWn9F qbNVD72RLiFPCZBxgTo1dq5CGcXjtuLy4AcRVJIdNKSme3Bsif7f23mJNbsbCKQjAX+C EBap14LmAY2Q1g3jaKGvH3Qyl1MQ0272bz/s0JUnd4MmC/x43KGB6Nr0uV9tIh5N5VHE A3Ag== 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=PErFZCw/f4FuvTRwMuk2kB61K7C7+88bbcoB6IDjcos=; b=UcdkIwrEC6m3jbm7rHlxRF2mS966YuuhZTyHF5a08ULdcURF444zLu4o4K5mDdOwRC Hm74xdiDXieY+0Nwy24Tq0SoWXTrreGFW5/kkd/21ucIL1cWPINdfQZF6xlLj5Es4jPn hxjnjnWdw7+ajtcqaLxoQHONS2VGT00bplDNuBwNMbcRK2hLkFSUEzFlLg0oQspLfr7v cuCpGcZUnLJ23LjyYXWsmBvUl5p2ug2saSPvWvYgPKcCt7M+nnnN8vXHMIhznbjFwjOT 86w79RO1y1AMW48SjKAIghwz2/aNYgf+M8Uujwy8rB7Rj7NNm6DrBy7o0eEhexovxfoW 3ecw== X-Gm-Message-State: AOAM531Z2NsZ/Q9TBi2h5MnV9rilvag/DOiuo3IKaezziJasXRH1WMx0 pkhADRhaZvxRZD5TwFzcIRA= X-Google-Smtp-Source: ABdhPJzweCehvuLE5lT+8ePRiDrXVHYpnmwwzAh9hwoAUO4Sys6b94b74WCTV/dq7nsgDpOJfuJzig== X-Received: by 2002:adf:ba05:: with SMTP id o5mr6684213wrg.7.1596707881252; Thu, 06 Aug 2020 02:58:01 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c14sm5749253wrw.85.2020.08.06.02.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:00 -0700 (PDT) From: luca.boccassi@gmail.com To: Ruifeng Wang Cc: David Marchand , Akhil Goyal , dpdk stable Date: Thu, 6 Aug 2020 10:53:37 +0100 Message-Id: <20200806095411.774624-9-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-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/armv8: use dedicated log type' 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 641a749ab6e4e0579b3eff8dcbccbca09f659d77 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/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 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@dpdk.org Suggested-by: David Marchand Signed-off-by: Ruifeng Wang @@ -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;