Commit 232b82d2 authored by Athira Rajeev's avatar Athira Rajeev Committed by Arnaldo Carvalho de Melo

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: 9d9b22be ("perf test: Add event group test for events in multiple PMUs")
Signed-off-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Acked-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Cc: Disha Goel <disgoel@linux.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nageswara R Sastry <rnsastry@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Link: https://lore.kernel.org/r/20221207165815.774-1-atrajeev@linux.vnet.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b9a49f8c
...@@ -51,7 +51,7 @@ static int event_open(int type, unsigned long config, int group_fd) ...@@ -51,7 +51,7 @@ static int event_open(int type, unsigned long config, int group_fd)
static int setup_uncore_event(void) static int setup_uncore_event(void)
{ {
struct perf_pmu *pmu; struct perf_pmu *pmu;
int i; int i, fd;
if (list_empty(&pmus)) if (list_empty(&pmus))
perf_pmu__scan(NULL); perf_pmu__scan(NULL);
...@@ -62,6 +62,18 @@ static int setup_uncore_event(void) ...@@ -62,6 +62,18 @@ static int setup_uncore_event(void)
pr_debug("Using %s for uncore pmu event\n", pmu->name); pr_debug("Using %s for uncore pmu event\n", pmu->name);
types[2] = pmu->type; types[2] = pmu->type;
configs[2] = uncore_pmus[i].config; 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; return 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment