From: Steven Rostedt <rostedt@goodmis.org>
To: Alexander Z Lam <azl@google.com>
Cc: linux-kernel@vger.kernel.org, David Sharp <dhsharp@google.com>,
Vaibhav Nagarnaik <vnagarnaik@google.com>,
Alexander Z Lam <lambchop468@gmail.com>
Subject: Re: [PATCH 2/3] tracing: Make trace_marker use the correct per-instance buffer
Date: Mon, 01 Jul 2013 20:25:04 -0400 [thread overview]
Message-ID: <1372724704.22688.30.camel@gandalf.local.home> (raw)
In-Reply-To: <1372717885-4543-2-git-send-email-azl@google.com>
On Mon, 2013-07-01 at 15:31 -0700, Alexander Z Lam wrote:
> The trace_marker file was present for each new instance created, but it
> added the trace mark to the global trace buffer instead of to
> the instance's buffer.
Thanks, I'll get this into this merge window. And maybe even mark it for
stable.
-- Steve
>
> Cc: David Sharp <dhsharp@google.com>
> Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
> Cc: Alexander Z Lam <lambchop468@gmail.com>
> Signed-off-by: Alexander Z Lam <azl@google.com>
> ---
> kernel/trace/trace.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index e0b0d2a..2f7307e 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -4351,6 +4351,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
> size_t cnt, loff_t *fpos)
> {
> unsigned long addr = (unsigned long)ubuf;
> + struct trace_array *tr = filp->private_data;
> struct ring_buffer_event *event;
> struct ring_buffer *buffer;
> struct print_entry *entry;
> @@ -4410,7 +4411,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
>
> local_save_flags(irq_flags);
> size = sizeof(*entry) + cnt + 2; /* possible \n added */
> - buffer = global_trace.trace_buffer.buffer;
> + buffer = tr->trace_buffer.buffer;
> event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,
> irq_flags, preempt_count());
> if (!event) {
next prev parent reply other threads:[~2013-07-02 0:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 22:31 [PATCH 1/3] tracing: Use a ring buffer size of 1 when creating a new trace buffer Alexander Z Lam
2013-07-01 22:31 ` [PATCH 2/3] tracing: Make trace_marker use the correct per-instance buffer Alexander Z Lam
2013-07-02 0:25 ` Steven Rostedt [this message]
2013-07-01 22:31 ` [PATCH 3/3] tracing: Protect ftrace_trace_arrays list in trace_events.c Alexander Z Lam
2013-07-02 0:28 ` Steven Rostedt
2013-07-02 1:25 ` Steven Rostedt
2013-07-02 2:21 ` Alexander Lam
2013-07-02 0:16 ` [PATCH 1/3] tracing: Use a ring buffer size of 1 when creating a new trace buffer 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=1372724704.22688.30.camel@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=azl@google.com \
--cc=dhsharp@google.com \
--cc=lambchop468@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vnagarnaik@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
all inboxes | Powered by JetHome®