Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d4b96b authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing/uprobe: Set print format when parsing command 

Set event call's print format right after parsed command for
simplifying (un)register_uprobe_event().

Link: http://lkml.kernel.org/r/155931581659.28323.5404667166417404076.stgit@devnote2



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent f730e0f2

kernel/trace/trace_uprobe.c

+7 −18
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ static void free_trace_uprobe(struct trace_uprobe *tu) 
	path_put(&tu->path);

	kfree(tu->tp.call.class->system);

	kfree(tu->tp.call.name);

	kfree(tu->tp.call.print_fmt);

	kfree(tu->filename);

	kfree(tu);

}
@@ -592,6 +593,10 @@ static int trace_uprobe_create(int argc, const char **argv) 
			goto error;

	}



	ret = traceprobe_set_print_fmt(&tu->tp, is_ret_probe(tu));

	if (ret < 0)

		goto error;



	ret = register_trace_uprobe(tu);

	if (!ret)

		goto out;
@@ -1362,21 +1367,15 @@ static int register_uprobe_event(struct trace_uprobe *tu) 


	init_trace_event_call(tu, call);



	if (traceprobe_set_print_fmt(&tu->tp, is_ret_probe(tu)) < 0)

		return -ENOMEM;



	ret = register_trace_event(&call->event);

	if (!ret) {

		kfree(call->print_fmt);

	if (!ret)

		return -ENODEV;

	}



	ret = trace_add_event_call(call);



	if (ret) {

		pr_info("Failed to register uprobe event: %s\n",

			trace_event_name(call));

		kfree(call->print_fmt);

		unregister_trace_event(&call->event);

	}
@@ -1385,15 +1384,8 @@ static int register_uprobe_event(struct trace_uprobe *tu) 


static int unregister_uprobe_event(struct trace_uprobe *tu)

{

	int ret;



	/* tu->event is unregistered in trace_remove_event_call() */

	ret = trace_remove_event_call(&tu->tp.call);

	if (ret)

		return ret;

	kfree(tu->tp.call.print_fmt);

	tu->tp.call.print_fmt = NULL;

	return 0;

	return trace_remove_event_call(&tu->tp.call);

}



#ifdef CONFIG_PERF_EVENTS
@@ -1452,9 +1444,6 @@ void destroy_local_trace_uprobe(struct trace_event_call *event_call) 


	tu = container_of(event_call, struct trace_uprobe, tp.call);



	kfree(tu->tp.call.print_fmt);

	tu->tp.call.print_fmt = NULL;



	free_trace_uprobe(tu);

}

#endif /* CONFIG_PERF_EVENTS */