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

Commit c45628b0 authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Robustify perf_event__synth_time_conv() 



It is possible that all events in an evlist are overwritable.
perf_event__synth_time_conv() should not crash in this case.
record__pick_pc() is used to check avaliability.

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1464056944-166978-3-git-send-email-wangnan0@huawei.com


Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
[ Split from a larger patch ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 792d48b4

tools/perf/arch/x86/util/tsc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,8 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc, 
	struct perf_tsc_conversion tc;

	struct perf_tsc_conversion tc;

	int err;

	int err;





	if (!pc)

		return 0;

	err = perf_read_tsc_conversion(pc, &tc);

	err = perf_read_tsc_conversion(pc, &tc);

	if (err == -EOPNOTSUPP)

	if (err == -EOPNOTSUPP)

		return 0;

		return 0;

tools/perf/builtin-record.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -655,6 +655,13 @@ perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused 
	return 0;

	return 0;

}

}





static const struct perf_event_mmap_page *record__pick_pc(struct record *rec)

{

	if (rec->evlist && rec->evlist->mmap && rec->evlist->mmap[0].base)

		return rec->evlist->mmap[0].base;

	return NULL;

}



static int record__synthesize(struct record *rec)

static int record__synthesize(struct record *rec)

{

{

	struct perf_session *session = rec->session;

	struct perf_session *session = rec->session;
@@ -692,7 +699,7 @@ static int record__synthesize(struct record *rec) 
		}

		}

	}

	}





	err = perf_event__synth_time_conv(rec->evlist->mmap[0].base, tool,

	err = perf_event__synth_time_conv(record__pick_pc(rec), tool,

					  process_synthesized_event, machine);

					  process_synthesized_event, machine);

	if (err)

	if (err)

		goto out;

		goto out;