Commit a021169b authored by John Garry's avatar John Garry Committed by Ge Hu
Browse files

perf test: Add parse-events test for aliases with hyphens 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAMH2B


CVE: NA

----------------------------------------------------------------------

Add a test which allows us to test parsing an event alias with hyphens.

Since these events typically do not exist on most host systems, add the
alias to the fake pmu.

Function perf_pmu__test_parse_init() has terms added to match known test
aliases.

Fixes: 231bb2aa ("perf pmu: Support event aliases for non cpu//pmus")
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarzhangqz <14294317+zwx1160575@user.noreply.gitee.com>
parent 62b3feaa

tools/perf/tests/parse-events.c

+49 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,31 @@ static int test_event(struct evlist_test *e) 
	return ret;

}



static int test_event_fake_pmu(const char *str)

{

	struct parse_events_error err;

	struct evlist *evlist;

	int ret;



	evlist = evlist__new();

	if (!evlist)

		return -ENOMEM;



	parse_events_error__init(&err);

	perf_pmu__test_parse_init();

	ret = __parse_events(evlist, str, &err, &perf_pmu__fake);

	if (ret) {

		pr_debug("failed to parse event '%s', err %d, str '%s'\n",

			 str, ret, err.str);

		parse_events_error__print(&err, str);

	}



	parse_events_error__exit(&err);

	evlist__delete(evlist);



	return ret;

}



static int test_events(struct evlist_test *events, unsigned cnt)

{

	int ret1, ret2 = 0;
@@ -2026,6 +2051,26 @@ static int test_pmu_events(void) 
	return ret;

}



static int test_pmu_events_alias2(void)

{

	static const char events[][30] = {

			"event-hyphen",

			"event-two-hyph",

	};

	unsigned long i;

	int ret = 0;



	for (i = 0; i < ARRAY_SIZE(events); i++) {

		ret = test_event_fake_pmu(&events[i][0]);

		if (ret) {

			pr_err("check_parse_fake %s failed\n", &events[i][0]);

			break;

		}

	}



	return ret;

}



int test__parse_events(struct test *test __maybe_unused, int subtest __maybe_unused)

{

	int ret1, ret2 = 0;
@@ -2048,6 +2093,10 @@ do { \ 
			return ret;

	}



	ret1 = test_pmu_events_alias2();

	if (!ret2)

		ret2 = ret1;



	ret1 = test_terms(test__terms, ARRAY_SIZE(test__terms));

	if (!ret2)

		ret2 = ret1;

tools/perf/util/parse-events.c

+33 −9
Original line number Diff line number Diff line
@@ -1617,6 +1617,15 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 
			}

		}

	}



	if (parse_state->fake_pmu) {

		if (!parse_events_add_pmu(parse_state, list, str, head,

					  true, true)) {

			pr_debug("%s -> %s/%s/\n", str, "fake_pmu", str);

			ok++;

		}

	}



	if (!ok) {

		free(list);

		return -1;
@@ -2074,23 +2083,38 @@ static void perf_pmu__parse_init(void) 
 */

int perf_pmu__test_parse_init(void)

{

	struct perf_pmu_event_symbol *list;

	struct perf_pmu_event_symbol *list, *tmp, symbols[] = {

		{(char *)"read", PMU_EVENT_SYMBOL},

		{(char *)"event", PMU_EVENT_SYMBOL_PREFIX},

		{(char *)"two", PMU_EVENT_SYMBOL_SUFFIX},

		{(char *)"hyphen", PMU_EVENT_SYMBOL_SUFFIX},

		{(char *)"hyph", PMU_EVENT_SYMBOL_SUFFIX2},

	};

	unsigned long i, j;



	list = malloc(sizeof(*list) * 1);

	tmp = list = malloc(sizeof(*list) * ARRAY_SIZE(symbols));

	if (!list)

		return -ENOMEM;



	list->type   = PMU_EVENT_SYMBOL;

	list->symbol = strdup("read");



	if (!list->symbol) {

		free(list);

		return -ENOMEM;

	for (i = 0; i < ARRAY_SIZE(symbols); i++, tmp++) {

		tmp->type = symbols[i].type;

		tmp->symbol = strdup(symbols[i].symbol);

		if (!list->symbol)

			goto err_free;

	}



	perf_pmu_events_list = list;

	perf_pmu_events_list_num = 1;

	perf_pmu_events_list_num = ARRAY_SIZE(symbols);



	qsort(perf_pmu_events_list, ARRAY_SIZE(symbols),

	      sizeof(struct perf_pmu_event_symbol), comp_pmu);

	return 0;



err_free:

	for (j = 0, tmp = list; j < i; j++, tmp++)

		free(tmp->symbol);

	free(list);

	return -ENOMEM;

}



enum perf_pmu_event_symbol_type