From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 59186454EF; Tue, 25 Jun 2024 14:25:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDDD04337B; Tue, 25 Jun 2024 14:25:01 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DE6F142E57 for ; Tue, 25 Jun 2024 14:25:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719318300; 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=bdyuAtXHpAcVC9e6K7aiaHotImCXFPD53apmYQm2XQs=; b=RMEoTdEKx05sEXDNFeAw8fDeWAJgieFpI5sqOnpZjPlwGdvJjVaQZLqiQAHWAHhrMEdeFq 5qHixMAd9h2tnCQvj/pjj1a9QDWV3kqajXsiMRHx4zufChR4lSbDuGeArlvvArIqrT5Hpk dcR3hbDvcm9EFxHWYIQscaIYeOXEqn4= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-7CSnBzAQPi-FXB8Y1CqwOA-1; Tue, 25 Jun 2024 08:24:58 -0400 X-MC-Unique: 7CSnBzAQPi-FXB8Y1CqwOA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D54F319560AB; Tue, 25 Jun 2024 12:24:57 +0000 (UTC) Received: from dmarchan.redhat.com (unknown [10.45.225.3]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 990B51956087; Tue, 25 Jun 2024 12:24:56 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Sunil Uttarwar Subject: [PATCH 6/6] crypto/ccp: use a dynamic logtype Date: Tue, 25 Jun 2024 14:24:14 +0200 Message-ID: <20240625122414.1065829-7-david.marchand@redhat.com> In-Reply-To: <20240625122414.1065829-1-david.marchand@redhat.com> References: <20240625122414.1065829-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Register a logtype for this bus driver and stop logging as CRYPTODEV. Signed-off-by: David Marchand --- drivers/crypto/ccp/ccp_crypto.c | 4 ++-- drivers/crypto/ccp/ccp_pmd_private.h | 15 +++++---------- drivers/crypto/ccp/rte_ccp_pmd.c | 2 ++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c index 4b84b3303e..5899d83bae 100644 --- a/drivers/crypto/ccp/ccp_crypto.c +++ b/drivers/crypto/ccp/ccp_crypto.c @@ -1829,7 +1829,7 @@ ccp_perform_sha3_hmac(struct rte_crypto_op *op, append_ptr = (uint8_t *)rte_pktmbuf_append(op->sym->m_src, session->auth.ctx_len); if (!append_ptr) { - CCP_LOG_ERR("CCP MBUF append failed\n"); + CCP_LOG_ERR("CCP MBUF append failed"); return -1; } dest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr); @@ -1966,7 +1966,7 @@ ccp_perform_sha3(struct rte_crypto_op *op, append_ptr = (uint8_t *)rte_pktmbuf_append(op->sym->m_src, session->auth.ctx_len); if (!append_ptr) { - CCP_LOG_ERR("CCP MBUF append failed\n"); + CCP_LOG_ERR("CCP MBUF append failed"); return -1; } dest_addr = (phys_addr_t)rte_mem_virt2iova((void *)append_ptr); diff --git a/drivers/crypto/ccp/ccp_pmd_private.h b/drivers/crypto/ccp/ccp_pmd_private.h index 390442ff19..94c8fec46d 100644 --- a/drivers/crypto/ccp/ccp_pmd_private.h +++ b/drivers/crypto/ccp/ccp_pmd_private.h @@ -8,23 +8,18 @@ #include #include "ccp_crypto.h" -#define CRYPTODEV_NAME_CCP_PMD crypto_ccp +extern int crypto_ccp_logtype; +#define RTE_LOGTYPE_CRYPTO_CCP crypto_ccp_logtype #define CCP_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_CCP_PMD), \ - __func__, __LINE__, ## args) + RTE_LOG_LINE(ERR, CRYPTO_CCP, "%s() line %u: " fmt, __func__, __LINE__, ## args) #ifdef RTE_LIBRTE_CCP_DEBUG #define CCP_LOG_INFO(fmt, args...) \ - RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_CCP_PMD), \ - __func__, __LINE__, ## args) + RTE_LOG_LINE(INFO, CRYPTO_CCP, "%s() line %u: " fmt, __func__, __LINE__, ## args) #define CCP_LOG_DBG(fmt, args...) \ - RTE_LOG(DEBUG, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ - RTE_STR(CRYPTODEV_NAME_CCP_PMD), \ - __func__, __LINE__, ## args) + RTE_LOG_LINE(DEBUG, CRYPTO_CCP, "%s() line %u: " fmt, __func__, __LINE__, ## args) #else #define CCP_LOG_INFO(fmt, args...) #define CCP_LOG_DBG(fmt, args...) diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index 869399597e..022c1df182 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -22,6 +22,7 @@ static unsigned int ccp_pmd_init_done; uint8_t ccp_cryptodev_driver_id; uint8_t cryptodev_cnt; +int crypto_ccp_logtype; struct ccp_pmd_init_params { struct rte_cryptodev_pmd_init_params def_p; @@ -320,3 +321,4 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_CCP_PMD, "ccp_auth_opt="); RTE_PMD_REGISTER_CRYPTO_DRIVER(ccp_crypto_drv, cryptodev_ccp_pmd_drv.driver, ccp_cryptodev_driver_id); +RTE_LOG_REGISTER_DEFAULT(crypto_ccp_logtype, NOTICE); -- 2.45.2