From patchwork Thu Dec 21 16:46:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135456 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E9E1F43751; Thu, 21 Dec 2023 17:48:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94D0C406BA; Thu, 21 Dec 2023 17:48:55 +0100 (CET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id E412940689 for ; Thu, 21 Dec 2023 17:48:53 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d3ea5cc137so8414275ad.0 for ; Thu, 21 Dec 2023 08:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177333; x=1703782133; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O9n/R/0lVOtKuAC8rUs6nmjwU2eevo+EEd/nJaLzizA=; b=Os92PnawKkfnt6/ACbLTXCSJkuviZQE1t23cUKRJXleFs1ZNGJQu9LPhAhhpCU5ac0 PVCxI+dJ3j9s3VE7Nlb+et/kACrhBEs0HlgmulocK9OWepw4/pfS3w+puKltx6n9xtnq vcH8jWhkW95aJfzlTNs50gSTyXfwaTOB/8i8LAxjijglVbzsUeSbx8y2+MCJZkDa+cr4 mLUOl7/A1u1EanA1+cFaeLZDe7u+sd2IRHKrp500cxuiGWN77y3/ebmsYIqruziMMLM3 4S57F9sy0znbu3ZfRv7wvvg+8urBUq754L/4dRJxwrImOaWfiG8RCAP1queegpCJU1aL 8bPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177333; x=1703782133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O9n/R/0lVOtKuAC8rUs6nmjwU2eevo+EEd/nJaLzizA=; b=m+Gz5tQ2TGGh0N9wXT7uiNzEt0E/yhk8MHr9tj8mQM5pyLosKE4uTj2+Tu9tsp5Zib 1wg40ctY9hwAOnwhE3ReM1/+tS3OefULQGSPujqqBPjdTfIsQVL5pyswbjQS8Hli30Cq PnCOkJw2Bz9bPw0ocLv6dbKkcL4WFdn2VzKlsyhPwg4VelQLYDuU6upOZsJNue92NtLT I2ezjPchkJtfcR3FtJFQWJab1qEzvsi5hcMW3tkWylTQATM1IJpDM1clLYESydQoQ6Re iLkE6uyn0qzkNO/eEOnkPZkpchpARiXl3HAFKXXHG1M/zaTIzcVnJ+HhvSMSAOakI336 K17Q== X-Gm-Message-State: AOJu0YzfrIOvl5xh9b9pYhVuHPJGq7zPDV8qyLjjq1ASeorakxOrNtIw 0aob4jCB2RpPfw4DUdnXBb5uU4cyspx0sAVdyFFBMA== X-Google-Smtp-Source: AGHT+IEA3CgtmbMGZLgHbhWM/fzYB79ZKlENfJS3I1arYK+HvGulUY4DKJkXao1+BV1AiOY2Pw9WZw== X-Received: by 2002:a17:902:930b:b0:1d3:f33c:e2b4 with SMTP id bc11-20020a170902930b00b001d3f33ce2b4mr2592552plb.22.1703177332693; Thu, 21 Dec 2023 08:48:52 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.48.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:48:52 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: David Marchand , Gagandeep Singh , Hemant Agrawal , Nipun Gupta , Nikhil Agarwal , Sachin Saxena , Anoob Joseph , Jingjing Wu , Beilei Xing , Abdullah Sevincer , Igor Russkikh , Steven Webster , Matt Peters , Ajit Khaparde , Somnath Kotur , Ruifeng Wang , Bruce Richardson , Konstantin Ananyev , Apeksha Gupta , Junfeng Guo , Simei Su , Long Li , Vamsi Attunuru , Harman Kalra , Devendra Singh Rawat , Alok Prasad , Maxime Coquelin , Chenbo Xia , Jochen Behrens , Rosen Xu , Tianfei Zhang , Xiao Wang Subject: [PATCH v5 01/18] drivers: use dedicated logtypes Date: Thu, 21 Dec 2023 08:46:18 -0800 Message-ID: <20231221164841.125006-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 From: David Marchand When a driver dedicated logtype exists, use it instead of the generic PMD logtype. This has been done partially automatically with: $ for file in $(git grep -l RTE_LOG.*PMD.*fmt drivers/'**.h' \ :^drivers/common/cnxk/roc_platform.h) do tail=${file#drivers/*/*/} dir=${file%%$tail} ! git grep -q RTE_LOGTYPE_ $dir || \ { echo $dir already done; continue; } git grep -hE '^extern int .*log.*;$' $file | \ sed -ne 's/^extern int \([^ ;]*\);$/\1/p' | \ while read logtype do git grep -q 'RTE_LOG_REGISTER\(_DEFAULT\|\)('$logtype',' || \ [ "$logtype" != "${logtype%%driver}" ] || \ { echo Skipped $logtype; continue; } abbrev=$(echo $logtype | sed -e 's/_logtype//' | tr '[a-z]' '[A-Z]') sed -i -e 's/^\(extern int '$logtype'.*\)$/\1\n#define RTE_LOGTYPE_' \ $abbrev' '$logtype'/' $file sed -i -e 's/\(RTE_LOG.*, \)PMD,/\1'$abbrev',/' $file break done done Then a manual update for: - common/cpt, - common/dpaax, - common/idpf, - mempool/dpaa, - net/bnxt, - net/octeon_ep, - raw/ifpga, - vdpa/ifc, Signed-off-by: David Marchand --- drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h | 3 ++- drivers/bus/cdx/cdx_logs.h | 3 ++- drivers/bus/fslmc/fslmc_logs.h | 3 ++- drivers/common/cpt/cpt_pmd_logs.h | 6 +++--- drivers/common/dpaax/caamflib/compat.h | 4 +++- drivers/common/dpaax/dpaax_logs.h | 3 ++- drivers/common/dpaax/version.map | 1 + drivers/common/idpf/idpf_common_logs.h | 5 +++-- drivers/crypto/caam_jr/caam_jr_log.h | 3 ++- drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 3 ++- drivers/crypto/dpaa_sec/dpaa_sec_log.h | 3 ++- drivers/dma/dpaa/dpaa_qdma_logs.h | 3 ++- drivers/dma/dpaa2/dpaa2_qdma_logs.h | 3 ++- drivers/event/dlb2/dlb2_log.h | 3 ++- drivers/event/dpaa2/dpaa2_eventdev_logs.h | 3 ++- drivers/mempool/dpaa/dpaa_mempool.c | 1 + drivers/mempool/dpaa/dpaa_mempool.h | 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 3 ++- drivers/net/atlantic/atl_logs.h | 5 +++-- drivers/net/avp/avp_logs.h | 5 +++-- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_rxtx_vec_neon.c | 2 +- drivers/net/bnxt/bnxt_rxtx_vec_sse.c | 2 +- drivers/net/bnxt/bnxt_txr.c | 2 +- drivers/net/dpaa/dpaa_ethdev.h | 3 ++- drivers/net/dpaa2/dpaa2_pmd_logs.h | 3 ++- drivers/net/enetc/enetc_logs.h | 3 ++- drivers/net/enetfec/enet_pmd_logs.h | 3 ++- drivers/net/igc/igc_logs.h | 5 +++-- drivers/net/mana/mana.h | 3 ++- drivers/net/octeon_ep/otx_ep_common.h | 2 ++ drivers/net/octeon_ep/otx_ep_rxtx.c | 2 +- drivers/net/octeontx/octeontx_logs.h | 3 ++- drivers/net/pfe/pfe_logs.h | 3 ++- drivers/net/qede/qede_logs.h | 5 +++-- drivers/net/virtio/virtio_logs.h | 5 +++-- drivers/net/vmxnet3/vmxnet3_logs.h | 7 ++++--- drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h | 3 ++- drivers/raw/ifpga/base/osdep_rte/osdep_generic.h | 5 ++++- drivers/vdpa/ifc/base/ifcvf.c | 10 +++++----- drivers/vdpa/ifc/base/ifcvf_osdep.h | 7 +++++-- 41 files changed, 92 insertions(+), 52 deletions(-) diff --git a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h index 452435ccb942..49c8d35d104d 100644 --- a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h +++ b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h @@ -6,6 +6,7 @@ #define _BBDEV_LA12XX_PMD_LOGS_H_ extern int bbdev_la12xx_logtype; +#define RTE_LOGTYPE_BBDEV_LA12XX bbdev_la12xx_logtype #define rte_bbdev_log(level, fmt, ...) \ rte_log(RTE_LOG_ ## level, bbdev_la12xx_logtype, fmt "\n", \ @@ -23,6 +24,6 @@ extern int bbdev_la12xx_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define rte_bbdev_dp_log(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, BBDEV_LA12XX, fmt, ## args) #endif /* _BBDEV_LA12XX_PMD_LOGS_H_ */ diff --git a/drivers/bus/cdx/cdx_logs.h b/drivers/bus/cdx/cdx_logs.h index a1046ce544a6..3a56e814d0fd 100644 --- a/drivers/bus/cdx/cdx_logs.h +++ b/drivers/bus/cdx/cdx_logs.h @@ -6,6 +6,7 @@ #define CDX_LOGS_H extern int cdx_logtype_bus; +#define RTE_LOGTYPE_CDX_BUS cdx_logtype_bus #define CDX_BUS_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, cdx_logtype_bus, "cdx: " fmt "\n", \ @@ -25,7 +26,7 @@ extern int cdx_logtype_bus; /* DP Logs, toggled out at compile time if level lower than current level */ #define CDX_BUS_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, CDX_BUS, fmt, ## args) #define CDX_BUS_DP_DEBUG(fmt, args...) \ CDX_BUS_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h index a1e14dd84e9a..37c6852ddd72 100644 --- a/drivers/bus/fslmc/fslmc_logs.h +++ b/drivers/bus/fslmc/fslmc_logs.h @@ -8,6 +8,7 @@ #define _FSLMC_LOGS_H_ extern int dpaa2_logtype_bus; +#define RTE_LOGTYPE_DPAA2_BUS dpaa2_logtype_bus #define DPAA2_BUS_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_logtype_bus, "fslmc: " fmt "\n", \ @@ -27,7 +28,7 @@ extern int dpaa2_logtype_bus; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_BUS_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA2_BUS, fmt, ## args) #define DPAA2_BUS_DP_DEBUG(fmt, args...) \ DPAA2_BUS_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/common/cpt/cpt_pmd_logs.h b/drivers/common/cpt/cpt_pmd_logs.h index 174326c6ce38..3c109c1983ca 100644 --- a/drivers/common/cpt/cpt_pmd_logs.h +++ b/drivers/common/cpt/cpt_pmd_logs.h @@ -15,6 +15,8 @@ * otx*_cryptodev.h file would define the CPT_LOGTYPE macro for the * platform. */ +#define RTE_LOGTYPE_CPT CPT_LOGTYPE + #define CPT_PMD_DRV_LOG_RAW(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, CPT_LOGTYPE, \ "cpt: %s(): " fmt "\n", __func__, ##args) @@ -30,11 +32,9 @@ /* * DP logs, toggled out at compile time if level lower than current level. - * DP logs would be logged under 'PMD' type. So for dynamic logging, the - * level of 'pmd' has to be used. */ #define CPT_LOG_DP(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + RTE_LOG_DP(level, CPT, fmt "\n", ## args) #define CPT_LOG_DP_DEBUG(fmt, args...) \ CPT_LOG_DP(DEBUG, fmt, ## args) diff --git a/drivers/common/dpaax/caamflib/compat.h b/drivers/common/dpaax/caamflib/compat.h index 9776eed437ad..43da6a4fe32f 100644 --- a/drivers/common/dpaax/caamflib/compat.h +++ b/drivers/common/dpaax/caamflib/compat.h @@ -20,6 +20,8 @@ #include #include +#include "dpaax_logs.h" + #ifndef __BYTE_ORDER__ #error "Undefined endianness" #endif @@ -44,7 +46,7 @@ #define pr_msg(l, fmt, ...) do { } while (0) #else #define pr_msg(l, fmt, ...) \ - RTE_LOG(l, PMD, "%s(): " fmt "\n", __func__, ##__VA_ARGS__) + RTE_LOG(l, DPAAX_LOGGER, "%s(): " fmt "\n", __func__, ##__VA_ARGS__) #endif #if !defined(pr_debug) diff --git a/drivers/common/dpaax/dpaax_logs.h b/drivers/common/dpaax/dpaax_logs.h index 180476f6757c..c405c60992c8 100644 --- a/drivers/common/dpaax/dpaax_logs.h +++ b/drivers/common/dpaax/dpaax_logs.h @@ -8,6 +8,7 @@ #include extern int dpaax_logger; +#define RTE_LOGTYPE_DPAAX_LOGGER dpaax_logger #ifdef RTE_LIBRTE_DPAAX_DEBUG #define DPAAX_HWWARN(cond, fmt, args...) \ @@ -37,7 +38,7 @@ extern int dpaax_logger; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAAX_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAAX_LOGGER, fmt, ## args) #define DPAAX_DP_DEBUG(fmt, args...) \ DPAAX_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/common/dpaax/version.map b/drivers/common/dpaax/version.map index ee1ca6801c81..d48a6b6f37ee 100644 --- a/drivers/common/dpaax/version.map +++ b/drivers/common/dpaax/version.map @@ -6,6 +6,7 @@ INTERNAL { dpaax_iova_table_p; dpaax_iova_table_populate; dpaax_iova_table_update; + dpaax_logger; of_device_is_available; of_device_is_compatible; of_find_compatible_node; diff --git a/drivers/common/idpf/idpf_common_logs.h b/drivers/common/idpf/idpf_common_logs.h index f6be84ceb549..e638c616d8f5 100644 --- a/drivers/common/idpf/idpf_common_logs.h +++ b/drivers/common/idpf/idpf_common_logs.h @@ -8,6 +8,7 @@ #include extern int idpf_common_logtype; +#define RTE_LOGTYPE_IDPF_COMMON idpf_common_logtype #define DRV_LOG_RAW(level, ...) \ rte_log(RTE_LOG_ ## level, \ @@ -23,7 +24,7 @@ extern int idpf_common_logtype; #ifdef RTE_LIBRTE_IDPF_DEBUG_RX #define RX_LOG(level, ...) \ RTE_LOG(level, \ - PMD, \ + IDPF_COMMON, \ RTE_FMT("%s(): " \ RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ __func__, \ @@ -35,7 +36,7 @@ extern int idpf_common_logtype; #ifdef RTE_LIBRTE_IDPF_DEBUG_TX #define TX_LOG(level, ...) \ RTE_LOG(level, \ - PMD, \ + IDPF_COMMON, \ RTE_FMT("%s(): " \ RTE_FMT_HEAD(__VA_ARGS__,) "\n", \ __func__, \ diff --git a/drivers/crypto/caam_jr/caam_jr_log.h b/drivers/crypto/caam_jr/caam_jr_log.h index 106ff07a70fe..8f6aa50e2a4a 100644 --- a/drivers/crypto/caam_jr/caam_jr_log.h +++ b/drivers/crypto/caam_jr/caam_jr_log.h @@ -8,6 +8,7 @@ #include extern int caam_jr_logtype; +#define RTE_LOGTYPE_CAAM_JR caam_jr_logtype #define CAAM_JR_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, caam_jr_logtype, "caam_jr: " \ @@ -28,7 +29,7 @@ extern int caam_jr_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define CAAM_JR_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + RTE_LOG_DP(level, CAAM_JR, fmt "\n", ## args) #define CAAM_JR_DP_DEBUG(fmt, args...) \ CAAM_JR_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h index c2e11f9516f9..ee692095045a 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h @@ -9,6 +9,7 @@ #define _DPAA2_SEC_LOGS_H_ extern int dpaa2_logtype_sec; +#define RTE_LOGTYPE_DPAA2_SEC dpaa2_logtype_sec #define DPAA2_SEC_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_logtype_sec, "dpaa2_sec: " \ @@ -29,7 +30,7 @@ extern int dpaa2_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA2_SEC, fmt, ## args) #define DPAA2_SEC_DP_DEBUG(fmt, args...) \ DPAA2_SEC_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_log.h b/drivers/crypto/dpaa_sec/dpaa_sec_log.h index fb895a8bc67f..f8c85b6528a9 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h @@ -9,6 +9,7 @@ #define _DPAA_SEC_LOG_H_ extern int dpaa_logtype_sec; +#define RTE_LOGTYPE_DPAA_SEC dpaa_logtype_sec #define DPAA_SEC_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa_logtype_sec, "dpaa_sec: " \ @@ -29,7 +30,7 @@ extern int dpaa_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA_SEC, fmt, ## args) #define DPAA_SEC_DP_DEBUG(fmt, args...) \ DPAA_SEC_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/dma/dpaa/dpaa_qdma_logs.h b/drivers/dma/dpaa/dpaa_qdma_logs.h index 762598f8f72f..95753dcd89b0 100644 --- a/drivers/dma/dpaa/dpaa_qdma_logs.h +++ b/drivers/dma/dpaa/dpaa_qdma_logs.h @@ -6,6 +6,7 @@ #define __DPAA_QDMA_LOGS_H__ extern int dpaa_qdma_logtype; +#define RTE_LOGTYPE_DPAA_QDMA dpaa_qdma_logtype #define DPAA_QDMA_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa_qdma_logtype, "dpaa_qdma: " \ @@ -26,7 +27,7 @@ extern int dpaa_qdma_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA_QDMA_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "dpaa_qdma: " fmt "\n", ## args) + RTE_LOG_DP(level, DPAA_QDMA, "dpaa_qdma: " fmt "\n", ## args) #define DPAA_QDMA_DP_DEBUG(fmt, args...) \ DPAA_QDMA_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/dma/dpaa2/dpaa2_qdma_logs.h b/drivers/dma/dpaa2/dpaa2_qdma_logs.h index a46b8f24b5a7..37a5a5c6e974 100644 --- a/drivers/dma/dpaa2/dpaa2_qdma_logs.h +++ b/drivers/dma/dpaa2/dpaa2_qdma_logs.h @@ -10,6 +10,7 @@ extern "C" { #endif extern int dpaa2_qdma_logtype; +#define RTE_LOGTYPE_DPAA2_QDMA dpaa2_qdma_logtype #define DPAA2_QDMA_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_qdma_logtype, "dpaa2_qdma: " \ @@ -30,7 +31,7 @@ extern int dpaa2_qdma_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_QDMA_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "dpaa2_qdma: " fmt "\n", ## args) + RTE_LOG_DP(level, DPAA2_QDMA, "dpaa2_qdma: " fmt "\n", ## args) #define DPAA2_QDMA_DP_DEBUG(fmt, args...) \ DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/event/dlb2/dlb2_log.h b/drivers/event/dlb2/dlb2_log.h index dc1481ef870c..54d6a3011f25 100644 --- a/drivers/event/dlb2/dlb2_log.h +++ b/drivers/event/dlb2/dlb2_log.h @@ -6,6 +6,7 @@ #define _DLB2_EVDEV_LOG_H_ extern int eventdev_dlb2_log_level; +#define RTE_LOGTYPE_EVENTDEV_DLB2_LOG_LEVEL eventdev_dlb2_log_level /* Dynamic logging */ #define DLB2_LOG_IMPL(level, fmt, args...) \ @@ -20,6 +21,6 @@ extern int eventdev_dlb2_log_level; /* remove debug logs at compile time unless actually debugging */ #define DLB2_LOG_DBG(fmt, args...) \ - RTE_LOG_DP(DEBUG, PMD, fmt, ## args) + RTE_LOG_DP(DEBUG, EVENTDEV_DLB2_LOG_LEVEL, fmt, ## args) #endif /* _DLB2_EVDEV_LOG_H_ */ diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h index 66c8c772740d..ae221e7e1524 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h +++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h @@ -6,6 +6,7 @@ #define _DPAA2_EVENTDEV_LOGS_H_ extern int dpaa2_logtype_event; +#define RTE_LOGTYPE_DPAA2_EVENT dpaa2_logtype_event #define DPAA2_EVENTDEV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_logtype_event, "dpaa2_event: " \ @@ -26,7 +27,7 @@ extern int dpaa2_logtype_event; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_EVENTDEV_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA2_EVENT, fmt, ## args) #define DPAA2_EVENTDEV_DP_DEBUG(fmt, args...) \ DPAA2_EVENTDEV_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c index 32639a3bfdab..0b484b3d9c7d 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.c +++ b/drivers/mempool/dpaa/dpaa_mempool.c @@ -38,6 +38,7 @@ struct dpaa_memseg_list rte_dpaa_memsegs struct dpaa_bp_info *rte_dpaa_bpid_info; RTE_LOG_REGISTER_DEFAULT(dpaa_logtype_mempool, NOTICE); +#define RTE_LOGTYPE_DPAA_MEMPOOL dpaa_logtype_mempool static int dpaa_mbuf_create_pool(struct rte_mempool *mp) diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 3f0eafa7dd7b..153fefd507f9 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.h +++ b/drivers/mempool/dpaa/dpaa_mempool.h @@ -67,7 +67,7 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info; #define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>") #define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \ - RTE_LOG_DP(DEBUG, PMD, fmt, ## args) + RTE_LOG_DP(DEBUG, DPAA_MEMPOOL, fmt, ## args) #define DPAA_MEMPOOL_DEBUG(fmt, args...) \ DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args) #define DPAA_MEMPOOL_ERR(fmt, args...) \ diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h index 986264319623..fbc8cb30a284 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h @@ -6,6 +6,7 @@ #define _DPAA2_HW_MEMPOOL_LOGS_H_ extern int dpaa2_logtype_mempool; +#define RTE_LOGTYPE_DPAA2_MEMPOOL dpaa2_logtype_mempool #define DPAA2_MEMPOOL_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_logtype_mempool, \ @@ -25,7 +26,7 @@ extern int dpaa2_logtype_mempool; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_MEMPOOL_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA2_MEMPOOL, fmt, ## args) #define DPAA2_MEMPOOL_DP_DEBUG(fmt, args...) \ DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/atlantic/atl_logs.h b/drivers/net/atlantic/atl_logs.h index e3dba334fe92..14a7a1de1d5a 100644 --- a/drivers/net/atlantic/atl_logs.h +++ b/drivers/net/atlantic/atl_logs.h @@ -15,12 +15,13 @@ extern int atl_logtype_init; #define PMD_INIT_FUNC_TRACE() PMD_INIT_LOG(DEBUG, " >>") #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG_DP(level, ATL_DRIVER, "%s(): " fmt "\n", __func__, ## args) #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG_DP(level, ATL_DRIVER, "%s(): " fmt "\n", __func__, ## args) extern int atl_logtype_driver; +#define RTE_LOGTYPE_ATL_DRIVER atl_logtype_driver #define PMD_DRV_LOG_RAW(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, atl_logtype_driver, "%s(): " fmt, \ __func__, ## args) diff --git a/drivers/net/avp/avp_logs.h b/drivers/net/avp/avp_logs.h index 6e297c7a4a81..574b720b3050 100644 --- a/drivers/net/avp/avp_logs.h +++ b/drivers/net/avp/avp_logs.h @@ -9,19 +9,20 @@ #ifdef RTE_LIBRTE_AVP_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() rx: " fmt, __func__, ## args) + RTE_LOG(level, AVP_DRIVER, "%s() rx: " fmt, __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_LIBRTE_AVP_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() tx: " fmt, __func__, ## args) + RTE_LOG(level, AVP_DRIVER, "%s() tx: " fmt, __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif extern int avp_logtype_driver; +#define RTE_LOGTYPE_AVP_DRIVER avp_logtype_driver #define PMD_DRV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, avp_logtype_driver, \ diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 0e01b1d4baea..61cc34417631 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -1051,6 +1051,7 @@ extern const struct rte_flow_ops bnxt_flow_meter_ops; ((eth_dev)->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) extern int bnxt_logtype_driver; +#define RTE_LOGTYPE_BNXT bnxt_logtype_driver #define PMD_DRV_LOG_RAW(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, bnxt_logtype_driver, "%s(): " fmt, \ __func__, ## args) diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c index aa1b1ab8bb7e..775400f21ced 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c @@ -357,7 +357,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, + RTE_LOG_DP(ERR, BNXT, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c index e99a547f5857..8ef51ce79a71 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c +++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c @@ -326,7 +326,7 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq) if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2)) nb_tx_pkts += txcmp->opaque; else - RTE_LOG_DP(ERR, PMD, + RTE_LOG_DP(ERR, BNXT, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 899986764f93..04e74587cb06 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -542,7 +542,7 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq) if (CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2) nb_tx_pkts += opaque; else - RTE_LOG_DP(ERR, PMD, + RTE_LOG_DP(ERR, BNXT, "Unhandled CMP type %02x\n", CMP_TYPE(txcmp)); raw_cons = NEXT_RAW_CMP(raw_cons); diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 5b6802ece8f0..b6c61b8b6b08 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -214,6 +214,7 @@ dpaa_rx_cb_atomic(void *event, /* PMD related logs */ extern int dpaa_logtype_pmd; +#define RTE_LOGTYPE_DPAA_PMD dpaa_logtype_pmd #define DPAA_PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa_logtype_pmd, "%s(): " fmt "\n", \ @@ -232,6 +233,6 @@ extern int dpaa_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA_PMD, fmt, ## args) #endif diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h b/drivers/net/dpaa2/dpaa2_pmd_logs.h index c47ba8e10bfc..af895a6b6e7b 100644 --- a/drivers/net/dpaa2/dpaa2_pmd_logs.h +++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h @@ -6,6 +6,7 @@ #define _DPAA2_PMD_LOGS_H_ extern int dpaa2_logtype_pmd; +#define RTE_LOGTYPE_DPAA2_PMD dpaa2_logtype_pmd #define DPAA2_PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_logtype_pmd, "dpaa2_net: " \ @@ -28,7 +29,7 @@ extern int dpaa2_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_PMD_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, DPAA2_PMD, fmt, ## args) #define DPAA2_PMD_DP_DEBUG(fmt, args...) \ DPAA2_PMD_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h index 0976d42debd7..63f6ca4cf48a 100644 --- a/drivers/net/enetc/enetc_logs.h +++ b/drivers/net/enetc/enetc_logs.h @@ -6,6 +6,7 @@ #define _ENETC_LOGS_H_ extern int enetc_logtype_pmd; +#define RTE_LOGTYPE_ENETC_PMD enetc_logtype_pmd #define ENETC_PMD_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, enetc_logtype_pmd, "enetc_net: " \ @@ -30,7 +31,7 @@ extern int enetc_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETC_PMD_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, ENETC_PMD, fmt, ## args) #define ENETC_PMD_DP_DEBUG(fmt, args...) \ ENETC_PMD_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/enetfec/enet_pmd_logs.h b/drivers/net/enetfec/enet_pmd_logs.h index 72d1cb61c598..270981373f53 100644 --- a/drivers/net/enetfec/enet_pmd_logs.h +++ b/drivers/net/enetfec/enet_pmd_logs.h @@ -8,6 +8,7 @@ #include extern int enetfec_logtype_pmd; +#define RTE_LOGTYPE_ENETFEC_PMD enetfec_logtype_pmd /* PMD related logs */ #define ENETFEC_PMD_LOG(level, fmt, args...) \ @@ -28,6 +29,6 @@ extern int enetfec_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define ENETFEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, ENETFEC_PMD, fmt, ## args) #endif /* _ENETFEC_LOGS_H_ */ diff --git a/drivers/net/igc/igc_logs.h b/drivers/net/igc/igc_logs.h index 11071a32b542..cca5389eff8e 100644 --- a/drivers/net/igc/igc_logs.h +++ b/drivers/net/igc/igc_logs.h @@ -13,6 +13,7 @@ extern "C" { extern int igc_logtype_init; extern int igc_logtype_driver; +#define RTE_LOGTYPE_IGC_DRIVER igc_logtype_driver #define PMD_INIT_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, igc_logtype_init, \ @@ -22,14 +23,14 @@ extern int igc_logtype_driver; #ifdef RTE_ETHDEV_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG(level, IGC_DRIVER, "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while (0) #endif #ifdef RTE_ETHDEV_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG(level, IGC_DRIVER, "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) #endif diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h index 6836872dc257..6d4770dc3e96 100644 --- a/drivers/net/mana/mana.h +++ b/drivers/net/mana/mana.h @@ -460,6 +460,7 @@ struct mana_rxq { }; extern int mana_logtype_driver; +#define RTE_LOGTYPE_MANA_DRIVER mana_logtype_driver extern int mana_logtype_init; #define DRV_LOG(level, fmt, args...) \ @@ -467,7 +468,7 @@ extern int mana_logtype_init; __func__, ## args) #define DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt "\n", ## args) + RTE_LOG_DP(level, MANA_DRIVER, fmt "\n", ## args) #define PMD_INIT_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, mana_logtype_init, "%s(): " fmt "\n",\ diff --git a/drivers/net/octeon_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h index 82e57520d38d..d5074b74e4ae 100644 --- a/drivers/net/octeon_ep/otx_ep_common.h +++ b/drivers/net/octeon_ep/otx_ep_common.h @@ -598,4 +598,6 @@ int otx_ep_delete_oqs(struct otx_ep_device *otx_ep, uint32_t oq_no); #define PCI_VENDOR_ID_CAVIUM 0x177D extern int otx_net_ep_logtype; +#define RTE_LOGTYPE_OTX_NET_EP otx_net_ep_logtype + #endif /* _OTX_EP_COMMON_H_ */ diff --git a/drivers/net/octeon_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c index c421ef0a1c04..a6a71fdbfd47 100644 --- a/drivers/net/octeon_ep/otx_ep_rxtx.c +++ b/drivers/net/octeon_ep/otx_ep_rxtx.c @@ -884,7 +884,7 @@ otx_ep_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) next_fetch = (pkts == new_pkts - 1) ? 0 : 1; oq_pkt = otx_ep_droq_read_packet(otx_ep, droq, next_fetch); if (!oq_pkt) { - RTE_LOG_DP(ERR, PMD, + RTE_LOG_DP(ERR, OTX_NET_EP, "DROQ read pkt failed pending %" PRIu64 "last_pkt_count %" PRIu64 "new_pkts %d.\n", droq->pkts_pending, droq->last_pkt_count, diff --git a/drivers/net/octeontx/octeontx_logs.h b/drivers/net/octeontx/octeontx_logs.h index dec8042c67ba..b58f296478c9 100644 --- a/drivers/net/octeontx/octeontx_logs.h +++ b/drivers/net/octeontx/octeontx_logs.h @@ -20,7 +20,7 @@ "%s(): " fmt "\n", __func__, ## args) #define octeontx_log_info(fmt, args...) \ - RTE_LOG(INFO, PMD, fmt "\n", ## args) + RTE_LOG(INFO, OTX_NET_DRIVER, fmt "\n", ## args) #define octeontx_log_err(s, ...) PMD_INIT_LOG(ERR, s, ##__VA_ARGS__) #define octeontx_log_dbg(s, ...) PMD_DRV_LOG(DEBUG, s, ##__VA_ARGS__) @@ -31,6 +31,7 @@ extern int otx_net_logtype_init; extern int otx_net_logtype_driver; +#define RTE_LOGTYPE_OTX_NET_DRIVER otx_net_logtype_driver extern int otx_net_logtype_mbox; #endif /* __OCTEONTX_LOGS_H__*/ diff --git a/drivers/net/pfe/pfe_logs.h b/drivers/net/pfe/pfe_logs.h index 58d5e8e7cff1..369a50bec567 100644 --- a/drivers/net/pfe/pfe_logs.h +++ b/drivers/net/pfe/pfe_logs.h @@ -6,6 +6,7 @@ #define _PFE_LOGS_H_ extern int pfe_logtype_pmd; +#define RTE_LOGTYPE_PFE_PMD pfe_logtype_pmd /* PMD related logs */ #define PFE_PMD_LOG(level, fmt, args...) \ @@ -26,6 +27,6 @@ extern int pfe_logtype_pmd; /* DP Logs, toggled out at compile time if level lower than current level */ #define PFE_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + RTE_LOG_DP(level, PFE_PMD, fmt, ## args) #endif /* _PFE_LOGS_H_ */ diff --git a/drivers/net/qede/qede_logs.h b/drivers/net/qede/qede_logs.h index 3187d97bb7b0..f67052d10646 100644 --- a/drivers/net/qede/qede_logs.h +++ b/drivers/net/qede/qede_logs.h @@ -8,6 +8,7 @@ #define _QEDE_LOGS_H_ extern int qede_logtype_driver; +#define RTE_LOGTYPE_QEDE_DRIVER qede_logtype_driver #define DP_ERR(p_dev, fmt, ...) \ rte_log(RTE_LOG_ERR, qede_logtype_driver, \ @@ -59,7 +60,7 @@ extern int qede_logtype_init; #ifdef RTE_LIBRTE_QEDE_DEBUG_TX #define PMD_TX_LOG(level, q, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): port=%u queue=%u " fmt "\n", \ + RTE_LOG(level, QEDE_DRIVER, "%s(): port=%u queue=%u " fmt "\n", \ __func__, q->port_id, q->queue_id, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while (0) @@ -67,7 +68,7 @@ extern int qede_logtype_init; #ifdef RTE_LIBRTE_QEDE_DEBUG_RX #define PMD_RX_LOG(level, q, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): port=%u queue=%u " fmt "\n", \ + RTE_LOG(level, QEDE_DRIVER, "%s(): port=%u queue=%u " fmt "\n", \ __func__, q->port_id, q->queue_id, ## args) #else #define PMD_RX_LOG(level, q, fmt, args...) do { } while (0) diff --git a/drivers/net/virtio/virtio_logs.h b/drivers/net/virtio/virtio_logs.h index 9b1b1defc5a6..01911514bd45 100644 --- a/drivers/net/virtio/virtio_logs.h +++ b/drivers/net/virtio/virtio_logs.h @@ -16,19 +16,20 @@ extern int virtio_logtype_init; #ifdef RTE_LIBRTE_VIRTIO_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() rx: " fmt "\n", __func__, ## args) + RTE_LOG(level, VIRTIO_DRIVER, "%s() rx: " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while(0) #endif #ifdef RTE_LIBRTE_VIRTIO_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s() tx: " fmt "\n", __func__, ## args) + RTE_LOG(level, VIRTIO_DRIVER, "%s() tx: " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while(0) #endif extern int virtio_logtype_driver; +#define RTE_LOGTYPE_VIRTIO_DRIVER virtio_logtype_driver #define PMD_DRV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, virtio_logtype_driver, \ "%s(): " fmt "\n", __func__, ## args) diff --git a/drivers/net/vmxnet3/vmxnet3_logs.h b/drivers/net/vmxnet3/vmxnet3_logs.h index 74154e3a1a6d..e2127988f6fa 100644 --- a/drivers/net/vmxnet3/vmxnet3_logs.h +++ b/drivers/net/vmxnet3/vmxnet3_logs.h @@ -13,26 +13,27 @@ extern int vmxnet3_logtype_init; #ifdef RTE_LIBRTE_VMXNET3_DEBUG_RX #define PMD_RX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG(level, VMXNET3_DRIVER, "%s(): " fmt "\n", __func__, ## args) #else #define PMD_RX_LOG(level, fmt, args...) do { } while(0) #endif #ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX #define PMD_TX_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG(level, VMXNET3_DRIVER, "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_LOG(level, fmt, args...) do { } while(0) #endif #ifdef RTE_LIBRTE_VMXNET3_DEBUG_TX_FREE #define PMD_TX_FREE_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + RTE_LOG(level, VMXNET3_DRIVER, "%s(): " fmt "\n", __func__, ## args) #else #define PMD_TX_FREE_LOG(level, fmt, args...) do { } while(0) #endif extern int vmxnet3_logtype_driver; +#define RTE_LOGTYPE_VMXNET3_DRIVER vmxnet3_logtype_driver #define PMD_DRV_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, vmxnet3_logtype_driver, \ "%s(): " fmt "\n", __func__, ## args) diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h index 8991e8327d68..f5f2455413f0 100644 --- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h +++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif_logs.h @@ -10,6 +10,7 @@ extern "C" { #endif extern int dpaa2_cmdif_logtype; +#define RTE_LOGTYPE_DPAA2_CMDIF dpaa2_cmdif_logtype #define DPAA2_CMDIF_LOG(level, fmt, args...) \ rte_log(RTE_LOG_ ## level, dpaa2_cmdif_logtype, "dpaa2_cmdif: " \ @@ -30,7 +31,7 @@ extern int dpaa2_cmdif_logtype; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_CMDIF_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, "dpaa2_cmdif: " fmt "\n", ## args) + RTE_LOG_DP(level, DPAA2_CMDIF, "dpaa2_cmdif: " fmt "\n", ## args) #define DPAA2_CMDIF_DP_DEBUG(fmt, args...) \ DPAA2_CMDIF_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h index 33041c907e19..62c5666ca948 100644 --- a/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h +++ b/drivers/raw/ifpga/base/osdep_rte/osdep_generic.h @@ -16,8 +16,11 @@ #include #include +extern int ifpga_rawdev_logtype; +#define RTE_LOGTYPE_IFPGA_RAWDEV ifpga_rawdev_logtype + #define dev_printf(level, fmt, args...) \ - RTE_LOG(level, PMD, "osdep_rte: " fmt, ## args) + RTE_LOG(level, IFPGA_RAWDEV, "osdep_rte: " fmt, ## args) #define osdep_panic(...) rte_panic(...) diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c index 53e982a52e9d..8479172bfa53 100644 --- a/drivers/vdpa/ifc/base/ifcvf.c +++ b/drivers/vdpa/ifc/base/ifcvf.c @@ -224,10 +224,10 @@ ifcvf_enable_mq(struct ifcvf_hw *hw) if (mq_cfg) { if (hw->device_type == IFCVF_BLK) { *(u32 *)mq_cfg = nr_queue; - RTE_LOG(INFO, PMD, "%d queues are enabled\n", nr_queue); + RTE_LOG(INFO, IFCVF_VDPA, "%d queues are enabled\n", nr_queue); } else { *(u32 *)mq_cfg = nr_queue / 2; - RTE_LOG(INFO, PMD, "%d queue pairs are enabled\n", + RTE_LOG(INFO, IFCVF_VDPA, "%d queue pairs are enabled\n", nr_queue / 2); } } @@ -246,7 +246,7 @@ ifcvf_enable_vring_hw(struct ifcvf_hw *hw, int i) cfg = hw->common_cfg; if (!cfg) { - RTE_LOG(ERR, PMD, "common_cfg in HW is NULL.\n"); + RTE_LOG(ERR, IFCVF_VDPA, "common_cfg in HW is NULL.\n"); return -1; } @@ -258,7 +258,7 @@ ifcvf_enable_vring_hw(struct ifcvf_hw *hw, int i) IFCVF_WRITE_REG16(i + 1, &cfg->queue_msix_vector); msix_vector = IFCVF_READ_REG16(&cfg->queue_msix_vector); if (msix_vector == IFCVF_MSI_NO_VECTOR) { - RTE_LOG(ERR, PMD, "queue %d, msix vec alloc failed\n", + RTE_LOG(ERR, IFCVF_VDPA, "queue %d, msix vec alloc failed\n", i); return -1; } @@ -307,7 +307,7 @@ ifcvf_disable_vring_hw(struct ifcvf_hw *hw, int i) cfg = hw->common_cfg; if (!cfg) { - RTE_LOG(ERR, PMD, "common_cfg in HW is NULL.\n"); + RTE_LOG(ERR, IFCVF_VDPA, "common_cfg in HW is NULL.\n"); return; } diff --git a/drivers/vdpa/ifc/base/ifcvf_osdep.h b/drivers/vdpa/ifc/base/ifcvf_osdep.h index dd2ff08f77cc..ba7d684c25bc 100644 --- a/drivers/vdpa/ifc/base/ifcvf_osdep.h +++ b/drivers/vdpa/ifc/base/ifcvf_osdep.h @@ -13,8 +13,11 @@ #include #include -#define WARNINGOUT(S, args...) RTE_LOG(WARNING, PMD, S, ##args) -#define DEBUGOUT(S, args...) RTE_LOG(DEBUG, PMD, S, ##args) +extern int ifcvf_vdpa_logtype; +#define RTE_LOGTYPE_IFCVF_VDPA ifcvf_vdpa_logtype + +#define WARNINGOUT(S, args...) RTE_LOG(WARNING, IFCVF_VDPA, S, ##args) +#define DEBUGOUT(S, args...) RTE_LOG(DEBUG, IFCVF_VDPA, S, ##args) #define STATIC static #define msec_delay(x) rte_delay_us_sleep(1000 * (x)) From patchwork Thu Dec 21 16:46:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135457 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F70C43751; Thu, 21 Dec 2023 17:49:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23BBA42D95; Thu, 21 Dec 2023 17:48:58 +0100 (CET) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mails.dpdk.org (Postfix) with ESMTP id 77F38406A2 for ; Thu, 21 Dec 2023 17:48:54 +0100 (CET) Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-5c699b44dddso478286a12.1 for ; Thu, 21 Dec 2023 08:48:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177333; x=1703782133; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YyBqO/sb6UeQ4NeBuhZ1nXTlTFjLIN4jayiZCG0GWMs=; b=XcTyZlmvK2WrksxSYGYNUeFVMUYtzzcEOqAKDxnZWeFO02FqyGpjgeuijFps1bsezX 5RC5mLauIBTUeEdJ8bq8kTLBUuaXwcCcLs/s9LQxCWhJaFa6D8Mnarn3TVrdQQ45Rd8J T/w8dq3tUC3uCSH7jtSKzgH0CBVR0F9Hd6vfgI3va2y++oscTV/lux9sGtbDd2VU/nfQ 8GZYiKGESMOnMi6bvrgEJ9U+w2cKmsoKfOo1l9o7Ns++kNCsBXvA9/X0RDFsCK1ts93r C/F/6N+0gYlgdqsQ10NErYKsfeWz9bY7+BdyVPqioVEogaWV5DYVoWvx2RNm/QivGCV8 jGcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177333; x=1703782133; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YyBqO/sb6UeQ4NeBuhZ1nXTlTFjLIN4jayiZCG0GWMs=; b=jfX97gatUENhOY96vjiRiJYXq0+erb1iIlYmbR5Bwk6+7N45MdW31MSoZj1Q3QWHzC 68J/dEm6moHJVk+ZcHRoDNe+CXJtSbcOxNdzQcwWCqdNIU9SqFzppxSj0vZPFHgqWayW vu9uGaYfc1XUbpxGLiz7qxTVfwUxnQNK5RR5nVnUS6Dn7vZgHEk7BEUR+g83fqRdM+5r hCLBsYspaaAkn1SMU0P1JZss4HaDNaLN0EQRbamVwIt5O74RrVOSpo/nFxOeZUEZ4rB4 LN+hpnbx6GUcTyLZmclRYfF6jv5y8tCx+V6n1EYdmBu9ATaeyET+b+EpbWxshNUAL/qw WoAg== X-Gm-Message-State: AOJu0YyzgFLkEF0/GWavpk+Db19c+Yu+POx6bRDz9xHif4n+iRMgLpAK 46U5ucP26S7IM2k/I+7JwfXz6tK1oFguDOpdN/ob9Q== X-Google-Smtp-Source: AGHT+IGZHhq+b5t6ofvsAAgU50R3UwFLpF4PJnxBFwJ8X9zjw7GqOHtvJPEIP+nTDxpQHGRQeFvcpg== X-Received: by 2002:a05:6a20:7352:b0:18f:97c:4f4b with SMTP id v18-20020a056a20735200b0018f097c4f4bmr1185987pzc.87.1703177333631; Thu, 21 Dec 2023 08:48:53 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:48:53 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Andrew Rybchenko Subject: [PATCH v5 02/18] common/sfc_efx: remove use of PMD logtype Date: Thu, 21 Dec 2023 08:46:19 -0800 Message-ID: <20231221164841.125006-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 This code was implemented in a slightly different manner than all the other logging code (for no good reason). Make it the same and handle errors in same way as other drivers. Signed-off-by: Stephen Hemminger --- drivers/common/sfc_efx/sfc_efx.c | 11 ++--------- drivers/common/sfc_efx/sfc_efx_log.h | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/common/sfc_efx/sfc_efx.c b/drivers/common/sfc_efx/sfc_efx.c index 2dc5545760b8..5eeffb065b0d 100644 --- a/drivers/common/sfc_efx/sfc_efx.c +++ b/drivers/common/sfc_efx/sfc_efx.c @@ -15,7 +15,7 @@ #include "sfc_efx_log.h" #include "sfc_efx.h" -uint32_t sfc_efx_logtype; +int sfc_efx_logtype; static int sfc_efx_kvarg_dev_class_handler(__rte_unused const char *key, @@ -117,11 +117,4 @@ sfc_efx_family(struct rte_pci_device *pci_dev, return rc; } -RTE_INIT(sfc_efx_register_logtype) -{ - int ret; - - ret = rte_log_register_type_and_pick_level("pmd.common.sfc_efx", - RTE_LOG_NOTICE); - sfc_efx_logtype = (ret < 0) ? RTE_LOGTYPE_PMD : ret; -} +RTE_LOG_REGISTER_DEFAULT(sfc_efx_logtype, NOTICE); diff --git a/drivers/common/sfc_efx/sfc_efx_log.h b/drivers/common/sfc_efx/sfc_efx_log.h index 694455c1b14e..1519ebdc175f 100644 --- a/drivers/common/sfc_efx/sfc_efx_log.h +++ b/drivers/common/sfc_efx/sfc_efx_log.h @@ -11,7 +11,7 @@ #define _SFC_EFX_LOG_H_ /** Generic driver log type */ -extern uint32_t sfc_efx_logtype; +extern int sfc_efx_logtype; /** Log message, add a prefix and a line break */ #define SFC_EFX_LOG(level, ...) \ From patchwork Thu Dec 21 16:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135458 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8701843751; Thu, 21 Dec 2023 17:49:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 527DB42E5F; Thu, 21 Dec 2023 17:48:59 +0100 (CET) Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) by mails.dpdk.org (Postfix) with ESMTP id 590F3406A2 for ; Thu, 21 Dec 2023 17:48:55 +0100 (CET) Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-594019698b8so686957eaf.3 for ; Thu, 21 Dec 2023 08:48:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177334; x=1703782134; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nv8FTd4nIOkDpIrFZS5XqniknFq2wcwUf8nwWdOzVQw=; b=q32i3k5XyPb+ZnhLTJwAdGFZQ2/c0TGmkAbFSivJ08k1UlmKwYyTEoOJJrbgyqr0hL qcdXlhIoLpjb9MPXhjH6049dssSTFLeIvFZdn8Jox18lcYmMdY9/CUSPZbaZydm1/8I9 vY82430y7syOewko8PLttW9axLqh8GbXMUvuVOO2KYlFOOm3q2sCKuWAVQgDSI7NIS/l 9K9E+a95seMiEwqWy9NQByWHj4UX2ULit8FWrembPktP3wJPdTQbdLGBfk2wbPgCZ1fe +5pLyS5P9QFU6CJhfX7S2kZ0mKHslM+f8EatLZoFm7L4vmIFNKUdf5wc49Co2S5Hh58R vmcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177334; x=1703782134; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nv8FTd4nIOkDpIrFZS5XqniknFq2wcwUf8nwWdOzVQw=; b=W5+Knt/TqJq5nkTbJABZuDzJtdZZVP5b516DD8i8haF4cVy8vyJSqyjNsTL/ofsowS yd2e/+MvSa702cWtW/8MIIzR+OCfpdSyRgejMrhMoav9WWc1FfyoPh2RjLBkt//q3Qoc 8+kiCUIR7C4kM2Kfu4GFQtIkO6qG1bKpCEl+A1aGPYQJFAD/i2cQUKqH5CTiwEDMpV40 J5XkJ5KsoGYPeeIPYmFkMGDb+VmKaqvqZ3s/vyWpru7uKU7FU6DnoCRM4y8RhBziYiiL YhecilK0/Zg/IXG2th6XqU78GQTsPCEdobx83Gh4V5YhI8Kf79hxs3TraVGUasxs1V85 C2gA== X-Gm-Message-State: AOJu0Yy7kYH7bUe0AXWM5eulcDjZAg5yZBd1Z6OAldf+dBQcmspiheO6 n7aCHoDnjrUwABKIkmgP1NrkmvDLjNh4fhRVipFvtVabVzdinQ== X-Google-Smtp-Source: AGHT+IHPbdqCgR2j3pwSjbDf7VkpVnrNvJMuOlYw+zbVZBUKDlZObrN15JjthyeEFtpii8y5r8wqvw== X-Received: by 2002:a05:6358:6f1a:b0:172:e226:c173 with SMTP id r26-20020a0563586f1a00b00172e226c173mr45790rwn.3.1703177334586; Thu, 21 Dec 2023 08:48:54 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:48:54 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Hemant Agrawal , Sachin Saxena , Nipun Gupta , Shreyansh Jain Subject: [PATCH v5 03/18] mempool/dpaa2: use driver logtype not PMD Date: Thu, 21 Dec 2023 08:46:20 -0800 Message-ID: <20231221164841.125006-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The driver already has macros for logging, use them. Fixes: 7ed359909556 ("mempool/dpaa2: add functions for CMDIF") Signed-off-by: Stephen Hemminger --- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 84371d5d1abb..4c9245cb814c 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -293,7 +293,7 @@ rte_dpaa2_mbuf_pool_bpid(struct rte_mempool *mp) bp_info = mempool_to_bpinfo(mp); if (!(bp_info->bp_list)) { - RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n"); + DPAA2_MEMPOOL_ERR("DPAA2 buffer pool not configured"); return -ENOMEM; } @@ -307,7 +307,7 @@ rte_dpaa2_mbuf_from_buf_addr(struct rte_mempool *mp, void *buf_addr) bp_info = mempool_to_bpinfo(mp); if (!(bp_info->bp_list)) { - RTE_LOG(ERR, PMD, "DPAA2 buffer pool not configured\n"); + DPAA2_MEMPOOL_ERR("DPAA2 buffer pool not configured"); return NULL; } From patchwork Thu Dec 21 16:46:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135459 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A310443751; Thu, 21 Dec 2023 17:49:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD61242E63; Thu, 21 Dec 2023 17:49:00 +0100 (CET) Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by mails.dpdk.org (Postfix) with ESMTP id 45B7D40A7A for ; Thu, 21 Dec 2023 17:48:56 +0100 (CET) Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-35fb0dcec7aso3925555ab.3 for ; Thu, 21 Dec 2023 08:48:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177335; x=1703782135; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uwbsWX2Ew2Xai4uqvaY0ZrANYDi5fODTCO5ci30KcQA=; b=VQFBimorRTeZWbAoRv8Zw8qm05saKDtooW3Ski3truH3KsebyppPoae8kfsITbzy+d W4qWS2i81lBIhTU71rnQWZPTQ+CUyGUeQPRNpMGznEYzwogFEmyIVPBxy1+gj7ph21Qs 7ZVuK8EVfRAwAauTv09p/QYHfs7xJqIgcmRK7HTfpdQRgJjNqU6ES+CRDBiTLbfuQ/Td GNzPEvya0WQo8e6hCRBpn5deNqBDzq90h1hsQATRV6CXos33ISkuodNPXWAFD46FrmS3 NpQOSm2mIutBdHF8++lRHf488HuTaYtqBoxm+rpgsazMZPqyC9dP70R1hoRxfNohlwfY xCVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177335; x=1703782135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uwbsWX2Ew2Xai4uqvaY0ZrANYDi5fODTCO5ci30KcQA=; b=VxE5/8YHCh7P6ugnIbmQ7kDJdOsOf+gAhaMqp2upsV4NSQewXFEdjQWlSzvnIstuLU e0RAbId4fvehFArP+DDd4rq1wZRuw3Cu4ntn+U5tBQpDRZwBqe+cju7G7xOHL7yxedJE HEveh4WV+J2LKVnjt182/sHRQdYVYVLgyOHebb5//+0JFDP2Ha+wzgDSfSHoqsoxbYpa k++i4782jaX92UqYH9D6q8L57Vz/yMO/3jgGHe74sWfYerOn5bQvXxtrEdadEUFUGcFL N6rtEkN291p55cS5p3QIP1zPhAawHtg7QYw97Z+M8Bi4wHupOrn90gsjeyptkIYsN4KR NRCw== X-Gm-Message-State: AOJu0YzkdVX6c6sTFfe9SGtfLHhAfp8T05Inij4JES5H/sHN7ZkHkZy7 TIpPrpZziXBAafNsKAT1o1sUopnSIDERbuNCvx3+Rg== X-Google-Smtp-Source: AGHT+IG1R7K7PWLW4sXrJnI76bYawnQyUPkMeWwR0ysjbjYJqHP+Wm/+rvdHTUQ1BGH0Rv8dt7/d4g== X-Received: by 2002:a05:6e02:b44:b0:35f:a1b6:94e6 with SMTP id f4-20020a056e020b4400b0035fa1b694e6mr14270309ilu.10.1703177335599; Thu, 21 Dec 2023 08:48:55 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:48:55 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Hemant Agrawal , Sachin Saxena , Nipun Gupta , Ferruh Yigit , Aman Singh Subject: [PATCH v5 04/18] net/dpaa: use dedicated logtype not PMD Date: Thu, 21 Dec 2023 08:46:21 -0800 Message-ID: <20231221164841.125006-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The driver already has a logtype, but was not used in couple places. Fixes: 6b10d1f7bdea ("net/dpaa: update process specific device info") Fixes: c2c4f87b1259 ("net: add macro for MAC address print") Signed-off-by: Stephen Hemminger --- drivers/net/dpaa/dpaa_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index ef4c06db6a4d..2b497694cb02 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -2096,8 +2096,8 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) /* copy the primary mac address */ rte_ether_addr_copy(&fman_intf->mac_addr, ð_dev->data->mac_addrs[0]); - RTE_LOG(INFO, PMD, "net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT "\n", - dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr)); + DPAA_PMD_INFO("net: dpaa: %s: " RTE_ETHER_ADDR_PRT_FMT, + dpaa_device->name, RTE_ETHER_ADDR_BYTES(&fman_intf->mac_addr)); if (!fman_intf->is_shared_mac) { /* Configure error packet handling */ @@ -2166,7 +2166,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, ret = dpaa_dev_init_secondary(eth_dev); if (ret != 0) { - RTE_LOG(ERR, PMD, "secondary dev init failed\n"); + DPAA_PMD_ERR("secondary dev init failed"); return ret; } @@ -2182,7 +2182,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, if (!(default_q || fmc_q)) { if (dpaa_fm_init()) { - DPAA_PMD_ERR("FM init failed\n"); + DPAA_PMD_ERR("FM init failed"); return -1; } } From patchwork Thu Dec 21 16:46:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135460 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB0DA43751; Thu, 21 Dec 2023 17:49:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E81C42E6A; Thu, 21 Dec 2023 17:49:03 +0100 (CET) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mails.dpdk.org (Postfix) with ESMTP id 9BAB642E65 for ; Thu, 21 Dec 2023 17:49:01 +0100 (CET) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5cddfe0cb64so509599a12.0 for ; Thu, 21 Dec 2023 08:49:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177341; x=1703782141; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1Y949PQVoZ0MsGzQje0CViLo2gY8MRdgQrEma/yqLOA=; b=kyeDzQ1Fh0CXNQ7VcPNIi3+6VhlTA4AHbZGp5zsuALjmXJH2XS6lG66bWp1suSRYDx Cb/GpSgnz1+pQObeFFOPR4fceDG/5tnuaENuEztRGn4AK3KfIDmPXD1JaaSYslGQ0Dcw xVBfN/+UNiI06owiRL+rsL8AmdAvWao/S9g2HFbv/BRF0JIRd3Hz6VcXv4iwcmARL4Lz fE9HTjgTjiY02PE9f313fjKkpwHDbdCfb0tFhqLWAOR8+J3LZN3IwAhaHff/iUAdoaJ5 sFKln4J4Nnepc+XtLbc3XEvWNvx7vNe6K15zH110+uHZ1i08wWFxm6roy4e43tBpWeYh 1AMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177341; x=1703782141; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Y949PQVoZ0MsGzQje0CViLo2gY8MRdgQrEma/yqLOA=; b=I/oL2K5/9rfZGbP0rp9uwHsgDiiy+MHhleDoe0+DbaqICD3doMChBTKPuiJR2AHbau ax82Ory8KJXBhDf5stfbb08iZPTY34AdZqGrGrJm0zofBIWvbZlU15Jsy5aU7yQWvwLf aFyzeph/IWhinuvfQmy1LgCJmAj8HSVxub8vENcTadoIMUsXv4IfUnklNSUAmoeO1qv5 88m3/TuLEZ6DCVTtbybLQ6DXAUH599gbHQ1XpANxueU91yNHtuYaFuDY0lPZIJVmzuPB Rsjm8Cx0D3BG1yFb3t7tD6B8Wxn7i9F0ah/GxF4As1uyY+TMtP9rf2/K1/R86xXqE37N 1M2Q== X-Gm-Message-State: AOJu0Yx1fJD13DBhZ5k2SwPq50ZfImxhjX6sXvv8a7XGeka4dBYzOMGX yHaKczypVUaQNTmk+QZVm8SO6ErEaJOOguXONHQumg== X-Google-Smtp-Source: AGHT+IHIn14zAY5Tr2uX9p7pRc0Ap0dSVXB6vmRZZvr+Dmy9RZ7MB8Lg5v0hXPkq/2b4+bglUyFFkQ== X-Received: by 2002:a05:6a21:33a2:b0:18f:f0cf:e0dd with SMTP id yy34-20020a056a2133a200b0018ff0cfe0ddmr1081073pzb.68.1703177340865; Thu, 21 Dec 2023 08:49:00 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:00 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Hemant Agrawal , Sachin Saxena , Jun Yang Subject: [PATCH v5 05/18] net/dpaa2: used dedicated logtype not PMD Date: Thu, 21 Dec 2023 08:46:22 -0800 Message-ID: <20231221164841.125006-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The driver has a logtype, but was not being used in one place. Fixes: f023d059769f ("net/dpaa2: support recycle loopback port") Fixes: 72ec7a678e70 ("net/dpaa2: add soft parser driver") Signed-off-by: Stephen Hemminger --- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_sparser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 8e610b6bba30..91846fcd2f23 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -2851,7 +2851,7 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) return ret; } } - RTE_LOG(INFO, PMD, "%s: netdev created, connected to %s\n", + DPAA2_PMD_INFO("%s: netdev created, connected to %s", eth_dev->data->name, dpaa2_dev->ep_name); return 0; diff --git a/drivers/net/dpaa2/dpaa2_sparser.c b/drivers/net/dpaa2/dpaa2_sparser.c index 63463c4fbfd6..36a14526a5c5 100644 --- a/drivers/net/dpaa2/dpaa2_sparser.c +++ b/drivers/net/dpaa2/dpaa2_sparser.c @@ -181,7 +181,7 @@ int dpaa2_eth_load_wriop_soft_parser(struct dpaa2_dev_priv *priv, priv->ss_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(addr)); priv->ss_offset += sp_param.size; - RTE_LOG(INFO, PMD, "Soft parser loaded for dpni@%d\n", priv->hw_id); + DPAA2_PMD_INFO("Soft parser loaded for dpni@%d", priv->hw_id); rte_free(addr); return 0; @@ -234,6 +234,6 @@ int dpaa2_eth_enable_wriop_soft_parser(struct dpaa2_dev_priv *priv, } rte_free(param_addr); - RTE_LOG(INFO, PMD, "Soft parser enabled for dpni@%d\n", priv->hw_id); + DPAA2_PMD_INFO("Soft parser enabled for dpni@%d", priv->hw_id); return 0; } From patchwork Thu Dec 21 16:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135461 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86D2643751; Thu, 21 Dec 2023 17:49:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4242E42E79; Thu, 21 Dec 2023 17:49:06 +0100 (CET) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mails.dpdk.org (Postfix) with ESMTP id 03A5C42E79 for ; Thu, 21 Dec 2023 17:49:04 +0100 (CET) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6d6d48354ccso599053b3a.1 for ; Thu, 21 Dec 2023 08:49:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177344; x=1703782144; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uS5Ba8ZHzyrFAw4NaWR81b04okCnnLNgeNua0B6rZac=; b=gBUeMDuV85o3v61oOPkxJzO7D+rk3k4ea94Q7DadELDDoF+J+a/J/h846oO1RlePms CXHL42a4pcfWDpDmv8DG070XNx0WjVxmLzHfla3SZMunCfXkRQz8+Mt2Ao1P67KFXpTm soQhZoBJnPwPKnANhqeGJWIYaN3A52XABaK4sAIjK1/r8z8swsaIWvKLmi41N95ynHK8 UUvjP/AZ/AG8Fl0puYB6UOPZ+ne41GE7wIXpidlNCLQnamSZ/wckhmHiD8LDNCNev6dV IrRgVDU/RKv0tMNx8Gziu5QZstYKga0NVAAHzmRvPu3l0+e+weBphFjg3NmNTEyyaWAm +zpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177344; x=1703782144; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uS5Ba8ZHzyrFAw4NaWR81b04okCnnLNgeNua0B6rZac=; b=M1FWl7md62LOde3J5WFYUIvkkiszJ+iVoEM4NKvL3rcebKD2vIZx838pZ9D2LuGL8n XUBLtGhwbDo6JaLWTwSc79es6pSebTe4sbgSCeLcnyDmPPzSfo9fHCXvEQyN7OnvZEBH AyTA64l6P1lq/Zwc8QgAi19vp8vQW0iL3+hznZNxr/urZX7NAqvN1NXJiIsOGh/Fe5hP cFKeF6NJCEHgVJO27i9of+VSKhk3t2m8rxmNLEbd9/0R67UyASnJdymBx10h8CBdlfw7 YPxjYD+6DOshehO7nA8J3GDLpyB/JllXZBvaP450MmgLfrwM0nH5AKJLx6F1/vyutabI 2X9Q== X-Gm-Message-State: AOJu0YwkF42thBU/W7HgS1bOdqpoqphZDK3Opb26cJhCYgMxetkZjEbe H8Bv1fzWdMd3b/byAi5WVf0bV46M6qIUxxoOmiU9nA== X-Google-Smtp-Source: AGHT+IFq9k4gNNbKkwhGzuaiZTUfYO1XvI31qem/eifq3ZhsYiH6fFG+EvVZbr9Yr5bH4/CJ8Xjnzg== X-Received: by 2002:a05:6a20:4a27:b0:194:96e7:628a with SMTP id fr39-20020a056a204a2700b0019496e7628amr993623pzb.13.1703177344251; Thu, 21 Dec 2023 08:49:04 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:03 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Liron Himi , Natalie Samsonov , Yelena Krivosheev Subject: [PATCH v5 06/18] net/mvpp2: use dedicated logtype Date: Thu, 21 Dec 2023 08:46:23 -0800 Message-ID: <20231221164841.125006-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Always use the dedicated logtype, not PMD. Fixes: 9e79d810911d ("net/mvpp2: support Tx scatter/gather") Signed-off-by: Stephen Hemminger --- drivers/net/mvpp2/mrvl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index c12364941d62..9a9279a8783a 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -415,10 +415,10 @@ mrvl_set_tx_function(struct rte_eth_dev *dev) /* Use a simple Tx queue (no offloads, no multi segs) if possible */ if (priv->multiseg) { - RTE_LOG(INFO, PMD, "Using multi-segment tx callback\n"); + MRVL_LOG(INFO, "Using multi-segment tx callback"); dev->tx_pkt_burst = mrvl_tx_sg_pkt_burst; } else { - RTE_LOG(INFO, PMD, "Using single-segment tx callback\n"); + MRVL_LOG(INFO, "Using single-segment tx callback"); dev->tx_pkt_burst = mrvl_tx_pkt_burst; } } From patchwork Thu Dec 21 16:46:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135462 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 493BB43751; Thu, 21 Dec 2023 17:49:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8677142E7F; Thu, 21 Dec 2023 17:49:08 +0100 (CET) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mails.dpdk.org (Postfix) with ESMTP id D8BAA42E70 for ; Thu, 21 Dec 2023 17:49:05 +0100 (CET) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so772950a12.1 for ; Thu, 21 Dec 2023 08:49:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177345; x=1703782145; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u986atT1BkRmtCNh10url9mKtsPhvh7P/VKgHCU2mrY=; b=f2z12M1C5az2XB1euf3uA7geTmW28Kuwn6anD8Num/QgO7ZsRkz+jZJesRqddNZSEs eUI3hyPlGb4hbcwkXm9Ce/MT7jQhpfE5j79E9IHZHuOJxdtrubc9wLf1Z+V+7yCm22dM EFl1wXwO5e1d+Hfv8whisCjz/UsRHsEkZE96aSKVdGHKohaLhooWeZpAX3bGRt94iozj +JgzoaaW52ydOvWs6J+GS/NM/7b382gm/7Ih1cuCvofFDrip2Clvz2u8SsiN7ZllDVBN uUSahCV928PXtvTs29X4sGuAMLEcH4wzrB5P9A4XOU46cVUp6gt4EACFwszBCvqfdsMo 6tZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177345; x=1703782145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u986atT1BkRmtCNh10url9mKtsPhvh7P/VKgHCU2mrY=; b=P3tiAxuRVqMJ0GRxBwTxeLIqkGNgzYS/ZVpC7m4RmbU8SGeydrRfBfPpQrz4S1EcOs eT0Amtz/d2CaLTQLXmDPqVL24BfqemBB9kBLR9E8Xsl2efSJrqKjaiBBfdqJdn58Zx4l buCrcB2Y7u6e3Twt2SuRsC8MnexV71JtsR1RcQLkAphdcQmAVljon+cXYOilzxxhw3W7 YP2ikHnl7iH6Ag6z+Zr2smuWWFWLUGlQ+J98u9NBbQxh1EKhP47GhJyzIVf8b/iQUc9E smC2645/nIFOR3X+Qc2IbIPJjq1WEyarySBYJFriLot0v/XpLqLQMrVUgrrs24T1HjUh z2JA== X-Gm-Message-State: AOJu0YzbKZvwVxoax5T/xjl9Di2Hv3ShhAu+4A7oFcJs4th41oKdDx/e hffrbOKQ2mnybzF44QpnzdAnnAzuNEY94eGnA8OQaw== X-Google-Smtp-Source: AGHT+IF1QGkmnhwD3DKTSPn9rq5PedPldE17H0Ul12ZysV0yZX1451hFyTJNtaVR4FCF+hu2NmA8Nw== X-Received: by 2002:a05:6a20:3d10:b0:190:7d54:f0c4 with SMTP id y16-20020a056a203d1000b001907d54f0c4mr1868996pzi.87.1703177345167; Thu, 21 Dec 2023 08:49:05 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jochen Behrens , Yong Wang Subject: [PATCH v5 07/18] net/vmxnet3: used dedicated logtype not PMD Date: Thu, 21 Dec 2023 08:46:24 -0800 Message-ID: <20231221164841.125006-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The driver has log macros, just not used in one place. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Signed-off-by: Stephen Hemminger --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index e49191718aea..4fd704045fc4 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1919,7 +1919,7 @@ vmxnet3_interrupt_handler(void *param) if (events == 0) goto done; - RTE_LOG(DEBUG, PMD, "Reading events: 0x%X", events); + PMD_DRV_LOG(DEBUG, "Reading events: 0x%X", events); vmxnet3_process_events(dev); done: vmxnet3_enable_intr(hw, *eventIntrIdx); From patchwork Thu Dec 21 16:46:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135463 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 46B6343751; Thu, 21 Dec 2023 17:49:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC32942E8B; Thu, 21 Dec 2023 17:49:09 +0100 (CET) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mails.dpdk.org (Postfix) with ESMTP id F043842E7D for ; Thu, 21 Dec 2023 17:49:06 +0100 (CET) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5cddc5455aeso490525a12.1 for ; Thu, 21 Dec 2023 08:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177346; x=1703782146; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3PUGQibq4Z04OHz5a5w2IsgLwCxy9TOKdOEbRTjZwLg=; b=tBhebzoZcgAKBwn1P99kfyZtHcBeWu/fUJIoPLiavoQFTELoNVJg/PvbK23OJrB/hO dOYcIX1DWpiUgNMyA9Chgk8+obr/HscExvYXszW3z929pFZzabm4z9QlN5PnmpM+BLjA dtjG6ufhYEDY8RPaJPiGuweuN4fkkhMzPfxeaniwKsbaFoelmV2Eb6JEFjI/OcmuPO15 gu30kPHp3TdL0QezLVfmc7qthYrdmcO9iEgwRL9pawJLLgNHQTEeSYQ+yE+hqEsqTM+6 jTuKNeCpRypqWMfxF0TbuK+bB2QB8dSzAU5zxQH2sPppIW8H6+4/eaNBxIFkCDyuGgsC qz6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177346; x=1703782146; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3PUGQibq4Z04OHz5a5w2IsgLwCxy9TOKdOEbRTjZwLg=; b=V1wIfAtaKxT5KKtJ9YIPPJJCYF473QrgxplSB/eKlowzb4mAgwzR4epm0QcUe6kcAf VImdQJxM9uRlkvZfKrvGc8XRYI9P+XL9gl98siuNOks3oPhRHedudCl+rmLq2Ym60OAx BUi3yvovYaxaCPEwt5WBJH4fM9/a9BPkwuNgSzopox3KDl6CkI//J61B01yMg/1N8kWb s9GWcZNfsUGtYHNElKWv1VxyfQ1SUyiODhvH32zjL93SxsSunjRKsfyylF6PpIbakhDb qV4JUZBB2KYKyujUKFmohJtNlQAWQvI3573IUVC6KptVQfbif1zQ457cZqnOKVHzLpNq Pieg== X-Gm-Message-State: AOJu0YzRnXedXvzNO+jsz7XhCcSNJWW/nSlEQupsL+jlXO0ZB8LTVpO9 riABM3PMUWbqWxhoRM9CrB+D/6lzU3DROzGQcRxwkg== X-Google-Smtp-Source: AGHT+IE2izQE4mx6aaGvSvYUacj+mjpPyox67Sq0MQdvD3lCbx22/mNQ/Mb7EKaGRPM0gZ/GWhjGeg== X-Received: by 2002:a05:6a20:6aaf:b0:194:9f9e:5f54 with SMTP id bi47-20020a056a206aaf00b001949f9e5f54mr1302725pzb.12.1703177346156; Thu, 21 Dec 2023 08:49:06 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:05 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Jakub Palider , Tomasz Duszynski Subject: [PATCH v5 08/18] raw/cnxk: replace PMD logtype with dynamic type Date: Thu, 21 Dec 2023 08:46:25 -0800 Message-ID: <20231221164841.125006-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Driver should not be using PMD logtype, they should have their own logtype. Signed-off-by: Stephen Hemminger --- drivers/common/cnxk/roc_platform.h | 16 ++++++----- drivers/raw/cnxk_bphy/cnxk_bphy.c | 3 ++- drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c | 31 +++++++++++----------- drivers/raw/cnxk_bphy/rte_pmd_bphy.h | 6 +++++ drivers/raw/cnxk_gpio/cnxk_gpio.c | 21 ++++++++------- drivers/raw/cnxk_gpio/cnxk_gpio.h | 5 ++++ drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c | 17 ++++++------ 8 files changed, 57 insertions(+), 44 deletions(-) diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h index ba23b2e0d79e..9d2ea8f00965 100644 --- a/drivers/common/cnxk/roc_platform.h +++ b/drivers/common/cnxk/roc_platform.h @@ -265,11 +265,13 @@ extern int cnxk_logtype_tm; extern int cnxk_logtype_ree; extern int cnxk_logtype_dpi; +#define RTE_LOGTYPE_CNXK cnxk_logtype_base + #define plt_err(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) -#define plt_info(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) -#define plt_warn(fmt, args...) RTE_LOG(WARNING, PMD, fmt "\n", ##args) -#define plt_print(fmt, args...) RTE_LOG(INFO, PMD, fmt "\n", ##args) + RTE_LOG(ERR, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) +#define plt_info(fmt, args...) RTE_LOG(INFO, CNXK, fmt "\n", ##args) +#define plt_warn(fmt, args...) RTE_LOG(WARNING, CNXK, fmt "\n", ##args) +#define plt_print(fmt, args...) RTE_LOG(INFO, CNXK, fmt "\n", ##args) #define plt_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__) #define plt_dump_no_nl(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) @@ -296,11 +298,11 @@ extern int cnxk_logtype_dpi; /* Datapath logs */ #define plt_dp_err(fmt, args...) \ - RTE_LOG_DP(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(ERR, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #define plt_dp_info(fmt, args...) \ - RTE_LOG_DP(INFO, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(INFO, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #define plt_dp_dbg(fmt, args...) \ - RTE_LOG_DP(DEBUG, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args) + RTE_LOG_DP(DEBUG, CNXK, "%s():%u " fmt "\n", __func__, __LINE__, ##args) #ifdef __cplusplus #define CNXK_PCI_ID(subsystem_dev, dev) \ diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c b/drivers/raw/cnxk_bphy/cnxk_bphy.c index 15dbc4c1a637..1dbab6fb3e12 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c @@ -251,7 +251,7 @@ cnxk_bphy_irq_enqueue_bufs(struct rte_rawdev *dev, /* get rid of last response if any */ if (qp->rsp) { - RTE_LOG(WARNING, PMD, "Previous response got overwritten\n"); + CNXK_BPHY_LOG(WARNING, "Previous response got overwritten"); rte_free(qp->rsp); } qp->rsp = rsp; @@ -410,3 +410,4 @@ static struct rte_pci_driver cnxk_bphy_rawdev_pmd = { RTE_PMD_REGISTER_PCI(bphy_rawdev_pci_driver, cnxk_bphy_rawdev_pmd); RTE_PMD_REGISTER_PCI_TABLE(bphy_rawdev_pci_driver, pci_bphy_map); RTE_PMD_REGISTER_KMOD_DEP(bphy_rawdev_pci_driver, "vfio-pci"); +RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_bphy, bphy, INFO); diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c index 2d8466ef918b..4358aeecc3e5 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx.c @@ -189,7 +189,7 @@ cnxk_bphy_cgx_process_buf(struct cnxk_bphy_cgx *cgx, unsigned int queue, /* get rid of last response if any */ if (qp->rsp) { - RTE_LOG(WARNING, PMD, "Previous response got overwritten\n"); + CNXK_BPHY_LOG(WARNING, "Previous response got overwritten"); rte_free(qp->rsp); } qp->rsp = rsp; diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c index a3021b4bb7db..f01d958661ad 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_cgx_test.c @@ -57,62 +57,61 @@ cnxk_bphy_cgx_dev_selftest(uint16_t dev_id) if (ret) break; if (descs != 1) { - RTE_LOG(ERR, PMD, "Wrong number of descs reported\n"); + CNXK_BPHY_LOG(ERR, "Wrong number of descs reported"); ret = -ENODEV; break; } - RTE_LOG(INFO, PMD, "Testing queue %d\n", i); + CNXK_BPHY_LOG(INFO, "Testing queue %d", i); ret = rte_pmd_bphy_cgx_stop_rxtx(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to stop rx/tx\n"); + CNXK_BPHY_LOG(ERR, "Failed to stop rx/tx"); break; } ret = rte_pmd_bphy_cgx_start_rxtx(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to start rx/tx\n"); + CNXK_BPHY_LOG(ERR, "Failed to start rx/tx"); break; } ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, false); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set link down\n"); + CNXK_BPHY_LOG(ERR, "Failed to set link down"); break; } ret = cnxk_bphy_cgx_link_cond(dev_id, i, 0); if (ret != 0) - RTE_LOG(ERR, PMD, - "Timed out waiting for a link down\n"); + CNXK_BPHY_LOG(ERR, "Timed out waiting for a link down"); ret = rte_pmd_bphy_cgx_set_link_state(dev_id, i, true); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set link up\n"); + CNXK_BPHY_LOG(ERR, "Failed to set link up"); break; } ret = cnxk_bphy_cgx_link_cond(dev_id, i, 1); if (ret != 1) - RTE_LOG(ERR, PMD, "Timed out waiting for a link up\n"); + CNXK_BPHY_LOG(ERR, "Timed out waiting for a link up"); ret = rte_pmd_bphy_cgx_intlbk_enable(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to enable internal lbk\n"); + CNXK_BPHY_LOG(ERR, "Failed to enable internal lbk"); break; } ret = rte_pmd_bphy_cgx_intlbk_disable(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "Failed to disable internal lbk\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable internal lbk"); break; } ret = rte_pmd_bphy_cgx_ptp_rx_enable(dev_id, i); /* ptp not available on RPM */ if (ret < 0 && ret != -ENOTSUP) { - RTE_LOG(ERR, PMD, "Failed to enable ptp\n"); + CNXK_BPHY_LOG(ERR, "Failed to enable ptp"); break; } ret = 0; @@ -120,27 +119,27 @@ cnxk_bphy_cgx_dev_selftest(uint16_t dev_id) ret = rte_pmd_bphy_cgx_ptp_rx_disable(dev_id, i); /* ptp not available on RPM */ if (ret < 0 && ret != -ENOTSUP) { - RTE_LOG(ERR, PMD, "Failed to disable ptp\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable ptp"); break; } ret = 0; ret = rte_pmd_bphy_cgx_get_supported_fec(dev_id, i, &fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to get supported FEC\n"); + CNXK_BPHY_LOG(ERR, "Failed to get supported FEC"); break; } ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to set FEC to %d\n", fec); + CNXK_BPHY_LOG(ERR, "Failed to set FEC to %d", fec); break; } fec = CNXK_BPHY_CGX_ETH_LINK_FEC_NONE; ret = rte_pmd_bphy_cgx_set_fec(dev_id, i, fec); if (ret) { - RTE_LOG(ERR, PMD, "Failed to disable FEC\n"); + CNXK_BPHY_LOG(ERR, "Failed to disable FEC"); break; } } diff --git a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h index 9d8d0285581b..7a7d9f6fa66f 100644 --- a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h +++ b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h @@ -26,6 +26,12 @@ extern "C" { #endif +extern int cnxk_logtype_bphy; + +#define CNXK_BPHY_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, cnxk_logtype_bphy, \ + "%s(): " fmt "\n", __func__, ## args) + /** Available message types */ enum cnxk_bphy_cgx_msg_type { /** Type used to obtain link information */ diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c b/drivers/raw/cnxk_gpio/cnxk_gpio.c index 3c4d79e4810e..329ac28a2736 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c @@ -215,13 +215,13 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist) errno = 0; val = strtol(token, NULL, 10); if (errno) { - RTE_LOG(ERR, PMD, "failed to parse %s\n", token); + CNXK_GPIO_LOG(ERR, "failed to parse %s", token); ret = -errno; goto out; } if (val < 0 || val >= gpiochip->num_gpios) { - RTE_LOG(ERR, PMD, "gpio%d out of 0-%d range\n", val, + CNXK_GPIO_LOG(ERR, "gpio%d out of 0-%d range", val, gpiochip->num_gpios - 1); ret = -EINVAL; goto out; @@ -231,7 +231,7 @@ cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip, char *allowlist) if (list[i] != val) continue; - RTE_LOG(WARNING, PMD, "gpio%d already allowed\n", val); + CNXK_GPIO_LOG(WARNING, "gpio%d already allowed", val); break; } if (i == queue) @@ -398,7 +398,7 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id, return ret; } } else { - RTE_LOG(WARNING, PMD, "using existing gpio%d\n", gpio->num); + CNXK_GPIO_LOG(WARNING, "using existing gpio%d", gpio->num); } gpiochip->gpios[num] = gpio; @@ -647,7 +647,7 @@ cnxk_gpio_process_buf(struct cnxk_gpio *gpio, struct rte_rawdev_buf *rbuf) /* get rid of last response if any */ if (gpio->rsp) { - RTE_LOG(WARNING, PMD, "previous response got overwritten\n"); + CNXK_GPIO_LOG(WARNING, "previous response got overwritten"); rte_free(gpio->rsp); } gpio->rsp = rsp; @@ -741,7 +741,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) cnxk_gpio_format_name(name, sizeof(name)); rawdev = rte_rawdev_pmd_allocate(name, sizeof(*gpiochip), rte_socket_id()); if (!rawdev) { - RTE_LOG(ERR, PMD, "failed to allocate %s rawdev\n", name); + CNXK_GPIO_LOG(ERR, "failed to allocate %s rawdev", name); return -ENOMEM; } @@ -770,7 +770,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) snprintf(buf, sizeof(buf), "%s/gpiochip%d/base", CNXK_GPIO_CLASS_PATH, gpiochip->num); ret = cnxk_gpio_read_attr_int(buf, &gpiochip->base); if (ret) { - RTE_LOG(ERR, PMD, "failed to read %s\n", buf); + CNXK_GPIO_LOG(ERR, "failed to read %s", buf); goto out; } @@ -778,20 +778,20 @@ cnxk_gpio_probe(struct rte_vdev_device *dev) snprintf(buf, sizeof(buf), "%s/gpiochip%d/ngpio", CNXK_GPIO_CLASS_PATH, gpiochip->num); ret = cnxk_gpio_read_attr_int(buf, &gpiochip->num_gpios); if (ret) { - RTE_LOG(ERR, PMD, "failed to read %s\n", buf); + CNXK_GPIO_LOG(ERR, "failed to read %s", buf); goto out; } gpiochip->num_queues = gpiochip->num_gpios; ret = cnxk_gpio_parse_allowlist(gpiochip, params->allowlist); if (ret) { - RTE_LOG(ERR, PMD, "failed to parse allowed gpios\n"); + CNXK_GPIO_LOG(ERR, "failed to parse allowed gpios"); goto out; } gpiochip->gpios = rte_calloc(NULL, gpiochip->num_gpios, sizeof(struct cnxk_gpio *), 0); if (!gpiochip->gpios) { - RTE_LOG(ERR, PMD, "failed to allocate gpios memory\n"); + CNXK_GPIO_LOG(ERR, "failed to allocate gpios memory"); ret = -ENOMEM; goto out; } @@ -851,3 +851,4 @@ RTE_PMD_REGISTER_VDEV(cnxk_gpio, cnxk_gpio_drv); RTE_PMD_REGISTER_PARAM_STRING(cnxk_gpio, "gpiochip= " "allowlist="); +RTE_LOG_REGISTER_SUFFIX(cnxk_logtype_gpio, gpio, INFO); diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.h b/drivers/raw/cnxk_gpio/cnxk_gpio.h index e62f78a7604a..336d7ac373d7 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio.h +++ b/drivers/raw/cnxk_gpio/cnxk_gpio.h @@ -5,6 +5,11 @@ #ifndef _CNXK_GPIO_H_ #define _CNXK_GPIO_H_ +extern int cnxk_logtype_gpio; + +#define CNXK_GPIO_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, cnxk_logtype_gpio, fmt "\n", ## args) + struct cnxk_gpiochip; struct cnxk_gpio { diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c index 10742b5dc48a..2f3973a7b5e6 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c @@ -56,7 +56,7 @@ cnxk_gpio_read_attr(char *attr, char *val) #define CNXK_GPIO_ERR_STR(err, str, ...) do { \ if (err) { \ - RTE_LOG(ERR, PMD, "%s:%d: " str " (%d)\n", __func__, __LINE__, \ + CNXK_GPIO_LOG(ERR, "%s:%d: " str " (%d)", __func__, __LINE__, \ ##__VA_ARGS__, err); \ goto out; \ } \ @@ -330,30 +330,29 @@ cnxk_gpio_selftest(uint16_t dev_id) for (i = 0; i < queues; i++) { ret = rte_rawdev_queue_conf_get(dev_id, i, &conf, sizeof(conf)); if (ret) { - RTE_LOG(ERR, PMD, - "failed to read queue configuration (%d)\n", + CNXK_GPIO_LOG(ERR, "failed to read queue configuration (%d)", ret); goto out; } - RTE_LOG(INFO, PMD, "testing queue%d (gpio%d)\n", i, conf.gpio); + CNXK_GPIO_LOG(INFO, "testing queue%d (gpio%d)", i, conf.gpio); if (conf.size != 1) { - RTE_LOG(ERR, PMD, "wrong queue size received\n"); + CNXK_GPIO_LOG(ERR, "wrong queue size received"); ret = -EIO; goto out; } ret = rte_rawdev_queue_setup(dev_id, i, NULL, 0); if (ret) { - RTE_LOG(ERR, PMD, "failed to setup queue (%d)\n", ret); + CNXK_GPIO_LOG(ERR, "failed to setup queue (%d)", ret); goto out; } gpio = gpiochip->gpios[conf.gpio]; snprintf(buf, sizeof(buf), CNXK_GPIO_PATH_FMT, gpio->num); if (!cnxk_gpio_attr_exists(buf)) { - RTE_LOG(ERR, PMD, "%s does not exist\n", buf); + CNXK_GPIO_LOG(ERR, "%s does not exist", buf); ret = -ENOENT; goto release; } @@ -371,13 +370,13 @@ cnxk_gpio_selftest(uint16_t dev_id) ret2 = ret; ret = rte_rawdev_queue_release(dev_id, i); if (ret) { - RTE_LOG(ERR, PMD, "failed to release queue (%d)\n", + CNXK_GPIO_LOG(ERR, "failed to release queue (%d)", ret); break; } if (cnxk_gpio_attr_exists(buf)) { - RTE_LOG(ERR, PMD, "%s still exists\n", buf); + CNXK_GPIO_LOG(ERR, "%s still exists", buf); ret = -EIO; break; } From patchwork Thu Dec 21 16:46:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135464 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AD34543751; Thu, 21 Dec 2023 17:50:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C4C242EA1; Thu, 21 Dec 2023 17:49:11 +0100 (CET) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mails.dpdk.org (Postfix) with ESMTP id DD56B42E7F for ; Thu, 21 Dec 2023 17:49:07 +0100 (CET) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5cd82917ecfso736519a12.0 for ; Thu, 21 Dec 2023 08:49:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177347; x=1703782147; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ReCHWYVVFgtu2iT5BN6vOCJzI4k8TVKmnR1CS2RbRyg=; b=zpbEcOAqM7kFz4tPYcqqjxYwn3n2YWYOMORkNTIyR5oysYTjF3TrLZq+BGdONI/bUg TwgPZN2cvOd2jJcc4vv9QAJB75JOF5fbjgJHD3PMvWE9dAMn55rz1cQNzekKUGX8zsCz Q+xHD9ZGRPpBDpl5IqnAi59oJibmsEPgIp9+e2joP4+G0upNL9YUErYXaa4o+uTWIenH g6uD3l/VrJV/zibv8LzKE23OCTZHxCwAhaOZjbaYvgzTun1v0yrK37Ee83wLLeU56+1+ yA8VnCmGs0iqjBqpcZFHXy3dlSes0jEoWhleITgl3E5iCprxX8aJ+WWkBrIsb36IxfmP ut/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177347; x=1703782147; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ReCHWYVVFgtu2iT5BN6vOCJzI4k8TVKmnR1CS2RbRyg=; b=elXxyBm5iPu/q9ZWRywQXt+oARrFLDA81MCXrVJoEkSUQDp6Uo8Ml/84D2rKiRdHEA q/HiFtfNZb7JiKwGeZgMS+4TGvMNsTqafz2lvA+LHBoq8Ve3zR2+mBtVtHdg4b6R61lg L8eQhPr+8VFoK1kF+Jscpdb2yDIgSQ19Dfk2LsWZImraGozqy5lPz5VsLGweqztJqQlp 3HY0luSuxv4xbghGRhI18kmDuz7t6SCPrl0W5zYUSh6EnWnGXxToksNjfFUDVeEbRjo2 sZzFmu3Fx7EL2nHoZvpzCYSISngo8ioyCnD+rSaryoUavoxTRH3s3NCi1HIm7UV2S3B4 1m0Q== X-Gm-Message-State: AOJu0Yx1ct6WLM959xPxuKjjHqVxzi++kWTHwbgRdyhm6sRi1u35Rdpb HhAwugV/itNtsf6Cocz6U3iiWmGph8tDC3LIxvsVUg== X-Google-Smtp-Source: AGHT+IHHu6JaGiAh9qsN14SMBAh9bVyHJ8mzwiXT1dQqt88aMqXyyeYyYZ2aPYApb0duPqNzasAItA== X-Received: by 2002:a05:6a20:244c:b0:194:f17b:f877 with SMTP id t12-20020a056a20244c00b00194f17bf877mr1904749pzc.61.1703177347146; Thu, 21 Dec 2023 08:49:07 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:06 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji , Fan Zhang Subject: [PATCH v5 09/18] crypto/scheduler: replace use of logtype PMD Date: Thu, 21 Dec 2023 08:46:26 -0800 Message-ID: <20231221164841.125006-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Driver has logging macro but not used everywhere. Fixes: 6760463c9f26 ("crypto/scheduler: add mode-specific threshold parameter") Signed-off-by: Stephen Hemminger --- drivers/crypto/scheduler/scheduler_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/scheduler/scheduler_pmd.c b/drivers/crypto/scheduler/scheduler_pmd.c index 589d092d7457..95ce893f0540 100644 --- a/drivers/crypto/scheduler/scheduler_pmd.c +++ b/drivers/crypto/scheduler/scheduler_pmd.c @@ -197,8 +197,8 @@ cryptodev_scheduler_create(const char *name, return -EINVAL; } - RTE_LOG(INFO, PMD, " Sched mode param (%s = %s)\n", - param_name, param_val); + CR_SCHED_LOG(INFO, " Sched mode param (%s = %s)", + param_name, param_val); } } From patchwork Thu Dec 21 16:46:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135465 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51E4943751; Thu, 21 Dec 2023 17:50:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BEB5842EA8; Thu, 21 Dec 2023 17:49:13 +0100 (CET) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mails.dpdk.org (Postfix) with ESMTP id B3CF842E81 for ; Thu, 21 Dec 2023 17:49:08 +0100 (CET) Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-5c239897895so473818a12.2 for ; Thu, 21 Dec 2023 08:49:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177348; x=1703782148; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5DFqFzsaRdJASZzwcyvtGPWWuOUL4czYfaLuijsZvIw=; b=VgGbmMadvwLN222USqRh2rJxb8RODIYbfswlg39dpDjs71iSjLNrc5xs9dyHALOU+H 97z5bIT4Put5KeKh9XxmGtx/Jt4Bcw6AxGlmElayo9XF1uQK4tEkpILRU/sSxnrFhSro xlMAR+1eXmzmGnkuVBBHarQWQrzRjhT5Hz9fklmQ7hasnpSKIvFw/Q39LDR88sXFLxhD lxkn4Sf5z9zCeKj5LZZJSEGwaqw/bKL9OYN6zbmDQyicJj+SISJ6IGvBrePkyrDk15qV qxsz5gv2xiMi+QMWklXMZZQ68zNgxmxdrjl9sqRyBT0l810eDDq05AZwSSbb40Mt/uXY e08w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177348; x=1703782148; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5DFqFzsaRdJASZzwcyvtGPWWuOUL4czYfaLuijsZvIw=; b=sQf2SSuTJKjzNDDeBOOu8s6ZB3oLZjebp3rw//qL+q/hWOVcowNxzDlWQB7tHzXQ+g up5/1P0lefh71wW5ziwPwgHe+woprSFCCuuPNjT4s8BLbZG60qhtR/lbnt0hQqTkjHTo WEhfYQLHUKqccGzmpgGTgq30VEoTUiIDuiiLGgRsP12xUPJiFYf8z82QV99Ex0nO1wGQ yBZ3SS+H2iDfuUx0eSZD2fWlmQOF4SgyD3oZ5laoGVhSwY2eNz/D1xLMr6DZFWE5uCEB cW8OfAmimJunXVAkngKFowpy6rcQiz6oEcdwyed8MFtnTTxcCASjXQgJUhwMGz8wQeSo LnoA== X-Gm-Message-State: AOJu0Yy2yB8lnS03owe70RVuiJ+pTTnX4mTnnXl7SFQ8Y/FIR8Ycq6lc aLT/1jE51qY7V8aAa6sOrSfnDb9oM93tXF9Tw6M6pQ== X-Google-Smtp-Source: AGHT+IEEqryTjXbd3h5JQ9FkAk22ZcUiRnolJu2VCvfR3fPYAXJXqYT1JHFxPJAvjR0kGNoXxw0o9Q== X-Received: by 2002:a05:6a20:e129:b0:195:1462:187b with SMTP id kr41-20020a056a20e12900b001951462187bmr645750pzb.15.1703177347954; Thu, 21 Dec 2023 08:49:07 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:07 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Sunil Uttarwar , Ravi Kumar Subject: [PATCH v5 10/18] crypto/ccp: do not use PMD logtype Date: Thu, 21 Dec 2023 08:46:27 -0800 Message-ID: <20231221164841.125006-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 This driver has logging macros but not used consistently. Fixes: ef4b04f87fa6 ("crypto/ccp: support device init") Signed-off-by: Stephen Hemminger --- drivers/crypto/ccp/rte_ccp_pmd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index a5271d72273d..46a9275e3743 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -194,8 +194,7 @@ cryptodev_ccp_remove(struct rte_pci_device *pci_dev) ccp_pmd_init_done = 0; - RTE_LOG(INFO, PMD, "Closing ccp device %s on numa socket %u\n", - name, rte_socket_id()); + CCP_LOG_INFO("Closing ccp device %s on numa socket %u", name, rte_socket_id()); return rte_cryptodev_pmd_destroy(dev); } @@ -228,7 +227,7 @@ cryptodev_ccp_create(const char *name, } cryptodev_cnt++; - CCP_LOG_DBG("CCP : Crypto device count = %d\n", cryptodev_cnt); + CCP_LOG_DBG("CCP : Crypto device count = %d", cryptodev_cnt); dev->device = &pci_dev->device; dev->device->driver = &pci_drv->driver; dev->driver_id = ccp_cryptodev_driver_id; @@ -279,7 +278,7 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused, }; if (ccp_pmd_init_done) { - RTE_LOG(INFO, PMD, "CCP PMD already initialized\n"); + CCP_LOG_INFO("CCP PMD already initialized"); return -EFAULT; } rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); @@ -288,11 +287,11 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused, init_params.def_p.max_nb_queue_pairs = CCP_PMD_MAX_QUEUE_PAIRS; - RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name, + CCP_LOG_INFO("Initialising %s on NUMA node %d", name, init_params.def_p.socket_id); - RTE_LOG(INFO, PMD, "Max number of queue pairs = %d\n", + CCP_LOG_INFO("Max number of queue pairs = %d", init_params.def_p.max_nb_queue_pairs); - RTE_LOG(INFO, PMD, "Authentication offload to %s\n", + CCP_LOG_INFO("Authentication offload to %s", ((init_params.auth_opt == 0) ? "CCP" : "CPU")); rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); From patchwork Thu Dec 21 16:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135466 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44E8F43751; Thu, 21 Dec 2023 17:50:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 087D742EAB; Thu, 21 Dec 2023 17:49:15 +0100 (CET) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mails.dpdk.org (Postfix) with ESMTP id 8065242E83 for ; Thu, 21 Dec 2023 17:49:09 +0100 (CET) Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-5cdbc4334edso544858a12.3 for ; Thu, 21 Dec 2023 08:49:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177349; x=1703782149; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Xh4D2SpLkvfLLARfsIRBCrzMRJLDTHlNSrfuOw2/GqA=; b=epZeBrN9usUfjTWj3UJe80+fkLX0ijVzTex5mWzzAMtYttTMswOmJ5MXYX2v17oQWQ ji1GE0riO6L89cZRdV8qSePvn5xPKOF697VJjTUWPm3zUinfgYuKR71djfdAyEde/POH YQzpj14u+CQbdvfafJ9n1ZT6E7RzvgcQJdWKycdSmNeXpHEc3tLSQkevjMioDLR7QZj5 p6/xwF9oIJmDTQ8GqGurLj94cQ1MgSHrtny0cX9gwCOV+CAmhUWTzewaprqJRZpXyjsb TzhDaFc+6VKeEsfPKhnNOr7mqhpFm73SRP0Rz08you6NAJoml8SbGyBTgsGBibkgJ700 1m2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177349; x=1703782149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xh4D2SpLkvfLLARfsIRBCrzMRJLDTHlNSrfuOw2/GqA=; b=LQGXuXUgksyXtf9DuD7133BTKmOfdCk1o451+GMmZlczp0pgq47oGDDl2rIHDrcs6Y VIhbvBEgpxu/EHDcTIYy8B6dJLYk6hb0yOqm0+Lze3obchGdsVIY1o+OnsfzhHmhH63Y Cvg1uG65oU/9NthbHeLDVWnftON9Rvm6HubfuiYZtgRqWqNKvY5e08yoiiOZWX/yCLBC bRhn5mjJyb6QeoRaoNZUzNMFqbPd/WScbG1HHA2SkV0KIX4LOpD31o20lZsWGbrMh7N4 faHwfw3crmKOCqChaEmTHoN2tJuXWX1AfaKeapQK4yM+lHQq8L0S2LEbDTSnKqxGtqqt 5otA== X-Gm-Message-State: AOJu0Yz89LRW83WIag2nBToZga58pA/Vd5Sl3va8anBj+6Gw+H2xX0el 6VohWZbwUEhiLfV2EnNICHHMZxqNfA8yKTpUoauopg== X-Google-Smtp-Source: AGHT+IFHw5ptRz6J8S6zgDNbudtLkIS1a2RZfV0iRUMKG/2R0JTw58PfCyVuwP36yaqQwh6te6EIxA== X-Received: by 2002:a05:6a20:3cab:b0:193:f809:ecd7 with SMTP id b43-20020a056a203cab00b00193f809ecd7mr1329845pzj.14.1703177348760; Thu, 21 Dec 2023 08:49:08 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:08 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Akhil Goyal Subject: [PATCH v5 11/18] crypto/caam_jr: use dedicated logtype Date: Thu, 21 Dec 2023 08:46:28 -0800 Message-ID: <20231221164841.125006-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The driver has macro and logtype but not used in a couple places. Also, remove extraneous newlines. Fixes: af7c9b5e9ce7 ("crypto/caam_jr: introduce basic driver") Signed-off-by: Stephen Hemminger --- drivers/crypto/caam_jr/caam_jr.c | 46 +++++++++++++--------------- drivers/crypto/caam_jr/caam_jr_log.h | 12 ++++---- drivers/crypto/caam_jr/caam_jr_uio.c | 4 +-- 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c index b55258689b49..d3b42d8e1b91 100644 --- a/drivers/crypto/caam_jr/caam_jr.c +++ b/drivers/crypto/caam_jr/caam_jr.c @@ -123,10 +123,8 @@ void caam_jr_stats_get(struct rte_cryptodev *dev, stats->dequeued_count += qp[i]->rx_pkts; stats->enqueue_err_count += qp[i]->tx_errs; stats->dequeue_err_count += qp[i]->rx_errs; - CAAM_JR_INFO("extra stats:\n\tRX Poll ERR = %" PRIu64 - "\n\tTX Ring Full = %" PRIu64, - qp[i]->rx_poll_err, - qp[i]->tx_ring_full); + CAAM_JR_INFO("extra stats: RX Poll ERR = %" PRIu64 "TX Ring Full = %" PRIu64, + qp[i]->rx_poll_err, qp[i]->tx_ring_full); } } @@ -309,7 +307,7 @@ caam_jr_prep_cdb(struct caam_jr_session *ses) cdb = caam_jr_dma_mem_alloc(L1_CACHE_BYTES, sizeof(struct sec_cdb)); if (!cdb) { - CAAM_JR_ERR("failed to allocate memory for cdb\n"); + CAAM_JR_ERR("failed to allocate memory for cdb"); return -1; } @@ -606,7 +604,7 @@ hw_poll_job_ring(struct sec_job_ring_t *job_ring, /*TODO for multiple ops, packets*/ ctx = container_of(current_desc, struct caam_jr_op_ctx, jobdes); if (unlikely(sec_error_code)) { - CAAM_JR_ERR("desc at cidx %d generated error 0x%x\n", + CAAM_JR_ERR("desc at cidx %d generated error 0x%x", job_ring->cidx, sec_error_code); hw_handle_job_ring_error(job_ring, sec_error_code); //todo improve with exact errors @@ -1368,7 +1366,7 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp) } if (unlikely(!ses->qp || ses->qp != qp)) { - CAAM_JR_DP_DEBUG("Old:sess->qp=%p New qp = %p\n", ses->qp, qp); + CAAM_JR_DP_DEBUG("Old:sess->qp=%p New qp = %p", ses->qp, qp); ses->qp = qp; caam_jr_prep_cdb(ses); } @@ -1554,7 +1552,7 @@ caam_jr_cipher_init(struct rte_cryptodev *dev __rte_unused, session->cipher_key.data = rte_zmalloc(NULL, xform->cipher.key.length, RTE_CACHE_LINE_SIZE); if (session->cipher_key.data == NULL && xform->cipher.key.length > 0) { - CAAM_JR_ERR("No Memory for cipher key\n"); + CAAM_JR_ERR("No Memory for cipher key"); return -ENOMEM; } session->cipher_key.length = xform->cipher.key.length; @@ -1576,7 +1574,7 @@ caam_jr_auth_init(struct rte_cryptodev *dev __rte_unused, session->auth_key.data = rte_zmalloc(NULL, xform->auth.key.length, RTE_CACHE_LINE_SIZE); if (session->auth_key.data == NULL && xform->auth.key.length > 0) { - CAAM_JR_ERR("No Memory for auth key\n"); + CAAM_JR_ERR("No Memory for auth key"); return -ENOMEM; } session->auth_key.length = xform->auth.key.length; @@ -1602,7 +1600,7 @@ caam_jr_aead_init(struct rte_cryptodev *dev __rte_unused, session->aead_key.data = rte_zmalloc(NULL, xform->aead.key.length, RTE_CACHE_LINE_SIZE); if (session->aead_key.data == NULL && xform->aead.key.length > 0) { - CAAM_JR_ERR("No Memory for aead key\n"); + CAAM_JR_ERR("No Memory for aead key"); return -ENOMEM; } session->aead_key.length = xform->aead.key.length; @@ -1755,7 +1753,7 @@ caam_jr_set_ipsec_session(__rte_unused struct rte_cryptodev *dev, RTE_CACHE_LINE_SIZE); if (session->cipher_key.data == NULL && cipher_xform->key.length > 0) { - CAAM_JR_ERR("No Memory for cipher key\n"); + CAAM_JR_ERR("No Memory for cipher key"); return -ENOMEM; } @@ -1765,7 +1763,7 @@ caam_jr_set_ipsec_session(__rte_unused struct rte_cryptodev *dev, RTE_CACHE_LINE_SIZE); if (session->auth_key.data == NULL && auth_xform->key.length > 0) { - CAAM_JR_ERR("No Memory for auth key\n"); + CAAM_JR_ERR("No Memory for auth key"); rte_free(session->cipher_key.data); return -ENOMEM; } @@ -1810,11 +1808,11 @@ caam_jr_set_ipsec_session(__rte_unused struct rte_cryptodev *dev, case RTE_CRYPTO_AUTH_KASUMI_F9: case RTE_CRYPTO_AUTH_AES_CBC_MAC: case RTE_CRYPTO_AUTH_ZUC_EIA3: - CAAM_JR_ERR("Crypto: Unsupported auth alg %u\n", + CAAM_JR_ERR("Crypto: Unsupported auth alg %u", auth_xform->algo); goto out; default: - CAAM_JR_ERR("Crypto: Undefined Auth specified %u\n", + CAAM_JR_ERR("Crypto: Undefined Auth specified %u", auth_xform->algo); goto out; } @@ -1834,11 +1832,11 @@ caam_jr_set_ipsec_session(__rte_unused struct rte_cryptodev *dev, case RTE_CRYPTO_CIPHER_3DES_ECB: case RTE_CRYPTO_CIPHER_AES_ECB: case RTE_CRYPTO_CIPHER_KASUMI_F8: - CAAM_JR_ERR("Crypto: Unsupported Cipher alg %u\n", + CAAM_JR_ERR("Crypto: Unsupported Cipher alg %u", cipher_xform->algo); goto out; default: - CAAM_JR_ERR("Crypto: Undefined Cipher specified %u\n", + CAAM_JR_ERR("Crypto: Undefined Cipher specified %u", cipher_xform->algo); goto out; } @@ -1962,7 +1960,7 @@ caam_jr_dev_configure(struct rte_cryptodev *dev, NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); if (!internals->ctx_pool) { - CAAM_JR_ERR("%s create failed\n", str); + CAAM_JR_ERR("%s create failed", str); return -ENOMEM; } } else @@ -2180,7 +2178,7 @@ init_job_ring(void *reg_base_addr, int irq_id) } } if (job_ring == NULL) { - CAAM_JR_ERR("No free job ring\n"); + CAAM_JR_ERR("No free job ring"); return NULL; } @@ -2301,7 +2299,7 @@ caam_jr_dev_init(const char *name, job_ring->uio_fd); if (!dev->data->dev_private) { - CAAM_JR_ERR("Ring memory allocation failed\n"); + CAAM_JR_ERR("Ring memory allocation failed"); goto cleanup2; } @@ -2334,7 +2332,7 @@ caam_jr_dev_init(const char *name, security_instance = rte_malloc("caam_jr", sizeof(struct rte_security_ctx), 0); if (security_instance == NULL) { - CAAM_JR_ERR("memory allocation failed\n"); + CAAM_JR_ERR("memory allocation failed"); //todo error handling. goto cleanup2; } @@ -2346,7 +2344,7 @@ caam_jr_dev_init(const char *name, rte_cryptodev_pmd_probing_finish(dev); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", dev->data->name); + CAAM_JR_INFO("%s cryptodev init", dev->data->name); return 0; @@ -2386,8 +2384,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) ret = of_init(); if (ret) { - RTE_LOG(ERR, PMD, - "of_init failed\n"); + CAAM_JR_ERR("of_init failed"); return -EINVAL; } /* if sec device version is not configured */ @@ -2407,8 +2404,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev) } #ifdef RTE_LIBRTE_PMD_CAAM_JR_BE if (rta_get_sec_era() > RTA_SEC_ERA_8) { - RTE_LOG(ERR, PMD, - "CAAM is compiled in BE mode for device with sec era > 8???\n"); + CAAM_JR_ERR("CAAM is compiled in BE mode for device with sec era > 8???"); return -EINVAL; } #endif diff --git a/drivers/crypto/caam_jr/caam_jr_log.h b/drivers/crypto/caam_jr/caam_jr_log.h index 8f6aa50e2a4a..3d32b75e3a01 100644 --- a/drivers/crypto/caam_jr/caam_jr_log.h +++ b/drivers/crypto/caam_jr/caam_jr_log.h @@ -10,13 +10,13 @@ extern int caam_jr_logtype; #define RTE_LOGTYPE_CAAM_JR caam_jr_logtype -#define CAAM_JR_LOG(level, fmt, args...) \ - rte_log(RTE_LOG_ ## level, caam_jr_logtype, "caam_jr: " \ - fmt "\n", ##args) +#define CAAM_JR_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, caam_jr_logtype, \ + "caam_jr: " fmt "\n", ##args) -#define CAAM_JR_DEBUG(fmt, args...) \ - rte_log(RTE_LOG_DEBUG, caam_jr_logtype, "caam_jr: %s(): " \ - fmt "\n", __func__, ##args) +#define CAAM_JR_DEBUG(fmt, args...) \ + rte_log(RTE_LOG_DEBUG, caam_jr_logtype, \ + "caam_jr: %s(): " fmt "\n", __func__, ##args) #define PMD_INIT_FUNC_TRACE() CAAM_JR_DEBUG(" >>") diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c index 583ba3b523af..4d9acfbe9196 100644 --- a/drivers/crypto/caam_jr/caam_jr_uio.c +++ b/drivers/crypto/caam_jr/caam_jr_uio.c @@ -338,7 +338,7 @@ free_job_ring(int uio_fd) } if (job_ring == NULL) { - CAAM_JR_ERR("JR not available for fd = %x\n", uio_fd); + CAAM_JR_ERR("JR not available for fd = %x", uio_fd); return; } @@ -441,7 +441,7 @@ sec_configure(void) dir->d_name, "name", uio_name); CAAM_JR_INFO("sec device uio name: %s", uio_name); if (ret != 0) { - CAAM_JR_ERR("file_read_first_line failed\n"); + CAAM_JR_ERR("file_read_first_line failed"); closedir(d); return -1; } From patchwork Thu Dec 21 16:46:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135467 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A865743751; Thu, 21 Dec 2023 17:50:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DFB342EB4; Thu, 21 Dec 2023 17:49:16 +0100 (CET) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mails.dpdk.org (Postfix) with ESMTP id 5C9D842E9D for ; Thu, 21 Dec 2023 17:49:10 +0100 (CET) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6d089e8b1b2so719222b3a.3 for ; Thu, 21 Dec 2023 08:49:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177350; x=1703782150; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7b++1J2gLUx6NDJv7+P8qjyP68Z7y4QCIYZi5ANpsi0=; b=yAvnnMta1HU4K6Atlx/b7uabhYLzM8dJWarcWJm+S5YxNVdiUxqpSQJPVlaW6q5R4Y qaRuxcTSeyxsWs+n224xCwGNQItupTgPt8GD0rWqR+HbLxaGdq43kxwKw1Rs7dz2pmT3 KwNmKEw+IcbuMG9UZaPU+ARFLb2zokDOMNCNNy5OgoOor/7hU8yOmEi620yuxXxylOV6 3WCcq36ejLhu0y3ui68PLmA5Ce1Gqldl09/Ygiy/zhQ2moRvG7EXTJkQVa07tftfOBtK 8Eg+I+q4SewH6TYsbhoDXMrujjeVsx4NxyPa2N6pgiRZEpTN7rNICDm1uo9HRjwqSDRB zaow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177350; x=1703782150; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7b++1J2gLUx6NDJv7+P8qjyP68Z7y4QCIYZi5ANpsi0=; b=LBYKZcJngy4bgmG9YcHMWqfneAouUhkSDuegxt9C22uUHhv1kuWBba4IEfe1HgwAu7 49BeryxuXAdOnUl3u8CtMy4uigREqdXLqZU8VvpZxXQUqz+2BJUdJXvxQujdvWZnE15z 9uEC0qwOwElbuXwvezG0kADxCz9IfreHW7ZzOvZy5xlS1T5fXvzq0Vx1L7oG+xwCOJGD XFsdhJm9f3QLoveGCpw9LEj/bGrWTVYpUAar2pV7UJriMgua6J+UpZAI+ruxOyGdvcoQ mGYFdHi+C5FK+o4tYWLnrD7xilGNKdEiClPBPstJQm4K3WmP4mFq5NHIQW9kTz3etDGt YmQg== X-Gm-Message-State: AOJu0Yzn9/fezb2JEjc9GMz/otrYCxKKUJ34/R6lAJWt9CuDvjaoHOPi a6sF0hBPTAGx82tBWfxW032vvaGLWsTuQHG3x+TpGg== X-Google-Smtp-Source: AGHT+IFZDqo02qD9AlqlSlynLx5+6SACOlG1xBEwFe7QS78/S5GZtlzSkC8tBlPFZ7hW+GlerFxQgA== X-Received: by 2002:a05:6a00:460b:b0:68e:3eab:9e18 with SMTP id ko11-20020a056a00460b00b0068e3eab9e18mr14047272pfb.12.1703177349791; Thu, 21 Dec 2023 08:49:09 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:09 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Akhil Goyal , Ashish Jain Subject: [PATCH v5 12/18] crypto/dpaa_sec, crypto/dpaa2_sec: use dedicated logtype Date: Thu, 21 Dec 2023 08:46:29 -0800 Message-ID: <20231221164841.125006-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 A couple of messages were using RTE_LOGTYPE_PMD when dedicated logtype was already available. Fixes: fe3688ba7950 ("crypto/dpaa_sec: support event crypto adapter") Fixes: bffc7d561c81 ("crypto/dpaa2_sec: support event crypto adapter") Signed-off-by: Stephen Hemminger --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 ++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 30 ++++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index bb5a2c629e53..1cae6c45059e 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -4153,7 +4153,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_opr(dpseci, CMD_PRI_LOW, priv->token, qp_id, OPR_OPT_CREATE, &ocfg); if (ret) { - RTE_LOG(ERR, PMD, "Error setting opr: ret: %d\n", ret); + DPAA2_SEC_ERR("Error setting opr: ret: %d", ret); return ret; } qp->tx_vq.cb_eqresp_free = dpaa2_sec_free_eqresp_buf; @@ -4163,7 +4163,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) { - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } @@ -4188,7 +4188,7 @@ dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index a301e8edb2a4..e7ebcbe2af22 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -102,7 +102,7 @@ ern_sec_fq_handler(struct qman_portal *qm __rte_unused, struct qman_fq *fq, const struct qm_mr_entry *msg) { - DPAA_SEC_DP_ERR("sec fq %d error, RC = %x, seqnum = %x\n", + DPAA_SEC_DP_ERR("sec fq %d error, RC = %x, seqnum = %x", fq->fqid, msg->ern.rc, msg->ern.seqnum); } @@ -849,7 +849,7 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops) op->status = RTE_CRYPTO_OP_STATUS_SUCCESS; } else { if (dpaa_sec_dp_dump > DPAA_SEC_DP_NO_DUMP) { - DPAA_SEC_DP_WARN("SEC return err:0x%x\n", + DPAA_SEC_DP_WARN("SEC return err:0x%x", ctx->fd_status); if (dpaa_sec_dp_dump > DPAA_SEC_DP_ERR_DUMP) dpaa_sec_dump(ctx, qp); @@ -1943,8 +1943,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, } } else if (unlikely(ses->qp[rte_lcore_id() % MAX_DPAA_CORES] != qp)) { - DPAA_SEC_DP_ERR("Old:sess->qp = %p" - " New qp = %p\n", + DPAA_SEC_DP_ERR("Old: sess->qp = %p New qp = %p", ses->qp[rte_lcore_id() % MAX_DPAA_CORES], qp); frames_to_send = loop; @@ -2054,7 +2053,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, fd->cmd = 0x80000000 | *((uint32_t *)((uint8_t *)op + ses->pdcp.hfn_ovd_offset)); - DPAA_SEC_DP_DEBUG("Per packet HFN: %x, ovd:%u\n", + DPAA_SEC_DP_DEBUG("Per packet HFN: %x, ovd:%u", *((uint32_t *)((uint8_t *)op + ses->pdcp.hfn_ovd_offset)), ses->pdcp.hfn_ovd); @@ -2095,7 +2094,7 @@ dpaa_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops, dpaa_qp->rx_pkts += num_rx; dpaa_qp->rx_errs += nb_ops - num_rx; - DPAA_SEC_DP_DEBUG("SEC Received %d Packets\n", num_rx); + DPAA_SEC_DP_DEBUG("SEC Received %d Packets", num_rx); return num_rx; } @@ -2158,7 +2157,7 @@ dpaa_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); if (!qp->ctx_pool) { - DPAA_SEC_ERR("%s create failed\n", str); + DPAA_SEC_ERR("%s create failed", str); return -ENOMEM; } } else @@ -2459,7 +2458,7 @@ dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused, session->aead_key.data = rte_zmalloc(NULL, xform->aead.key.length, RTE_CACHE_LINE_SIZE); if (session->aead_key.data == NULL && xform->aead.key.length > 0) { - DPAA_SEC_ERR("No Memory for aead key\n"); + DPAA_SEC_ERR("No Memory for aead key"); return -ENOMEM; } session->aead_key.length = xform->aead.key.length; @@ -2508,7 +2507,7 @@ dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq) for (i = 0; i < RTE_DPAA_MAX_RX_QUEUE; i++) { if (&qi->inq[i] == fq) { if (qman_retire_fq(fq, NULL) != 0) - DPAA_SEC_DEBUG("Queue is not retired\n"); + DPAA_SEC_DEBUG("Queue is not retired"); qman_oos_fq(fq); qi->inq_attach[i] = 0; return 0; @@ -3483,7 +3482,7 @@ dpaa_sec_eventq_attach(const struct rte_cryptodev *dev, qp->outq.cb.dqrr_dpdk_cb = dpaa_sec_process_atomic_event; break; case RTE_SCHED_TYPE_ORDERED: - DPAA_SEC_ERR("Ordered queue schedule type is not supported\n"); + DPAA_SEC_ERR("Ordered queue schedule type is not supported"); return -ENOTSUP; default: opts.fqd.fq_ctrl |= QM_FQCTRL_AVOIDBLOCK; @@ -3518,7 +3517,7 @@ dpaa_sec_eventq_detach(const struct rte_cryptodev *dev, qman_oos_fq(&qp->outq); ret = qman_init_fq(&qp->outq, 0, &opts); if (ret) - RTE_LOG(ERR, PMD, "Error in qman_init_fq: ret: %d\n", ret); + DPAA_SEC_ERR("Error in qman_init_fq: ret: %d", ret); qp->outq.cb.dqrr = NULL; return ret; @@ -3581,8 +3580,7 @@ check_devargs_handler(__rte_unused const char *key, const char *value, { dpaa_sec_dp_dump = atoi(value); if (dpaa_sec_dp_dump > DPAA_SEC_DP_FULL_DUMP) { - DPAA_SEC_WARN("WARN: DPAA_SEC_DP_DUMP_LEVEL is not " - "supported, changing to FULL error prints\n"); + DPAA_SEC_WARN("WARN: DPAA_SEC_DP_DUMP_LEVEL is not supported, changing to FULL error prints"); dpaa_sec_dp_dump = DPAA_SEC_DP_FULL_DUMP; } @@ -3645,7 +3643,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) ret = munmap(internals->sec_hw, MAP_SIZE); if (ret) - DPAA_SEC_WARN("munmap failed\n"); + DPAA_SEC_WARN("munmap failed"); close(map_fd); cryptodev->driver_id = dpaa_cryptodev_driver_id; @@ -3709,11 +3707,11 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) dpaa_sec_get_devargs(cryptodev->device->devargs, DRIVER_DUMP_MODE); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name); + DPAA_SEC_INFO("%s cryptodev init", cryptodev->data->name); return 0; init_error: - DPAA_SEC_ERR("driver %s: create failed\n", cryptodev->data->name); + DPAA_SEC_ERR("driver %s: create failed", cryptodev->data->name); rte_free(cryptodev->security_ctx); return -EFAULT; From patchwork Thu Dec 21 16:46:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135468 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8434443751; Thu, 21 Dec 2023 17:50:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96B8842EB8; Thu, 21 Dec 2023 17:49:17 +0100 (CET) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mails.dpdk.org (Postfix) with ESMTP id EAD2540EE2 for ; Thu, 21 Dec 2023 17:49:11 +0100 (CET) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-5c66b093b86so1567667a12.0 for ; Thu, 21 Dec 2023 08:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177351; x=1703782151; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T/Z638rQSfEkbqZWPoKqctvqpAXmvGLW/Xzv5APFNr0=; b=nDIqftT95lG+tjM28SJmlLmY8UxpJCPEavNsj78hUBbLT+6LEwomD90TxqmiuWJCQl YVOEsKI/SWGiwx1tLfElXnhWGrtONXg4YsX7+oYW0oQIq15E6bkot4xoy1vbua0iyyIW XJIIzzNaD8SOnDWFSR/ZjtdCRHYlaKdFOb/6bgvJX53BYNgGCjLqjRxb1TzDqE8fG2Ho fv+jfTl12GtY/4mi3TVanWBJKp5zEHQ0Pk4QRFWsVGhsXJSAkG/XjzaE74s5KFL0TH4N aGtr82qG51XWiCnKmwSOXV6ROSDqaX+I4mLN1/rSXV/ZesdpQl0GnJPFdkzGUsoSlap3 5TJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177351; x=1703782151; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T/Z638rQSfEkbqZWPoKqctvqpAXmvGLW/Xzv5APFNr0=; b=owLgKdYJ1upp5DBjeWglKTQVZ3Giw5CsuKY19w+1/yY7cio7h70VL729mBgh7HYr/F gNy5HJpxkTR8wVdqX6LJbW4RFKzE09h7XjDRUjVIIQXR4AKdgveNT8V1cZKdazSU9WlY KdhyfQj8EpJmsybuEIeNaKhPumNkOmE9Sgli9llD08dDFdcK6bIRhGnb33eDHrtS+3dq eO5Zu1aP2h35b0grBcdJY0M07GNGLMsuW++MNfoQUFbLYpC+T5m2/2l/ePkfXfXXCi3E yE7qQ+r/vv1hAjRVUH5XuTb1RyIKPgafiVQ2aJ4WXUXgPWl38AQ2IJo9MV950VsvWMJh cfTw== X-Gm-Message-State: AOJu0YxpPKcaMQhBfEu48bWhSek9FOyrPcdmBINhpiEyWt154xTLt6C9 lenG7qHNVWlIfKGS7czkFmTazwblHlgKnIOVYpoEUw== X-Google-Smtp-Source: AGHT+IHE8WA6SPKjyTLf224OC60VovWcpNuNGAzkLFaRpLnTHQWzi4dCRMfvAcXTfDxCWnOQZh41SQ== X-Received: by 2002:a05:6a20:3d8c:b0:194:dd2b:a48c with SMTP id s12-20020a056a203d8c00b00194dd2ba48cmr1312381pzi.16.1703177350850; Thu, 21 Dec 2023 08:49:10 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:10 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Abdullah Sevincer , Timothy McDaniel , Gage Eads Subject: [PATCH v5 13/18] event/dlb2: use dedicated logtype Date: Thu, 21 Dec 2023 08:46:30 -0800 Message-ID: <20231221164841.125006-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Driver was using RTE_LOGTYPE_PMD when it had its own logtype. Fixes: 5433956d5185 ("event/dlb2: add eventdev probe") Signed-off-by: Stephen Hemminger --- drivers/event/dlb2/dlb2.c | 275 +++++++++++++++++++------------------- 1 file changed, 137 insertions(+), 138 deletions(-) diff --git a/drivers/event/dlb2/dlb2.c b/drivers/event/dlb2/dlb2.c index 050ace0904b4..419876490780 100644 --- a/drivers/event/dlb2/dlb2.c +++ b/drivers/event/dlb2/dlb2.c @@ -169,7 +169,7 @@ dlb2_hw_query_resources(struct dlb2_eventdev *dlb2) ret = dlb2_iface_get_num_resources(handle, &dlb2->hw_rsrc_query_results); if (ret) { - DLB2_LOG_ERR("ioctl get dlb2 num resources, err=%d\n", ret); + DLB2_LOG_ERR("ioctl get dlb2 num resources, err=%d", ret); return ret; } @@ -259,7 +259,7 @@ set_producer_coremask(const char *key __rte_unused, const char **mask_str = opaque; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -293,7 +293,7 @@ set_max_cq_depth(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -304,7 +304,7 @@ set_max_cq_depth(const char *key __rte_unused, if (*max_cq_depth < DLB2_MIN_CQ_DEPTH_OVERRIDE || *max_cq_depth > DLB2_MAX_CQ_DEPTH_OVERRIDE || !rte_is_power_of_2(*max_cq_depth)) { - DLB2_LOG_ERR("dlb2: max_cq_depth %d and %d and a power of 2\n", + DLB2_LOG_ERR("dlb2: max_cq_depth %d and %d and a power of 2", DLB2_MIN_CQ_DEPTH_OVERRIDE, DLB2_MAX_CQ_DEPTH_OVERRIDE); return -EINVAL; @@ -322,7 +322,7 @@ set_max_enq_depth(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -333,7 +333,7 @@ set_max_enq_depth(const char *key __rte_unused, if (*max_enq_depth < DLB2_MIN_ENQ_DEPTH_OVERRIDE || *max_enq_depth > DLB2_MAX_ENQ_DEPTH_OVERRIDE || !rte_is_power_of_2(*max_enq_depth)) { - DLB2_LOG_ERR("dlb2: max_enq_depth %d and %d and a power of 2\n", + DLB2_LOG_ERR("dlb2: max_enq_depth %d and %d and a power of 2", DLB2_MIN_ENQ_DEPTH_OVERRIDE, DLB2_MAX_ENQ_DEPTH_OVERRIDE); return -EINVAL; @@ -351,7 +351,7 @@ set_max_num_events(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -361,7 +361,7 @@ set_max_num_events(const char *key __rte_unused, if (*max_num_events < 0 || *max_num_events > DLB2_MAX_NUM_LDB_CREDITS) { - DLB2_LOG_ERR("dlb2: max_num_events must be between 0 and %d\n", + DLB2_LOG_ERR("dlb2: max_num_events must be between 0 and %d", DLB2_MAX_NUM_LDB_CREDITS); return -EINVAL; } @@ -378,7 +378,7 @@ set_num_dir_credits(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -388,7 +388,7 @@ set_num_dir_credits(const char *key __rte_unused, if (*num_dir_credits < 0 || *num_dir_credits > DLB2_MAX_NUM_DIR_CREDITS(DLB2_HW_V2)) { - DLB2_LOG_ERR("dlb2: num_dir_credits must be between 0 and %d\n", + DLB2_LOG_ERR("dlb2: num_dir_credits must be between 0 and %d", DLB2_MAX_NUM_DIR_CREDITS(DLB2_HW_V2)); return -EINVAL; } @@ -405,7 +405,7 @@ set_dev_id(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -425,7 +425,7 @@ set_poll_interval(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -445,7 +445,7 @@ set_port_cos(const char *key __rte_unused, int first, last, cos_id, i; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -458,18 +458,18 @@ set_port_cos(const char *key __rte_unused, } else if (sscanf(value, "%d:%d", &first, &cos_id) == 2) { last = first; } else { - DLB2_LOG_ERR("Error parsing ldb port port_cos devarg. Should be port-port:val, or port:val\n"); + DLB2_LOG_ERR("Error parsing ldb port port_cos devarg. Should be port-port:val, or port:val"); return -EINVAL; } if (first > last || first < 0 || last >= DLB2_MAX_NUM_LDB_PORTS) { - DLB2_LOG_ERR("Error parsing ldb port cos_id arg, invalid port value\n"); + DLB2_LOG_ERR("Error parsing ldb port cos_id arg, invalid port value"); return -EINVAL; } if (cos_id < DLB2_COS_0 || cos_id > DLB2_COS_3) { - DLB2_LOG_ERR("Error parsing ldb port cos_id devarg, must be between 0 and 4\n"); + DLB2_LOG_ERR("Error parsing ldb port cos_id devarg, must be between 0 and 4"); return -EINVAL; } @@ -487,7 +487,7 @@ set_cos_bw(const char *key __rte_unused, struct dlb2_cos_bw *cos_bw = opaque; if (opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -495,11 +495,11 @@ set_cos_bw(const char *key __rte_unused, if (sscanf(value, "%d:%d:%d:%d", &cos_bw->val[0], &cos_bw->val[1], &cos_bw->val[2], &cos_bw->val[3]) != 4) { - DLB2_LOG_ERR("Error parsing cos bandwidth devarg. Should be bw0:bw1:bw2:bw3 where all values combined are <= 100\n"); + DLB2_LOG_ERR("Error parsing cos bandwidth devarg. Should be bw0:bw1:bw2:bw3 where all values combined are <= 100"); return -EINVAL; } if (cos_bw->val[0] + cos_bw->val[1] + cos_bw->val[2] + cos_bw->val[3] > 100) { - DLB2_LOG_ERR("Error parsing cos bandwidth devarg. Should be bw0:bw1:bw2:bw3 where all values combined are <= 100\n"); + DLB2_LOG_ERR("Error parsing cos bandwidth devarg. Should be bw0:bw1:bw2:bw3 where all values combined are <= 100"); return -EINVAL; } @@ -515,7 +515,7 @@ set_sw_credit_quanta(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -524,7 +524,7 @@ set_sw_credit_quanta(const char *key __rte_unused, return ret; if (*sw_credit_quanta <= 0) { - DLB2_LOG_ERR("sw_credit_quanta must be > 0\n"); + DLB2_LOG_ERR("sw_credit_quanta must be > 0"); return -EINVAL; } @@ -540,7 +540,7 @@ set_hw_credit_quanta(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -560,7 +560,7 @@ set_default_depth_thresh(const char *key __rte_unused, int ret; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -579,7 +579,7 @@ set_vector_opts_enab(const char *key __rte_unused, bool *dlb2_vector_opts_enabled = opaque; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -599,7 +599,7 @@ set_default_ldb_port_allocation(const char *key __rte_unused, bool *default_ldb_port_allocation = opaque; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -619,7 +619,7 @@ set_enable_cq_weight(const char *key __rte_unused, bool *enable_cq_weight = opaque; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -640,7 +640,7 @@ set_qid_depth_thresh(const char *key __rte_unused, int first, last, thresh, i; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -657,18 +657,18 @@ set_qid_depth_thresh(const char *key __rte_unused, } else if (sscanf(value, "%d:%d", &first, &thresh) == 2) { last = first; } else { - DLB2_LOG_ERR("Error parsing qid depth devarg. Should be all:val, qid-qid:val, or qid:val\n"); + DLB2_LOG_ERR("Error parsing qid depth devarg. Should be all:val, qid-qid:val, or qid:val"); return -EINVAL; } if (first > last || first < 0 || last >= DLB2_MAX_NUM_QUEUES(DLB2_HW_V2)) { - DLB2_LOG_ERR("Error parsing qid depth devarg, invalid qid value\n"); + DLB2_LOG_ERR("Error parsing qid depth devarg, invalid qid value"); return -EINVAL; } if (thresh < 0 || thresh > DLB2_MAX_QUEUE_DEPTH_THRESHOLD) { - DLB2_LOG_ERR("Error parsing qid depth devarg, threshold > %d\n", + DLB2_LOG_ERR("Error parsing qid depth devarg, threshold > %d", DLB2_MAX_QUEUE_DEPTH_THRESHOLD); return -EINVAL; } @@ -688,7 +688,7 @@ set_qid_depth_thresh_v2_5(const char *key __rte_unused, int first, last, thresh, i; if (value == NULL || opaque == NULL) { - DLB2_LOG_ERR("NULL pointer\n"); + DLB2_LOG_ERR("NULL pointer"); return -EINVAL; } @@ -705,18 +705,18 @@ set_qid_depth_thresh_v2_5(const char *key __rte_unused, } else if (sscanf(value, "%d:%d", &first, &thresh) == 2) { last = first; } else { - DLB2_LOG_ERR("Error parsing qid depth devarg. Should be all:val, qid-qid:val, or qid:val\n"); + DLB2_LOG_ERR("Error parsing qid depth devarg. Should be all:val, qid-qid:val, or qid:val"); return -EINVAL; } if (first > last || first < 0 || last >= DLB2_MAX_NUM_QUEUES(DLB2_HW_V2_5)) { - DLB2_LOG_ERR("Error parsing qid depth devarg, invalid qid value\n"); + DLB2_LOG_ERR("Error parsing qid depth devarg, invalid qid value"); return -EINVAL; } if (thresh < 0 || thresh > DLB2_MAX_QUEUE_DEPTH_THRESHOLD) { - DLB2_LOG_ERR("Error parsing qid depth devarg, threshold > %d\n", + DLB2_LOG_ERR("Error parsing qid depth devarg, threshold > %d", DLB2_MAX_QUEUE_DEPTH_THRESHOLD); return -EINVAL; } @@ -738,7 +738,7 @@ dlb2_eventdev_info_get(struct rte_eventdev *dev, if (ret) { const struct rte_eventdev_data *data = dev->data; - DLB2_LOG_ERR("get resources err=%d, devid=%d\n", + DLB2_LOG_ERR("get resources err=%d, devid=%d", ret, data->dev_id); /* fn is void, so fall through and return values set up in * probe @@ -781,7 +781,7 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, struct dlb2_create_sched_domain_args *cfg; if (resources_asked == NULL) { - DLB2_LOG_ERR("dlb2: dlb2_create NULL parameter\n"); + DLB2_LOG_ERR("dlb2: dlb2_create NULL parameter"); ret = EINVAL; goto error_exit; } @@ -809,7 +809,7 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, if (cos_ports > resources_asked->num_ldb_ports || (cos_ports && dlb2->max_cos_port >= resources_asked->num_ldb_ports)) { - DLB2_LOG_ERR("dlb2: num_ldb_ports < cos_ports\n"); + DLB2_LOG_ERR("dlb2: num_ldb_ports < cos_ports"); ret = EINVAL; goto error_exit; } @@ -832,7 +832,7 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, evdev_dlb2_default_info.max_event_port_dequeue_depth; if (device_version == DLB2_HW_V2_5) { - DLB2_LOG_DBG("sched domain create - ldb_qs=%d, ldb_ports=%d, dir_ports=%d, atomic_inflights=%d, hist_list_entries=%d, credits=%d\n", + DLB2_LOG_DBG("sched domain create - ldb_qs=%d, ldb_ports=%d, dir_ports=%d, atomic_inflights=%d, hist_list_entries=%d, credits=%d", cfg->num_ldb_queues, resources_asked->num_ldb_ports, cfg->num_dir_ports, @@ -840,7 +840,7 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, cfg->num_hist_list_entries, cfg->num_credits); } else { - DLB2_LOG_DBG("sched domain create - ldb_qs=%d, ldb_ports=%d, dir_ports=%d, atomic_inflights=%d, hist_list_entries=%d, ldb_credits=%d, dir_credits=%d\n", + DLB2_LOG_DBG("sched domain create - ldb_qs=%d, ldb_ports=%d, dir_ports=%d, atomic_inflights=%d, hist_list_entries=%d, ldb_credits=%d, dir_credits=%d", cfg->num_ldb_queues, resources_asked->num_ldb_ports, cfg->num_dir_ports, @@ -854,7 +854,7 @@ dlb2_hw_create_sched_domain(struct dlb2_eventdev *dlb2, ret = dlb2_iface_sched_domain_create(handle, cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: domain create failed, ret = %d, extra status: %s\n", + DLB2_LOG_ERR("dlb2: domain create failed, ret = %d, extra status: %s", ret, dlb2_error_strings[cfg->response.status]); @@ -930,27 +930,27 @@ dlb2_eventdev_configure(const struct rte_eventdev *dev) dlb2_hw_reset_sched_domain(dev, true); ret = dlb2_hw_query_resources(dlb2); if (ret) { - DLB2_LOG_ERR("get resources err=%d, devid=%d\n", + DLB2_LOG_ERR("get resources err=%d, devid=%d", ret, data->dev_id); return ret; } } if (config->nb_event_queues > rsrcs->num_queues) { - DLB2_LOG_ERR("nb_event_queues parameter (%d) exceeds the QM device's capabilities (%d).\n", + DLB2_LOG_ERR("nb_event_queues parameter (%d) exceeds the QM device's capabilities (%d).", config->nb_event_queues, rsrcs->num_queues); return -EINVAL; } if (config->nb_event_ports > (rsrcs->num_ldb_ports + rsrcs->num_dir_ports)) { - DLB2_LOG_ERR("nb_event_ports parameter (%d) exceeds the QM device's capabilities (%d).\n", + DLB2_LOG_ERR("nb_event_ports parameter (%d) exceeds the QM device's capabilities (%d).", config->nb_event_ports, (rsrcs->num_ldb_ports + rsrcs->num_dir_ports)); return -EINVAL; } if (config->nb_events_limit > rsrcs->nb_events_limit) { - DLB2_LOG_ERR("nb_events_limit parameter (%d) exceeds the QM device's capabilities (%d).\n", + DLB2_LOG_ERR("nb_events_limit parameter (%d) exceeds the QM device's capabilities (%d).", config->nb_events_limit, rsrcs->nb_events_limit); return -EINVAL; @@ -1000,7 +1000,7 @@ dlb2_eventdev_configure(const struct rte_eventdev *dev) if (dlb2_hw_create_sched_domain(dlb2, handle, rsrcs, dlb2->version) < 0) { - DLB2_LOG_ERR("dlb2_hw_create_sched_domain failed\n"); + DLB2_LOG_ERR("dlb2_hw_create_sched_domain failed"); return -ENODEV; } @@ -1068,7 +1068,7 @@ dlb2_get_sn_allocation(struct dlb2_eventdev *dlb2, int group) ret = dlb2_iface_get_sn_allocation(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: get_sn_allocation ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: get_sn_allocation ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -1088,7 +1088,7 @@ dlb2_set_sn_allocation(struct dlb2_eventdev *dlb2, int group, int num) ret = dlb2_iface_set_sn_allocation(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: set_sn_allocation ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: set_sn_allocation ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -1107,7 +1107,7 @@ dlb2_get_sn_occupancy(struct dlb2_eventdev *dlb2, int group) ret = dlb2_iface_get_sn_occupancy(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: get_sn_occupancy ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: get_sn_occupancy ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -1161,7 +1161,7 @@ dlb2_program_sn_allocation(struct dlb2_eventdev *dlb2, } if (i == DLB2_NUM_SN_GROUPS) { - DLB2_LOG_ERR("[%s()] No groups with %d sequence_numbers are available or have free slots\n", + DLB2_LOG_ERR("[%s()] No groups with %d sequence_numbers are available or have free slots", __func__, sequence_numbers); return; } @@ -1236,7 +1236,7 @@ dlb2_hw_create_ldb_queue(struct dlb2_eventdev *dlb2, ret = dlb2_iface_ldb_queue_create(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: create LB event queue error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: create LB event queue error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return -EINVAL; } @@ -1250,7 +1250,7 @@ dlb2_hw_create_ldb_queue(struct dlb2_eventdev *dlb2, queue->sched_type = sched_type; queue->config_state = DLB2_CONFIGURED; - DLB2_LOG_DBG("Created LB event queue %d, nb_inflights=%d, nb_seq=%d, qid inflights=%d\n", + DLB2_LOG_DBG("Created LB event queue %d, nb_inflights=%d, nb_seq=%d, qid inflights=%d", qm_qid, cfg.num_atomic_inflights, cfg.num_sequence_numbers, @@ -1272,7 +1272,7 @@ dlb2_eventdev_ldb_queue_setup(struct rte_eventdev *dev, qm_qid = dlb2_hw_create_ldb_queue(dlb2, ev_queue, queue_conf); if (qm_qid < 0) { - DLB2_LOG_ERR("Failed to create the load-balanced queue\n"); + DLB2_LOG_ERR("Failed to create the load-balanced queue"); return qm_qid; } @@ -1380,7 +1380,7 @@ dlb2_init_consume_qe(struct dlb2_port *qm_port, char *mz_name) RTE_CACHE_LINE_SIZE); if (qe == NULL) { - DLB2_LOG_ERR("dlb2: no memory for consume_qe\n"); + DLB2_LOG_ERR("dlb2: no memory for consume_qe"); return -ENOMEM; } qm_port->consume_qe = qe; @@ -1412,7 +1412,7 @@ dlb2_init_int_arm_qe(struct dlb2_port *qm_port, char *mz_name) RTE_CACHE_LINE_SIZE); if (qe == NULL) { - DLB2_LOG_ERR("dlb2: no memory for complete_qe\n"); + DLB2_LOG_ERR("dlb2: no memory for complete_qe"); return -ENOMEM; } qm_port->int_arm_qe = qe; @@ -1440,20 +1440,20 @@ dlb2_init_qe_mem(struct dlb2_port *qm_port, char *mz_name) qm_port->qe4 = rte_zmalloc(mz_name, sz, RTE_CACHE_LINE_SIZE); if (qm_port->qe4 == NULL) { - DLB2_LOG_ERR("dlb2: no qe4 memory\n"); + DLB2_LOG_ERR("dlb2: no qe4 memory"); ret = -ENOMEM; goto error_exit; } ret = dlb2_init_int_arm_qe(qm_port, mz_name); if (ret < 0) { - DLB2_LOG_ERR("dlb2: dlb2_init_int_arm_qe ret=%d\n", ret); + DLB2_LOG_ERR("dlb2: dlb2_init_int_arm_qe ret=%d", ret); goto error_exit; } ret = dlb2_init_consume_qe(qm_port, mz_name); if (ret < 0) { - DLB2_LOG_ERR("dlb2: dlb2_init_consume_qe ret=%d\n", ret); + DLB2_LOG_ERR("dlb2: dlb2_init_consume_qe ret=%d", ret); goto error_exit; } @@ -1536,14 +1536,14 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, return -EINVAL; if (dequeue_depth < DLB2_MIN_CQ_DEPTH) { - DLB2_LOG_ERR("dlb2: invalid cq depth, must be at least %d\n", + DLB2_LOG_ERR("dlb2: invalid cq depth, must be at least %d", DLB2_MIN_CQ_DEPTH); return -EINVAL; } if (dlb2->version == DLB2_HW_V2 && ev_port->cq_weight != 0 && ev_port->cq_weight > dequeue_depth) { - DLB2_LOG_ERR("dlb2: invalid cq dequeue depth %d, must be >= cq weight %d\n", + DLB2_LOG_ERR("dlb2: invalid cq dequeue depth %d, must be >= cq weight %d", dequeue_depth, ev_port->cq_weight); return -EINVAL; } @@ -1579,14 +1579,14 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, ret = dlb2_iface_ldb_port_create(handle, &cfg, dlb2->poll_mode); if (ret < 0) { - DLB2_LOG_ERR("dlb2: dlb2_ldb_port_create error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: dlb2_ldb_port_create error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); goto error_exit; } qm_port_id = cfg.response.id; - DLB2_LOG_DBG("dlb2: ev_port %d uses qm LB port %d <<<<<\n", + DLB2_LOG_DBG("dlb2: ev_port %d uses qm LB port %d <<<<<", ev_port->id, qm_port_id); qm_port = &ev_port->qm_port; @@ -1602,7 +1602,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, ret = dlb2_init_qe_mem(qm_port, mz_name); if (ret < 0) { - DLB2_LOG_ERR("dlb2: init_qe_mem failed, ret=%d\n", ret); + DLB2_LOG_ERR("dlb2: init_qe_mem failed, ret=%d", ret); goto error_exit; } @@ -1615,7 +1615,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, ret = dlb2_iface_enable_cq_weight(handle, &cq_weight_args); if (ret < 0) { - DLB2_LOG_ERR("dlb2: dlb2_dir_port_create error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: dlb2_dir_port_create error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response. status]); goto error_exit; @@ -1680,7 +1680,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, qm_port->credit_pool[DLB2_DIR_QUEUE] = &dlb2->dir_credit_pool; qm_port->credit_pool[DLB2_LDB_QUEUE] = &dlb2->ldb_credit_pool; - DLB2_LOG_DBG("dlb2: created ldb port %d, depth = %d, ldb credits=%d, dir credits=%d\n", + DLB2_LOG_DBG("dlb2: created ldb port %d, depth = %d, ldb credits=%d, dir credits=%d", qm_port_id, dequeue_depth, qm_port->ldb_credits, @@ -1689,7 +1689,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, qm_port->credits = credit_high_watermark; qm_port->credit_pool[DLB2_COMBINED_POOL] = &dlb2->credit_pool; - DLB2_LOG_DBG("dlb2: created ldb port %d, depth = %d, credits=%d\n", + DLB2_LOG_DBG("dlb2: created ldb port %d, depth = %d, credits=%d", qm_port_id, dequeue_depth, qm_port->credits); @@ -1717,7 +1717,7 @@ dlb2_hw_create_ldb_port(struct dlb2_eventdev *dlb2, rte_spinlock_unlock(&handle->resource_lock); - DLB2_LOG_ERR("dlb2: create ldb port failed!\n"); + DLB2_LOG_ERR("dlb2: create ldb port failed!"); return ret; } @@ -1761,13 +1761,13 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, return -EINVAL; if (dequeue_depth < DLB2_MIN_CQ_DEPTH) { - DLB2_LOG_ERR("dlb2: invalid dequeue_depth, must be %d-%d\n", + DLB2_LOG_ERR("dlb2: invalid dequeue_depth, must be %d-%d", DLB2_MIN_CQ_DEPTH, DLB2_MAX_INPUT_QUEUE_DEPTH); return -EINVAL; } if (enqueue_depth < DLB2_MIN_ENQUEUE_DEPTH) { - DLB2_LOG_ERR("dlb2: invalid enqueue_depth, must be at least %d\n", + DLB2_LOG_ERR("dlb2: invalid enqueue_depth, must be at least %d", DLB2_MIN_ENQUEUE_DEPTH); return -EINVAL; } @@ -1802,14 +1802,14 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, ret = dlb2_iface_dir_port_create(handle, &cfg, dlb2->poll_mode); if (ret < 0) { - DLB2_LOG_ERR("dlb2: dlb2_dir_port_create error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: dlb2_dir_port_create error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); goto error_exit; } qm_port_id = cfg.response.id; - DLB2_LOG_DBG("dlb2: ev_port %d uses qm DIR port %d <<<<<\n", + DLB2_LOG_DBG("dlb2: ev_port %d uses qm DIR port %d <<<<<", ev_port->id, qm_port_id); qm_port = &ev_port->qm_port; @@ -1827,7 +1827,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, ret = dlb2_init_qe_mem(qm_port, mz_name); if (ret < 0) { - DLB2_LOG_ERR("dlb2: init_qe_mem failed, ret=%d\n", ret); + DLB2_LOG_ERR("dlb2: init_qe_mem failed, ret=%d", ret); goto error_exit; } @@ -1881,7 +1881,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, qm_port->credit_pool[DLB2_DIR_QUEUE] = &dlb2->dir_credit_pool; qm_port->credit_pool[DLB2_LDB_QUEUE] = &dlb2->ldb_credit_pool; - DLB2_LOG_DBG("dlb2: created dir port %d, depth = %d cr=%d,%d\n", + DLB2_LOG_DBG("dlb2: created dir port %d, depth = %d cr=%d,%d", qm_port_id, dequeue_depth, dir_credit_high_watermark, @@ -1890,7 +1890,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, qm_port->credits = credit_high_watermark; qm_port->credit_pool[DLB2_COMBINED_POOL] = &dlb2->credit_pool; - DLB2_LOG_DBG("dlb2: created dir port %d, depth = %d cr=%d\n", + DLB2_LOG_DBG("dlb2: created dir port %d, depth = %d cr=%d", qm_port_id, dequeue_depth, credit_high_watermark); @@ -1916,7 +1916,7 @@ dlb2_hw_create_dir_port(struct dlb2_eventdev *dlb2, rte_spinlock_unlock(&handle->resource_lock); - DLB2_LOG_ERR("dlb2: create dir port failed!\n"); + DLB2_LOG_ERR("dlb2: create dir port failed!"); return ret; } @@ -1932,7 +1932,7 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, int ret; if (dev == NULL || port_conf == NULL) { - DLB2_LOG_ERR("Null parameter\n"); + DLB2_LOG_ERR("Null parameter"); return -EINVAL; } @@ -1950,7 +1950,7 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, ev_port = &dlb2->ev_ports[ev_port_id]; /* configured? */ if (ev_port->setup_done) { - DLB2_LOG_ERR("evport %d is already configured\n", ev_port_id); + DLB2_LOG_ERR("evport %d is already configured", ev_port_id); return -EINVAL; } @@ -1982,7 +1982,7 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, if (port_conf->enqueue_depth > sw_credit_quanta || port_conf->enqueue_depth > hw_credit_quanta) { - DLB2_LOG_ERR("Invalid port config. Enqueue depth %d must be <= credit quanta %d and batch size %d\n", + DLB2_LOG_ERR("Invalid port config. Enqueue depth %d must be <= credit quanta %d and batch size %d", port_conf->enqueue_depth, sw_credit_quanta, hw_credit_quanta); @@ -2004,7 +2004,7 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, port_conf->dequeue_depth, port_conf->enqueue_depth); if (ret < 0) { - DLB2_LOG_ERR("Failed to create the lB port ve portId=%d\n", + DLB2_LOG_ERR("Failed to create the lB port ve portId=%d", ev_port_id); return ret; @@ -2015,7 +2015,7 @@ dlb2_eventdev_port_setup(struct rte_eventdev *dev, port_conf->dequeue_depth, port_conf->enqueue_depth); if (ret < 0) { - DLB2_LOG_ERR("Failed to create the DIR port\n"); + DLB2_LOG_ERR("Failed to create the DIR port"); return ret; } } @@ -2082,14 +2082,14 @@ dlb2_hw_map_ldb_qid_to_port(struct dlb2_hw_dev *handle, ret = dlb2_iface_map_qid(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: map qid error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: map qid error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); - DLB2_LOG_ERR("dlb2: grp=%d, qm_port=%d, qm_qid=%d prio=%d\n", + DLB2_LOG_ERR("dlb2: grp=%d, qm_port=%d, qm_qid=%d prio=%d", handle->domain_id, cfg.port_id, cfg.qid, cfg.priority); } else { - DLB2_LOG_DBG("dlb2: mapped queue %d to qm_port %d\n", + DLB2_LOG_DBG("dlb2: mapped queue %d to qm_port %d", qm_qid, qm_port_id); } @@ -2117,7 +2117,7 @@ dlb2_event_queue_join_ldb(struct dlb2_eventdev *dlb2, first_avail = i; } if (first_avail == -1) { - DLB2_LOG_ERR("dlb2: qm_port %d has no available QID slots.\n", + DLB2_LOG_ERR("dlb2: qm_port %d has no available QID slots.", ev_port->qm_port.id); return -EINVAL; } @@ -2154,7 +2154,7 @@ dlb2_hw_create_dir_queue(struct dlb2_eventdev *dlb2, ret = dlb2_iface_dir_queue_create(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: create DIR event queue error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: create DIR event queue error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return -EINVAL; } @@ -2172,7 +2172,7 @@ dlb2_eventdev_dir_queue_setup(struct dlb2_eventdev *dlb2, qm_qid = dlb2_hw_create_dir_queue(dlb2, ev_queue, ev_port->qm_port.id); if (qm_qid < 0) { - DLB2_LOG_ERR("Failed to create the DIR queue\n"); + DLB2_LOG_ERR("Failed to create the DIR queue"); return qm_qid; } @@ -2202,7 +2202,7 @@ dlb2_do_port_link(struct rte_eventdev *dev, err = dlb2_event_queue_join_ldb(dlb2, ev_port, ev_queue, prio); if (err) { - DLB2_LOG_ERR("port link failure for %s ev_q %d, ev_port %d\n", + DLB2_LOG_ERR("port link failure for %s ev_q %d, ev_port %d", ev_queue->qm_queue.is_directed ? "DIR" : "LDB", ev_queue->id, ev_port->id); @@ -2240,7 +2240,7 @@ dlb2_validate_port_link(struct dlb2_eventdev_port *ev_port, queue_is_dir = ev_queue->qm_queue.is_directed; if (port_is_dir != queue_is_dir) { - DLB2_LOG_ERR("%s queue %u can't link to %s port %u\n", + DLB2_LOG_ERR("%s queue %u can't link to %s port %u", queue_is_dir ? "DIR" : "LDB", ev_queue->id, port_is_dir ? "DIR" : "LDB", ev_port->id); @@ -2250,7 +2250,7 @@ dlb2_validate_port_link(struct dlb2_eventdev_port *ev_port, /* Check if there is space for the requested link */ if (!link_exists && index == -1) { - DLB2_LOG_ERR("no space for new link\n"); + DLB2_LOG_ERR("no space for new link"); rte_errno = -ENOSPC; return -1; } @@ -2258,7 +2258,7 @@ dlb2_validate_port_link(struct dlb2_eventdev_port *ev_port, /* Check if the directed port is already linked */ if (ev_port->qm_port.is_directed && ev_port->num_links > 0 && !link_exists) { - DLB2_LOG_ERR("Can't link DIR port %d to >1 queues\n", + DLB2_LOG_ERR("Can't link DIR port %d to >1 queues", ev_port->id); rte_errno = -EINVAL; return -1; @@ -2267,7 +2267,7 @@ dlb2_validate_port_link(struct dlb2_eventdev_port *ev_port, /* Check if the directed queue is already linked */ if (ev_queue->qm_queue.is_directed && ev_queue->num_links > 0 && !link_exists) { - DLB2_LOG_ERR("Can't link DIR queue %d to >1 ports\n", + DLB2_LOG_ERR("Can't link DIR queue %d to >1 ports", ev_queue->id); rte_errno = -EINVAL; return -1; @@ -2289,14 +2289,14 @@ dlb2_eventdev_port_link(struct rte_eventdev *dev, void *event_port, RTE_SET_USED(dev); if (ev_port == NULL) { - DLB2_LOG_ERR("dlb2: evport not setup\n"); + DLB2_LOG_ERR("dlb2: evport not setup"); rte_errno = -EINVAL; return 0; } if (!ev_port->setup_done && ev_port->qm_port.config_state != DLB2_PREV_CONFIGURED) { - DLB2_LOG_ERR("dlb2: evport not setup\n"); + DLB2_LOG_ERR("dlb2: evport not setup"); rte_errno = -EINVAL; return 0; } @@ -2305,13 +2305,13 @@ dlb2_eventdev_port_link(struct rte_eventdev *dev, void *event_port, * queues pointer. */ if (nb_links == 0) { - DLB2_LOG_DBG("dlb2: nb_links is 0\n"); + DLB2_LOG_DBG("dlb2: nb_links is 0"); return 0; /* Ignore and return success */ } dlb2 = ev_port->dlb2; - DLB2_LOG_DBG("Linking %u queues to %s port %d\n", + DLB2_LOG_DBG("Linking %u queues to %s port %d", nb_links, ev_port->qm_port.is_directed ? "DIR" : "LDB", ev_port->id); @@ -2381,7 +2381,7 @@ dlb2_hw_unmap_ldb_qid_from_port(struct dlb2_hw_dev *handle, ret = dlb2_iface_unmap_qid(handle, &cfg); if (ret < 0) - DLB2_LOG_ERR("dlb2: unmap qid error, ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: unmap qid error, ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; @@ -2408,7 +2408,7 @@ dlb2_event_queue_detach_ldb(struct dlb2_eventdev *dlb2, * It blindly attempts to unmap all queues. */ if (i == DLB2_MAX_NUM_QIDS_PER_LDB_CQ) { - DLB2_LOG_DBG("dlb2: ignoring LB QID %d not mapped for qm_port %d.\n", + DLB2_LOG_DBG("dlb2: ignoring LB QID %d not mapped for qm_port %d.", ev_queue->qm_queue.id, ev_port->qm_port.id); return 0; @@ -2434,19 +2434,19 @@ dlb2_eventdev_port_unlink(struct rte_eventdev *dev, void *event_port, RTE_SET_USED(dev); if (!ev_port->setup_done) { - DLB2_LOG_ERR("dlb2: evport %d is not configured\n", + DLB2_LOG_ERR("dlb2: evport %d is not configured", ev_port->id); rte_errno = -EINVAL; return 0; } if (queues == NULL || nb_unlinks == 0) { - DLB2_LOG_DBG("dlb2: queues is NULL or nb_unlinks is 0\n"); + DLB2_LOG_DBG("dlb2: queues is NULL or nb_unlinks is 0"); return 0; /* Ignore and return success */ } if (ev_port->qm_port.is_directed) { - DLB2_LOG_DBG("dlb2: ignore unlink from dir port %d\n", + DLB2_LOG_DBG("dlb2: ignore unlink from dir port %d", ev_port->id); rte_errno = 0; return nb_unlinks; /* as if success */ @@ -2459,7 +2459,7 @@ dlb2_eventdev_port_unlink(struct rte_eventdev *dev, void *event_port, int ret, j; if (queues[i] >= dlb2->num_queues) { - DLB2_LOG_ERR("dlb2: invalid queue id %d\n", queues[i]); + DLB2_LOG_ERR("dlb2: invalid queue id %d", queues[i]); rte_errno = -EINVAL; return i; /* return index of offending queue */ } @@ -2477,7 +2477,7 @@ dlb2_eventdev_port_unlink(struct rte_eventdev *dev, void *event_port, ret = dlb2_event_queue_detach_ldb(dlb2, ev_port, ev_queue); if (ret) { - DLB2_LOG_ERR("unlink err=%d for port %d queue %d\n", + DLB2_LOG_ERR("unlink err=%d for port %d queue %d", ret, ev_port->id, queues[i]); rte_errno = -ENOENT; return i; /* return index of offending queue */ @@ -2504,7 +2504,7 @@ dlb2_eventdev_port_unlinks_in_progress(struct rte_eventdev *dev, RTE_SET_USED(dev); if (!ev_port->setup_done) { - DLB2_LOG_ERR("dlb2: evport %d is not configured\n", + DLB2_LOG_ERR("dlb2: evport %d is not configured", ev_port->id); rte_errno = -EINVAL; return 0; @@ -2516,7 +2516,7 @@ dlb2_eventdev_port_unlinks_in_progress(struct rte_eventdev *dev, ret = dlb2_iface_pending_port_unmaps(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: num_unlinks_in_progress ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: num_unlinks_in_progress ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -2609,7 +2609,7 @@ dlb2_eventdev_start(struct rte_eventdev *dev) rte_spinlock_lock(&dlb2->qm_instance.resource_lock); if (dlb2->run_state != DLB2_RUN_STATE_STOPPED) { - DLB2_LOG_ERR("bad state %d for dev_start\n", + DLB2_LOG_ERR("bad state %d for dev_start", (int)dlb2->run_state); rte_spinlock_unlock(&dlb2->qm_instance.resource_lock); return -EINVAL; @@ -2645,13 +2645,13 @@ dlb2_eventdev_start(struct rte_eventdev *dev) ret = dlb2_iface_sched_domain_start(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: sched_domain_start ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: sched_domain_start ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } dlb2->run_state = DLB2_RUN_STATE_STARTED; - DLB2_LOG_DBG("dlb2: sched_domain_start completed OK\n"); + DLB2_LOG_DBG("dlb2: sched_domain_start completed OK"); return 0; } @@ -2746,7 +2746,7 @@ dlb2_check_enqueue_hw_ldb_credits(struct dlb2_port *qm_port) DLB2_INC_STAT( qm_port->ev_port->stats.traffic.tx_nospc_ldb_hw_credits, 1); - DLB2_LOG_DBG("ldb credits exhausted\n"); + DLB2_LOG_DBG("ldb credits exhausted"); return 1; /* credits exhausted */ } } @@ -2765,7 +2765,7 @@ dlb2_check_enqueue_hw_dir_credits(struct dlb2_port *qm_port) DLB2_INC_STAT( qm_port->ev_port->stats.traffic.tx_nospc_dir_hw_credits, 1); - DLB2_LOG_DBG("dir credits exhausted\n"); + DLB2_LOG_DBG("dir credits exhausted"); return 1; /* credits exhausted */ } } @@ -2783,7 +2783,7 @@ dlb2_check_enqueue_hw_credits(struct dlb2_port *qm_port) if (unlikely(qm_port->cached_credits == 0)) { DLB2_INC_STAT( qm_port->ev_port->stats.traffic.tx_nospc_hw_credits, 1); - DLB2_LOG_DBG("credits exhausted\n"); + DLB2_LOG_DBG("credits exhausted"); return 1; /* credits exhausted */ } } @@ -2817,7 +2817,7 @@ dlb2_consume_qe_immediate(struct dlb2_port *qm_port, int num) dlb2_movntdq_single(port_data->pp_addr, qe); - DLB2_LOG_DBG("dlb2: consume immediate - %d QEs\n", num); + DLB2_LOG_DBG("dlb2: consume immediate - %d QEs", num); qm_port->owed_tokens = 0; @@ -2888,9 +2888,9 @@ dlb2_event_enqueue_prep(struct dlb2_eventdev_port *ev_port, } switch (ev->sched_type) { case RTE_SCHED_TYPE_ORDERED: - DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_ORDERED\n"); + DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_ORDERED"); if (qm_queue->sched_type != RTE_SCHED_TYPE_ORDERED) { - DLB2_LOG_ERR("dlb2: tried to send ordered event to unordered queue %d\n", + DLB2_LOG_ERR("dlb2: tried to send ordered event to unordered queue %d", *queue_id); rte_errno = -EINVAL; return 1; @@ -2898,18 +2898,18 @@ dlb2_event_enqueue_prep(struct dlb2_eventdev_port *ev_port, *sched_type = DLB2_SCHED_ORDERED; break; case RTE_SCHED_TYPE_ATOMIC: - DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_ATOMIC\n"); + DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_ATOMIC"); *sched_type = DLB2_SCHED_ATOMIC; break; case RTE_SCHED_TYPE_PARALLEL: - DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_PARALLEL\n"); + DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_PARALLEL"); if (qm_queue->sched_type == RTE_SCHED_TYPE_ORDERED) *sched_type = DLB2_SCHED_ORDERED; else *sched_type = DLB2_SCHED_UNORDERED; break; default: - DLB2_LOG_ERR("Unsupported LDB sched type in put_qe\n"); + DLB2_LOG_ERR("Unsupported LDB sched type in put_qe"); DLB2_INC_STAT(ev_port->stats.tx_invalid, 1); rte_errno = -EINVAL; return 1; @@ -2930,7 +2930,7 @@ dlb2_event_enqueue_prep(struct dlb2_eventdev_port *ev_port, } cached_credits = &qm_port->cached_credits; } - DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_DIRECTED\n"); + DLB2_LOG_DBG("dlb2: put_qe: RTE_SCHED_TYPE_DIRECTED"); *sched_type = DLB2_SCHED_DIRECTED; } @@ -3156,7 +3156,7 @@ dlb2_event_release(struct dlb2_eventdev *dlb2, int i; if (port_id > dlb2->num_ports) { - DLB2_LOG_ERR("Invalid port id %d in dlb2-event_release\n", + DLB2_LOG_ERR("Invalid port id %d in dlb2-event_release", port_id); rte_errno = -EINVAL; return; @@ -3213,7 +3213,7 @@ dlb2_event_release(struct dlb2_eventdev *dlb2, sw_credit_update: /* each release returns one credit */ if (unlikely(!ev_port->outstanding_releases)) { - DLB2_LOG_ERR("%s: Outstanding releases underflowed.\n", + DLB2_LOG_ERR("%s: Outstanding releases underflowed.", __func__); return; } @@ -3367,7 +3367,7 @@ dlb2_process_dequeue_qes(struct dlb2_eventdev_port *ev_port, * buffer is a mbuf. */ if (unlikely(qe->error)) { - DLB2_LOG_ERR("QE error bit ON\n"); + DLB2_LOG_ERR("QE error bit ON"); DLB2_INC_STAT(ev_port->stats.traffic.rx_drop, 1); dlb2_consume_qe_immediate(qm_port, 1); continue; /* Ignore */ @@ -4281,7 +4281,7 @@ dlb2_get_ldb_queue_depth(struct dlb2_eventdev *dlb2, ret = dlb2_iface_get_ldb_queue_depth(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: get_ldb_queue_depth ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: get_ldb_queue_depth ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -4301,7 +4301,7 @@ dlb2_get_dir_queue_depth(struct dlb2_eventdev *dlb2, ret = dlb2_iface_get_dir_queue_depth(handle, &cfg); if (ret < 0) { - DLB2_LOG_ERR("dlb2: get_dir_queue_depth ret=%d (driver status: %s)\n", + DLB2_LOG_ERR("dlb2: get_dir_queue_depth ret=%d (driver status: %s)", ret, dlb2_error_strings[cfg.response.status]); return ret; } @@ -4392,7 +4392,7 @@ dlb2_drain(struct rte_eventdev *dev) } if (i == dlb2->num_ports) { - DLB2_LOG_ERR("internal error: no LDB ev_ports\n"); + DLB2_LOG_ERR("internal error: no LDB ev_ports"); return; } @@ -4400,7 +4400,7 @@ dlb2_drain(struct rte_eventdev *dev) rte_event_port_unlink(dev_id, ev_port->id, NULL, 0); if (rte_errno) { - DLB2_LOG_ERR("internal error: failed to unlink ev_port %d\n", + DLB2_LOG_ERR("internal error: failed to unlink ev_port %d", ev_port->id); return; } @@ -4418,7 +4418,7 @@ dlb2_drain(struct rte_eventdev *dev) /* Link the ev_port to the queue */ ret = rte_event_port_link(dev_id, ev_port->id, &qid, &prio, 1); if (ret != 1) { - DLB2_LOG_ERR("internal error: failed to link ev_port %d to queue %d\n", + DLB2_LOG_ERR("internal error: failed to link ev_port %d to queue %d", ev_port->id, qid); return; } @@ -4433,7 +4433,7 @@ dlb2_drain(struct rte_eventdev *dev) /* Unlink the ev_port from the queue */ ret = rte_event_port_unlink(dev_id, ev_port->id, &qid, 1); if (ret != 1) { - DLB2_LOG_ERR("internal error: failed to unlink ev_port %d to queue %d\n", + DLB2_LOG_ERR("internal error: failed to unlink ev_port %d to queue %d", ev_port->id, qid); return; } @@ -4448,11 +4448,11 @@ dlb2_eventdev_stop(struct rte_eventdev *dev) rte_spinlock_lock(&dlb2->qm_instance.resource_lock); if (dlb2->run_state == DLB2_RUN_STATE_STOPPED) { - DLB2_LOG_DBG("Internal error: already stopped\n"); + DLB2_LOG_DBG("Internal error: already stopped"); rte_spinlock_unlock(&dlb2->qm_instance.resource_lock); return; } else if (dlb2->run_state != DLB2_RUN_STATE_STARTED) { - DLB2_LOG_ERR("Internal error: bad state %d for dev_stop\n", + DLB2_LOG_ERR("Internal error: bad state %d for dev_stop", (int)dlb2->run_state); rte_spinlock_unlock(&dlb2->qm_instance.resource_lock); return; @@ -4608,7 +4608,7 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev, err = dlb2_iface_open(&dlb2->qm_instance, name); if (err < 0) { - DLB2_LOG_ERR("could not open event hardware device, err=%d\n", + DLB2_LOG_ERR("could not open event hardware device, err=%d", err); return err; } @@ -4616,14 +4616,14 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev, err = dlb2_iface_get_device_version(&dlb2->qm_instance, &dlb2->revision); if (err < 0) { - DLB2_LOG_ERR("dlb2: failed to get the device version, err=%d\n", + DLB2_LOG_ERR("dlb2: failed to get the device version, err=%d", err); return err; } err = dlb2_hw_query_resources(dlb2); if (err) { - DLB2_LOG_ERR("get resources err=%d for %s\n", + DLB2_LOG_ERR("get resources err=%d for %s", err, name); return err; } @@ -4646,7 +4646,7 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev, break; } if (ret) { - DLB2_LOG_ERR("dlb2: failed to configure class of service, err=%d\n", + DLB2_LOG_ERR("dlb2: failed to configure class of service, err=%d", err); return err; } @@ -4654,7 +4654,7 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev, err = dlb2_iface_get_cq_poll_mode(&dlb2->qm_instance, &dlb2->poll_mode); if (err < 0) { - DLB2_LOG_ERR("dlb2: failed to get the poll mode, err=%d\n", + DLB2_LOG_ERR("dlb2: failed to get the poll mode, err=%d", err); return err; } @@ -4662,7 +4662,7 @@ dlb2_primary_eventdev_probe(struct rte_eventdev *dev, /* Complete xtstats runtime initialization */ err = dlb2_xstats_init(dlb2); if (err) { - DLB2_LOG_ERR("dlb2: failed to init xstats, err=%d\n", err); + DLB2_LOG_ERR("dlb2: failed to init xstats, err=%d", err); return err; } @@ -4692,14 +4692,14 @@ dlb2_secondary_eventdev_probe(struct rte_eventdev *dev, err = dlb2_iface_open(&dlb2->qm_instance, name); if (err < 0) { - DLB2_LOG_ERR("could not open event hardware device, err=%d\n", + DLB2_LOG_ERR("could not open event hardware device, err=%d", err); return err; } err = dlb2_hw_query_resources(dlb2); if (err) { - DLB2_LOG_ERR("get resources err=%d for %s\n", + DLB2_LOG_ERR("get resources err=%d for %s", err, name); return err; } @@ -4741,9 +4741,8 @@ dlb2_parse_params(const char *params, struct rte_kvargs *kvlist = rte_kvargs_parse(params, args); if (kvlist == NULL) { - RTE_LOG(INFO, PMD, - "Ignoring unsupported parameters when creating device '%s'\n", - name); + DLB2_LOG_INFO("Ignoring unsupported parameters when creating device '%s'", + name); } else { int ret = rte_kvargs_process(kvlist, NUMA_NODE_ARG, set_numa_node, From patchwork Thu Dec 21 16:46:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135469 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 404F443751; Thu, 21 Dec 2023 17:50:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CE96B42ED3; Thu, 21 Dec 2023 17:49:19 +0100 (CET) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mails.dpdk.org (Postfix) with ESMTP id 818F842EBC for ; Thu, 21 Dec 2023 17:49:18 +0100 (CET) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-5ca29c131ebso782651a12.0 for ; Thu, 21 Dec 2023 08:49:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177358; x=1703782158; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7fmLyGTEsBMDiSo/AXk6vGJW073GLmANpKukqMpxbjw=; b=GwQskUxe3wBdTxGH8KihG5TVOCnQq+C0SyVwHGJd9+D0e2M8YBJ1TtUrfriwslzAb5 yXw6dzOeQ9+PSmcNdJcUcXQCWagJsx3wApg3SUxrnLYsWzUTiesb8nhWf5nLJycrSJ2M EokzpWIypeN5UdtNwcxmPZgeFT72KWN1/ayVSe2Sfe/gkAfWgFBRAJhhp8/Cy58Y9sv2 HsE7Y/odNNb03h56DiHj7d+xmpp5eBsZCtlq1K07umWZO+GXEjakviGeS3H5uPrP8MCC Ubv1GaYM2rkely6eVEq8M+WmLuSi/ObUPx8qcsWDNAzHIcCXzjxpkX1YfmQ05K8zntRm XxYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177358; x=1703782158; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7fmLyGTEsBMDiSo/AXk6vGJW073GLmANpKukqMpxbjw=; b=IFrga7dhw1Ufk9MjMI1VYgyIqk63hrj0CEWbLtGZuj5mq69tklzQtXrafgneAAZSm0 bzLTXaUG6C6Lyq74t6nqk/Zm/yMwmFKgxx30kRCdwzsyQaw/3ZylkZFQ1biLKB+LIW+I a3nqfbGtRt3J7MTyYGXQiifc798Ok4m+0N2hkQm7+mAmUtfHu+m7be3F23g9mDkw9WRV SMsSFf1NBolXCV/jnQ3koOrX9DOSlWtymAC9CxnG4nk7uCvLByojYHe7OrcOBeV69UeC axIOLXlwN9V31cmVi70JNyFRXtNr5tE0v7dTE4ssO+G6GmHCRoacrr2SZmc7PSK+jq2W B48g== X-Gm-Message-State: AOJu0YzcfDNO3Ffw+T/YSXb6KvmC25tGSezYkjBvs5jKZG1J77vkDZR1 Y4/FGbFATiR3i8qkTmnyA4sVMhMMuEGJB5s8FAtpZg== X-Google-Smtp-Source: AGHT+IHEx2j7Fdmm26OrNB5WmkUOPD5GFaNVkZ3FfG0jMzQzC6pMQrZkgxlQ6lQypnB3Y5f1oBJbfQ== X-Received: by 2002:a05:6a20:be28:b0:185:876f:4f4d with SMTP id ge40-20020a056a20be2800b00185876f4f4dmr1525764pzb.32.1703177357737; Thu, 21 Dec 2023 08:49:17 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:17 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Hemant Agrawal , Sachin Saxena , Akhil Goyal Subject: [PATCH v5 14/18] event/dpaa, event/dpaa2: use dedicated logtype Date: Thu, 21 Dec 2023 08:46:31 -0800 Message-ID: <20231221164841.125006-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Do not use RTE_LOGTYPE_PMD. Fixes: b0f66a68ca74 ("event/dpaa: support crypto adapter") Fixes: 4ab57b042e7c ("event/dpaa2: affine portal at runtime during I/O") Signed-off-by: Stephen Hemminger --- drivers/event/dpaa/dpaa_eventdev.c | 2 +- drivers/event/dpaa2/dpaa2_eventdev.c | 4 ++-- drivers/event/dpaa2/dpaa2_eventdev_selftest.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 46a9b88c73ae..a8e5c3421df1 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -1025,7 +1025,7 @@ dpaa_event_dev_create(const char *name, const char *params, struct rte_vdev_devi eventdev->txa_enqueue = dpaa_eventdev_txa_enqueue; eventdev->txa_enqueue_same_dest = dpaa_eventdev_txa_enqueue_same_dest; - RTE_LOG(INFO, PMD, "%s eventdev added", name); + DPAA_EVENTDEV_INFO("%s eventdev added", name); /* For secondary processes, the primary has done all the work */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index dd4e64395fe5..85c2dbd998dd 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -1141,7 +1141,7 @@ dpaa2_eventdev_create(const char *name, struct rte_vdev_device *vdev) priv->max_event_queues++; } while (dpcon_dev && dpci_dev); - RTE_LOG(INFO, PMD, "%s eventdev created\n", name); + DPAA2_EVENTDEV_INFO("%s eventdev created", name); done: event_dev_probing_finish(eventdev); @@ -1178,7 +1178,7 @@ dpaa2_eventdev_destroy(const char *name) } priv->max_event_queues = 0; - RTE_LOG(INFO, PMD, "%s eventdev cleaned\n", name); + DPAA2_EVENTDEV_INFO("%s eventdev cleaned", name); return 0; } diff --git a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c index 427aff4b1111..9d4938efe6aa 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_selftest.c +++ b/drivers/event/dpaa2/dpaa2_eventdev_selftest.c @@ -774,15 +774,15 @@ static void dpaa2_test_run(int (*setup)(void), void (*tdown)(void), int (*test)(void), const char *name) { if (setup() < 0) { - RTE_LOG(INFO, PMD, "Error setting up test %s", name); + DPAA2_EVENTDEV_INFO("Error setting up test %s", name); unsupported++; } else { if (test() < 0) { failed++; - RTE_LOG(INFO, PMD, "%s Failed\n", name); + DPAA2_EVENTDEV_INFO("%s Failed", name); } else { passed++; - RTE_LOG(INFO, PMD, "%s Passed", name); + DPAA2_EVENTDEV_INFO("%s Passed", name); } } From patchwork Thu Dec 21 16:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135470 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1358C43751; Thu, 21 Dec 2023 17:50:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 103B642ED7; Thu, 21 Dec 2023 17:49:21 +0100 (CET) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mails.dpdk.org (Postfix) with ESMTP id 5251642ECA for ; Thu, 21 Dec 2023 17:49:19 +0100 (CET) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-517ab9a4a13so773084a12.1 for ; Thu, 21 Dec 2023 08:49:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177358; x=1703782158; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IliaEP2TEKKFe31xugoOmaiAaNmKUbc7ILbkzWi/uR4=; b=HmBW1bcp48/vchcECt06uFTG+0C1/GhgfKMt3FEiSWsw1jH9R3bP4CFwaPFOBR+i0c MhBRCEK1V5E58QMUcPKFZqyzo3nPOUQwSV/EScgT5myPlcQcHDoplgDzC3J7Mpr0DJXW iCiJpVz7PFpmg6kTE79yK1tDuFPGWn2HuFfa5/H35pPXBwrTE5wBwotooiBvo3zYKFBM Z0KYF5u43A9iKa+hTSPtXGi4b6RoFyrKq5yKvGqP1havw0w5k9FZTzpYlhKOHigUPnx5 nvFMnhT/FAG1x98QRNhvAh2t9ato5x+azae3jBgRbiRc7bwO/lc+Wobd569aWWLS4+SO Xk3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177358; x=1703782158; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IliaEP2TEKKFe31xugoOmaiAaNmKUbc7ILbkzWi/uR4=; b=Ub7Cs9/JRM8c54PGTygT1cyld5hlk11rIVXKZ3w06YV1iieAUEz5UThOaX8W54iDs3 MkHh9VyiRGkYjZ1jkggOrncSsPrcxqVbNnHNTOThdjzASGnVHQ0vO9Zc5M22rvpz6jz4 VQBq5hHfno9t14/A0L/YhKly3F7lp6DzufUy1nBae3fhx3SUGaGtCd1RBvDMsX1mEuru SJqvxEVgm7bZ70kp1UjU5XDP8Wm7PZOX0aAug5A7MEr9XuZOmujdgTjVZXq8DAAhnz7i SFGIC10oGqqxK1j6J7tjfIjat1BhuwvHnIjihLVmt6zrGIIhRjl3sEUHLH1yzRKmuVr+ r0KA== X-Gm-Message-State: AOJu0YzeqJhTnH2dVcTmD4a/hkkE75db0Oa3BpbULFxq9u3Y66Q0nKME 8wU6JZPPnXiJjalK0WwDM6eNoVkoO651C1NZBak6Ug== X-Google-Smtp-Source: AGHT+IHzRY2TP1fT8cYyIu/GGr8sClLki/Vl7Xsmy78Vr2W6jMqVblj+5+ahLRb7jOT6ynkgsSedVg== X-Received: by 2002:a05:6a21:3284:b0:190:2ce8:dc87 with SMTP id yt4-20020a056a21328400b001902ce8dc87mr1944412pzb.60.1703177358518; Thu, 21 Dec 2023 08:49:18 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Jerin Jacob Subject: [PATCH v5 15/18] event/skeleton: replace logtype PMD with dynamic type Date: Thu, 21 Dec 2023 08:46:32 -0800 Message-ID: <20231221164841.125006-16-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 The skeleton is supposed to match current best practices. Change it to use dynamic logtype. Signed-off-by: Stephen Hemminger --- drivers/event/skeleton/skeleton_eventdev.c | 4 ++-- drivers/event/skeleton/skeleton_eventdev.h | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/event/skeleton/skeleton_eventdev.c b/drivers/event/skeleton/skeleton_eventdev.c index 7df032b7daa1..848b3be82c40 100644 --- a/drivers/event/skeleton/skeleton_eventdev.c +++ b/drivers/event/skeleton/skeleton_eventdev.c @@ -457,8 +457,7 @@ skeleton_eventdev_probe(struct rte_vdev_device *vdev) const char *name; name = rte_vdev_device_name(vdev); - RTE_LOG(INFO, PMD, "Initializing %s on NUMA node %d\n", name, - rte_socket_id()); + PMD_DRV_LOG(INFO, "Initializing %s on NUMA node %d", name, rte_socket_id()); return skeleton_eventdev_create(name, rte_socket_id(), vdev); } @@ -479,3 +478,4 @@ static struct rte_vdev_driver vdev_eventdev_skeleton_pmd = { }; RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_SKELETON_PMD, vdev_eventdev_skeleton_pmd); +RTE_LOG_REGISTER_DEFAULT(skeleton_eventdev_logtype, INFO); diff --git a/drivers/event/skeleton/skeleton_eventdev.h b/drivers/event/skeleton/skeleton_eventdev.h index 9193f45f4782..9c1ed4ec5755 100644 --- a/drivers/event/skeleton/skeleton_eventdev.h +++ b/drivers/event/skeleton/skeleton_eventdev.h @@ -8,9 +8,12 @@ #include #include +extern int skeleton_eventdev_logtype; + #ifdef RTE_LIBRTE_PMD_SKELETON_EVENTDEV_DEBUG #define PMD_DRV_LOG(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ ## level, skeleton_eventdev_logtype, \ + "%s(): " fmt "\n", __func__, ## args) #define PMD_DRV_FUNC_TRACE() PMD_DRV_LOG(DEBUG, ">>") #else #define PMD_DRV_LOG(level, fmt, args...) do { } while (0) @@ -18,7 +21,8 @@ #endif #define PMD_DRV_ERR(fmt, args...) \ - RTE_LOG(ERR, PMD, "%s(): " fmt "\n", __func__, ## args) + rte_log(RTE_LOG_ERR, skeleton_eventdev_logtype, \ + "%s(): " fmt "\n", __func__, ## args) struct skeleton_eventdev { uintptr_t reg_base; From patchwork Thu Dec 21 16:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135471 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6EE2043751; Thu, 21 Dec 2023 17:50:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3108542ED8; Thu, 21 Dec 2023 17:49:22 +0100 (CET) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id 19E1A42ED5 for ; Thu, 21 Dec 2023 17:49:20 +0100 (CET) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d408d0bb87so5641435ad.0 for ; Thu, 21 Dec 2023 08:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177359; x=1703782159; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AXqY9tm56NIkHBlZ4D/qsJ18O3y92AEmnbPnLiJvu4M=; b=O7e4Hdj+W0ixguv+LUw0fvmn/jTSZePkmgQnct8v2U2Mz83Chsaa5FxBgA5CfxYLvS AR63mEZHHJXMyc31GEbP1mgP7FzS6FWahxb0atyxYnE6/BZR3EnqG9XKzb35/2xBLq0R 0bANRNkBbDDwWcWpiqq3ZVe/IDflVRydB96W8DDxeM5faGgvWHg7Wwm4INusi9sxOee8 vGwD3Zi25qFGZnuWo/r6IzAIjZE6pxHUE4zO3dLVXEkAG6N0g35ZF5Uv1ddrWkhttb7b 5RCJDbXeGcWZu1YpVNsQXC/B9e02UMdxrNtOwl8C2MR1JbxkTNtqepV96dbgdotf5r9Y qUtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177359; x=1703782159; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AXqY9tm56NIkHBlZ4D/qsJ18O3y92AEmnbPnLiJvu4M=; b=c1obQcgHE3qbfGqnEJIlp3EHyRzCgoxkd3S3YptJE7UQhlUoAdeHbYriSFrRotS/Gu r/BGRW5ramO5FoXlDEDnVXpoGEH4NBaBCTD2XHvqkyT0YYc4VpLpbvuo2Z8MlQhllClu AyF98FICqrIGbuu+K0SWs+N7kGyx7mvL479y0bs/XnInJ3vawnN/6f4RZ7vYCbIvkXM1 TWih4RR+ERkm5WoYxlAobaGyah754WxhviwPihXcd0XsS4ERPPqojYlZdwSTmHyTNba7 Jnf8ss0jqGCG+lVMEy1ypdrmkZ/7JNy2od86YzQdJ6WjVn8al518YtW1Ob8amnngjzl0 YXkg== X-Gm-Message-State: AOJu0YydZxqNhlFrnUqK7T7ctuNFYfNkotQE8sNArtUzNHH9pUPKx7qT 7gxSjKgkBCQ+jelZJzOeVSbwDjMD/s6fs/N1kSb0Ew== X-Google-Smtp-Source: AGHT+IET577VZi2Kw9uGtG+YR2KbcRPhOzzg5soabHb8C5S+DBJ51sgTKYEbilB6fHxmNGFEhG4KEQ== X-Received: by 2002:a17:903:124f:b0:1d3:e1f7:2d63 with SMTP id u15-20020a170903124f00b001d3e1f72d63mr4869391plh.124.1703177359300; Thu, 21 Dec 2023 08:49:19 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:18 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Martin Spinler , Rastislav Cernay Subject: [PATCH v5 16/18] net/nfb: use dynamic logtype Date: Thu, 21 Dec 2023 08:46:33 -0800 Message-ID: <20231221164841.125006-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 All drivers should be using dynamic logtype. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Signed-off-by: Stephen Hemminger --- drivers/net/nfb/nfb.h | 5 +++++ drivers/net/nfb/nfb_ethdev.c | 24 ++++++++++-------------- drivers/net/nfb/nfb_rx.c | 9 ++++----- drivers/net/nfb/nfb_rx.h | 2 +- drivers/net/nfb/nfb_tx.c | 9 ++++----- drivers/net/nfb/nfb_tx.h | 2 +- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 7dc5bd29e44c..45226ee3d938 100644 --- a/drivers/net/nfb/nfb.h +++ b/drivers/net/nfb/nfb.h @@ -12,6 +12,11 @@ #include #include +extern int nfb_logtype; +#define NFB_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, nfb_logtype, "%s(): " fmt "\n", \ + __func__, ## args) + #include "nfb_rx.h" #include "nfb_tx.h" diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index defd118bd0ee..e533144efe5d 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -12,11 +12,9 @@ #include #include +#include "nfb.h" #include "nfb_stats.h" -#include "nfb_rx.h" -#include "nfb_tx.h" #include "nfb_rxmode.h" -#include "nfb.h" /** * Default MAC addr @@ -192,8 +190,7 @@ nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) (&nfb_timestamp_dynfield_offset, &nfb_timestamp_rx_dynflag); if (ret != 0) { - RTE_LOG(ERR, PMD, "Cannot register Rx timestamp" - " field/flag %d\n", ret); + NFB_LOG(ERR, "Cannot register Rx timestamp field/flag %d", ret); nfb_close(internals->nfb); return -rte_errno; } @@ -520,7 +517,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) struct rte_ether_addr eth_addr_init; struct rte_kvargs *kvlist; - RTE_LOG(INFO, PMD, "Initializing NFB device (" PCI_PRI_FMT ")\n", + NFB_LOG(INFO, "Initializing NFB device (" PCI_PRI_FMT ")", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -536,7 +533,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) kvlist = rte_kvargs_parse(dev->device->devargs->args, VALID_KEYS); if (kvlist == NULL) { - RTE_LOG(ERR, PMD, "Failed to parse device arguments %s", + NFB_LOG(ERR, "Failed to parse device arguments %s", dev->device->devargs->args); rte_kvargs_free(kvlist); return -EINVAL; @@ -551,14 +548,14 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) */ internals->nfb = nfb_open(internals->nfb_dev); if (internals->nfb == NULL) { - RTE_LOG(ERR, PMD, "nfb_open(): failed to open %s", + NFB_LOG(ERR, "nfb_open(): failed to open %s", internals->nfb_dev); return -EINVAL; } data->nb_rx_queues = ndp_get_rx_queue_available_count(internals->nfb); data->nb_tx_queues = ndp_get_tx_queue_available_count(internals->nfb); - RTE_LOG(INFO, PMD, "Available NDP queues RX: %u TX: %u\n", + NFB_LOG(INFO, "Available NDP queues RX: %u TX: %u\n", data->nb_rx_queues, data->nb_tx_queues); nfb_nc_rxmac_init(internals->nfb, @@ -583,7 +580,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) data->mac_addrs = rte_zmalloc(data->name, sizeof(struct rte_ether_addr) * mac_count, RTE_CACHE_LINE_SIZE); if (data->mac_addrs == NULL) { - RTE_LOG(ERR, PMD, "Could not alloc space for MAC address!\n"); + NFB_LOG(ERR, "Could not alloc space for MAC address"); nfb_close(internals->nfb); return -EINVAL; } @@ -601,8 +598,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully initialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully initialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -626,8 +622,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev) nfb_eth_dev_close(dev); - RTE_LOG(INFO, PMD, "NFB device (" - PCI_PRI_FMT ") successfully uninitialized\n", + NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully uninitialized", pci_addr->domain, pci_addr->bus, pci_addr->devid, pci_addr->function); @@ -690,3 +685,4 @@ static struct rte_pci_driver nfb_eth_driver = { RTE_PMD_REGISTER_PCI(RTE_NFB_DRIVER_NAME, nfb_eth_driver); RTE_PMD_REGISTER_PCI_TABLE(RTE_NFB_DRIVER_NAME, nfb_pci_id_table); RTE_PMD_REGISTER_KMOD_DEP(RTE_NFB_DRIVER_NAME, "* nfb"); +RTE_LOG_REGISTER_DEFAULT(nfb_logtype, NOTICE); diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c index 8a9b232305f2..a20f7b9b4b41 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -6,7 +6,6 @@ #include -#include "nfb_rx.h" #include "nfb.h" uint64_t nfb_timestamp_rx_dynflag; @@ -19,7 +18,7 @@ nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -40,7 +39,7 @@ nfb_eth_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rxq_id) int ret; if (rxq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -70,8 +69,8 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (rxq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for rx queue id " - "%" PRIu16 "!\n", rx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for rx queue id %" PRIu16, + rx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h index b618682e1393..2802f17091a0 100644 --- a/drivers/net/nfb/nfb_rx.h +++ b/drivers/net/nfb/nfb_rx.h @@ -156,7 +156,7 @@ nfb_eth_ndp_rx(void *queue, struct rte_mbuf *mbufs[nb_pkts]; if (unlikely(ndp->queue == NULL || nb_pkts == 0)) { - RTE_LOG(ERR, PMD, "RX invalid arguments!\n"); + NFB_LOG(ERR, "RX invalid arguments"); return 0; } diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c index d49fc324e76b..0cc2f596301a 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -4,7 +4,6 @@ * All rights reserved. */ -#include "nfb_tx.h" #include "nfb.h" int @@ -14,7 +13,7 @@ nfb_eth_tx_queue_start(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "RX NDP queue is NULL!\n"); + NFB_LOG(ERR, "RX NDP queue is NULL"); return -EINVAL; } @@ -35,7 +34,7 @@ nfb_eth_tx_queue_stop(struct rte_eth_dev *dev, uint16_t txq_id) int ret; if (txq->queue == NULL) { - RTE_LOG(ERR, PMD, "TX NDP queue is NULL!\n"); + NFB_LOG(ERR, "TX NDP queue is NULL"); return -EINVAL; } @@ -62,8 +61,8 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { - RTE_LOG(ERR, PMD, "rte_zmalloc_socket() failed for tx queue id " - "%" PRIu16 "!\n", tx_queue_id); + NFB_LOG(ERR, "rte_zmalloc_socket() failed for tx queue id %" PRIu16, + tx_queue_id); return -ENOMEM; } diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h index 910020e9e96f..f107cf914bbd 100644 --- a/drivers/net/nfb/nfb_tx.h +++ b/drivers/net/nfb/nfb_tx.h @@ -140,7 +140,7 @@ nfb_eth_ndp_tx(void *queue, return 0; if (unlikely(ndp->queue == NULL)) { - RTE_LOG(ERR, PMD, "TX invalid arguments!\n"); + NFB_LOG(ERR, "TX invalid arguments"); return 0; } From patchwork Thu Dec 21 16:46:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135472 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 81F6343751; Thu, 21 Dec 2023 17:51:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 59A8E42EDB; Thu, 21 Dec 2023 17:49:23 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id 0F2F442EC5 for ; Thu, 21 Dec 2023 17:49:21 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1d3eabe9321so6911855ad.2 for ; Thu, 21 Dec 2023 08:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177360; x=1703782160; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+8K8aM/eDl/j95kjfXB1e7jWZldW/p4FDToC2O3/f8Y=; b=MMKK0MYP2D7mISMK8N9q7XSfCMbJlvEdi88D9g3mdEHumIeSylO1WRWlHspSuxT0KH mj6XuexiUgJDA0AslwKqI7TSug210LY/DeONCh6bNva3i+hbIpa1E4wjdzZkOc8bNeyD mEhuGeV0XkEeQR7t3RwgiAGw2MRwho5oUTBvpjIdfeQQ1wXgQgew8pYf1N97JO2Plkpz Pxn4f7IKWMpCtAyn97x/EZbaKI/+ieVPbwCB42yIXLRK53gOkPMhY2jYWDZcapTq+mAH f+7HEUehDoIkrwX2anumCtYUX/C3vnvByekEcIeplpnDeE0QpxmGzNeaXu5rHXWoG9Fx klyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177360; x=1703782160; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+8K8aM/eDl/j95kjfXB1e7jWZldW/p4FDToC2O3/f8Y=; b=eObKaDRk9rmOF6+rLUX0w4h7cx7Hsm/sz0TNsLslcPIP/VFuuTUcNcIN4uKUMNvPZw NMLCHohjCY91gY4lpU9KeXQpKc6I17j3ZwvdXSc7o3i3DQRXUEZURZRkIDLVSkA12trE GGio7wT8GOEy0i85SnnOIFktS7mgc7QKykSOtGHgsWBigacI4cEfRU4nJUYtjiFoOYMI VMWxnUQTDpioRr4KlRKv7VfeVrcivAV4eURQzHhYSHrbqQbvYxTR5jUkcjEYXCNu1vlO qbWqqLkB/oYS+2rjPfuoeinMs2TlpySSUoCR+qZ/I4SdFeoi3KTzCng93F8a/xYBYocZ qa8w== X-Gm-Message-State: AOJu0YzenlTmTmArkYMQBWltZONbq5rT9SOGGlv15JmWQwahm7oGkDqX GVQVrAVIuoQJuiBmO2ZrxgabCmJLCM3AAOk14XCJUA== X-Google-Smtp-Source: AGHT+IGZ6xYwxir4uwsecD1gFa4yNJIJoFti4b0fug6mZMbzFIr2MnS5irVUSVCtiSjm4VSWYv5qYw== X-Received: by 2002:a17:902:a38f:b0:1d4:906:67f8 with SMTP id x15-20020a170902a38f00b001d4090667f8mr677955pla.111.1703177360249; Thu, 21 Dec 2023 08:49:20 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:19 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Brian Dooley , Gowrishankar Muthukrishnan , Damian Nowak , Fan Zhang Subject: [PATCH v5 17/18] examples/fips_validation: replace use of PMD logtype Date: Thu, 21 Dec 2023 08:46:34 -0800 Message-ID: <20231221164841.125006-18-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Replace PMD with USER1 since that is already used in main Fixes: 41d561cbdd24 ("examples/fips_validation: add power on self test") Signed-off-by: Stephen Hemminger --- examples/fips_validation/fips_dev_self_test.c | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/fips_validation/fips_dev_self_test.c b/examples/fips_validation/fips_dev_self_test.c index b17f664a5eda..667f5da4e7d9 100644 --- a/examples/fips_validation/fips_dev_self_test.c +++ b/examples/fips_validation/fips_dev_self_test.c @@ -1032,7 +1032,7 @@ prepare_cipher_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1040,7 +1040,7 @@ prepare_cipher_xform(uint8_t dev_id, if (rte_cryptodev_sym_capability_check_cipher(cap, cipher_xform->key.length, cipher_xform->iv.length) != 0) { - RTE_LOG(ERR, PMD, "PMD %s key length %u IV length %u\n", + RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n", rte_cryptodev_name_get(dev_id), cipher_xform->key.length, cipher_xform->iv.length); @@ -1088,7 +1088,7 @@ prepare_auth_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1096,7 +1096,7 @@ prepare_auth_xform(uint8_t dev_id, if (rte_cryptodev_sym_capability_check_auth(cap, auth_xform->key.length, auth_xform->digest_length, 0) != 0) { - RTE_LOG(ERR, PMD, "PMD %s key length %u Digest length %u\n", + RTE_LOG(ERR, USER1, "PMD %s key length %u Digest length %u\n", rte_cryptodev_name_get(dev_id), auth_xform->key.length, auth_xform->digest_length); @@ -1147,7 +1147,7 @@ prepare_aead_xform(uint8_t dev_id, cap = rte_cryptodev_sym_capability_get(dev_id, &cap_idx); if (!cap) { - RTE_LOG(ERR, PMD, "Failed to get capability for cdev %u\n", + RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n", dev_id); return -EACCES; } @@ -1156,7 +1156,7 @@ prepare_aead_xform(uint8_t dev_id, aead_xform->key.length, aead_xform->digest_length, aead_xform->aad_length, aead_xform->iv.length) != 0) { - RTE_LOG(ERR, PMD, + RTE_LOG(ERR, USER1, "PMD %s key_len %u tag_len %u aad_len %u iv_len %u\n", rte_cryptodev_name_get(dev_id), aead_xform->key.length, @@ -1195,7 +1195,7 @@ prepare_cipher_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, len); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1219,7 +1219,7 @@ prepare_auth_op(struct rte_crypto_op *op, uint8_t *dst; if (vec->input.len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) { - RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n", + RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n", -ENOMEM, vec->input.len + vec->digest.len); return -ENOMEM; } @@ -1229,7 +1229,7 @@ prepare_auth_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, vec->input.len + vec->digest.len); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1274,7 +1274,7 @@ prepare_aead_op(struct rte_crypto_op *op, memcpy(iv, vec->iv.data, vec->iv.len); if (len + vec->digest.len > RTE_MBUF_MAX_NB_SEGS) { - RTE_LOG(ERR, PMD, "Error %i: Test data too long (%u).\n", + RTE_LOG(ERR, USER1, "Error %i: Test data too long (%u).\n", -ENOMEM, len + vec->digest.len); return -ENOMEM; } @@ -1282,7 +1282,7 @@ prepare_aead_op(struct rte_crypto_op *op, dst = (uint8_t *)rte_pktmbuf_append(mbuf, RTE_ALIGN_CEIL(len + vec->digest.len, 16)); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: MBUF too small\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n", -ENOMEM); return -ENOMEM; } @@ -1303,7 +1303,7 @@ prepare_aead_op(struct rte_crypto_op *op, dst = rte_malloc(NULL, len, 16); if (!dst) { - RTE_LOG(ERR, PMD, "Error %i: Not enough memory\n", -ENOMEM); + RTE_LOG(ERR, USER1, "Error %i: Not enough memory\n", -ENOMEM); return -ENOMEM; } @@ -1474,24 +1474,24 @@ run_single_test(uint8_t dev_id, ret = test_ops->prepare_xform(dev_id, &xform, vec, dir, key, negative_test); if (ret < 0) { - RTE_LOG(ERR, PMD, "Error %i: Prepare Xform\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Prepare Xform\n", ret); return ret; } sess = rte_cryptodev_sym_session_create(dev_id, &xform, env->sess_pool); if (!sess) { - RTE_LOG(ERR, PMD, "Error %i: Init session\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Init session\n", ret); return ret; } ret = test_ops->prepare_op(env->op, env->mbuf, sess, dir, vec); if (ret < 0) { - RTE_LOG(ERR, PMD, "Error %i: Prepare op\n", ret); + RTE_LOG(ERR, USER1, "Error %i: Prepare op\n", ret); return ret; } if (rte_cryptodev_enqueue_burst(dev_id, 0, &env->op, 1) < 1) { - RTE_LOG(ERR, PMD, "Error: Failed enqueue\n"); + RTE_LOG(ERR, USER1, "Error: Failed enqueue\n"); return ret; } @@ -1622,7 +1622,7 @@ fips_dev_self_test(uint8_t dev_id, ret = fips_dev_auto_test_init(dev_id, &env); if (ret < 0) { - RTE_LOG(ERR, PMD, "Failed to init self-test for PMD %u\n", + RTE_LOG(ERR, USER1, "Failed to init self-test for PMD %u\n", dev_id); return ret; } @@ -1644,7 +1644,7 @@ fips_dev_self_test(uint8_t dev_id, negative_test = 0; } - RTE_LOG(INFO, PMD, "Testing (ID %u) %s %s%s...\n", + RTE_LOG(INFO, USER1, "Testing (ID %u) %s %s%s...\n", i, vec->name, j == self_test_dir_enc_auth_gen ? @@ -1658,18 +1658,18 @@ fips_dev_self_test(uint8_t dev_id, if (!negative_test) break; ret = -1; - RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n", + RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n", dev_id, vec->name, j == self_test_dir_enc_auth_gen ? "Encrypt" : "Decrypt"); goto error_exit; case -EACCES: - RTE_LOG(ERR, PMD, "Not supported by %s. Skip\n", + RTE_LOG(ERR, USER1, "Not supported by %s. Skip\n", rte_cryptodev_name_get(dev_id)); ret = 0; break; default: - RTE_LOG(ERR, PMD, "PMD %u Failed test %s %s\n", + RTE_LOG(ERR, USER1, "PMD %u Failed test %s %s\n", dev_id, vec->name, j == self_test_dir_enc_auth_gen ? "Encrypt" : "Decrypt"); @@ -1682,7 +1682,7 @@ fips_dev_self_test(uint8_t dev_id, fips_dev_auto_test_uninit(dev_id, &env); if (ret == 0) { - RTE_LOG(INFO, PMD, "PMD %u finished self-test successfully\n", + RTE_LOG(INFO, USER1, "PMD %u finished self-test successfully\n", dev_id); } From patchwork Thu Dec 21 16:46:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135473 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A311643751; Thu, 21 Dec 2023 17:51:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D056742EE6; Thu, 21 Dec 2023 17:49:24 +0100 (CET) Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by mails.dpdk.org (Postfix) with ESMTP id B909E42EC5 for ; Thu, 21 Dec 2023 17:49:21 +0100 (CET) Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-35fd0154368so3727915ab.0 for ; Thu, 21 Dec 2023 08:49:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1703177361; x=1703782161; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mU02qcfKmh+7GTO/E4p4sLY/ezuijlsZqMjzilPdqn8=; b=lzpmSDwE7mpgDZ/cRY0g1cjdFgYBaBi7ZyQkx18SVxH/+mdPcZqoTmhPRvtpL2sFag VmcANlgonJ/q8mmM35XZ8dwSouaVbVo6ZtDebib/xvNpmT7pd8No4OHpBuTkgkJUhOmY 0nI0UYNEP2IUltaE0tEwZlGYNbYL5Fq84YFXOZze0j7SqCq2lkQcYitweHxmdC5Tk3uA 0oAae0yITJjwHeHksUrCuoJRQ28sK4a7gc+HxVw3PoCx7wiLz8fGo5ZsLE77sGyYYiiR jtqurVTRoGwyX63egwLg89h6S+IgQBKCxcSSuEzVXcufmXEXNWQatpx3L9517UQfkAv5 +GHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703177361; x=1703782161; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mU02qcfKmh+7GTO/E4p4sLY/ezuijlsZqMjzilPdqn8=; b=FgqPORHzjDBwnAIORswQRUqO9ThPU9Zt7DUfdympRpCSdK2DW4hfBzfkimNFtxQz21 JyiaLYnL8eIliw4hFTcJI8f/ZmyyMqoHdNQCrSWley8leYKj3tZ+lz38wjRGYz546yzG +wrziRcAceTf7aT/MwB0swYDESKm0U8SA16eRTr1DcTY3sV9Y8UkY1YVJ2PErg+NRtKj TQOF0IL74jX17janypiXePA/aTzdRJBMP3y/CKhB/1RWclAWQNqPFgb62IfIWm2dKwIc lNQVgH6oO9JEVIUhbRLbuyenelFQz8VkO9ODMiTww8yurF4sxWV/QecNeUq9y6he3rsU 6ZTw== X-Gm-Message-State: AOJu0YxrLsW3GJlEmpKT2P3E6Y5gn3hR2+HNWOLN/inArAxNhzuC8ZXx BPLdpA/WjkIfm6zHi0lnUV7t23Js1QP5FgmCwtouyQ== X-Google-Smtp-Source: AGHT+IF8J/Wf/ss15Rul6f+jA+E/rnpO/Ww6GvwxmMq8g4LtFNU1tmK975WWBHX6HrcR5aSn1qOrBw== X-Received: by 2002:a05:6e02:1c0b:b0:35f:afca:8c56 with SMTP id l11-20020a056e021c0b00b0035fafca8c56mr10493303ilh.24.1703177361167; Thu, 21 Dec 2023 08:49:21 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id g20-20020a63e614000000b0058901200bbbsm1842456pgh.40.2023.12.21.08.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:49:20 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v5 18/18] log: mark PMD logtype as deprecated Date: Thu, 21 Dec 2023 08:46:35 -0800 Message-ID: <20231221164841.125006-19-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221164841.125006-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231221164841.125006-1-stephen@networkplumber.org> MIME-Version: 1.0 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 This is temporary patch to help find all misuse use of PMD logtype --- lib/log/log.c | 3 +++ lib/log/rte_log.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/log/log.c b/lib/log/log.c index ab06132a98a1..09a31a62c0fd 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -352,6 +352,9 @@ struct logtype { static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_EAL, "lib.eal"}, +/* avoid deprecated warning */ +#undef RTE_LOGTYPE_PMD +#define RTE_LOGTYPE_PMD 5 {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_PORT, "lib.port"}, {RTE_LOGTYPE_TABLE, "lib.table"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 5ba198ba2484..1ac7e26f56ba 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -32,7 +32,7 @@ extern "C" { /* was RTE_LOGTYPE_RING */ /* was RTE_LOGTYPE_MEMPOOL */ /* was RTE_LOGTYPE_TIMER */ -#define RTE_LOGTYPE_PMD 5 /**< Log related to poll mode driver. */ +#define RTE_LOGTYPE_PMD RTE_DEPRECATED(RTE_LOGTYPE_PMD) 5 /* was RTE_LOGTYPE_HASH */ /* was RTE_LOGTYPE_LPM */ /* was RTE_LOGTYPE_KNI */