[PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[Athira Rajeev]

The session topology test fails in powerpc pSeries platform.
Test logs:
<<>>
Session topology : FAILED!
<<>>

This testcases tests cpu topology by checking the core_id and
socket_id stored in perf_env from perf session. The data from
perf session is compared with the cpu topology information
from "/sys/devices/system/cpu/cpuX/topology" like core_id,
physical_package_id. In case of virtual environment, detail
like physical_package_id is restricted to be exposed. Hence
physical_package_id is set to -1. The testcase fails on such
platforms 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 <atrajeev@linux.vnet.ibm.com>
---
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(+)

diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index 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++) {
-- 
2.31.1

Re: [PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[kajoljain]

On 5/11/22 17:19, Athira Rajeev wrote:
> The session topology test fails in powerpc pSeries platform.
> Test logs:
> <<>>
> Session topology : FAILED!
> <<>>
> 
> This testcases tests cpu topology by checking the core_id and
> socket_id stored in perf_env from perf session. The data from
> perf session is compared with the cpu topology information
> from "/sys/devices/system/cpu/cpuX/topology" like core_id,
> physical_package_id. In case of virtual environment, detail
> like physical_package_id is restricted to be exposed. Hence
> physical_package_id is set to -1. The testcase fails on such
> platforms since socket_id can't be fetched from topology info.
> 
> Skip the testcase in powerpc if physical_package_id returns -1
> 

Patch looks fine to me.

Reviewed-by: Kajol Jain<kjain@linux.ibm.com>

Thanks,
Kajol Jain

> Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> ---
> 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(+)
> 
> diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
> index 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++) {

Re: [PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[Ian Rogers]

On Thu, May 12, 2022 at 11:18 PM Disha Goel <disgoel@linux.vnet.ibm.com> wrote:
>
>
>
> -----Original Message-----
> From: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
> 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 and
>
> socket_id stored in perf_env from perf session. The data from
>
> perf session is compared with the cpu topology information
>
> from "/sys/devices/system/cpu/cpuX/topology" like core_id,
>
> physical_package_id. In case of virtual environment, detail
>
> like physical_package_id is restricted to be exposed. Hence
>
> physical_package_id is set to -1. The testcase fails on such
>
> platforms 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 <
>
> atrajeev@linux.vnet.ibm.com
>
> >
>
> ---
>
> 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 <disgoel@linux.vnet.ibm.com>


Acked-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
>
> index 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++) {

Re: [PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[Athira Rajeev]

> On 14-May-2022, at 12:03 AM, Ian Rogers <irogers@google.com> wrote:
> 
> On Thu, May 12, 2022 at 11:18 PM Disha Goel <disgoel@linux.vnet.ibm.com> wrote:
>> 
>> 
>> 
>> -----Original Message-----
>> From: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
>> 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 and
>> 
>> socket_id stored in perf_env from perf session. The data from
>> 
>> perf session is compared with the cpu topology information
>> 
>> from "/sys/devices/system/cpu/cpuX/topology" like core_id,
>> 
>> physical_package_id. In case of virtual environment, detail
>> 
>> like physical_package_id is restricted to be exposed. Hence
>> 
>> physical_package_id is set to -1. The testcase fails on such
>> 
>> platforms 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 <
>> 
>> atrajeev@linux.vnet.ibm.com
>> 
>>> 
>> 
>> ---
>> 
>> 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 <disgoel@linux.vnet.ibm.com>
> 
> 
> Acked-by: Ian Rogers <irogers@google.com>
> 
> Thanks,
> Ian

Hi,

Thanks all for the review.

Athira
> 
>> diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
>> 
>> index 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++) {

Re: [PATCH V2] tools/perf/tests: Fix session topology test to skip the test in guest environment

[Arnaldo Carvalho de Melo]

Em Sat, May 21, 2022 at 10:16:59AM +0530, Athira Rajeev escreveu:
> > On 14-May-2022, at 12:03 AM, Ian Rogers <irogers@google.com> wrote:
> > On Thu, May 12, 2022 at 11:18 PM Disha Goel <disgoel@linux.vnet.ibm.com> wrote:
> >> Tested the patch on powerpc and powernv, session topology test works fine with the patch.
> >> Tested-by: Disha Goel <disgoel@linux.vnet.ibm.com>

> > Acked-by: Ian Rogers <irogers@google.com>
 
> Thanks all for the review.

Thanks, applied.

- Arnaldo