Commit f4d83436 authored by Robert Richter's avatar Robert Richter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix type for evsel->ids and add size check for ids 



Use same type for ids everywhere.

In case of writing to perf.data the size is u32. In pipe mode it is
limited to header.size (less than u16). Adding a size check here.

Size overflow due to casting shouldn't actually happen in practice, but
during development this may cause type missmatch warninngs/errors,
unifying types avoids this.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1345144224-27280-2-git-send-email-robert.richter@amd.com


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

tools/perf/util/evsel.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct perf_evsel { 
	u64			*id;

	struct perf_counts	*counts;

	int			idx;

	int			ids;

	u32			ids;

	struct hists		hists;

	char			*name;

	struct event_format	*tp_format;

tools/perf/util/header.c

+7 −4
Original line number Diff line number Diff line
@@ -2240,7 +2240,7 @@ int perf_session__read_header(struct perf_session *session, int fd) 
}



int perf_event__synthesize_attr(struct perf_tool *tool,

				struct perf_event_attr *attr, u16 ids, u64 *id,

				struct perf_event_attr *attr, u32 ids, u64 *id,

				perf_event__handler_t process)

{

	union perf_event *ev;
@@ -2261,9 +2261,12 @@ int perf_event__synthesize_attr(struct perf_tool *tool, 
	memcpy(ev->attr.id, id, ids * sizeof(u64));



	ev->attr.header.type = PERF_RECORD_HEADER_ATTR;

	ev->attr.header.size = size;

	ev->attr.header.size = (u16)size;



	if (ev->attr.header.size == size)

		err = process(tool, ev, NULL, NULL);

	else

		err = -E2BIG;



	free(ev);
@@ -2292,7 +2295,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool, 
int perf_event__process_attr(union perf_event *event,

			     struct perf_evlist **pevlist)

{

	unsigned int i, ids, n_ids;

	u32 i, ids, n_ids;

	struct perf_evsel *evsel;

	struct perf_evlist *evlist = *pevlist;

tools/perf/util/header.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir, 
int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir);



int perf_event__synthesize_attr(struct perf_tool *tool,

				struct perf_event_attr *attr, u16 ids, u64 *id,

				struct perf_event_attr *attr, u32 ids, u64 *id,

				perf_event__handler_t process);

int perf_event__synthesize_attrs(struct perf_tool *tool,

				 struct perf_session *session,