From 232b82d201cbade4f15e243bc0472ac241239d8c Mon Sep 17 00:00:00 2001 From: Athira Rajeev Date: Wed, 7 Dec 2022 22:28:15 +0530 Subject: perf test: Update event group check for support of uncore event The event group test checks group creation for combinations of hw, sw and uncore PMU events. Some of the uncore pmus may require additional permission to access the counters. For example, in case of hv_24x7, partition need to have permissions to access hv_24x7 pmu counters. If not, event_open will fail. Hence add a sanity check to see if event_open succeeds before proceeding with the test. Fixes: 9d9b22bedad13d96 ("perf test: Add event group test for events in multiple PMUs") Signed-off-by: Athira Jajeev Acked-by: Ravi Bangoria Cc: Disha Goel Cc: Ian Rogers Cc: James Clark Cc: Jiri Olsa Cc: Kajol Jain Cc: linuxppc-dev@lists.ozlabs.org Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Nageswara R Sastry Cc: Namhyung Kim Cc: Ravi Bangoria Link: https://lore.kernel.org/r/20221207165815.774-1-atrajeev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/event_groups.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'tools/perf/tests') diff --git a/tools/perf/tests/event_groups.c b/tools/perf/tests/event_groups.c index 612c0444aaa8..029442b4e9c6 100644 --- a/tools/perf/tests/event_groups.c +++ b/tools/perf/tests/event_groups.c @@ -51,7 +51,7 @@ static int event_open(int type, unsigned long config, int group_fd) static int setup_uncore_event(void) { struct perf_pmu *pmu; - int i; + int i, fd; if (list_empty(&pmus)) perf_pmu__scan(NULL); @@ -62,6 +62,18 @@ static int setup_uncore_event(void) pr_debug("Using %s for uncore pmu event\n", pmu->name); types[2] = pmu->type; configs[2] = uncore_pmus[i].config; + /* + * Check if the chosen uncore pmu event can be + * used in the test. For example, incase of accessing + * hv_24x7 pmu counters, partition should have + * additional permissions. If not, event open will + * fail. So check if the event open succeeds + * before proceeding. + */ + fd = event_open(types[2], configs[2], -1); + if (fd < 0) + return -1; + close(fd); return 0; } } -- cgit v1.2.3