Skip to contentSkip to conversation

perf test: S390 does not support watchpoints in test 22

PATCH Superseded Thomas Richter 2 participants 5 messages Sep 28, 2018 perf events

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 perf test: S390 does not support watchpoints in test 22

S390 does not support the perf_event_open system call for attribute type PERF_TYPE_BREAKPOINT. This results in test failure for test 22:

[root@s8360046 perf]# ./perf test 22

22: Watchpoint                                :
22.1: Read Only Watchpoint                    : FAILED!
22.2: Write Only Watchpoint                   : FAILED!
22.3: Read / Write Watchpoint                 : FAILED!
22.4: Modify Watchpoint                       : FAILED!

[root@s8360046 perf]#

Add s390 support to avoid these tests being executed on s390 platform:

[root@s8360046 perf]# ./perf test 22

22: Watchpoint                                :
22.1: Read Only Watchpoint                    : Skip
22.2: Write Only Watchpoint                   : Skip
22.3: Read / Write Watchpoint                 : Skip
22.4: Modify Watchpoint                       : Skip

[root@s8360046 perf]#

---
 tools/perf/tests/builtin-test.c | 2 +-
 tools/perf/tests/wp.c           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
tools/perf/tests/builtin-test.c +1 -1
index 54ca7d87236f..e83c15a95c43 100644
@@ -124,7 +124,7 @@ static struct test generic_tests[] = {
 		.desc = "Watchpoint",
 		.func = test__wp,
 		.subtest = {
-			.skip_if_fail	= false,
+			.skip_if_fail	= true,
 			.get_nr		= test__wp_subtest_get_nr,
 			.get_desc	= test__wp_subtest_get_desc,
 		},
tools/perf/tests/wp.c +2 -2
index 017a99317f94..85c66f978732 100644
@@ -162,7 +162,7 @@ static int wp_modify_test(void)
 
 static bool wp_ro_supported(void)
 {
-#if defined (__x86_64__) || defined (__i386__)
+#if defined(__x86_64__) || defined(__i386__) || defined(__s390x__)
 	return false;
 #else
 	return true;
@@ -171,7 +171,7 @@ static bool wp_ro_supported(void)
 
 static void wp_ro_skip_msg(void)
 {
-#if defined (__x86_64__) || defined (__i386__)
+#if defined(__x86_64__) || defined (__i386__) || defined(__s390x__)
 	pr_debug("Hardware does not support read only watchpoints.\n");
 #endif
 }
Signature · 1 line
2.17.0
#1 lore raw

Hi Thomas,

tools/perf/tests/builtin-test.c static struct test generic_tests[] = { · line 127

Quoted 10 lines · Thomas Richter
tools/perf/tests/builtin-test.c +1 -1
index 54ca7d87236f..e83c15a95c43 100644
@@ -124,7 +124,7 @@ static struct test generic_tests[] = {
 		.desc = "Watchpoint",
 		.func = test__wp,
 		.subtest = {
-			.skip_if_fail	= false,
+			.skip_if_fail	= true,

Can you instead use ".is_supported"?

Thanks,
Ravi

#2 lore raw
Quoted 16 lines · Ravi Bangoria

Hi Thomas,

tools/perf/tests/builtin-test.c static struct test generic_tests[] = { · line 127

Quoted 10 lines · Thomas Richter
tools/perf/tests/builtin-test.c +1 -1
index 54ca7d87236f..e83c15a95c43 100644
@@ -124,7 +124,7 @@ static struct test generic_tests[] = {
 		.desc = "Watchpoint",
 		.func = test__wp,
 		.subtest = {
-			.skip_if_fail	= false,
+			.skip_if_fail	= true,

Can you instead use ".is_supported"?

Quoted 3 lines

Thanks,
Ravi

Hi Ravi,

I can rework the patch to use the is_supported() member function. The down side is that the test does not show up in the list of executed tests anymore, unless some debug output is enabled:

[root@s8360046 perf]# ./perf test -F 22
[root@s8360046 perf]# ./perf test -Fv 22
22: Watchpoint : Disabled
[root@s8360046 perf]#

I leave it to Arnaldo to decide...

Signature · 5 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany
--
Vorsitzende des Aufsichtsrats: Martina Koederitz 
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
#3 lore raw

Hi Thomas,

Quoted 3 lines · Thomas-Mich Richter

I can rework the patch to use the is_supported() member function. The down side is that the test does not show up in the list of executed tests anymore, unless some debug output is enabled:

Which should be fine because s390 is doing that in all breakpoint related tests. But more important thing to suggest .is_supported field is, this patch has a regression on x86:

Before:

  $ sudo ./perf test 22
  22: Watchpoint                                            :
  22.1: Read Only Watchpoint                                : Skip
  22.2: Write Only Watchpoint                               : Ok
  22.3: Read / Write Watchpoint                             : Ok
  22.4: Modify Watchpoint                                   : Ok

After:

  $ git apply 1.patch
  $ make
  $ sudo ./perf test 22
  22: Watchpoint                                            :
  22.1: Read Only Watchpoint                                : Skip
  22.2: Write Only Watchpoint                               : Skip
  22.3: Read / Write Watchpoint                             : Skip
  22.4: Modify Watchpoint                                   : Skip

Intel hw does not support read only watchpoitns. If you use skip_if_fail=true, all subsequent testcases are skipped as well.

Thanks,
Ravi

#4 lore raw
Quoted 29 lines · Ravi Bangoria

Hi Thomas,

Quoted 3 lines · Thomas-Mich Richter

I can rework the patch to use the is_supported() member function. The down side is that the test does not show up in the list of executed tests anymore, unless some debug output is enabled:

Which should be fine because s390 is doing that in all breakpoint related tests. But more important thing to suggest .is_supported field is, this patch has a regression on x86:

Before:

  $ sudo ./perf test 22
  22: Watchpoint                                            :
  22.1: Read Only Watchpoint                                : Skip
  22.2: Write Only Watchpoint                               : Ok
  22.3: Read / Write Watchpoint                             : Ok
  22.4: Modify Watchpoint                                   : Ok

After:

  $ git apply 1.patch
  $ make
  $ sudo ./perf test 22
  22: Watchpoint                                            :
  22.1: Read Only Watchpoint                                : Skip
  22.2: Write Only Watchpoint                               : Skip
  22.3: Read / Write Watchpoint                             : Skip
  22.4: Modify Watchpoint                                   : Skip
Quoted 6 lines

Intel hw does not support read only watchpoitns. If you use skip_if_fail=true, all subsequent testcases are skipped as well.

Thanks,
Ravi

Ahhh .... thanks a lot for the hint, will post version 3.

Signature · 5 lines
Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany
--
Vorsitzende des Aufsichtsrats: Martina Koederitz 
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294