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

Commit 7582732f authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix hw breakpoint's type modifier parsing 



Fixing the hw breakpoint's type modifier parsing to allow all possible
combinations of 'rwx' characters.

Adding automated tests to the parsing test suite.

Reported-by: default avatarJovi Zhang <bookjovi@gmail.com>
Original-patch-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Jovi Zhang <bookjovi@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20120629072254.GA940@krava.brq.redhat.com


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

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

+37 −0
Original line number Diff line number Diff line
@@ -181,6 +181,22 @@ static int test__checkevent_breakpoint_w(struct perf_evlist *evlist) 
	return 0;

}



static int test__checkevent_breakpoint_rw(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel = list_entry(evlist->entries.next,

					      struct perf_evsel, node);



	TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->nr_entries);

	TEST_ASSERT_VAL("wrong type",

			PERF_TYPE_BREAKPOINT == evsel->attr.type);

	TEST_ASSERT_VAL("wrong config", 0 == evsel->attr.config);

	TEST_ASSERT_VAL("wrong bp_type",

		(HW_BREAKPOINT_R|HW_BREAKPOINT_W) == evsel->attr.bp_type);

	TEST_ASSERT_VAL("wrong bp_len",

			HW_BREAKPOINT_LEN_4 == evsel->attr.bp_len);

	return 0;

}



static int test__checkevent_tracepoint_modifier(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel = list_entry(evlist->entries.next,
@@ -352,6 +368,19 @@ static int test__checkevent_breakpoint_w_modifier(struct perf_evlist *evlist) 
	return test__checkevent_breakpoint_w(evlist);

}



static int test__checkevent_breakpoint_rw_modifier(struct perf_evlist *evlist)

{

	struct perf_evsel *evsel = list_entry(evlist->entries.next,

					      struct perf_evsel, node);



	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 precise_ip", evsel->attr.precise_ip);



	return test__checkevent_breakpoint_rw(evlist);

}



static int test__checkevent_pmu(struct perf_evlist *evlist)

{
@@ -585,6 +614,14 @@ static struct test__event_st test__events[] = { 
		.name  = "instructions:H",

		.check = test__checkevent_exclude_guest_modifier,

	},

	[26] = {

		.name  = "mem:0:rw",

		.check = test__checkevent_breakpoint_rw,

	},

	[27] = {

		.name  = "mem:0:rw:kp",

		.check = test__checkevent_breakpoint_rw_modifier,

	},

};



#define TEST__EVENTS_CNT (sizeof(test__events) / sizeof(struct test__event_st))

tools/perf/util/parse-events.c

+13 −3
Original line number Diff line number Diff line
@@ -383,21 +383,31 @@ parse_breakpoint_type(const char *type, struct perf_event_attr *attr) 
		if (!type || !type[i])

			break;



#define CHECK_SET_TYPE(bit)		\

do {					\

	if (attr->bp_type & bit)	\

		return -EINVAL;		\

	else				\

		attr->bp_type |= bit;	\

} while (0)



		switch (type[i]) {

		case 'r':

			attr->bp_type |= HW_BREAKPOINT_R;

			CHECK_SET_TYPE(HW_BREAKPOINT_R);

			break;

		case 'w':

			attr->bp_type |= HW_BREAKPOINT_W;

			CHECK_SET_TYPE(HW_BREAKPOINT_W);

			break;

		case 'x':

			attr->bp_type |= HW_BREAKPOINT_X;

			CHECK_SET_TYPE(HW_BREAKPOINT_X);

			break;

		default:

			return -EINVAL;

		}

	}



#undef CHECK_SET_TYPE



	if (!attr->bp_type) /* Default */

		attr->bp_type = HW_BREAKPOINT_R | HW_BREAKPOINT_W;

tools/perf/util/parse-events.l

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ num_hex 0x[a-fA-F0-9]+ 
num_raw_hex	[a-fA-F0-9]+

name		[a-zA-Z_*?][a-zA-Z0-9_*?]*

modifier_event	[ukhpGH]{1,8}

modifier_bp	[rwx]

modifier_bp	[rwx]{1,3}



%%