-----Original Message----- From: Athira Rajeev To: acme@kernel.org, jolsa@kernel.org Cc: mpe@ellerman.id.au, linux-perf-users@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, maddy@linux.vnet.ibm.com, rnsastry@linux.ibm.com, kjain@linux.ibm.com, disgoel@linux.vnet.ibm.com , irogers@google.com Subject: [PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment Date: Wed, 11 May 2022 17:19:59 +0530 The session topology test fails in powerpc pSeries platform.Test logs:<<>>Session topology : FAILED!<<>> This testcases tests cpu topology by checking the core_id andsocket_id stored in perf_env from perf session. The data fromperf session is compared with the cpu topology informationfrom "/sys/devices/system/cpu/cpuX/topology" like core_id,physical_package_id. In case of virtual environment, detaillike physical_package_id is restricted to be exposed. Hencephysical_package_id is set to -1. The testcase fails on suchplatforms since socket_id can't be fetched from topology info. Skip the testcase in powerpc if physical_package_id returns -1 Signed-off-by: Athira Rajeev --- Changelog:v1 -> v2: Addressed review comments from Arnaldo and Michael Ellerman. skip the test in powerpc when physical_package_id is set to -1. Dropped patch 1 from V1 since current change doesn't use info from /proc/cpuinfo and rather uses physical_package_id value. tools/perf/tests/topology.c | 11 +++++++++++ 1 file changed, 11 insertions(+) Tested the patch on powerpc and powernv, session topology test works fine with the patch.Tested-by: Disha Goel diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.cindex ee1e3dcbc0bd..d23a9e322ff5 100644--- a/tools/perf/tests/topology.c+++ b/tools/perf/tests/topology.c@@ -109,6 +109,17 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) && strncmp(session- >header.env.arch, "aarch64", 7)) return TEST_SKIP; + /*+ * In powerpc pSeries platform, not all the topology information+ * are exposed via sysfs. Due to restriction, detail like+ * physical_package_id will be set to -1. Hence skip this+ * test if physical_package_id returns -1 for cpu from perf_cpu_map.+ */+ if (strncmp(session->header.env.arch, "powerpc", 7)) {+ if (cpu__get_socket_id(perf_cpu_map__cpu(map, 0)) == -1)+ return TEST_SKIP;+ }+ TEST_ASSERT_VAL("Session header CPU map not set", session->header.env.cpu); for (i = 0; i < session->header.env.nr_cpus_avail; i++) {