* [PATCH v2 0/6] trace-cmd reset fixes
@ 2019-03-08 13:43 Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 1/6] trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on" Tzvetomir Stoyanov
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:43 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
[
V2 changes:
- Fixed subjects of the patches.
- Refactored add_event_pid() and reset_event_pid(),
as Steven Rostedt suggested.
]
This patch series fixes "trace-cmd reset" command to
restore default values of various ftrace configurations:
tracng_on, trace_clock, set_event_pid and tracing_max_latency.
It also fixes a segfault when the command is executed with
"-a -d" options.
Tzvetomir Stoyanov (6):
trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on"
trace-cmd: Fix "trace-cmd reset -a -d" segfault
trace-cmd: Fix "trace-cmd reset" command to restore default clock
trace-cmd: Reafctored add_event_pid()to utilize write_instance_file()
trace-cmd: Fix "trace-cmd reset" command to restore the default value
of set_event_pid
trace-cmd: Fix "trace-cmd reset" command to restore the default value
of tracing_max_latency
tracecmd/trace-record.c | 123 ++++++++++++++++++++++++----------------
1 file changed, 73 insertions(+), 50 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/6] trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on"
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 2/6] trace-cmd: Fix "trace-cmd reset -a -d" segfault Tzvetomir Stoyanov
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
The "trace-cmd reset" command should restore ftrace to its default state.
By default, "tracing/current_tracer" is "nop" and "tracing/tracing_on" is "1".
This patch sets "tracing/tracing_on" to 1, when the command "trace-cmd reset"
is executed.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 8beefab..fc658b2 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4496,6 +4496,8 @@ void trace_reset(int argc, char **argv)
clear_triggers();
tracecmd_remove_instances();
clear_func_filters();
+ /* restore tracing_on to 1 */
+ tracecmd_enable_tracing();
exit(0);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/6] trace-cmd: Fix "trace-cmd reset -a -d" segfault
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 1/6] trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on" Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 3/6] trace-cmd: Fix "trace-cmd reset" command to restore default clock Tzvetomir Stoyanov
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
This patch fixes a segfault when "trace-cmd reset -a -d"
is executed and there is at least one ftrace instance created.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index fc658b2..d7267fe 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -4472,14 +4472,14 @@ void trace_reset(int argc, char **argv)
case 'a':
last_specified_all = 1;
add_all_instances();
- for_each_instance(instance) {
- instance->flags |= BUFFER_FL_KEEP;
+ for_each_instance(inst) {
+ inst->flags |= BUFFER_FL_KEEP;
}
break;
case 'd':
if (last_specified_all) {
for_each_instance(inst) {
- instance->flags &= ~BUFFER_FL_KEEP;
+ inst->flags &= ~BUFFER_FL_KEEP;
}
} else {
if (is_top_instance(instance))
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/6] trace-cmd: Fix "trace-cmd reset" command to restore default clock
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 1/6] trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on" Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 2/6] trace-cmd: Fix "trace-cmd reset -a -d" segfault Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 4/6] trace-cmd: Reafctored add_event_pid()to utilize write_instance_file() Tzvetomir Stoyanov
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
The "trace-cmd reset" command should restore ftrace to its default state.
This patch sets "tracing/trace_clock" to its default value "local",
when the "trace-cmd reset" command is executed.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index d7267fe..6972b9f 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3793,6 +3793,14 @@ static void clear_filters(void)
clear_instance_filters(instance);
}
+static void reset_clock(void)
+{
+ struct buffer_instance *instance;
+
+ for_all_instances(instance)
+ write_instance_file(instance, "trace_clock", "local", "clock");
+}
+
static void clear_triggers(void)
{
struct buffer_instance *instance;
@@ -4494,6 +4502,8 @@ void trace_reset(int argc, char **argv)
set_buffer_size();
clear_filters();
clear_triggers();
+ /* set clock to "local" */
+ reset_clock();
tracecmd_remove_instances();
clear_func_filters();
/* restore tracing_on to 1 */
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 4/6] trace-cmd: Reafctored add_event_pid()to utilize write_instance_file()
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
` (2 preceding siblings ...)
2019-03-08 13:44 ` [PATCH v2 3/6] trace-cmd: Fix "trace-cmd reset" command to restore default clock Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 5/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of set_event_pid Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 6/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of tracing_max_latency Tzvetomir Stoyanov
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
This patch changes add_event_pid() to utilize write_instance_file() for
writing set_event_pid instance file, instead of directly opening it.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 89 +++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 47 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 6972b9f..a398723 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -1094,30 +1094,64 @@ static void update_sched_events(struct buffer_instance *instance, int pid)
static int open_instance_fd(struct buffer_instance *instance,
const char *file, int flags);
-static void add_event_pid(const char *buf, int len)
+static int write_file(const char *file, const char *str, const char *type)
{
- struct buffer_instance *instance;
+ char buf[BUFSIZ];
int fd;
+ int ret;
- for_all_instances(instance) {
- fd = open_instance_fd(instance, "set_event_pid", O_WRONLY);
- write(fd, buf, len);
+ fd = open(file, O_WRONLY | O_TRUNC);
+ if (fd < 0)
+ die("opening to '%s'", file);
+ ret = write(fd, str, strlen(str));
+ close(fd);
+ if (ret < 0 && type) {
+ /* write failed */
+ fd = open(file, O_RDONLY);
+ if (fd < 0)
+ die("writing to '%s'", file);
+ /* the filter has the error */
+ while ((ret = read(fd, buf, BUFSIZ)) > 0)
+ fprintf(stderr, "%.*s", ret, buf);
+ die("Failed %s of %s\n", type, file);
close(fd);
}
+ return ret;
+}
+
+static int
+write_instance_file(struct buffer_instance *instance,
+ const char *file, const char *str, const char *type)
+{
+ char *path;
+ int ret;
+
+ path = get_instance_file(instance, file);
+ ret = write_file(path, str, type);
+ tracecmd_put_tracing_file(path);
+
+ return ret;
+}
+
+static void add_event_pid(const char *buf)
+{
+ struct buffer_instance *instance;
+
+ for_all_instances(instance)
+ write_instance_file(instance, "set_event_pid", buf, "event_pid");
}
static void add_new_filter_pid(int pid)
{
struct buffer_instance *instance;
char buf[100];
- int len;
add_filter_pid(pid, 0);
- len = sprintf(buf, "%d", pid);
+ sprintf(buf, "%d", pid);
update_ftrace_pid(buf, 0);
if (have_set_event_pid)
- return add_event_pid(buf, len);
+ return add_event_pid(buf);
common_pid_filter = append_pid_filter(common_pid_filter, "common_pid", pid);
@@ -1596,45 +1630,6 @@ static void reset_events(void)
reset_events_instance(instance);
}
-static int write_file(const char *file, const char *str, const char *type)
-{
- char buf[BUFSIZ];
- int fd;
- int ret;
-
- fd = open(file, O_WRONLY | O_TRUNC);
- if (fd < 0)
- die("opening to '%s'", file);
- ret = write(fd, str, strlen(str));
- close(fd);
- if (ret < 0 && type) {
- /* write failed */
- fd = open(file, O_RDONLY);
- if (fd < 0)
- die("writing to '%s'", file);
- /* the filter has the error */
- while ((ret = read(fd, buf, BUFSIZ)) > 0)
- fprintf(stderr, "%.*s", ret, buf);
- die("Failed %s of %s\n", type, file);
- close(fd);
- }
- return ret;
-}
-
-static int
-write_instance_file(struct buffer_instance *instance,
- const char *file, const char *str, const char *type)
-{
- char *path;
- int ret;
-
- path = get_instance_file(instance, file);
- ret = write_file(path, str, type);
- tracecmd_put_tracing_file(path);
-
- return ret;
-}
-
enum {
STATE_NEWLINE,
STATE_SKIP,
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 5/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of set_event_pid
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
` (3 preceding siblings ...)
2019-03-08 13:44 ` [PATCH v2 4/6] trace-cmd: Reafctored add_event_pid()to utilize write_instance_file() Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 6/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of tracing_max_latency Tzvetomir Stoyanov
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
The "trace-cmd reset" command should restore ftrace to its default state.
This patch sets "tracing/set_event_pid" to an empty string,
when the "trace-cmd reset" command is executed.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index a398723..bdf0c02 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3796,6 +3796,12 @@ static void reset_clock(void)
write_instance_file(instance, "trace_clock", "local", "clock");
}
+static void reset_event_pid(void)
+{
+ add_event_pid("");
+}
+
+
static void clear_triggers(void)
{
struct buffer_instance *instance;
@@ -4499,6 +4505,7 @@ void trace_reset(int argc, char **argv)
clear_triggers();
/* set clock to "local" */
reset_clock();
+ reset_event_pid();
tracecmd_remove_instances();
clear_func_filters();
/* restore tracing_on to 1 */
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 6/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of tracing_max_latency
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
` (4 preceding siblings ...)
2019-03-08 13:44 ` [PATCH v2 5/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of set_event_pid Tzvetomir Stoyanov
@ 2019-03-08 13:44 ` Tzvetomir Stoyanov
5 siblings, 0 replies; 7+ messages in thread
From: Tzvetomir Stoyanov @ 2019-03-08 13:44 UTC (permalink / raw)
To: rostedt; +Cc: linux-trace-devel
The "trace-cmd reset" command should restore ftrace to its default state.
This patch sets "tracing/tracing_max_latency" to 0,
when the "trace-cmd reset" command is executed.
Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
---
tracecmd/trace-record.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index bdf0c02..f4dac2f 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3801,6 +3801,14 @@ static void reset_event_pid(void)
add_event_pid("");
}
+static void reset_max_latency_instance(void)
+{
+ struct buffer_instance *instance;
+
+ for_all_instances(instance)
+ write_instance_file(instance,
+ "tracing_max_latency", "0", "max_latency");
+}
static void clear_triggers(void)
{
@@ -4506,6 +4514,7 @@ void trace_reset(int argc, char **argv)
/* set clock to "local" */
reset_clock();
reset_event_pid();
+ reset_max_latency_instance();
tracecmd_remove_instances();
clear_func_filters();
/* restore tracing_on to 1 */
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-03-08 13:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-08 13:43 [PATCH v2 0/6] trace-cmd reset fixes Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 1/6] trace-cmd: Fix "trace-cmd reset" command to restore "tracng_on" Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 2/6] trace-cmd: Fix "trace-cmd reset -a -d" segfault Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 3/6] trace-cmd: Fix "trace-cmd reset" command to restore default clock Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 4/6] trace-cmd: Reafctored add_event_pid()to utilize write_instance_file() Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 5/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of set_event_pid Tzvetomir Stoyanov
2019-03-08 13:44 ` [PATCH v2 6/6] trace-cmd: Fix "trace-cmd reset" command to restore the default value of tracing_max_latency Tzvetomir Stoyanov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.