From patchwork Wed Jan 24 16:28:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 136107 X-Patchwork-Delegate: david.marchand@redhat.com 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 54D40439B7; Wed, 24 Jan 2024 17:29:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8448242D3F; Wed, 24 Jan 2024 17:29:30 +0100 (CET) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mails.dpdk.org (Postfix) with ESMTP id A35C940294 for ; Wed, 24 Jan 2024 17:29:28 +0100 (CET) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6dbb003be79so4876989b3a.0 for ; Wed, 24 Jan 2024 08:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1706113767; x=1706718567; 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=Yl7kHF5Y47CSOKnvegeIVAwbyVB8xvqdMY4mqyf+6Hw=; b=u2F6KC8fMcFr2SMcVgkNu+SQX2z9Kh7CuNYSwIBoO/v/uNwExj0U7Z5HNLnY70df5o gj65LBKDEtadcXcbPR3jbemDcZi7oRESdsK2tB7NeeXqx+fb+1XhZ94cZXrDAZ2AG1KJ 2JOtx1fz0b14kHlVBzU4+EesT+gb1NXkDcNxfJNKndxI+gKB4Rw2L2QgSBh60Ix1p3j/ gvsirtiExRoXHllVlISDqTz6a9PkMgKIeSoW4ucZO/ILFmSqxyqdgiCkukMoATkz3f8F cd30tlt/t+Q81VB5j6gMqN9i/ObLI9bsqLaA0DAbok91NIvJb+q8/u2JORxVyBTE4aip GV3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706113767; x=1706718567; 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=Yl7kHF5Y47CSOKnvegeIVAwbyVB8xvqdMY4mqyf+6Hw=; b=aM0IUqfbtJimMSje5QvfVkTu0P/ivE+Ztyl6KVBjROlEsJaK8fCnshnKjGZA/cHobP ABesebAlF+uYVRb/dPdtf/Ex64fbaV6US1ZZhgXIdXsdL+bJyR7sMTNqnEXTdqkpqAII 1KGgtlNAhpQpAaxIiG1UxamyoMaphckd+7udqQk1ngcXdcgG/CBRdwZSM6I7jnkwM0a7 BVLR+7OjWsUCB1CcMaC5ef+lB9MQfttRwPTR9lWYUcWnx7x+0S/NUWlnVtS+1Sh4XkNR 4WBPP+eal+A8jxkQFSG8AIqhhgveBCwkt1mHyHG7yoB/Ce1OOuF3YCcP8CrBTqipUOvL bATg== X-Gm-Message-State: AOJu0YztYdE1t2b5fA6Tbar6jlq2CpHJUaFeqWh8/HKkUXThpUXWHQmF SuVb+LnZPCE8FNAqRmqz8Lprd3iuUQa5W4ofWqGOMmMtdBCRbWrY9LoMcITCE9LZXCQ2gNU22+d g8Op7KQ== X-Google-Smtp-Source: AGHT+IFL6dIf+ZwPO5AcEVSt/RAc4cXhlxqeu//xrOjD5qF9FsdNkZYaszRaURbn5U3ArZ/6BuZYWA== X-Received: by 2002:a05:6a20:158c:b0:19c:66ac:7fb6 with SMTP id h12-20020a056a20158c00b0019c66ac7fb6mr1908786pzj.1.1706113767710; Wed, 24 Jan 2024 08:29:27 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id ka9-20020a056a00938900b006dd8643d468sm2436121pfb.193.2024.01.24.08.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 08:29:27 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Nipun Gupta , Nikhil Agarwal , Hemant Agrawal , Sachin Saxena Subject: [PATCH 1/2] drivers: remove unnecessary RTE_LOG_DP macros Date: Wed, 24 Jan 2024 08:28:34 -0800 Message-ID: <20240124162917.59851-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124162917.59851-1-stephen@networkplumber.org> References: <20240124162917.59851-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 Several drivers did copy/paste of log macros for datapath but are not using them, so remove them. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- drivers/bus/cdx/cdx_logs.h | 11 ----------- drivers/bus/fslmc/fslmc_logs.h | 11 ----------- drivers/common/dpaax/dpaax_logs.h | 11 ----------- drivers/event/dpaa2/dpaa2_eventdev_logs.h | 11 ----------- 4 files changed, 44 deletions(-) diff --git a/drivers/bus/cdx/cdx_logs.h b/drivers/bus/cdx/cdx_logs.h index a1046ce544a6..0ec39e9dd489 100644 --- a/drivers/bus/cdx/cdx_logs.h +++ b/drivers/bus/cdx/cdx_logs.h @@ -23,15 +23,4 @@ extern int cdx_logtype_bus; #define CDX_BUS_WARN(fmt, args...) \ CDX_BUS_LOG(WARNING, fmt, ## args) -/* 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) - -#define CDX_BUS_DP_DEBUG(fmt, args...) \ - CDX_BUS_DP_LOG(DEBUG, fmt, ## args) -#define CDX_BUS_DP_INFO(fmt, args...) \ - CDX_BUS_DP_LOG(INFO, fmt, ## args) -#define CDX_BUS_DP_WARN(fmt, args...) \ - CDX_BUS_DP_LOG(WARNING, fmt, ## args) - #endif /* CDX_LOGS_H */ diff --git a/drivers/bus/fslmc/fslmc_logs.h b/drivers/bus/fslmc/fslmc_logs.h index a1e14dd84e9a..e15c603426b2 100644 --- a/drivers/bus/fslmc/fslmc_logs.h +++ b/drivers/bus/fslmc/fslmc_logs.h @@ -25,15 +25,4 @@ extern int dpaa2_logtype_bus; #define DPAA2_BUS_WARN(fmt, args...) \ DPAA2_BUS_LOG(WARNING, fmt, ## args) -/* 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) - -#define DPAA2_BUS_DP_DEBUG(fmt, args...) \ - DPAA2_BUS_DP_LOG(DEBUG, fmt, ## args) -#define DPAA2_BUS_DP_INFO(fmt, args...) \ - DPAA2_BUS_DP_LOG(INFO, fmt, ## args) -#define DPAA2_BUS_DP_WARN(fmt, args...) \ - DPAA2_BUS_DP_LOG(WARNING, fmt, ## args) - #endif /* _FSLMC_LOGS_H_ */ diff --git a/drivers/common/dpaax/dpaax_logs.h b/drivers/common/dpaax/dpaax_logs.h index 180476f6757c..f667aaff72fd 100644 --- a/drivers/common/dpaax/dpaax_logs.h +++ b/drivers/common/dpaax/dpaax_logs.h @@ -35,15 +35,4 @@ extern int dpaax_logger; #define DPAAX_WARN(fmt, args...) \ DPAAX_LOG(WARNING, fmt, ## args) -/* 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) - -#define DPAAX_DP_DEBUG(fmt, args...) \ - DPAAX_DP_LOG(DEBUG, fmt, ## args) -#define DPAAX_DP_INFO(fmt, args...) \ - DPAAX_DP_LOG(INFO, fmt, ## args) -#define DPAAX_DP_WARN(fmt, args...) \ - DPAAX_DP_LOG(WARNING, fmt, ## args) - #endif /* _DPAAX_LOGS_H_ */ diff --git a/drivers/event/dpaa2/dpaa2_eventdev_logs.h b/drivers/event/dpaa2/dpaa2_eventdev_logs.h index 66c8c772740d..b894fb32996a 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev_logs.h +++ b/drivers/event/dpaa2/dpaa2_eventdev_logs.h @@ -24,17 +24,6 @@ extern int dpaa2_logtype_event; #define DPAA2_EVENTDEV_WARN(fmt, args...) \ DPAA2_EVENTDEV_LOG(WARNING, fmt, ## args) -/* 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) - -#define DPAA2_EVENTDEV_DP_DEBUG(fmt, args...) \ - DPAA2_EVENTDEV_DP_LOG(DEBUG, fmt, ## args) -#define DPAA2_EVENTDEV_DP_INFO(fmt, args...) \ - DPAA2_EVENTDEV_DP_LOG(INFO, fmt, ## args) -#define DPAA2_EVENTDEV_DP_WARN(fmt, args...) \ - DPAA2_EVENTDEV_DP_LOG(WARNING, fmt, ## args) - #define dpaa2_evdev_info(fmt, ...) DPAA2_EVENTDEV_LOG(INFO, fmt, ##__VA_ARGS__) #define dpaa2_evdev_dbg(fmt, ...) DPAA2_EVENTDEV_LOG(DEBUG, fmt, ##__VA_ARGS__) #define dpaa2_evdev_err(fmt, ...) DPAA2_EVENTDEV_LOG(ERR, fmt, ##__VA_ARGS__) From patchwork Wed Jan 24 16:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 136108 X-Patchwork-Delegate: david.marchand@redhat.com 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 96C68439B7; Wed, 24 Jan 2024 17:29:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F00642DFA; Wed, 24 Jan 2024 17:29:32 +0100 (CET) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) by mails.dpdk.org (Postfix) with ESMTP id C8B2340E72 for ; Wed, 24 Jan 2024 17:29:29 +0100 (CET) Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-599d1fd9cc1so289383eaf.3 for ; Wed, 24 Jan 2024 08:29:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1706113769; x=1706718569; 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=HtnyUQ/ONMqOTnmsL7/d0J1lXrGH0iDI0iEqrJj0lYI=; b=G+mpuUO5HfHfp7xTq1Z5/6GE4b7uqsdJbudfJWDgIrMluANyk7Tb5ThDcM9OUKk2qL OyfUsoPjXjQZ8dpfPMJ4YeTg9YDVpRHTxD0ouwF7lpAlfwqEbGp8FhMElRvP75KEBa1C W8zN06BkAAsvnTMZgF9y8/VaPUSbA0AEEsplJWPHei/zY+5Ino3AiPZAcHMz6hqpEt6G zqhjWkx+dt+WsGOBgrhZgp3ir8Yh3HZANeLnsgzpZffhCcoYGNsaqK4tozzNDuJJGty6 TmQUSGC1wDg8RRxoMTsxJt5hLOZVNmy65nXOTZ2vY5WgK+I3lF+UmtFAPnsEyQvWPvt7 7fOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706113769; x=1706718569; 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=HtnyUQ/ONMqOTnmsL7/d0J1lXrGH0iDI0iEqrJj0lYI=; b=AeqhXXqBcB3pCDqr63wr6aqlsowJ+MMLpOr2LdvSAiqjpbXH9u1L6Eksm2VXHqT1Hc V+hlrgYZFi3R2JWMLTX0fM8QkRI6TzI76k3hG5AcJkOOs+38my3p/ZkBRDHMAuA6ORrC aLcMkP8Ku7nMHweuDqMBd2H1Z/TYXtHs8be0WhQJ4/AHcSrarWWdne//M0MJNoIXqUC/ yug6JpJzDwvymFM7lnhg3qUN2dQM82xJsljXMI2mpBUFy2ETsARcN3qejiZhpPhEJ3xF qwopWndwfpZA502nKq4IQRgg26ceMT8F/b5fpCsLNIBQRk1dUaZfLdyn1f7xHl4m6ksX kHvw== X-Gm-Message-State: AOJu0YzkoPixesB5wItUiNoHJ2jXwQ6DcnWHdDsNR+Uqt73HZUxX07Fs d5PvNmNYgB4JbI0rt9ae/+Wb6aRJFcaQUiCCmYSace5d+XIhqsq2D60WzjD41MhT+VYeZOp5nKb DDaYIBA== X-Google-Smtp-Source: AGHT+IFYBOCeyjcMsdzeqgx3BUdfe5f98WVh8Fp4S87VuPKJn0FKqMbdODcRxa62LTYjK/AUnnBEqA== X-Received: by 2002:a05:6358:901:b0:176:4f1e:1f1f with SMTP id r1-20020a056358090100b001764f1e1f1fmr5184501rwi.23.1706113768761; Wed, 24 Jan 2024 08:29:28 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id ka9-20020a056a00938900b006dd8643d468sm2436121pfb.193.2024.01.24.08.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 08:29:28 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Abdullah Sevincer , =?utf-8?q?Mattias_R=C3=B6n?= =?utf-8?q?nblom?= , Sachin Saxena , Apeksha Gupta Subject: [PATCH 2/2] drivers: RTE_LOG_DP newline consistency Date: Wed, 24 Jan 2024 08:28:35 -0800 Message-ID: <20240124162917.59851-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240124162917.59851-1-stephen@networkplumber.org> References: <20240124162917.59851-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 Make sure use of RTE_LOG_DP has newline just like uses of RTE_LOG. Signed-off-by: Stephen Hemminger Acked-by: Tyler Retzlaff --- .../baseband/la12xx/bbdev_la12xx_pmd_logs.h | 2 +- drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 2 +- drivers/crypto/dpaa_sec/dpaa_sec_log.h | 2 +- drivers/event/dlb2/dlb2_log.h | 2 +- drivers/event/dsw/dsw_evdev.h | 2 +- drivers/event/dsw/dsw_event.c | 40 ++++++++--------- drivers/mempool/dpaa/dpaa_mempool.c | 2 +- drivers/mempool/dpaa/dpaa_mempool.h | 2 +- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 6 +-- drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 2 +- drivers/net/dpaa/dpaa_ethdev.h | 2 +- drivers/net/dpaa2/dpaa2_pmd_logs.h | 2 +- drivers/net/dpaa2/dpaa2_rxtx.c | 44 +++++++++---------- drivers/net/enetc/enetc_logs.h | 2 +- drivers/net/enetc/enetc_rxtx.c | 2 +- drivers/net/enetfec/enet_pmd_logs.h | 2 +- drivers/net/pfe/pfe_logs.h | 2 +- 17 files changed, 59 insertions(+), 59 deletions(-) diff --git a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h index 452435ccb942..bddf4e6cd2f4 100644 --- a/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h +++ b/drivers/baseband/la12xx/bbdev_la12xx_pmd_logs.h @@ -23,6 +23,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, PMD, fmt "\n", ## args) #endif /* _BBDEV_LA12XX_PMD_LOGS_H_ */ diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h index c2e11f9516f9..b1c24fd1c325 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h @@ -29,7 +29,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, PMD, fmt "\n", ## 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..d298ac5b5755 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h @@ -29,7 +29,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, PMD, fmt "\n", ## args) #define DPAA_SEC_DP_DEBUG(fmt, args...) \ DPAA_SEC_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/event/dlb2/dlb2_log.h b/drivers/event/dlb2/dlb2_log.h index dc1481ef870c..1582f8bdf7bd 100644 --- a/drivers/event/dlb2/dlb2_log.h +++ b/drivers/event/dlb2/dlb2_log.h @@ -20,6 +20,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, PMD, fmt "\n", ## args) #endif /* _DLB2_EVDEV_LOG_H_ */ diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h index 6416a8a898d6..f6fc402f6d29 100644 --- a/drivers/event/dsw/dsw_evdev.h +++ b/drivers/event/dsw/dsw_evdev.h @@ -297,7 +297,7 @@ dsw_pmd_priv(const struct rte_eventdev *eventdev) } #define DSW_LOG_DP(level, fmt, args...) \ - RTE_LOG_DP(level, EVENTDEV, "[%s] %s() line %u: " fmt, \ + RTE_LOG_DP(level, EVENTDEV, "[%s] %s() line %u: " fmt "\n", \ DSW_PMD_NAME, \ __func__, __LINE__, ## args) diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c index 93bbeead2efe..6dc6b45d92ab 100644 --- a/drivers/event/dsw/dsw_event.c +++ b/drivers/event/dsw/dsw_event.c @@ -55,7 +55,7 @@ dsw_port_acquire_credits(struct dsw_evdev *dsw, struct dsw_port *port, return false; } - DSW_LOG_DP_PORT(DEBUG, port->id, "Acquired %d tokens from pool.\n", + DSW_LOG_DP_PORT(DEBUG, port->id, "Acquired %d tokens from pool.", acquired_credits); port->inflight_credits += acquired_credits; @@ -81,7 +81,7 @@ dsw_port_return_credits(struct dsw_evdev *dsw, struct dsw_port *port, __ATOMIC_RELAXED); DSW_LOG_DP_PORT(DEBUG, port->id, - "Returned %d tokens to pool.\n", + "Returned %d tokens to pool.", return_credits); } } @@ -257,7 +257,7 @@ dsw_port_add_paused_flows(struct dsw_port *port, struct dsw_queue_flow *qfs, struct dsw_queue_flow *qf = &qfs[i]; DSW_LOG_DP_PORT(DEBUG, port->id, - "Pausing queue_id %d flow_hash %d.\n", + "Pausing queue_id %d flow_hash %d.", qf->queue_id, qf->flow_hash); port->paused_flows[port->paused_flows_len] = *qf; @@ -283,7 +283,7 @@ dsw_port_remove_paused_flow(struct dsw_port *port, port->paused_flows_len--; DSW_LOG_DP_PORT(DEBUG, port->id, - "Unpausing queue_id %d flow_hash %d.\n", + "Unpausing queue_id %d flow_hash %d.", target_qf->queue_id, target_qf->flow_hash); @@ -292,7 +292,7 @@ dsw_port_remove_paused_flow(struct dsw_port *port, } DSW_LOG_DP_PORT(ERR, port->id, - "Failed to unpause queue_id %d flow_hash %d.\n", + "Failed to unpause queue_id %d flow_hash %d.", target_qf->queue_id, target_qf->flow_hash); } @@ -515,7 +515,7 @@ dsw_select_emigration_target(struct dsw_evdev *dsw, DSW_LOG_DP_PORT(DEBUG, source_port->id, "Selected queue_id %d " "flow_hash %d (with flow load %d) for migration " - "to port %d.\n", candidate_qf->queue_id, + "to port %d.", candidate_qf->queue_id, candidate_qf->flow_hash, DSW_LOAD_TO_PERCENT(candidate_flow_load), candidate_port_id); @@ -560,7 +560,7 @@ dsw_select_emigration_targets(struct dsw_evdev *dsw, if (*targets_len == 0) DSW_LOG_DP_PORT(DEBUG, source_port->id, "For the %d flows considered, no target port " - "was found.\n", num_bursts); + "was found.", num_bursts); } static uint8_t @@ -578,7 +578,7 @@ dsw_schedule(struct dsw_evdev *dsw, uint8_t queue_id, uint16_t flow_hash) port_id = queue->serving_ports[0]; DSW_LOG_DP(DEBUG, "Event with queue_id %d flow_hash %d is scheduled " - "to port %d.\n", queue_id, flow_hash, port_id); + "to port %d.", queue_id, flow_hash, port_id); return port_id; } @@ -767,7 +767,7 @@ dsw_port_end_emigration(struct dsw_evdev *dsw, struct dsw_port *port, } DSW_LOG_DP_PORT(DEBUG, port->id, "Migration completed for " - "queue_id %d flow_hash %d.\n", queue_id, + "queue_id %d flow_hash %d.", queue_id, flow_hash); } @@ -835,11 +835,11 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, if (dsw->num_ports == 1) return; - DSW_LOG_DP_PORT(DEBUG, source_port->id, "Considering emigration.\n"); + DSW_LOG_DP_PORT(DEBUG, source_port->id, "Considering emigration."); if (seen_events_len < DSW_MAX_EVENTS_RECORDED) { DSW_LOG_DP_PORT(DEBUG, source_port->id, "Not enough events " - "are recorded to allow for a migration.\n"); + "are recorded to allow for a migration."); return; } @@ -857,7 +857,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, */ if (source_port->paused_events_len > 0) { DSW_LOG_DP_PORT(DEBUG, source_port->id, "There are " - "events in the paus buffer.\n"); + "events in the paus buffer."); return; } @@ -871,7 +871,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, if (source_port->migration_state != DSW_MIGRATION_STATE_IDLE) { DSW_LOG_DP_PORT(DEBUG, source_port->id, - "Emigration already in progress.\n"); + "Emigration already in progress."); return; } @@ -881,7 +881,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, */ if (source_port->in_buffer_len > 0) { DSW_LOG_DP_PORT(DEBUG, source_port->id, "There are still " - "events in the input buffer.\n"); + "events in the input buffer."); return; } @@ -889,7 +889,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, __atomic_load_n(&source_port->load, __ATOMIC_RELAXED); if (source_port_load < DSW_MIN_SOURCE_LOAD_FOR_MIGRATION) { DSW_LOG_DP_PORT(DEBUG, source_port->id, - "Load %d is below threshold level %d.\n", + "Load %d is below threshold level %d.", DSW_LOAD_TO_PERCENT(source_port_load), DSW_LOAD_TO_PERCENT(DSW_MIN_SOURCE_LOAD_FOR_MIGRATION)); return; @@ -904,7 +904,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, if (!any_port_below_limit) { DSW_LOG_DP_PORT(DEBUG, source_port->id, "Candidate target ports are all too highly " - "loaded.\n"); + "loaded."); return; } @@ -916,7 +916,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw, */ if (num_bursts < 2) { DSW_LOG_DP_PORT(DEBUG, source_port->id, "Only a single flow " - "queue_id %d flow_hash %d has been seen.\n", + "queue_id %d flow_hash %d has been seen.", bursts[0].queue_flow.queue_id, bursts[0].queue_flow.flow_hash); return; @@ -1260,7 +1260,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port, uint16_t i; DSW_LOG_DP_PORT(DEBUG, source_port->id, "Attempting to enqueue %d " - "events.\n", events_len); + "events.", events_len); dsw_port_bg_process(dsw, source_port); @@ -1329,7 +1329,7 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port, } DSW_LOG_DP_PORT(DEBUG, source_port->id, "%d non-release events " - "accepted.\n", num_non_release); + "accepted.", num_non_release); return (num_non_release + num_release); } @@ -1505,7 +1505,7 @@ dsw_event_dequeue_burst(void *port, struct rte_event *events, uint16_t num, dsw_port_note_op(source_port, dequeued); if (dequeued > 0) { - DSW_LOG_DP_PORT(DEBUG, source_port->id, "Dequeued %d events.\n", + DSW_LOG_DP_PORT(DEBUG, source_port->id, "Dequeued %d events.", dequeued); dsw_port_return_credits(dsw, source_port, dequeued); diff --git a/drivers/mempool/dpaa/dpaa_mempool.c b/drivers/mempool/dpaa/dpaa_mempool.c index 32639a3bfdab..d94350dfcba1 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.c +++ b/drivers/mempool/dpaa/dpaa_mempool.c @@ -312,7 +312,7 @@ dpaa_populate(struct rte_mempool *mp, unsigned int max_objs, bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp); total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size; - DPAA_MEMPOOL_DPDEBUG("Req size %" PRIx64 " vs Available %u\n", + DPAA_MEMPOOL_DPDEBUG("Req size %" PRIx64 " vs Available %u", (uint64_t)len, total_elt_sz * mp->size); /* Detect pool area has sufficient space for elements in this memzone */ diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 3f0eafa7dd7b..ba30519f1d86 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, PMD, fmt "\n", ## 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.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index 84371d5d1abb..877ed749bc59 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -378,7 +378,7 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, obj_table[n] = (struct rte_mbuf *) (bufs[i] - bp_info->meta_data_size); DPAA2_MEMPOOL_DP_DEBUG( - "Acquired %p address %p from BMAN\n", + "Acquired %p address %p from BMAN", (void *)bufs[i], (void *)obj_table[n]); n++; } @@ -386,7 +386,7 @@ rte_dpaa2_mbuf_alloc_bulk(struct rte_mempool *pool, #ifdef RTE_LIBRTE_DPAA2_DEBUG_DRIVER alloc += n; - DPAA2_MEMPOOL_DP_DEBUG("Total = %d , req = %d done = %d\n", + DPAA2_MEMPOOL_DP_DEBUG("Total = %d , req = %d done = %d", alloc, count, n); #endif return 0; @@ -439,7 +439,7 @@ rte_hw_mbuf_get_count(const struct rte_mempool *mp) return 0; } - DPAA2_MEMPOOL_DP_DEBUG("Free bufs = %u\n", num_of_bufs); + DPAA2_MEMPOOL_DP_DEBUG("Free bufs = %u", num_of_bufs); return num_of_bufs; } diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h index 986264319623..b5934e32370e 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h @@ -25,7 +25,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, PMD, fmt "\n", ## args) #define DPAA2_MEMPOOL_DP_DEBUG(fmt, args...) \ DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 5b6802ece8f0..8334649e38d9 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -232,6 +232,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, PMD, fmt "\n", ## args) #endif diff --git a/drivers/net/dpaa2/dpaa2_pmd_logs.h b/drivers/net/dpaa2/dpaa2_pmd_logs.h index c47ba8e10bfc..253147e9d5aa 100644 --- a/drivers/net/dpaa2/dpaa2_pmd_logs.h +++ b/drivers/net/dpaa2/dpaa2_pmd_logs.h @@ -28,7 +28,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, PMD, fmt "\n", ## args) #define DPAA2_PMD_DP_DEBUG(fmt, args...) \ DPAA2_PMD_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 23f7c4132d9e..92e9dd40dc0c 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -399,7 +399,7 @@ eth_fd_to_mbuf(const struct qbman_fd *fd, mbuf->packet_type = dpaa2_dev_rx_parse(mbuf, hw_annot_addr); DPAA2_PMD_DP_DEBUG("to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d," - "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n", + "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d", mbuf, mbuf->buf_addr, mbuf->data_off, DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, @@ -446,7 +446,7 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, } else { temp = rte_pktmbuf_alloc(dpaa2_tx_sg_pool); if (temp == NULL) { - DPAA2_PMD_DP_DEBUG("No memory to allocate S/G table\n"); + DPAA2_PMD_DP_DEBUG("No memory to allocate S/G table"); return -ENOMEM; } DPAA2_SET_ONLY_FD_BPID(fd, mempool_to_bpid(dpaa2_tx_sg_pool)); @@ -543,7 +543,7 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf, DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid); DPAA2_PMD_DP_DEBUG("mbuf =%p, mbuf->buf_addr =%p, off = %d," - "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d\n", + "fd_off=%d fd =%" PRIx64 ", meta = %d bpid =%d, len=%d", mbuf, mbuf->buf_addr, mbuf->data_off, DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ADDR(fd), rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size, @@ -587,7 +587,7 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf, if (rte_dpaa2_mbuf_alloc_bulk( rte_dpaa2_bpid_info[bpid].bp_list->mp, &mb, 1)) { - DPAA2_PMD_DP_DEBUG("Unable to allocated DPAA2 buffer\n"); + DPAA2_PMD_DP_DEBUG("Unable to allocated DPAA2 buffer"); return -1; } m = (struct rte_mbuf *)mb; @@ -609,7 +609,7 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf, #endif DPAA2_PMD_DP_DEBUG( "mbuf: %p, BMAN buf addr: %p, fdaddr: %" PRIx64 ", bpid: %d," - " meta: %d, off: %d, len: %d\n", + " meta: %d, off: %d, len: %d", (void *)mbuf, mbuf->buf_addr, DPAA2_GET_FD_ADDR(fd), @@ -640,7 +640,7 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q) if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); if (ret) { - DPAA2_PMD_ERR("Failed to allocate IO portal, tid: %d\n", + DPAA2_PMD_ERR("Failed to allocate IO portal, tid: %d", rte_gettid()); return; } @@ -656,7 +656,7 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q) while (1) { if (qbman_swp_pull(swp, &pulldesc)) { - DPAA2_PMD_DP_DEBUG("VDQ command is not issued.QBMAN is busy\n"); + DPAA2_PMD_DP_DEBUG("VDQ command is not issued.QBMAN is busy"); /* Portal was busy, try again */ continue; } @@ -691,7 +691,7 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q) hw_annot_addr = (void *)((size_t)v_addr + DPAA2_FD_PTA_SIZE); fas = hw_annot_addr; - DPAA2_PMD_ERR("\n\n[%d] error packet on port[%d]:" + DPAA2_PMD_ERR("[%d] error packet on port[%d]:" " fd_off: %d, fd_err: %x, fas_status: %x", rte_lcore_id(), eth_data->port_id, DPAA2_GET_FD_OFFSET(fd), DPAA2_GET_FD_ERR(fd), @@ -765,7 +765,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG("VDQ command is not issued." - " QBMAN is busy (1)\n"); + " QBMAN is busy (1)"); /* Portal was busy, try again */ continue; } @@ -861,7 +861,7 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG("VDQ command is not issued." - "QBMAN is busy (2)\n"); + "QBMAN is busy (2)"); continue; } break; @@ -976,7 +976,7 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ret = dpaa2_affine_qbman_swp(); if (ret) { DPAA2_PMD_ERR( - "Failed to allocate IO portal, tid: %d\n", + "Failed to allocate IO portal, tid: %d", rte_gettid()); return 0; } @@ -1002,7 +1002,7 @@ dpaa2_dev_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG( - "VDQ command is not issued.QBMAN is busy\n"); + "VDQ command is not issued.QBMAN is busy"); /* Portal was busy, try again */ continue; } @@ -1107,7 +1107,7 @@ uint16_t dpaa2_dev_tx_conf(void *queue) ret = dpaa2_affine_qbman_swp(); if (ret) { DPAA2_PMD_ERR( - "Failed to allocate IO portal, tid: %d\n", + "Failed to allocate IO portal, tid: %d", rte_gettid()); return 0; } @@ -1126,7 +1126,7 @@ uint16_t dpaa2_dev_tx_conf(void *queue) while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG("VDQ command is not issued." - "QBMAN is busy\n"); + "QBMAN is busy"); /* Portal was busy, try again */ continue; } @@ -1256,14 +1256,14 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ret = dpaa2_affine_qbman_swp(); if (ret) { DPAA2_PMD_ERR( - "Failed to allocate IO portal, tid: %d\n", + "Failed to allocate IO portal, tid: %d", rte_gettid()); return 0; } } swp = DPAA2_PER_LCORE_PORTAL; - DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d\n", + DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d", eth_data, dpaa2_q->fqid); #ifdef RTE_LIBRTE_IEEE1588 @@ -1573,7 +1573,7 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, ret = dpaa2_affine_qbman_swp(); if (ret) { DPAA2_PMD_ERR( - "Failed to allocate IO portal, tid: %d\n", + "Failed to allocate IO portal, tid: %d", rte_gettid()); return 0; } @@ -1598,7 +1598,7 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, } } - DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d\n", + DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d", eth_data, dpaa2_q[loop]->fqid); /* Check if the queue is congested */ @@ -1747,14 +1747,14 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ret = dpaa2_affine_qbman_swp(); if (ret) { DPAA2_PMD_ERR( - "Failed to allocate IO portal, tid: %d\n", + "Failed to allocate IO portal, tid: %d", rte_gettid()); return 0; } } swp = DPAA2_PER_LCORE_PORTAL; - DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d\n", + DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d", eth_data, dpaa2_q->fqid); /* This would also handle normal and atomic queues as any type @@ -1989,7 +1989,7 @@ dpaa2_dev_loopback_rx(void *queue, while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG( - "VDQ command not issued.QBMAN busy\n"); + "VDQ command not issued.QBMAN busy"); /* Portal was busy, try again */ continue; } @@ -2071,7 +2071,7 @@ dpaa2_dev_loopback_rx(void *queue, while (1) { if (qbman_swp_pull(swp, &pulldesc)) { DPAA2_PMD_DP_DEBUG("VDQ command is not issued." - "QBMAN is busy (2)\n"); + "QBMAN is busy (2)"); continue; } break; diff --git a/drivers/net/enetc/enetc_logs.h b/drivers/net/enetc/enetc_logs.h index 0976d42debd7..69974eb39cc2 100644 --- a/drivers/net/enetc/enetc_logs.h +++ b/drivers/net/enetc/enetc_logs.h @@ -30,7 +30,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, PMD, fmt "\n", ## args) #define ENETC_PMD_DP_DEBUG(fmt, args...) \ ENETC_PMD_DP_LOG(DEBUG, fmt, ## args) diff --git a/drivers/net/enetc/enetc_rxtx.c b/drivers/net/enetc/enetc_rxtx.c index ea64c9f68299..988273de89d7 100644 --- a/drivers/net/enetc/enetc_rxtx.c +++ b/drivers/net/enetc/enetc_rxtx.c @@ -255,7 +255,7 @@ static inline void enetc_slow_parsing(struct rte_mbuf *m, static inline void __rte_hot enetc_dev_rx_parse(struct rte_mbuf *m, uint16_t parse_results) { - ENETC_PMD_DP_DEBUG("parse summary = 0x%x ", parse_results); + ENETC_PMD_DP_DEBUG("parse summary = 0x%x", parse_results); m->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD; switch (parse_results) { diff --git a/drivers/net/enetfec/enet_pmd_logs.h b/drivers/net/enetfec/enet_pmd_logs.h index 72d1cb61c598..c37706245929 100644 --- a/drivers/net/enetfec/enet_pmd_logs.h +++ b/drivers/net/enetfec/enet_pmd_logs.h @@ -28,6 +28,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, PMD, fmt "\n", ## args) #endif /* _ENETFEC_LOGS_H_ */ diff --git a/drivers/net/pfe/pfe_logs.h b/drivers/net/pfe/pfe_logs.h index 58d5e8e7cff1..76c4f540d096 100644 --- a/drivers/net/pfe/pfe_logs.h +++ b/drivers/net/pfe/pfe_logs.h @@ -26,6 +26,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, PMD, fmt "\n", ## args) #endif /* _PFE_LOGS_H_ */