Commit c1264a4a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 * Validate syscall id before growing syscall table in 'trace', fixing potential
   excessive memory usage.

 * Validate perf_sample.raw_data, making 'trace' more robust, avoiding some
   potential SEGFAULTs when reading tracepoint fields.

 * Fix exclude_guest parse events 'perf test's, from Jiri Olsa.

 * Do not flush maps on COMM, that is sent by the kernel when a process is
   exec'ed, but also when a process changes its name. Since we were assuming
   a COMM always meant an EXEC, we were losing track of a process maps by
   flushing its maps. Fix from Luigi Semenzato.

 * A recent patch introduced a problem by not initializing what should be
   the first kind of pager to use, 'man', instead it was being left as zero
   which means no pager. This caused 'perf subcmd --help' to produce no output.
   Fix from Namhyung Kim.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0e9e3e30 42be7398

tools/perf/builtin-help.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ static int show_html_page(const char *perf_cmd) 
int cmd_help(int argc, const char **argv, const char *prefix __maybe_unused)

{

	bool show_all = false;

	enum help_format help_format = HELP_FORMAT_NONE;

	enum help_format help_format = HELP_FORMAT_MAN;

	struct option builtin_help_options[] = {

	OPT_BOOLEAN('a', "all", &show_all, "print all available commands"),

	OPT_SET_UINT('m', "man", &help_format, "show man page", HELP_FORMAT_MAN),

tools/perf/builtin-trace.c

+13 −5
Original line number Diff line number Diff line
@@ -56,6 +56,10 @@ static int trace__read_syscall_info(struct trace *trace, int id) 
{

	char tp_name[128];

	struct syscall *sc;

	const char *name = audit_syscall_to_name(id, trace->audit_machine);



	if (name == NULL)

		return -1;



	if (id > trace->syscalls.max) {

		struct syscall *nsyscalls = realloc(trace->syscalls.table, (id + 1) * sizeof(*sc));
@@ -75,10 +79,7 @@ static int trace__read_syscall_info(struct trace *trace, int id) 
	}



	sc = trace->syscalls.table + id;

	sc->name = audit_syscall_to_name(id, trace->audit_machine);

	if (sc->name == NULL)

		return -1;



	sc->name = name;

	sc->fmt  = syscall_fmt__find(sc->name);



	snprintf(tp_name, sizeof(tp_name), "sys_enter_%s", sc->name);
@@ -267,6 +268,13 @@ again: 
			if (evlist->threads->map[0] == -1 || evlist->threads->nr > 1)

				printf("%d ", sample.tid);



			if (sample.raw_data == NULL) {

				printf("%s sample with no payload for tid: %d, cpu %d, raw_size=%d, skipping...\n",

				       perf_evsel__name(evsel), sample.tid,

				       sample.cpu, sample.raw_size);

				continue;

			}



			handler = evsel->handler.func;

			handler(trace, evsel, &sample);

		}

tools/perf/util/parse-events-test.c

+8 −4
Original line number Diff line number Diff line
@@ -513,7 +513,8 @@ static int test__group1(struct perf_evlist *evlist) 
	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
@@ -599,7 +600,8 @@ static int test__group3(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 3);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);
@@ -662,7 +664,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", !evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 1);

	TEST_ASSERT_VAL("wrong group name", !evsel->group_name);
@@ -676,7 +679,8 @@ static int test__group4(struct perf_evlist *evlist __maybe_unused) 
	TEST_ASSERT_VAL("wrong exclude_user", evsel->attr.exclude_user);

	TEST_ASSERT_VAL("wrong exclude_kernel", !evsel->attr.exclude_kernel);

	TEST_ASSERT_VAL("wrong exclude_hv", evsel->attr.exclude_hv);

	TEST_ASSERT_VAL("wrong exclude guest", !evsel->attr.exclude_guest);

	/* use of precise requires exclude_guest */

	TEST_ASSERT_VAL("wrong exclude guest", evsel->attr.exclude_guest);

	TEST_ASSERT_VAL("wrong exclude host", !evsel->attr.exclude_host);

	TEST_ASSERT_VAL("wrong precise_ip", evsel->attr.precise_ip == 2);

	TEST_ASSERT_VAL("wrong leader", evsel->leader == leader);

tools/perf/util/thread.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ int thread__set_comm(struct thread *self, const char *comm) 
	err = self->comm == NULL ? -ENOMEM : 0;

	if (!err) {

		self->comm_set = true;

		map_groups__flush(&self->mg);

	}

	return err;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE