Skip to contentSkip to conversation

trace-cmd: Fix some bugs that include issues with --max-graph-depth

PATCH In review Steven Rostedt 3 participants 9 messages Jun 12, 2019 – Jun 13, 2019

lore
Share & tools
lore
#0 lore raw

cover trace-cmd: Fix some bugs that include issues with --max-graph-depth

Some last minute bugs that were found and fixed.

Steven Rostedt (VMware) (3):
trace-cmd: Fix typo in Makefile bidr to bdir
trace-cmd: Have --max-graph-depth only be part of instance
trace-cmd: Check the return of get_file_content() before calling add_reset_file()

----

 tracecmd/Makefile              |  2 +-
 tracecmd/include/trace-local.h |  2 ++
 tracecmd/trace-record.c        | 33 +++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 15 deletions(-)
#1 lore raw

PATCH 1/3 trace-cmd: Fix typo in Makefile bidr to bdir

From: "Steven Rostedt (VMware)" <[email protected]>

The order-only prerequisit to $(bdir)/include has a typo of "$(bidr)" instead of being "$(bdir)"

---
 tracecmd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tracecmd/Makefile +1 -1
index 93b373d58155..bcd437a26b98 100644
@@ -47,7 +47,7 @@ all: $(TARGETS)
 $(bdir):
 	@mkdir -p $(bdir)
 
-$(bdir)/include: | $(bidr)
+$(bdir)/include: | $(bdir)
 	@mkdir -p $(bdir)/include
 
 $(TC_VERSION): force | $(bdir)/include
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] trace-cmd: Fix typo in Makefile bidr to bdir

Quoted 8 lines · Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

The order-only prerequisit to $(bdir)/include has a typo of "$(bidr)" instead of being "$(bdir)"

---

Looks OK to me

Quoted 17 lines
 tracecmd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tracecmd/Makefile +1 -2
index 93b373d58155..bcd437a26b98 100644
@@ -47,7 +47,7 @@ all: $(TARGETS)
 $(bdir):
        @mkdir -p $(bdir)
 
-$(bdir)/include: | $(bidr)
+$(bdir)/include: | $(bdir)
        @mkdir -p $(bdir)/include
 
 $(TC_VERSION): force | $(bdir)/include
--
Quoted 3 lines

2.20.1

--

Tzvetomir (Ceco) Stoyanov
VMware Open Source Technology Center

#3 lore raw

PATCH 2/3 trace-cmd: Have --max-graph-depth only be part of instance

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

New kernels will allow function graph tracer to be used in an instance, which means that the max_graph_depth file will be per instance and not just the top level file. Make the max_graph_depth associated to the instance and not part of the trace record context.

---
 tracecmd/include/trace-local.h |  2 ++
 tracecmd/trace-record.c        | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)
