From: "Łukasz Bartosik" <lb@semihalf.com>
To: Jason Baron <jbaron@akamai.com>,
Jim Cromie <jim.cromie@gmail.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <keescook@chromium.org>,
Douglas Anderson <dianders@chromium.org>
Cc: Guenter Roeck <groeck@google.com>,
Yaniv Tzoreff <yanivt@google.com>,
Benson Leung <bleung@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
Pekka Paalanen <ppaalanen@gmail.com>,
Sean Paul <seanpaul@chromium.org>,
Daniel Vetter <daniel@ffwll.ch>, Simon Ser <contact@emersion.fr>,
John Ogness <john.ogness@linutronix.de>,
Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-kernel@vger.kernel.org, upstream@semihalf.com
Subject: [PATCH v3 05/22] tracefs: add __get_str_strip_nl - RFC
Date: Sat, 23 Dec 2023 02:51:14 +0100 [thread overview]
Message-ID: <20231223015131.2836090-6-lb@semihalf.com> (raw)
In-Reply-To: <20231223015131.2836090-1-lb@semihalf.com>
From: Jim Cromie <jim.cromie@gmail.com>
This variant of __get_str() removes the trailing newline. It is for
use by printk/debug-ish events which already have a trailing newline.
It is here to support [1] which taught dyndbg to send pr_debug() msgs
to tracefs, via -x/T flag. It "reused" the include/trace/events/printk.h
console event, which does the following:
TP_fast_assign(
/*
* Each trace entry is printed in a new line.
* If the msg finishes with '\n', cut it off
* to avoid blank lines in the trace.
*/
if (len > 0 && (msg[len-1] == '\n'))
len -= 1;
memcpy(__get_str(s), msg, len);
__get_str(s)[len] = 0;
),
That trim work could be avoided, *if* all pr_debug() callers are
known to have no '\n' to strip. While that's not true for *all*
callsites, it is 99+% true for DRM.debug callsites, and can be made
true for some subsets of prdbg/dyndbg callsites.
WANTED: macros to validate that a literal format-str has or doesn't
have a trailing newline, or to provide or trim trailing newline(s?).
Should be usable in TP_printk* defns, for use in new event defns.
[1] https://lore.kernel.org/lkml/20200825153338.17061-1-vincent.whitchurch@axis.com
Cc: <rostedt@goodmis.org>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: <daniel@ffwll.ch>
Cc: <pmladek@suse.com>
Cc: <sergey.senozhatsky@gmail.com>
Cc: <john.ogness@linutronix.de>
Cc: Simon Ser <contact@emersion.fr>
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Łukasz Bartosik <lb@semihalf.com>
---
include/trace/stages/stage3_trace_output.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/include/trace/stages/stage3_trace_output.h b/include/trace/stages/stage3_trace_output.h
index c1fb1355d309..283533a17e62 100644
--- a/include/trace/stages/stage3_trace_output.h
+++ b/include/trace/stages/stage3_trace_output.h
@@ -19,6 +19,19 @@
#undef __get_str
#define __get_str(field) ((char *)__get_dynamic_array(field))
+#undef __get_str_strip_nl
+#define __get_str_strip_nl(field) \
+ ({ \
+ char *s = trace_seq_buffer_ptr(p); \
+ size_t len; \
+ trace_seq_printf(p, "%s", __get_str(field)); \
+ trace_seq_putc(p, '\0'); \
+ len = strlen(s); \
+ if (len && s[len-1] == '\n') \
+ s[len-1] = '\0'; \
+ s; \
+ })
+
#undef __get_rel_dynamic_array
#define __get_rel_dynamic_array(field) \
((void *)__entry + \
--
2.43.0.472.g3155946c3a-goog
next prev parent reply other threads:[~2023-12-23 1:51 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-23 1:51 [PATCH v3 00/22] dyndbg: add support for writing debug logs to trace Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 01/22] dyndbg: add _DPRINTK_FLAGS_ENABLED Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 02/22] dyndbg: add _DPRINTK_FLAGS_TRACE Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 03/22] dyndbg: add write events to tracefs code Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 04/22] dyndbg: add 2 trace-events: prdbg, devdbg Łukasz Bartosik
2023-12-23 1:51 ` Łukasz Bartosik [this message]
2023-12-23 1:51 ` [PATCH v3 06/22] dyndbg: use __get_str_strip_nl in prdbg and devdbg Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 07/22] dyndbg: repack _ddebug structure Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 08/22] dyndbg: move flags field to a new structure Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 09/22] dyndbg: add trace destination field to _ddebug Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 10/22] dyndbg: add open and close commands for trace Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 11/22] dyndbg: don't close trace instance when in use Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 12/22] dyndbg: add processing of T(race) flag argument Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 13/22] dyndbg: add support for default trace destination Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 14/22] dyndbg: write debug logs to trace instance Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 15/22] dyndbg: add support for hex_dump output to trace Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 16/22] dyndbg: disambiguate quoting in a debug msg Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 17/22] dyndbg: fix old BUG_ON in >control parser Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 18/22] dyndbg: treat comma as a token separator Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 19/22] dyndbg: add skip_spaces_and_coma() Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 20/22] dyndbg: split multi-query strings with % Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 21/22] dyndbg: reduce verbose/debug clutter Łukasz Bartosik
2023-12-23 1:51 ` [PATCH v3 22/22] dyndbg: id the bad word in parse-flags err msg Łukasz Bartosik
2023-12-27 4:22 ` [PATCH v3 00/22] dyndbg: add support for writing debug logs to trace jim.cromie
2023-12-27 4:44 ` jim.cromie
2023-12-29 0:05 ` Łukasz Bartosik
2023-12-29 0:00 ` Łukasz Bartosik
2024-01-02 19:13 ` jim.cromie
2024-01-03 16:27 ` Łukasz Bartosik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231223015131.2836090-6-lb@semihalf.com \
--to=lb@semihalf.com \
--cc=akpm@linux-foundation.org \
--cc=bleung@google.com \
--cc=contact@emersion.fr \
--cc=daniel@ffwll.ch \
--cc=dianders@chromium.org \
--cc=groeck@google.com \
--cc=jbaron@akamai.com \
--cc=jim.cromie@gmail.com \
--cc=john.ogness@linutronix.de \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=ppaalanen@gmail.com \
--cc=rostedt@goodmis.org \
--cc=seanpaul@chromium.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=upstream@semihalf.com \
--cc=vincent.whitchurch@axis.com \
--cc=yanivt@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox