From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [for-next][PATCH 05/10] tracing: Have trace_marker break up by lines by size of trace_seq
Date: Tue, 19 Dec 2023 09:32:38 -0500 [thread overview]
Message-ID: <20231219143300.196456990@goodmis.org> (raw)
In-Reply-To: 20231219143233.204534014@goodmis.org
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
If a trace_marker write is bigger than what trace_seq can hold, then it
will print "LINE TOO BIG" message and not what was written.
Instead, check if the write is bigger than the trace_seq and break it
up by that size.
Ideally, we could make the trace_seq dynamic that could hold this. But
that's for another time.
Link: https://lore.kernel.org/linux-trace-kernel/20231212190422.1eaf224f@gandalf.local.home
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0be30cccabb4..9cf58383d2fb 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7304,6 +7304,11 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
if (cnt < FAULTED_SIZE)
size += FAULTED_SIZE - cnt;
+ if (size > TRACE_SEQ_BUFFER_SIZE) {
+ cnt -= size - TRACE_SEQ_BUFFER_SIZE;
+ goto again;
+ }
+
buffer = tr->array_buffer.buffer;
event = __trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,
tracing_gen_ctx());
--
2.42.0
next prev parent reply other threads:[~2023-12-19 14:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 14:32 [for-next][PATCH 00/10] tracing: Updates for 6.8 Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 01/10] tracing: Allow creating instances with specified system events Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 02/10] ring-buffer: Add offset of events in dump on mismatch Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 03/10] tracing: Allow for max buffer data size trace_marker writes Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 04/10] trace_seq: Increase the buffer size to almost two pages Steven Rostedt
2023-12-19 14:32 ` Steven Rostedt [this message]
2023-12-19 14:32 ` [for-next][PATCH 06/10] tracing: Increase size of trace_marker_raw to max ring buffer entry Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 07/10] tracing/selftests: Add test to test the trace_marker Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 08/10] ring-buffer: Remove 32bit timestamp logic Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 09/10] ring-buffer: Add interrupt information to dump of data sub-buffer Steven Rostedt
2023-12-19 14:32 ` [for-next][PATCH 10/10] ring-buffer: Check if absolute timestamp goes backwards Steven Rostedt
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=20231219143300.196456990@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
/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