tracecmd/include/trace-local.h +2 -0
index a1a06e9196b4..1cad3ccc4de7 100644
@@ -183,6 +183,8 @@ struct buffer_instance {
 	struct tracecmd_msg_handle *msg_handle;
 	struct tracecmd_output *network_handle;
 
+	char			*max_graph_depth;
+
 	int			flags;
 	int			tracing_on_init_val;
 	int			tracing_on_fd;
tracecmd/trace-record.c +15 -12
index ee35ada10d6e..2d716a81acbf 100644
@@ -207,7 +207,6 @@ struct common_record_context {
 	struct buffer_instance *instance;
 	const char *output;
 	char *date2ts;
-	char *max_graph_depth;
 	int data_flags;
 
 	int record_all;
@@ -4892,9 +4891,9 @@ static void parse_record_options(int argc,
 			ctx->data_flags |= DATA_FL_OFFSET;
 			break;
 		case OPT_max_graph_depth:
-			free(ctx->max_graph_depth);
-			ctx->max_graph_depth = strdup(optarg);
-			if (!ctx->max_graph_depth)
+			free(ctx->instance->max_graph_depth);
+			ctx->instance->max_graph_depth = strdup(optarg);
+			if (!ctx->instance->max_graph_depth)
 				die("Could not allocate option");
 			break;
 		case OPT_no_filter:
@@ -5056,10 +5055,12 @@ static void record_trace(int argc, char **argv,
 	update_plugins(type);
 	set_options();
 
-	if (ctx->max_graph_depth) {
-		for_all_instances(instance)
-			set_max_graph_depth(instance, ctx->max_graph_depth);
-		free(ctx->max_graph_depth);
+	for_all_instances(instance) {
+		if (instance->max_graph_depth) {
+			set_max_graph_depth(instance, instance->max_graph_depth);
+			free(instance->max_graph_depth);
+			instance->max_graph_depth = NULL;
+		}
 	}
 
 	allocate_seq();
@@ -5155,10 +5156,12 @@ void trace_extract(int argc, char **argv)
 	update_plugins(type);
 	set_options();
 
-	if (ctx.max_graph_depth) {
-		for_all_instances(instance)
-			set_max_graph_depth(instance, ctx.max_graph_depth);
-		free(ctx.max_graph_depth);
+	for_all_instances(instance) {
+		if (instance->max_graph_depth) {
+			set_max_graph_depth(instance, instance->max_graph_depth);
+			free(instance->max_graph_depth);
+			instance->max_graph_depth = NULL;
+		}
 	}
 
 	allocate_seq();
Signature · 1 line
2.20.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] trace-cmd: Have --max-graph-depth only be part of instance

Quoted 10 lines · Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

New kernels will allow function graph tracer to be used in an instance, which means that the max_graph_depth file will be per instance and not just the top level file. Make the max_graph_depth associated to the instance and not part of the trace record context.

---

Looks OK.

Quoted 77 lines
 tracecmd/include/trace-local.h |  2 ++
 tracecmd/trace-record.c        | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)
tracecmd/include/trace-local.h +2 -0
index a1a06e9196b4..1cad3ccc4de7 100644
@@ -183,6 +183,8 @@ struct buffer_instance {
        struct tracecmd_msg_handle *msg_handle;
        struct tracecmd_output *network_handle;
 
+       char                    *max_graph_depth;
+
        int                     flags;
        int                     tracing_on_init_val;
        int                     tracing_on_fd;
tracecmd/trace-record.c +15 -13
index ee35ada10d6e..2d716a81acbf 100644
@@ -207,7 +207,6 @@ struct common_record_context {
        struct buffer_instance *instance;
        const char *output;
        char *date2ts;
-       char *max_graph_depth;
        int data_flags;
 
        int record_all;
@@ -4892,9 +4891,9 @@ static void parse_record_options(int argc,
                        ctx->data_flags |= DATA_FL_OFFSET;
                        break;
                case OPT_max_graph_depth:
-                       free(ctx->max_graph_depth);
-                       ctx->max_graph_depth = strdup(optarg);
-                       if (!ctx->max_graph_depth)
+                       free(ctx->instance->max_graph_depth);
+                       ctx->instance->max_graph_depth = strdup(optarg);
+                       if (!ctx->instance->max_graph_depth)
                                die("Could not allocate option");
                        break;
                case OPT_no_filter:
@@ -5056,10 +5055,12 @@ static void record_trace(int argc, char **argv,
        update_plugins(type);
        set_options();
 
-       if (ctx->max_graph_depth) {
-               for_all_instances(instance)
-                       set_max_graph_depth(instance, ctx->max_graph_depth);
-               free(ctx->max_graph_depth);
+       for_all_instances(instance) {
+               if (instance->max_graph_depth) {
+                       set_max_graph_depth(instance, instance->max_graph_depth);
+                       free(instance->max_graph_depth);
+                       instance->max_graph_depth = NULL;
+               }
        }
 
        allocate_seq();
@@ -5155,10 +5156,12 @@ void trace_extract(int argc, char **argv)
        update_plugins(type);
        set_options();
 
-       if (ctx.max_graph_depth) {
-               for_all_instances(instance)
-                       set_max_graph_depth(instance, ctx.max_graph_depth);
-               free(ctx.max_graph_depth);
+       for_all_instances(instance) {
+               if (instance->max_graph_depth) {
+                       set_max_graph_depth(instance, instance->max_graph_depth);
+                       free(instance->max_graph_depth);
+                       instance->max_graph_depth = NULL;
+               }
        }
 
        allocate_seq();
--
Quoted 3 lines

2.20.1

--

Tzvetomir (Ceco) Stoyanov
VMware Open Source Technology Center

#5 lore raw

PATCH 3/3 trace-cmd: Check the return of get_file_content() before calling add_reset_file()

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

If get_file_content() returns NULL, because the file does not exist or for any other reason, it will cause add_reset_file() to trigger a SEGSEGV due to using a NULL pointer. Only call add_reset_file() if get_file_content() actually returns something.

---
 tracecmd/trace-record.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tracecmd/trace-record.c +4 -2
index 2d716a81acbf..5dc6f17aa743 100644
@@ -270,8 +270,10 @@ static void reset_save_file(const char *file, int prio)
 	char *content;
 
 	content = get_file_content(file);
-	add_reset_file(file, content, prio);
-	free(content);
+	if (content) {
+		add_reset_file(file, content, prio);
+		free(content);
+	}
 }
 
 /*
Signature · 1 line
2.20.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] trace-cmd: Check the return of get_file_content() before calling add_reset_file()

Quoted 10 lines · Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

If get_file_content() returns NULL, because the file does not exist or for any other reason, it will cause add_reset_file() to trigger a SEGSEGV due to using a NULL pointer. Only call add_reset_file() if get_file_content() actually returns something.

---

Looks OK.

Quoted 21 lines
 tracecmd/trace-record.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
tracecmd/trace-record.c +4 -3
index 2d716a81acbf..5dc6f17aa743 100644
@@ -270,8 +270,10 @@ static void reset_save_file(const char *file, int prio)
        char *content;
 
        content = get_file_content(file);
-       add_reset_file(file, content, prio);
-       free(content);
+       if (content) {
+               add_reset_file(file, content, prio);
+               free(content);
+       }
 }
 
 /*
--
Quoted 3 lines

2.20.1

--

Tzvetomir (Ceco) Stoyanov
VMware Open Source Technology Center

Reviewed-by on the v1 series
#7 lore raw
In reply to Steven Rostedt
Quoted 9 lines · Steven Rostedt

Some last minute bugs that were found and fixed.

Steven Rostedt (VMware) (3):
trace-cmd: Fix typo in Makefile bidr to bdir
trace-cmd: Have --max-graph-depth only be part of instance
trace-cmd: Check the return of get_file_content() before calling add_reset_file()

Quoted 5 lines

----

 tracecmd/Makefile              |  2 +-
 tracecmd/include/trace-local.h |  2 ++
 tracecmd/trace-record.c        | 33 +++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 15 deletions(-)

Looks good to me.

Cheers,

--Slavi

#8 lore raw
Quoted 16 lines · On Thu, 13 Jun 2019 14:51:48 +0000 Slavomir Kaslev <[email protected]> wrote:
Quoted 9 lines · Steven Rostedt

Some last minute bugs that were found and fixed.

Steven Rostedt (VMware) (3):
trace-cmd: Fix typo in Makefile bidr to bdir
trace-cmd: Have --max-graph-depth only be part of instance
trace-cmd: Check the return of get_file_content() before calling add_reset_file()

Quoted 5 lines

----

 tracecmd/Makefile              |  2 +-
 tracecmd/include/trace-local.h |  2 ++
 tracecmd/trace-record.c        | 33 +++++++++++++++++++--------------
 3 files changed, 22 insertions(+), 15 deletions(-)  
Quoted 4 lines

Looks good to me.

Thanks Slavomir and Tzvetomir.

I'll add these patches now with both of your reviewed-bys.

-- Steve