Commit fceb6212 authored by Changbin Du's avatar Changbin Du Committed by Arnaldo Carvalho de Melo
Browse files

perf ftrace: system_wide collection is not effective by default 



The ftrace.target.system_wide must be set before invoking
evlist__create_maps(), otherwise it has no effect.

Fixes: 53be5028 ("perf ftrace: Add 'latency' subcommand")
Signed-off-by: default avatarChangbin Du <changbin.du@gmail.com>
Acked-by: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220127132010.4836-1-changbin.du@gmail.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 407eb43a

tools/perf/builtin-ftrace.c

+24 −21
Original line number Original line Diff line number Diff line
@@ -1115,6 +1115,7 @@ enum perf_ftrace_subcommand { 
int cmd_ftrace(int argc, const char **argv)

int cmd_ftrace(int argc, const char **argv)

{

{

	int ret;

	int ret;

	int (*cmd_func)(struct perf_ftrace *) = NULL;

	struct perf_ftrace ftrace = {

	struct perf_ftrace ftrace = {

		.tracer = DEFAULT_TRACER,

		.tracer = DEFAULT_TRACER,

		.target = { .uid = UINT_MAX, },

		.target = { .uid = UINT_MAX, },
@@ -1221,6 +1222,28 @@ int cmd_ftrace(int argc, const char **argv) 
		goto out_delete_filters;

		goto out_delete_filters;

	}

	}





	switch (subcmd) {

	case PERF_FTRACE_TRACE:

		if (!argc && target__none(&ftrace.target))

			ftrace.target.system_wide = true;

		cmd_func = __cmd_ftrace;

		break;

	case PERF_FTRACE_LATENCY:

		if (list_empty(&ftrace.filters)) {

			pr_err("Should provide a function to measure\n");

			parse_options_usage(ftrace_usage, options, "T", 1);

			ret = -EINVAL;

			goto out_delete_filters;

		}

		cmd_func = __cmd_latency;

		break;

	case PERF_FTRACE_NONE:

	default:

		pr_err("Invalid subcommand\n");

		ret = -EINVAL;

		goto out_delete_filters;

	}



	ret = target__validate(&ftrace.target);

	ret = target__validate(&ftrace.target);

	if (ret) {

	if (ret) {

		char errbuf[512];

		char errbuf[512];
@@ -1248,27 +1271,7 @@ int cmd_ftrace(int argc, const char **argv) 
			goto out_delete_evlist;

			goto out_delete_evlist;

	}

	}





	switch (subcmd) {

	ret = cmd_func(&ftrace);

	case PERF_FTRACE_TRACE:

		if (!argc && target__none(&ftrace.target))

			ftrace.target.system_wide = true;

		ret = __cmd_ftrace(&ftrace);

		break;

	case PERF_FTRACE_LATENCY:

		if (list_empty(&ftrace.filters)) {

			pr_err("Should provide a function to measure\n");

			parse_options_usage(ftrace_usage, options, "T", 1);

			ret = -EINVAL;

			goto out_delete_evlist;

		}

		ret = __cmd_latency(&ftrace);

		break;

	case PERF_FTRACE_NONE:

	default:

		pr_err("Invalid subcommand\n");

		ret = -EINVAL;

		break;

	}





out_delete_evlist:

out_delete_evlist:

	evlist__delete(ftrace.evlist);

	evlist__delete(ftrace.evlist);