From: Jiri Olsa <jolsa@redhat.com>
To: rostedt@goodmis.org, fweisbec@gmail.com, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org, oleg@redhat.com,
Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH 1/2] tracing - trace lost events properly
Date: Sat, 12 Mar 2011 23:59:45 +0100 [thread overview]
Message-ID: <1299970786-8075-2-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1299970786-8075-1-git-send-email-jolsa@redhat.com>
Add proper handling of lost event trace, allowing callers
to get correct trace buffer info.
- returning TRACE_TYPE_PARTIAL_LINE, in case we dont fit into
the trace_seq buffer
- added WARN_ON to make sure we don't miss incorrect trace_seq
handling
wbr,
jirka
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
kernel/trace/trace.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9541c27..20d84f8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2013,9 +2013,10 @@ enum print_line_t print_trace_line(struct trace_iterator *iter)
{
enum print_line_t ret;
- if (iter->lost_events)
- trace_seq_printf(&iter->seq, "CPU:%d [LOST %lu EVENTS]\n",
- iter->cpu, iter->lost_events);
+ if (iter->lost_events &&
+ !trace_seq_printf(&iter->seq, "CPU:%d [LOST %lu EVENTS]\n",
+ iter->cpu, iter->lost_events))
+ return TRACE_TYPE_PARTIAL_LINE;
if (iter->trace && iter->trace->print_line) {
ret = iter->trace->print_line(iter);
@@ -3229,6 +3230,13 @@ waitagain:
if (iter->seq.len >= cnt)
break;
+
+ /*
+ * Setting the full flag means we reached the trace_seq buffer
+ * size and we should leave by partial output condition above.
+ * One of the trace_seq_* functions is not used properly.
+ */
+ WARN_ON(iter->seq.full);
}
trace_access_unlock(iter->cpu_file);
trace_event_read_unlock();
--
1.7.1
next prev parent reply other threads:[~2011-03-12 22:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-12 22:59 [PATCH 0/2] tracing - avoid soft lockup in trace_pipe Jiri Olsa
2011-03-12 22:59 ` Jiri Olsa [this message]
2011-03-12 22:59 ` [PATCH 2/2] tracing - putting cond_resched into tace_pipe loop Jiri Olsa
2011-03-13 14:58 ` Oleg Nesterov
2011-03-14 14:07 ` Steven Rostedt
2011-03-14 14:18 ` Jiri Olsa
2011-03-14 14:28 ` Steven Rostedt
2011-03-14 15:07 ` Jiri Olsa
2011-03-14 15:20 ` Steven Rostedt
2011-03-14 18:06 ` [PATCHv2] tracing - avoid soft lockup in trace_pipe Jiri Olsa
2011-03-21 12:10 ` Jiri Olsa
2011-03-25 2:23 ` Steven Rostedt
2011-03-25 3:14 ` Steven Rostedt
2011-03-25 11:05 ` [PATCHv3] " Jiri Olsa
2011-03-25 15:46 ` Steven Rostedt
2011-03-25 15:49 ` Steven Rostedt
2011-03-25 15:53 ` Jiri Olsa
2011-04-27 15:22 ` [tip:perf/core] tracing: Avoid " tip-bot for Jiri Olsa
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=1299970786-8075-2-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=oleg@redhat.com \
--cc=rostedt@goodmis.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
Powered by JetHome