From patchwork Mon Feb 26 20:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137277 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 B02DA43BF6; Mon, 26 Feb 2024 21:19:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9942342E3A; Mon, 26 Feb 2024 21:19:51 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id DB14E402CC for ; Mon, 26 Feb 2024 21:19:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id EE55320B74C1; Mon, 26 Feb 2024 12:19:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com EE55320B74C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978787; bh=vfWVHvZpGeZfHng6IESzSNipXhhIlQdENbbKHGiqK7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BRs591NWc26Anz6Vm9yzVTPwT1zhZaS+qzMrBMJENk9mGdZAvr223gIOIFcK/MNs4 ss89jq0gHGD9zh9rniMMzwusdOzWquD4ukMu33AYvFuKpKfpXkAaq5bRfMxKHHNO6S nopA5jK2ciQWzGxN+fG28WoUJztwMOL0wE71bBUI= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 01/16] log: add a per line log helper with parameterized prefix Date: Mon, 26 Feb 2024 12:19:31 -0800 Message-Id: <1708978786-6740-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Providing a custom prefix when logging is common for components. Lift ISO C99 compliant helper macros from mlx5_common.h and provide RTE_LOG_LINE_PREFIX macro that can expand similar to RTE_LOG_LINE with a custom prefix and argument list. Signed-off-by: Tyler Retzlaff --- lib/log/rte_log.h | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index fbc0df7..8f10e31 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -367,18 +367,115 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char *format, va_list ap) #define RTE_LOG_CHECK_NO_NEWLINE(...) #endif +/** + * Generates a log message with a single trailing newline. + * + * The RTE_LOG_LINE() is a helper that expands logging of a message + * with RTE_LOG() appending a single newline to the formatted message. + * + * @param l + * Log level. A value between EMERG (1) and DEBUG (8). The short name + * is expanded by the macro, so it cannot be an integer value. + * @param t + * The log type, for example, EAL. The short name is expanded by the + * macro, so it cannot be an integer value. + * @param ... + * The fmt string, as in printf(3), followed by the variable arguments + * required by the format. + */ #define RTE_LOG_LINE(l, t, ...) do { \ RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__ ,)); \ RTE_LOG(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ RTE_FMT_TAIL(__VA_ARGS__ ,))); \ } while (0) +/** + * Generates a log message for data path with a single trailing newline. + * + * Similar to RTE_LOG_LINE(), except that it is removed at compilation + * time if the RTE_LOG_DP_LEVEL configuration option is lower than the + * log level argument. + * + * The RTE_LOG_LINE() is a helper that expands logging of a message + * with RTE_LOG_DP() appending a single newline to the formatted + * message. + * + * @param l + * Log level. A value between EMERG (1) and DEBUG (8). The short name + * is expanded by the macro, so it cannot be an integer value. + * @param t + * The log type, for example, EAL. The short name is expanded by the + * macro, so it cannot be an integer value. + * @param ... + * The fmt string, as in printf(3), followed by the variable arguments + * required by the format. + */ #define RTE_LOG_DP_LINE(l, t, ...) do { \ RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(__VA_ARGS__ ,)); \ RTE_LOG_DP(l, t, RTE_FMT(RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ RTE_FMT_TAIL(__VA_ARGS__ ,))); \ } while (0) +#define RTE_LOG_COMMA , + +/* + * Generates a log message with a supplied prefix and arguments with a + * single trailing newline. + * + * The RTE_LOG_LINE_PREFIX() is a helper that expands logging of a + * message with RTE_LOG() prepending the supplied prefix and arguments + * appending a single newline to the formatted message. + * + * @param l + * Log level. A value between EMERG (1) and DEBUG (8). The short name + * is expanded by the macro, so it cannot be an integer value. + * @param t + * The log type, for example, EAL. The short name is expanded by the + * macro, so it cannot be an integer value. + * @param prefix + * The prefix format string. + * @param args + * The arguments for the prefix format string. If args contains + * multiple arguments use RTE_LOG_COMMA to defer expansion. + * @param ... + * The fmt string, as in printf(3), followed by the variable arguments + * required by the format. + */ +#define RTE_LOG_LINE_PREFIX(l, t, prefix, args, ...) do { \ + RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(prefix __VA_ARGS__ ,)); \ + RTE_LOG(l, t, RTE_FMT(prefix RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ + args RTE_LOG_COMMA RTE_FMT_TAIL(__VA_ARGS__ ,))); \ +} while (0) + +/* + * Generates a log message for the data path with a supplied prefix and + * arguments with a single trailing newline. + * + * The RTE_LOG_DP_LINE_PREFIX() is a helper that expands logging of a + * message with RTE_LOG_DP() prepending the supplied prefix and + * arguments appending a single newline to the formatted message. + * + * @param l + * Log level. A value between EMERG (1) and DEBUG (8). The short name + * is expanded by the macro, so it cannot be an integer value. + * @param t + * The log type, for example, EAL. The short name is expanded by the + * macro, so it cannot be an integer value. + * @param prefix + * The prefix format string. + * @param args + * The arguments for the prefix format string. If args contains + * multiple arguments use RTE_LOG_COMMA to defer expansion. + * @param ... + * The fmt string, as in printf(3), followed by the variable arguments + * required by the format. + */ +#define RTE_LOG_DP_LINE_PREFIX(l, t, prefix, args, ...) do { \ + RTE_LOG_CHECK_NO_NEWLINE(RTE_FMT_HEAD(prefix __VA_ARGS__ ,)); \ + RTE_LOG_DP(l, t, RTE_FMT(prefix RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \ + args RTE_LOG_COMMA RTE_FMT_TAIL(__VA_ARGS__ ,))); \ +} while (0) + #define RTE_LOG_REGISTER_IMPL(type, name, level) \ int type; \ RTE_INIT(__##type) \ From patchwork Mon Feb 26 20:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137279 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 87EDE43BF6; Mon, 26 Feb 2024 21:20:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A8CB42E6E; Mon, 26 Feb 2024 21:19:54 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2A1C742E37 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 08D7520B74C2; Mon, 26 Feb 2024 12:19:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 08D7520B74C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=W0T5qaTaGIzX+dJXRjSb5VyzPfvqCOtJUyBwocQiDhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RulboWHwVs7MMjX+eNbQcoubUx55qEbnXxF43296469Lap/k5ODcRpHvALpZSqQ5s 1xxLg0kDCCH7cWaOAEbOqDJ41qC2yJYgUujrd5InnN7UKfyO8oKSUUtXdx+g8ef/1I iIlZd3UgMGHKTp9HuQy9oYSa5IqCYVlXPOwOEB/o= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 02/16] bpf: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:32 -0800 Message-Id: <1708978786-6740-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff Acked-by: Konstantin Ananyev --- lib/bpf/bpf_impl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bpf/bpf_impl.h b/lib/bpf/bpf_impl.h index 1a3d97d..680b1e5 100644 --- a/lib/bpf/bpf_impl.h +++ b/lib/bpf/bpf_impl.h @@ -29,8 +29,8 @@ struct rte_bpf { extern int rte_bpf_logtype; #define RTE_LOGTYPE_BPF rte_bpf_logtype -#define RTE_BPF_LOG_LINE(lvl, fmt, args...) \ - RTE_LOG_LINE(lvl, BPF, fmt, ##args) +#define RTE_BPF_LOG_LINE(level, ...) \ + RTE_LOG_LINE_PREFIX(level, BPF, "%s(): ", __func__, __VA_ARGS__) static inline size_t bpf_size(uint32_t bpf_op_sz) From patchwork Mon Feb 26 20:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137278 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 9572843BF6; Mon, 26 Feb 2024 21:20:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BAF5542E62; Mon, 26 Feb 2024 21:19:52 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 1A17F42E33 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 170D220B74C3; Mon, 26 Feb 2024 12:19:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 170D220B74C3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=iiRrfo+WZjzPoZeO4F1BARsqUWZgsQCZIZo277q4f5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dmu/nLnGbOaEAcJNaOZ6/7GBWo/QuGr27LJQvoHX1n8hHVHrOI2EaDlQK3/ywG+lL hMxmvHYwbaomZlyPVwO3gLnp++0c+L+FBkfEmZLuG/xU0B3yMXE4QfVgohofqv5dmr tav5Zq7CKVDGfLwd7BlT/r8WzCTDzMG21eKP9bSE= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 03/16] cfgfile: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:33 -0800 Message-Id: <1708978786-6740-4-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/cfgfile/rte_cfgfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/cfgfile/rte_cfgfile.c b/lib/cfgfile/rte_cfgfile.c index 6a5e4fd..e7e690f 100644 --- a/lib/cfgfile/rte_cfgfile.c +++ b/lib/cfgfile/rte_cfgfile.c @@ -31,8 +31,9 @@ struct rte_cfgfile { RTE_LOG_REGISTER_DEFAULT(cfgfile_logtype, INFO); #define RTE_LOGTYPE_CFGFILE cfgfile_logtype -#define CFG_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, CFGFILE, "%s(): " fmt, __func__, ## args) +#define CFG_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, CFGFILE, "%s(): ", __func__, __VA_ARGS__) + /* >8 End of setting up dynamic logging */ /** when we resize a file structure, how many extra entries From patchwork Mon Feb 26 20:19:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137280 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 0025943BF6; Mon, 26 Feb 2024 21:20:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25D9342E80; Mon, 26 Feb 2024 21:19:55 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 178DF42E07 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 275B320B74C4; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 275B320B74C4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=6MQpnBBH7z48vEx5t8YSsZ4pvK9yEpwal57ymng/mJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OkH7fhjQC2Ze+UsbeMIbiNojec5HGVWfyR1DBOzQ/sJB6OqzYtQGQCMc83GwAiswU IzAga8cJdD46DUWehYX8XUn4EmEOqEHlgb0h3U9nALKR3O2qlNRIoKGl1AHbXTdpRJ +A3391IO8SAX8yVW/y46psSWrJu7CLu4vy2W8EGU= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 04/16] cmdline: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:34 -0800 Message-Id: <1708978786-6740-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Remove use of args... and just use __VA_ARGS__. The macros expanding the argument pack do not require args extension to remove trailing comma. Signed-off-by: Tyler Retzlaff --- lib/cmdline/cmdline_parse.c | 2 +- lib/cmdline/cmdline_parse_num.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cmdline/cmdline_parse.c b/lib/cmdline/cmdline_parse.c index b6d6dac..76a212d 100644 --- a/lib/cmdline/cmdline_parse.c +++ b/lib/cmdline/cmdline_parse.c @@ -16,7 +16,7 @@ #ifdef RTE_LIBRTE_CMDLINE_DEBUG #define debug_printf printf #else -#define debug_printf(args...) do {} while(0) +#define debug_printf(...) do {} while (0) #endif #define CMDLINE_BUFFER_SIZE 64 diff --git a/lib/cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c index 820af07..e849878 100644 --- a/lib/cmdline/cmdline_parse_num.c +++ b/lib/cmdline/cmdline_parse_num.c @@ -14,9 +14,9 @@ #include "cmdline_parse_num.h" #ifdef RTE_LIBRTE_CMDLINE_DEBUG -#define debug_printf(args...) printf(args) +#define debug_printf(...) printf(__VA_ARGS__) #else -#define debug_printf(args...) do {} while(0) +#define debug_printf(...) do {} while (0) #endif struct cmdline_token_ops cmdline_token_num_ops = { From patchwork Mon Feb 26 20:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137281 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 3239F43BF6; Mon, 26 Feb 2024 21:20:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69E7F42E8C; Mon, 26 Feb 2024 21:19:56 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id AAF92402C8 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 358B720B74C5; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 358B720B74C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=10p5Qptx3tYYLffbMVGCxjnT4GS0ULlqw6mj3+wHguU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QkziSqI8Vs4UY4TCBhiJSiryodSQLNtS11x5X6sOFGFhin/w0PixSt32IQQsM4NUc ggOsYPQrf18H0+rqo/NSv6w9ezOhwB1iMOmJFg+BWGUKCrq4R/zWw26CL+jK1MVP3q OuusAtIUwlzyP8ba8X4vy3rkk/Mvlqwa09VSF0Qs= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 05/16] compressdev: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:35 -0800 Message-Id: <1708978786-6740-6-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/compressdev/rte_compressdev_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/compressdev/rte_compressdev_internal.h b/lib/compressdev/rte_compressdev_internal.h index 01b7764..0bc8c87 100644 --- a/lib/compressdev/rte_compressdev_internal.h +++ b/lib/compressdev/rte_compressdev_internal.h @@ -23,8 +23,8 @@ extern int compressdev_logtype; #define RTE_LOGTYPE_COMPRESSDEV compressdev_logtype -#define COMPRESSDEV_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, COMPRESSDEV, "%s(): " fmt, __func__, ## args) +#define COMPRESSDEV_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, COMPRESSDEV, "%s(): ", __func__, __VA_ARGS__) /** * Dequeue processed packets from queue pair of a device. From patchwork Mon Feb 26 20:19:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137283 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 CE0C943BF6; Mon, 26 Feb 2024 21:20:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5964942EB7; Mon, 26 Feb 2024 21:19:59 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E0EFD42E33 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 43D1520B74C6; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 43D1520B74C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=qYEBHzBLZUaO7QilG3EwBpnBJ9+BAORgBIYJssQq6l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=puidESV+T7q4/6to8RkATjLUg36AyJSLQ2BM7ef1rbTD8JVx1EREiTqQ9tivTRzqK KTFlP+ub68U6Huo0n1EwytXghX3vbbw6PD8P845mtNoHa/lT8mWYpHWuXJgH1sA2nk 8KB0DtLt2NOilgw2nsyrUjd4Pc8VCt7XCKJ5hE1I= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 06/16] metrics: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:36 -0800 Message-Id: <1708978786-6740-7-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/metrics/rte_metrics_telemetry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/metrics/rte_metrics_telemetry.c b/lib/metrics/rte_metrics_telemetry.c index b8c9d75..dc43611 100644 --- a/lib/metrics/rte_metrics_telemetry.c +++ b/lib/metrics/rte_metrics_telemetry.c @@ -19,14 +19,14 @@ #define RTE_LOGTYPE_METRICS metrics_log_level /* Logging Macros */ -#define METRICS_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, METRICS, "%s(): "fmt, __func__, ## args) +#define METRICS_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, METRICS, "%s(): ", __func__, __VA_ARGS__) -#define METRICS_LOG_ERR(fmt, args...) \ - METRICS_LOG(ERR, fmt, ## args) +#define METRICS_LOG_ERR(...) \ + METRICS_LOG(ERR, __VA_ARGS__) -#define METRICS_LOG_WARN(fmt, args...) \ - METRICS_LOG(WARNING, fmt, ## args) +#define METRICS_LOG_WARN(...) \ + METRICS_LOG(WARNING, __VA_ARGS__) static int32_t rte_metrics_tel_reg_port_ethdev_to_metrics(uint16_t port_id) From patchwork Mon Feb 26 20:19:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137284 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 C9A3C43BF6; Mon, 26 Feb 2024 21:20:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7AA3542EA8; Mon, 26 Feb 2024 21:20:00 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id F22F142E38 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 51CF220B74C7; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 51CF220B74C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=j+Lfa1EQsgd/zKd+2D6kp1sI1zFaomvCiLp2T4fqFYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JSlErFkQki55ln/zghurEfuhi0EmFfZ4IPMtvk8fYD7LEswzkWNkyCKSOlv+8bOav gB7yR5JU9o8LJoWhb7StEzPHaoHoK0uVPzKjLeMtGTW6gjofLHfYVf/coIqsr/O1Bi BE7PyvF9N6gwo2/TCcQHn3Mx8N5AsdBu/Rsc6eOc= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 07/16] mldev: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:37 -0800 Message-Id: <1708978786-6740-8-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/mldev/rte_mldev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/mldev/rte_mldev.h b/lib/mldev/rte_mldev.h index 27e372f..01577bd 100644 --- a/lib/mldev/rte_mldev.h +++ b/lib/mldev/rte_mldev.h @@ -146,8 +146,8 @@ extern int rte_ml_dev_logtype; #define RTE_LOGTYPE_MLDEV rte_ml_dev_logtype -#define RTE_MLDEV_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, MLDEV, "%s(): " fmt, __func__, ##args) +#define RTE_MLDEV_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, MLDEV, "%s(): ", __func__, __VA_ARGS__) #define RTE_ML_STR_MAX 128 /**< Maximum length of name string */ From patchwork Mon Feb 26 20:19:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137286 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 8E00D43BF6; Mon, 26 Feb 2024 21:20:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D79C742E7D; Mon, 26 Feb 2024 21:20:02 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 0EAD342E4A for ; Mon, 26 Feb 2024 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 6033120B74C8; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6033120B74C8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=vSbwSNdFL7oqlGAb0+LnFj3GoMaH/TE7vlEQmVCP5Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcvc+DcsoHH0AQVRjSDYCrFWEEMXeyWi6DyPbRg0DTvJkk+pfEJ0w5AWhF2ogFW3x sophh5SKFNrPkpClz5WzLWNLB4qWnwJPXsS1pOFfxKsrNzXYhHAeOs0CJd4WiX0BRU t6jyfz/UeZeob+zwly7dm6l33jKM53ju1ren2LTU= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 08/16] net: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:38 -0800 Message-Id: <1708978786-6740-9-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/net/rte_net_crc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/net/rte_net_crc.c b/lib/net/rte_net_crc.c index b401ea3..346c285 100644 --- a/lib/net/rte_net_crc.c +++ b/lib/net/rte_net_crc.c @@ -73,8 +73,8 @@ RTE_LOG_REGISTER_DEFAULT(libnet_logtype, INFO); #define RTE_LOGTYPE_NET libnet_logtype -#define NET_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, NET, "%s(): " fmt, __func__, ## args) +#define NET_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, NET, "%s(): ", __func__, __VA_ARGS__) /* Scalar handling */ From patchwork Mon Feb 26 20:19:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137282 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 859AC43BF6; Mon, 26 Feb 2024 21:20:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 28DB742EB2; Mon, 26 Feb 2024 21:19:58 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id D4E3C402CC for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 6E97820B74C9; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6E97820B74C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=wF153sGq6x7DALcZxHYQPIcjG3QcO25v68IDoPz9SXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oBmFClcpXYA1ZY9Gbj/ZCQBBAM6oa5T+ZfO1MppV/s8h3bSXoUqm9DuHtLwfqvtFu GDmvXrlJT/uj/CU5esFpVRq88Mzh4mlvB2k2MVuRZZRhYXL1oWdd2JxcxyKOrXbksk k8C6mOgpFsia05XJpa7i3kTIEi7PQOgWCcGQU0ho= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 09/16] pdump: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:39 -0800 Message-Id: <1708978786-6740-10-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/pdump/rte_pdump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c index f6160f9..679c3dd 100644 --- a/lib/pdump/rte_pdump.c +++ b/lib/pdump/rte_pdump.c @@ -18,8 +18,8 @@ RTE_LOG_REGISTER_DEFAULT(pdump_logtype, NOTICE); #define RTE_LOGTYPE_PDUMP pdump_logtype -#define PDUMP_LOG_LINE(level, fmt, args...) \ - RTE_LOG_LINE(level, PDUMP, "%s(): " fmt, __func__, ## args) +#define PDUMP_LOG_LINE(level, ...) \ + RTE_LOG_LINE_PREFIX(level, PDUMP, "%s(): ", __func__, __VA_ARGS__) /* Used for the multi-process communication */ #define PDUMP_MP "mp_pdump" From patchwork Mon Feb 26 20:19:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137290 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 BF3F943BF6; Mon, 26 Feb 2024 21:21:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 29B7942EF1; Mon, 26 Feb 2024 21:20:08 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 0636D42E3A for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 7CAB720B74CA; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7CAB720B74CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=N0IEvi4kDR+S0VAnyPiffSnvBQpz4CjdjnrDPn6k3v8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dfgVEIF8MOraIgvgjFjwJugeHFkut9NdWI21UaaJxebRmZkWdIG+KoiP0rn5oYru/ HB3UcdSZbH/0v5FuFfvm8JWOIK2KsvgRrpm29ecvKtDEcaD7XNopRw0ikwUX1wla0C iE4cmZFy2R1MCB6kl1r5y1I18mUb4OWQsuNvzguM= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 10/16] power: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:40 -0800 Message-Id: <1708978786-6740-11-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/power/power_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/power/power_common.h b/lib/power/power_common.h index 3096640..77bc593 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -16,10 +16,10 @@ RTE_LOG_LINE(level, POWER, "" __VA_ARGS__) #ifdef RTE_LIBRTE_POWER_DEBUG -#define POWER_DEBUG_LOG(fmt, args...) \ - RTE_LOG_LINE(ERR, POWER, "%s: " fmt, __func__, ## args) +#define POWER_DEBUG_LOG(...) \ + RTE_LOG_LINE_PREFIX(ERR, POWER, "%s(): ", __func__, __VA_ARGS__) #else -#define POWER_DEBUG_LOG(fmt, args...) +#define POWER_DEBUG_LOG(fmt, ...) #endif /* check if scaling driver matches one we want */ From patchwork Mon Feb 26 20:19:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137291 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 CD10043BF6; Mon, 26 Feb 2024 21:21:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77E9042EF9; Mon, 26 Feb 2024 21:20:09 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 1DF6542E57 for ; Mon, 26 Feb 2024 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 8B48C20B74CB; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8B48C20B74CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=nkLKpJxDk54+N5G3Z5KeQVHNfox77IqshM9YgG1xR7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SrsWIa6onJtP/1zMLQVzvLXsB7m/NGiG0EAHm3VofH8bZ5LRrHeSoLke5mb83rQUV jmcKIdmFHYwCJUmd52Xo/xqr8hNwzbq3eqEr/CMX0O9zTjqLn6xG6HfVsS5+oxxSKG vewV10iCq1o+8n1Ok7y/BBh32bSGo4KI5p2zCKH8= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 11/16] rawdev: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:41 -0800 Message-Id: <1708978786-6740-12-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/rawdev/rte_rawdev_pmd.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/rawdev/rte_rawdev_pmd.h b/lib/rawdev/rte_rawdev_pmd.h index 7173282..22b4064 100644 --- a/lib/rawdev/rte_rawdev_pmd.h +++ b/lib/rawdev/rte_rawdev_pmd.h @@ -30,16 +30,17 @@ #define RTE_LOGTYPE_RAWDEV librawdev_logtype /* Logging Macros */ -#define RTE_RDEV_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, RAWDEV, "%s(): " fmt, __func__, ##args) +#define RTE_RDEV_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, RAWDEV, "%s(): ", __func__, __VA_ARGS__) -#define RTE_RDEV_ERR(fmt, args...) \ - RTE_RDEV_LOG(ERR, fmt, ## args) -#define RTE_RDEV_DEBUG(fmt, args...) \ - RTE_RDEV_LOG(DEBUG, fmt, ## args) -#define RTE_RDEV_INFO(fmt, args...) \ - RTE_RDEV_LOG(INFO, fmt, ## args) +#define RTE_RDEV_ERR(...) \ + RTE_RDEV_LOG(ERR, __VA_ARGS__) +#define RTE_RDEV_DEBUG(...) \ + RTE_RDEV_LOG(DEBUG, __VA_ARGS__) + +#define RTE_RDEV_INFO(...) \ + RTE_RDEV_LOG(INFO, __VA_ARGS__) /* Macros to check for valid device */ #define RTE_RAWDEV_VALID_DEVID_OR_ERR_RET(dev_id, retval) do { \ From patchwork Mon Feb 26 20:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137287 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 3085843BF6; Mon, 26 Feb 2024 21:21:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 285E542EDB; Mon, 26 Feb 2024 21:20:04 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id DA55C42E07 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 99F6E20B74CC; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 99F6E20B74CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=B5CL8C8Ks9c+/ZFhcPP4EOl2yt4yje7TRj1WZ07TYls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fx50JflJHuVwa4LdHsifgDN15UyGBP3G1icXOHB1bySm40U76YQLt17Tym2nCNrmH mfhhaER3MbO5rMy8y964amBTvDUgJZAEVuW861TohBMbODZYDB/WoybM+exT0AdqTl CbfHzV3Qqs7jhAMSI6770TOSyoOeVqEiBpylX4gU= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 12/16] rcu: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:42 -0800 Message-Id: <1708978786-6740-13-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/rcu/rte_rcu_qsbr.c | 4 ++-- lib/rcu/rte_rcu_qsbr.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c index bd0b83b..f08d974 100644 --- a/lib/rcu/rte_rcu_qsbr.c +++ b/lib/rcu/rte_rcu_qsbr.c @@ -19,8 +19,8 @@ #include "rte_rcu_qsbr.h" #include "rcu_qsbr_pvt.h" -#define RCU_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args) +#define RCU_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, RCU, "%s(): ", __func__, __VA_ARGS__) /* Get the memory size of QSBR variable */ size_t diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h index e7ef788..e4119cc 100644 --- a/lib/rcu/rte_rcu_qsbr.h +++ b/lib/rcu/rte_rcu_qsbr.h @@ -39,19 +39,19 @@ #define RTE_LOGTYPE_RCU rte_rcu_log_type #if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG -#define __RTE_RCU_DP_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args) +#define __RTE_RCU_DP_LOG(level, ...) \ + RTE_LOG_DP_LINE_PREFIX(level, RCU, "%s(): ", __func__, __VA_ARGS__) #else -#define __RTE_RCU_DP_LOG(level, fmt, args...) +#define __RTE_RCU_DP_LOG(level, ...) #endif #if defined(RTE_LIBRTE_RCU_DEBUG) -#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...) do { \ +#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, ...) do { \ if (v->qsbr_cnt[thread_id].lock_cnt) \ - RTE_LOG_LINE(level, RCU, "%s(): " fmt, __func__, ## args); \ + RTE_LOG_LINE_PREFIX(level, RCU, "%s(): ", __func__, __VA_ARGS__); \ } while (0) #else -#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, args...) +#define __RTE_RCU_IS_LOCK_CNT_ZERO(v, thread_id, level, fmt, ...) #endif /* Registered thread IDs are stored as a bitmap of 64b element array. From patchwork Mon Feb 26 20:19:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137289 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 9AD2E43BF6; Mon, 26 Feb 2024 21:21:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBA4042EEA; Mon, 26 Feb 2024 21:20:06 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 1310D42E52 for ; Mon, 26 Feb 2024 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id A86FC20B74CD; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A86FC20B74CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=StN3pNERROb2YkabVX7BYMlZSFxCrECCxLGU7dkdglk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k5fhb5J1Q5vj7u7PAPvvVwUN+fC4A7HcBQydqqKrwyK5rlA2uJ1Cze6NzKagdYaCW AK4bSaZSjufP/NvQ/TH+1WgBdYdflJG5gk8pxgUwut6/1EA8Ssfs7+xYxb7yNfNME8 cegcVLm41r0nkpd7R5abUCPCrR2ghcr/HyBtEtl0= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 13/16] stack: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:43 -0800 Message-Id: <1708978786-6740-14-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/stack/stack_pvt.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/stack/stack_pvt.h b/lib/stack/stack_pvt.h index 2dce42a..fc95796 100644 --- a/lib/stack/stack_pvt.h +++ b/lib/stack/stack_pvt.h @@ -10,16 +10,16 @@ extern int stack_logtype; #define RTE_LOGTYPE_STACK stack_logtype -#define STACK_LOG(level, fmt, args...) \ - RTE_LOG_LINE(level, STACK, "%s(): "fmt, __func__, ##args) +#define STACK_LOG(level, ...) \ + RTE_LOG_LINE_PREFIX(level, STACK, "%s(): ", __func__, __VA_ARGS__) -#define STACK_LOG_ERR(fmt, args...) \ - STACK_LOG(ERR, fmt, ## args) +#define STACK_LOG_ERR(...) \ + STACK_LOG(ERR, __VA_ARGS__) -#define STACK_LOG_WARN(fmt, args...) \ - STACK_LOG(WARNING, fmt, ## args) +#define STACK_LOG_WARN(...) \ + STACK_LOG(WARNING, __VA_ARGS__) -#define STACK_LOG_INFO(fmt, args...) \ - STACK_LOG(INFO, fmt, ## args) +#define STACK_LOG_INFO(fmt, ...) \ + STACK_LOG(INFO, __VA_ARGS__) #endif /* _STACK_PVT_H_ */ From patchwork Mon Feb 26 20:19:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137285 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 BB69943BF6; Mon, 26 Feb 2024 21:20:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E35A42ECC; Mon, 26 Feb 2024 21:20:01 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id E68CB42E37 for ; Mon, 26 Feb 2024 21:19:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id B6E2F20B74CE; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B6E2F20B74CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=HVkrC6vdIUv3u+ISu9fg5FLffWiIIFjMQvtr9Xlw6Sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QGlQP11HhbnvqTju5bcOEOnzeKWTASNuCyn06xJC/uXBcUM7KzsfeEwvOBOnZEf6n E0d5QJivq4ZadMaev05VLPOD1FYHSk4RkdpDvV3XaOVSR3fwoPqa+4AktXoevnJvWe ntLl6N5LKBeS9+1AfWeC3+FpzHXPETGk0SIZSrFM= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 14/16] eal: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:44 -0800 Message-Id: <1708978786-6740-15-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of EAL_LOG in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/eal/common/eal_trace.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/eal/common/eal_trace.h b/lib/eal/common/eal_trace.h index bd082a0..5526267 100644 --- a/lib/eal/common/eal_trace.h +++ b/lib/eal/common/eal_trace.h @@ -16,11 +16,11 @@ #include "eal_private.h" #include "eal_thread.h" -#define trace_err(fmt, args...) \ - EAL_LOG(ERR, "%s():%u " fmt, __func__, __LINE__, ## args) +#define trace_err(...) \ + RTE_LOG_LINE_PREFIX(ERR, EAL, "%s():%u ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) -#define trace_crit(fmt, args...) \ - EAL_LOG(CRIT, "%s():%u " fmt, __func__, __LINE__, ## args) +#define trace_crit(...) \ + RTE_LOG_LINE_PREFIX(CRIT, EAL, "%s():%u ", __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) #define TRACE_CTF_MAGIC 0xC1FC1FC1 #define TRACE_MAX_ARGS 32 From patchwork Mon Feb 26 20:19:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137288 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 5BA2D43BF6; Mon, 26 Feb 2024 21:21:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ACBF042EDE; Mon, 26 Feb 2024 21:20:05 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 26B7E42E5B for ; Mon, 26 Feb 2024 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id C5C3020B74CF; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C5C3020B74CF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=XHqoi0GfY8Sd/jDuISHknQIji+KZDSdoJ9ZN3ZdrxXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rUvLFD0RClbuPkIptrKyWcbI9QomfXy9cRn5bcAwdt3e2Ch29vh6qFZu3D1e/96QL 20th0d2eqRi2bJ1fgpottk/kAv0v8CyVbMH+Lr7W5sVc7ejMPTiv7cH/xAi05L4Z4E 3KoBROVrAV2rgx/ebS2CwIEukdUTk6loNzqNjWWQ= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 15/16] vhost: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:45 -0800 Message-Id: <1708978786-6740-16-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Use RTE_LOG_LINE_PREFIX instead of RTE_LOG_LINE in macro expansions which allow a prefix and arguments to be inserted into the log line without the need to use the ## args variadic argument pack extension. Signed-off-by: Tyler Retzlaff --- lib/vhost/vhost.h | 8 ++++---- lib/vhost/vhost_crypto.c | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index f163ff7..08e4ab9 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -679,11 +679,11 @@ void __vhost_log_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq, extern int vhost_data_log_level; #define RTE_LOGTYPE_VHOST_DATA vhost_data_log_level -#define VHOST_CONFIG_LOG(prefix, level, fmt, args...) \ - RTE_LOG_LINE(level, VHOST_CONFIG, "(%s) " fmt, prefix, ##args) +#define VHOST_CONFIG_LOG(prefix, level, ...) \ + RTE_LOG_LINE_PREFIX(level, VHOST_CONFIG, "(%s) ", prefix, __VA_ARGS__) -#define VHOST_DATA_LOG(prefix, level, fmt, args...) \ - RTE_LOG_DP_LINE(level, VHOST_DATA, "(%s) " fmt, prefix, ##args) +#define VHOST_DATA_LOG(prefix, level, ...) \ + RTE_LOG_DP_LINE_PREFIX(level, VHOST_DATA, "(%s) ", prefix, __VA_ARGS__) #ifdef RTE_LIBRTE_VHOST_DEBUG #define VHOST_MAX_PRINT_BUFF 6072 diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c index 3704fbb..3409cdf 100644 --- a/lib/vhost/vhost_crypto.c +++ b/lib/vhost/vhost_crypto.c @@ -20,19 +20,20 @@ RTE_LOG_REGISTER_SUFFIX(vhost_crypto_logtype, crypto, INFO); #define RTE_LOGTYPE_VHOST_CRYPTO vhost_crypto_logtype -#define VC_LOG_ERR(fmt, args...) \ - RTE_LOG_LINE(ERR, VHOST_CRYPTO, "%s() line %u: " fmt, \ - __func__, __LINE__, ## args) -#define VC_LOG_INFO(fmt, args...) \ - RTE_LOG_LINE(INFO, VHOST_CRYPTO, "%s() line %u: " fmt, \ - __func__, __LINE__, ## args) +#define VC_LOG_ERR(...) \ + RTE_LOG_LINE_PREFIX(ERR, VHOST_CRYPTO, "%s() line %u: ", \ + __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) + +#define VC_LOG_INFO(...) \ + RTE_LOG_LINE_PREFIX(INFO, VHOST_CRYPTO, "%s() line %u: ", \ + __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) #ifdef RTE_LIBRTE_VHOST_DEBUG -#define VC_LOG_DBG(fmt, args...) \ - RTE_LOG_LINE(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt, \ - __func__, __LINE__, ## args) +#define VC_LOG_DBG(...) \ + RTE_LOG_LINE_PREFIX(DEBUG, VHOST_CRYPTO, "%s() line %u: ", \ + __func__ RTE_LOG_COMMA __LINE__, __VA_ARGS__) #else -#define VC_LOG_DBG(fmt, args...) +#define VC_LOG_DBG(fmt, ...) #endif #define VIRTIO_CRYPTO_FEATURES ((1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \ From patchwork Mon Feb 26 20:19:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137292 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 4BE8843BF6; Mon, 26 Feb 2024 21:21:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B694842EFD; Mon, 26 Feb 2024 21:20:10 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 868EA42E61 for ; Mon, 26 Feb 2024 21:19:50 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id D473B20B74D0; Mon, 26 Feb 2024 12:19:48 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D473B20B74D0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708978788; bh=ssvP3b/hHSrD6flpTYt6v938p6It4Mg8d8v+xHnI3CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=acilZ3mIBnHNNn2vQU2xF31TDvNE7ZN785R6zXM/vAE7geALh3SPYGC9jPjmj1aLx 4QuAmnm9PBhagQAzTYppgMGsag5y2inWPFOGE2TOMVm4WLh5JbPasHUaQwgAk/jbIY lnGzLoG7NiozqHZnxho/gGw6fkGMtR+eh0YjhY1A= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Ashish Gupta , Chenbo Xia , Cristian Dumitrescu , David Hunt , Fan Zhang , Hemant Agrawal , Honnappa Nagarahalli , Jasvinder Singh , Jerin Jacob , Konstantin Ananyev , Maxime Coquelin , Reshma Pattan , Sachin Saxena , Sivaprasad Tummala , Srikanth Yalavarthi , Stephen Hemminger , Sunil Kumar Kori , bruce.richardson@intel.com, mb@smartsharesystems.com, thomas@monjalon.net, Tyler Retzlaff Subject: [PATCH v3 16/16] ip_frag: stop using variadic argument pack extension Date: Mon, 26 Feb 2024 12:19:46 -0800 Message-Id: <1708978786-6740-17-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708978786-6740-1-git-send-email-roretzla@linux.microsoft.com> 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 Remove use of args... and just use __VA_ARGS__. The macros expanding the argument pack do not require args extension to remove trailing comma. Signed-off-by: Tyler Retzlaff Acked-by: Konstantin Ananyev --- lib/ip_frag/ip_frag_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ip_frag/ip_frag_common.h b/lib/ip_frag/ip_frag_common.h index c766154..f66a963 100644 --- a/lib/ip_frag/ip_frag_common.h +++ b/lib/ip_frag/ip_frag_common.h @@ -26,9 +26,9 @@ RTE_LOG_LINE(level, IPFRAG, "" __VA_ARGS__) #ifdef RTE_LIBRTE_IP_FRAG_DEBUG -#define IP_FRAG_LOG(lvl, fmt, args...) RTE_LOG(lvl, IPFRAG, fmt, ##args) +#define IP_FRAG_LOG(lvl, ...) RTE_LOG(lvl, IPFRAG, __VA_ARGS__) #else -#define IP_FRAG_LOG(lvl, fmt, args...) do {} while(0) +#define IP_FRAG_LOG(lvl, fmt, ...) do {} while (0) #endif /* IP_FRAG_DEBUG */ #define IPV4_KEYLEN 1