From: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
linux-kernel@vger.kernel.org, yrl.pp-manager.tt@hitachi.com
Subject: [PATCH 2/2] trace-cmd: [BUGFIX] Don't die if an instance does not have 'current_tracer' file
Date: Tue, 24 Jun 2014 02:23:45 +0000 [thread overview]
Message-ID: <20140624022345.14037.44275.stgit@yuno-kbuild.novalocal> (raw)
In-Reply-To: <20140624022340.14037.63549.stgit@yuno-kbuild.novalocal>
Current trace-cmd requires 'current_tracer' file for an instance, and if
the file is nothing, trace-cmd dies. However, current_tracer file was
introduced from 607e2ea167e patch in Linux kernel 3.14-rc3, so current
trace-cmd cannot use multiple buffers for old kernels.
This patch avoids to die if current_tracer file is nothing in an instance
and the plugin name is "nop". This is because old kernels always trace
as nop mode in an instance.
<How to test>
1) # ./trace-cmd record -B foo -e sched
Before introducing this patch, following error message is output in an old
kernel:
trace-cmd: Permission denied
writing to '/sys/kernel/debug/tracing/instances/foo/current_tracer'
trace-cmd dies in disable_trace() calling set_plugin("nop").
After introducing this patch, trace-cmd works fine in both old kernels and
current kernel.
2) # ./trace-cmd record -B foo -e sched -p nop
It also works fine after introducing this patch in both old kernels and current
kernel.
3) # ./trace-cmd record -B foo -e sched -p function
For old kernels, it dies because an user should not set plugin tracer.
For current kernel, it works fine.
Note that this patch was tested for kernel 3.11.9-200 and 3.15.0-rc2+.
Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
---
trace-record.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/trace-record.c b/trace-record.c
index d3dd0c5..1912175 100644
--- a/trace-record.c
+++ b/trace-record.c
@@ -890,8 +890,18 @@ set_plugin_instance(struct buffer_instance *instance, const char *name)
path = get_instance_file(instance, "current_tracer");
fp = fopen(path, "w");
- if (!fp)
+ if (!fp) {
+ /*
+ * Legacy kernels do not have current_tracer file, and they
+ * always use nop. So, it doesn't need to try to change the
+ * plugin for those if name is "nop".
+ */
+ if (!strncmp(name, "nop", 3)) {
+ tracecmd_put_tracing_file(path);
+ return;
+ }
die("writing to '%s'", path);
+ }
tracecmd_put_tracing_file(path);
fwrite(name, 1, strlen(name), fp);
next prev parent reply other threads:[~2014-06-24 2:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 2:23 [ PATCH 0/2] [BUGFIX] trace-cmd: Fix two small bugs Yoshihiro YUNOMAE
2014-06-24 2:23 ` [PATCH 1/2] trace-cmd: [BUGFIX] Initialize handle->options list in tracecmd_attach_cpu_data_fd() Yoshihiro YUNOMAE
2014-06-27 19:14 ` Steven Rostedt
2014-06-24 2:23 ` Yoshihiro YUNOMAE [this message]
2014-06-27 19:17 ` [PATCH 2/2] trace-cmd: [BUGFIX] Don't die if an instance does not have 'current_tracer' file 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=20140624022345.14037.44275.stgit@yuno-kbuild.novalocal \
--to=yoshihiro.yunomae.ez@hitachi.com \
--cc=hidehiro.kawai.ez@hitachi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=rostedt@goodmis.org \
--cc=yrl.pp-manager.tt@hitachi.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®