From patchwork Thu Feb 22 23:46:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 137057 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 04CB243B8A; Fri, 23 Feb 2024 00:46:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9167040EAB; Fri, 23 Feb 2024 00:46:51 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2188E402BD for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 58C6820B74C1; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 58C6820B74C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=WLm8ngLLU+gjGYvJDbM2wFVMXPqKOSR6IQYSmPydxME=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ayMZ9pPZbwTsUe2e8xQMsqrlp18d4CeyoNLXjaRka2HAglvKrKrKSDqiqL5wN4Ay5 CGiAJr75o4pU/L0kLj32cDMtpB2tQ8svN/TwJh3bL0Wa0Mu97rno7HMoU++dVAsa1u L+SBG/Oe94KU40ZIU9jzx3jLEijclagYul8v6Pv8= 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 v2 01/17] log: add a per line log helper with parameterized prefix Date: Thu, 22 Feb 2024 15:46:30 -0800 Message-Id: <1708645606-7514-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index fbc0df7..a0fee24 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -379,6 +379,20 @@ int rte_vlog(uint32_t level, uint32_t logtype, const char *format, va_list ap) RTE_FMT_TAIL(__VA_ARGS__ ,))); \ } while (0) +#define _RTE_LOG_COMMA , + +#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) + +#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 Thu Feb 22 23:46: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: 137058 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 7B4B643B8A; Fri, 23 Feb 2024 00:47:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3CCE40F16; Fri, 23 Feb 2024 00:46:52 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4371E402CB for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 6746B20B74C2; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 6746B20B74C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=W0T5qaTaGIzX+dJXRjSb5VyzPfvqCOtJUyBwocQiDhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PMRMRwq5dxZ5IXMbfbbD/cn2mKF8SlvPS5KtUXf7gUjuPyWDc5GH1zcOp3FMxRTGU 8PtUeoe3z6BP4Kp9A5JFwGC/v/dAEcO68ByJ65u+Tzul/Pw0HGedl7uQvT5XW9IEab 2vm5QC0pH0vaem9VWZkTmUhYSs+beyfM4lXLy+ac= 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 v2 02/17] bpf: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:31 -0800 Message-Id: <1708645606-7514-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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/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 Thu Feb 22 23:46: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: 137060 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 7B43343B8A; Fri, 23 Feb 2024 00:47:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B687410F2; Fri, 23 Feb 2024 00:46:55 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 99378402ED for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 753AA20B74C3; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 753AA20B74C3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=iiRrfo+WZjzPoZeO4F1BARsqUWZgsQCZIZo277q4f5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fkP9qtYQIVrLEZ2KtGjKN5GUYB9L1fYFryUWrsqVN/OJh/At0zG2aWaR6HP0CXikP 2U1GtH49UxvjOXhy63phRMyKq5WU+E2foJvxcnphE3lFiMfCIu2/1APXX5yRzptb7k 0ukl9L7/nnUh1Klj978lRTONs0sCy9hn7e0l1TFQ= 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 v2 03/17] cfgfile: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:32 -0800 Message-Id: <1708645606-7514-4-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137059 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 79E6243B8A; Fri, 23 Feb 2024 00:47:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1525410E4; Fri, 23 Feb 2024 00:46:53 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 615BB402E3 for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 82E2A20B74C4; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 82E2A20B74C4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=6MQpnBBH7z48vEx5t8YSsZ4pvK9yEpwal57ymng/mJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DctnU2oziasYTKggtqybZYoRjyOL6rhzIpPn0szhtCKT5JHg7eTSzVumB0oOd0+/F rJCLrJvcoqNSwlDAKcj82YuY+J+wPqQr3FYkFyChhcDKsjGexDY75kd/gI5PbUJzgv yhKMwP+6XEOU5vOFjIbKseJUg/HFmQVq/ecpLJEs= 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 v2 04/17] cmdline: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:33 -0800 Message-Id: <1708645606-7514-5-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137061 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 9B18743B8A; Fri, 23 Feb 2024 00:47:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 90ABC4111B; Fri, 23 Feb 2024 00:46:56 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id EAD1A400EF for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 9151E20B74C5; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9151E20B74C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=10p5Qptx3tYYLffbMVGCxjnT4GS0ULlqw6mj3+wHguU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MuHMKJ2fbWAfhKs9zr5nROwx0kQuG3LoaGyQ98v6hKh4ktvuEHz34pD5cs7gVj8c/ rw06oCrpararJo9cWKxkdosCBzfCZ4dxpt8XsA80C3rURmAynczgS1/bAaAbnodNe3 V3p1hKMwiJ33rsLr6wc8xg0xc10kebZbIQbWtvMk= 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 v2 05/17] compressdev: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:34 -0800 Message-Id: <1708645606-7514-6-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137063 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 10FE443B8A; Fri, 23 Feb 2024 00:47:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69ED241157; Fri, 23 Feb 2024 00:46:59 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 04A72402CB for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 9E77E20B74C6; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9E77E20B74C6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=qYEBHzBLZUaO7QilG3EwBpnBJ9+BAORgBIYJssQq6l4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cx6WCQ4KUQ4NKZiipSRSZhrrDv6qRhNK+vU8Hy+EGCuAPjfQyJ/QPLazeOg44dizN wqLHbSXI3ENmWbvtJx2C8f43syJwIfApRADQMSCq7YpW5vdw9EcW2M2f7ByxkKMiGU Ienptm3dRa6kgU1+nlgQkGMeJpCaqanheC4hzQCI= 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 v2 06/17] metrics: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:35 -0800 Message-Id: <1708645606-7514-7-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137067 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 8673843B8A; Fri, 23 Feb 2024 00:48:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC8FC427E8; Fri, 23 Feb 2024 00:47:03 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 583D6400EF for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id AD99820B74C7; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AD99820B74C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=j+Lfa1EQsgd/zKd+2D6kp1sI1zFaomvCiLp2T4fqFYc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yqo6ewsWyLUmMwFv14VUgs39Zx6nShOplLzoQACrK/iLbfY6xfgvqfETg5UM1dqcp Kvwdah94TNKD9kouIrSNBDE+3GSeXOkUJITVhL7tHe4WJeRPivpx2qEy5RwK8jjF9E eSBw3YQVAupM81d8yyXg1ctsFmKcO4BxX33lSR8M= 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 v2 07/17] mldev: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:36 -0800 Message-Id: <1708645606-7514-8-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137062 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 3278D43B8A; Fri, 23 Feb 2024 00:47:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 454F741143; Fri, 23 Feb 2024 00:46:58 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id F1A95402BD for ; Fri, 23 Feb 2024 00:46:48 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id BB9F820B74C8; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BB9F820B74C8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=vSbwSNdFL7oqlGAb0+LnFj3GoMaH/TE7vlEQmVCP5Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YkR61UAB9uwzfSKAdN6qgErpOylmXigBrUcluObjsI0Xm2bUHbRaMoeJQgf/YtTOn Tg7V8MKEPbzx3vIzonUR/GgKW0bBxPKWtc/70YvzqkyKDDVCzIzQJQaVS/fph51d5c ZrNEictE96jMZprSg/VUMe0Zka3O9hGdLHkMBj5o= 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 v2 08/17] net: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:37 -0800 Message-Id: <1708645606-7514-9-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137066 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 78F6843B8A; Fri, 23 Feb 2024 00:47:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD317427E1; Fri, 23 Feb 2024 00:47:02 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 3D5F140E7C for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id CA01420B74C9; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CA01420B74C9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=wF153sGq6x7DALcZxHYQPIcjG3QcO25v68IDoPz9SXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dPxm7L0nPPPg+VSStT0L0VrDigBSl9SD2DfnDOsfxg0Jr/1CT6KMV3F01v5LOKFIG MgGjdOW3DtOKd59UNqE4OEbjnhXseMHe7ViWkCCNZk3bLHy0lJevOTwUq6yJVODaXc 93vPGc4VRjfXJ4i9wFILwak9nYBsScmMvTKdCDxw= 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 v2 09/17] pdump: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:38 -0800 Message-Id: <1708645606-7514-10-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137064 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 8335443B8A; Fri, 23 Feb 2024 00:47:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8AF7242686; Fri, 23 Feb 2024 00:47:00 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 115C8402E3 for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id D86DE20B74CA; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com D86DE20B74CA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=N0IEvi4kDR+S0VAnyPiffSnvBQpz4CjdjnrDPn6k3v8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BiCpJu9rHU94yuS1QY/orxOCfaZeS0a1hG8ji0jV0cMtAk2Ij80v6NyWkNfpQzrIN 2rjMJP8ZVgGPTvSsNv1+6eZDPAmh1uspD6CfxkPT4u34sFM+gpTGqRTb/q75UvKFEu 5XMD/yz0L0VdZZPBMlhPIfsEGWBVv+hgxOvzKwxE= 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 v2 10/17] power: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:39 -0800 Message-Id: <1708645606-7514-11-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137065 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 CE74D43B8A; Fri, 23 Feb 2024 00:47:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6C38427DC; Fri, 23 Feb 2024 00:47:01 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 38749402ED for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id E68D420B74CB; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E68D420B74CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645607; bh=nkLKpJxDk54+N5G3Z5KeQVHNfox77IqshM9YgG1xR7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qIrN8QlB88GqnVySd0CNGVTeLX0rrys9P9o4sCUrqr4vYKKxA9M3tvZ6DKoGyPqUF RU1x5OBOSjys2gFbzRdmJ4a4FfQNPTQo8HnJxcp2Vz4/YiQhUW8+8G7PjTi82sc1/V rodiUwwdx0HzYOudYEDf/dE0dub75OCQ0YEz+03g= 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 v2 11/17] rawdev: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:40 -0800 Message-Id: <1708645606-7514-12-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137070 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 6259F43B8A; Fri, 23 Feb 2024 00:48:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F295142D66; Fri, 23 Feb 2024 00:47:06 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 46D4A40E8A for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 010DB20B74CC; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 010DB20B74CC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=B5CL8C8Ks9c+/ZFhcPP4EOl2yt4yje7TRj1WZ07TYls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ODLP+oBViQbGxsnMnk1Q2xuQfwaaA1ykQ59O564eDC6UsHzr1eMVsYMBNusIvlQ7A fRQE9R3dSAbY1lmoHS0TfyVcwemU1njkoblgPYNKPQ5TL86hkPe2brYm9Of+hiA9dh XqPgAGYcTWBbAb8k4DYwIW7mJ7OQDbwL2uQRjUcw= 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 v2 12/17] rcu: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:41 -0800 Message-Id: <1708645606-7514-13-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137068 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 8DC8243B8A; Fri, 23 Feb 2024 00:48:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DBE0042D0C; Fri, 23 Feb 2024 00:47:04 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 6DA95402BD for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 0FAF820B74CD; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0FAF820B74CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=StN3pNERROb2YkabVX7BYMlZSFxCrECCxLGU7dkdglk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=quDxQZyHcdjwHjQqNHhz6lFZXLWY67MWtCeyv3za0qsYVQ63w3hBwiO3/ZnOsAk2J jUhquniRmVYD8l2kjGSNQ+RkuABtAnKXzFHhuIeeE2/t/MEYwKT7y3wOarWpV5ROlt 9uCkSok1QPc0IUOZd2QDHVCzvdsjA2tA7t+CkhFU= 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 v2 13/17] stack: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:42 -0800 Message-Id: <1708645606-7514-14-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 Thu Feb 22 23:46: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: 137073 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 C543E43B8A; Fri, 23 Feb 2024 00:48:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F62742D87; Fri, 23 Feb 2024 00:47:10 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 90FA640ED3 for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 1E0EA20B74CE; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1E0EA20B74CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=c7Ia5/EL4wRahhwdSCKCHRHr+okJMUBpAPbbSSEel84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XAEBE3b9D3neLa7TDXluG/09SiblX45UrLtOSlJWU1wkGZ0FYxbi4wqCnSJaaHNDM NBPVkUPSFDaU5q3MLbuoaA/Xrz7c8Gt9RNO0RVr/9WwjJy4t4AR/Y66AM4If0+CmH9 H+mUXYBV+Y0YRprXwB/1//qFxuShh4i2VECT9VAY= 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 v2 14/17] eal: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:43 -0800 Message-Id: <1708645606-7514-15-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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..bd24fcd 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 Thu Feb 22 23:46: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: 137069 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 67C0A43B8A; Fri, 23 Feb 2024 00:48:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0940142D2B; Fri, 23 Feb 2024 00:47:06 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 6DB5A40EAB for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 2C64A20B74CF; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 2C64A20B74CF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=nZBRGKbtEkbivcJzxwJQRy2IwURkwxff5HS3Z1Ljri0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdZj/YbOWUJBzrhTyO57AlayWrMn7dY0pWisXhjLX7ocmtmpCFhSDW7VtDtRFqTZS btsXFjVkumVizfNhHKgsH7cJZ8bwBOSZT44GV/bsRoPKCYQ19adNjJ/rdBCp1L5dM7 H1hbP+j+J/ooQUqZmhMrLO7fgmpUvowaGrRZ4Suk= 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 v2 15/17] vhost: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:44 -0800 Message-Id: <1708645606-7514-16-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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 ++++---- 1 file changed, 4 insertions(+), 4 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 From patchwork Thu Feb 22 23:46: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: 137072 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 37F4843B8A; Fri, 23 Feb 2024 00:48:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 79567410F1; Fri, 23 Feb 2024 00:47:09 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7537A402CB for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 3A9F420B74D0; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3A9F420B74D0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=iF5B7jrB2an1aE5/wQbuIiLigYfEoy/PHZryTXKjBL8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bc5oylBYm0yfyK9ncdW0YKlvibVWqKjBm543PMnm6XIkShGIlsYl5dt9yD5w/8+Nm CEXV9xTtdvQpRqHskSwbQLcI/6Jl+qTY8Z8t/kjiRDyZBQWkcBJD52ALGgZVamFCPq TZo90/sZvU2WQKKkclDnX8lnjNd8kteMqLwC0qYk= 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 v2 16/17] vhost: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:45 -0800 Message-Id: <1708645606-7514-17-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c index 3704fbb..68e755b 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 Thu Feb 22 23:46: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: 137071 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 6611543B8A; Fri, 23 Feb 2024 00:48:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5491742D76; Fri, 23 Feb 2024 00:47:08 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 78CFB402E3 for ; Fri, 23 Feb 2024 00:46:49 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id 4827020B74D1; Thu, 22 Feb 2024 15:46:47 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4827020B74D1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1708645608; bh=ssvP3b/hHSrD6flpTYt6v938p6It4Mg8d8v+xHnI3CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZuSTV8XIN5QuLjgBOAltruFoxUWrw0NMYSLe3UIvvqeBBaHIuifY7C0vvJkS/P5NU pgIRVLwtpDSlTxMPvZca/1F7oKE41rs6KwD8f4e7QMh1xr6utq6MS/iITPuvaw10rY gBxXtzmljqgICAHzeTl4Yt3emX6+ip3Y0hYjggU0= 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 v2 17/17] ip_frag: stop using variadic argument pack extension Date: Thu, 22 Feb 2024 15:46:46 -0800 Message-Id: <1708645606-7514-18-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1708645606-7514-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> <1708645606-7514-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/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