selftests/powerpc: Run EBB tests only on POWER8

EBB (Event Based Branches) are currently only available on POWER8, so we
should skip them on other CPUs.

I've found that at least one test loops forever on 970MP (cycles_with_freeze_test).

Signed-off-by: Denis Kirjanov <kda@linux-powerpc.org>
[mpe: Minor change log editing, add skip to cpu_event_vs_ebb_test]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c b/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
index 66ea765c0e72121932e5e5d85aaa13c4f9932dbd..94110b1dcd3d812d97dcc4313f5acadd67cd613c 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
@@ -63,6 +63,8 @@ int back_to_back_ebbs(void)
 {
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c b/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c
index 0f0423dba18bff8a3e6ff5cb46f3ef1a36ca1b91..ac18cf617dd617856959788041dfb8f74c3aaeb1 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/close_clears_pmcc_test.c
@@ -20,6 +20,8 @@ int close_clears_pmcc(void)
 {
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c
index d3ed64d5d6c043fd795b40af5f2e0c3dc7388a83..f0632e7fdf29972d2e4105dbc2ebc4be569739ab 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c
@@ -43,6 +43,8 @@ int cpu_event_pinned_vs_ebb(void)
        int cpu, rc;
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        cpu = pick_online_cpu();
        FAIL_IF(cpu < 0);
        FAIL_IF(bind_to_cpu(cpu));

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c
index 8b972c2aa392a19ace840909f211078424f62412..33e56a2342e546f001d1300b29bae3085be9c61c 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cpu_event_vs_ebb_test.c
@@ -41,6 +41,8 @@ int cpu_event_vs_ebb(void)
        int cpu, rc;
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        cpu = pick_online_cpu();
        FAIL_IF(cpu < 0);
        FAIL_IF(bind_to_cpu(cpu));

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
index 8590fc1bfc0d7a009c0637ad3e6d2dbf372a8f65..7c57a8d79535d6178c27fe0d92ea3b7a778240f2 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
@@ -16,6 +16,8 @@ int cycles(void)
 {
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
index 754b3f2008d32d40183a32c203066decb0bf00d8..ecf5ee3283a3ea135676cb9b20b106ab310b2fc2 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
@@ -56,6 +56,8 @@ int cycles_with_freeze(void)
        uint64_t val;
        bool fc_cleared;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
index d43029b0800c6124ef877884a2f24d11b1c83ba3..c0faba520b35c7113d19a80efcca05b07ddf9f88 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
@@ -26,6 +26,8 @@ int cycles_with_mmcr2(void)
        int i;
        bool bad_mmcr2;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
index d7a72ce696b54928a8ec0594e576e66bbdbe7e30..9729d9f9021874842e8a18998ba91e3eeae63c74 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.c
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <linux/auxvec.h>
 
 #include "trace.h"
 #include "reg.h"
@@ -319,6 +320,16 @@ void ebb_global_disable(void)
        mb();
 }
 
+bool ebb_is_supported(void)
+{
+#ifdef PPC_FEATURE2_EBB
+       /* EBB requires at least POWER8 */
+       return ((long)get_auxv_entry(AT_HWCAP2) & PPC_FEATURE2_EBB);
+#else
+       return false;
+#endif
+}
+
 void event_ebb_init(struct event *e)
 {
        e->attr.config |= (1ull << 63);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb.h b/tools/testing/selftests/powerpc/pmu/ebb/ebb.h
index e44eee5d97ca47d53935058dfdf76108edae467a..f87e761f82d04738d2eee64d2032a32e847e8724 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb.h
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb.h
@@ -52,6 +52,7 @@ void standard_ebb_callee(void);
 int ebb_event_enable(struct event *e);
 void ebb_global_enable(void);
 void ebb_global_disable(void);
+bool ebb_is_supported(void);
 void ebb_freeze_pmcs(void);
 void ebb_unfreeze_pmcs(void);
 void event_ebb_init(struct event *e);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c
index c45f948148e1b9b708bdaab3a1eb56471faf9bb8..1e7b7fe2396ba8de5e25fe7faccf37ae4aed353f 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_child_test.c
@@ -47,6 +47,8 @@ int ebb_on_child(void)
        struct event event;
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        FAIL_IF(pipe(read_pipe.fds) == -1);
        FAIL_IF(pipe(write_pipe.fds) == -1);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
index 11acf1d55f8d71206d341ed577dc75be5cb486e7..a991d2ea8d0a1e6908278a984dd227ac1001f8a4 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
@@ -54,6 +54,8 @@ int ebb_on_willing_child(void)
        struct event event;
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        FAIL_IF(pipe(read_pipe.fds) == -1);
        FAIL_IF(pipe(write_pipe.fds) == -1);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c b/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c
index be4dd5a4e98e6f993735e9223f47f07223634783..af20a2b363aa7d05c71024b204eb482ce9beaa4a 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/ebb_vs_cpu_event_test.c
@@ -41,6 +41,8 @@ int ebb_vs_cpu_event(void)
        int cpu, rc;
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        cpu = pick_online_cpu();
        FAIL_IF(cpu < 0);
        FAIL_IF(bind_to_cpu(cpu));

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c b/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c
index 7e78153f08eb16a06a43d0c165da603684139e62..7762ab26e5acf5d34f4ee621004c1db8104eac21 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/event_attributes_test.c
@@ -16,6 +16,8 @@ int event_attributes(void)
 {
        struct event event, leader;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init(&event, 0x1001e);
        event_leader_ebb_init(&event);
        /* Expected to succeed */

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c b/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c
index 9e7af6e766226728dbf6a045ea376bfeed262a39..167135bd92a8e61e9324fdf7523e1d0fe049a52e 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/fork_cleanup_test.c
@@ -44,6 +44,8 @@ int fork_cleanup(void)
 {
        pid_t pid;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c b/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c
index f8190fa29592b524fefcea22934446c7043df779..5da355135df2f8c5431d5e405f1312313401582a 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/instruction_count_test.c
@@ -111,6 +111,8 @@ int instruction_count(void)
        struct event event;
        uint64_t overhead;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x400FA, "PM_RUN_INST_CMPL");
        event_leader_ebb_init(&event);
        event.attr.exclude_kernel = 1;

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c b/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
index 0c9dd9b2e39d19de5a49c8f98fb1291aad8122db..eb8acb78bc6c11b3f4f54eedcf0660b9ddc005b1 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
@@ -23,6 +23,8 @@ static int test_body(void)
        int i, orig_period, max_period;
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        /* We use PMC4 to make sure the kernel switches all counters correctly */
        event_init_named(&event, 0x40002, "instructions");
        event_leader_ebb_init(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c b/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
index 67d78af3284c3e59f652b2bf765a607b4c25bb86..6ff8c8ff27d66cf9aeb4579f95a8598f1e4e8296 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
@@ -18,6 +18,8 @@ int multi_counter(void)
        struct event events[6];
        int i, group_fd;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&events[0], 0x1001C, "PM_CMPLU_STALL_THRD");
        event_init_named(&events[1], 0x2D016, "PM_CMPLU_STALL_FXU");
        event_init_named(&events[2], 0x30006, "PM_CMPLU_STALL_OTHER_CMPL");

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c b/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
index b8dc371f93388b5ef2cdcbb2965bbb02cc9745f2..037cb6154f36070a711ecbdc3985eade494d1761 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
@@ -79,6 +79,8 @@ int multi_ebb_procs(void)
        pid_t pids[NR_CHILDREN];
        int cpu, rc, i;
 
+       SKIP_IF(!ebb_is_supported());
+
        cpu = pick_online_cpu();
        FAIL_IF(cpu < 0);
        FAIL_IF(bind_to_cpu(cpu));

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c b/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
index 2f9bf8edfa607bb33fbd2f86022a0657176538d1..8341d7778d5ed4cb056a77ed846d7120a3f9cd5f 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/no_handler_test.c
@@ -19,6 +19,8 @@ static int no_handler_test(void)
        u64 val;
        int i;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c b/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
index 986500fd21317431cd3501b49ca7f461f0db3817..c5fa64790c22ee55c3a9a44ebf09e1745e58264b 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
@@ -58,6 +58,8 @@ static int test_body(void)
 {
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        event_init_named(&event, 0x1001e, "cycles");
        event_leader_ebb_init(&event);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c b/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
index a503fa70c95074acdbbc911684c59b4efba70d8c..c22860ab973378f76417d2bc85f1daf2c828e0c7 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c
@@ -49,6 +49,8 @@ int pmc56_overflow(void)
 {
        struct event event;
 
+       SKIP_IF(!ebb_is_supported());
+
        /* Use PMC2 so we set PMCjCE, which enables PMC5/6 */
        event_init(&event, 0x2001e);
        event_leader_ebb_init(&event);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c b/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c
index 0cae66f659a375b9071e66d812c01819a3ee4d48..5b1188f10c1598450fff3f62cd9be107d55cccee 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/reg_access_test.c
@@ -18,6 +18,8 @@ int reg_access(void)
 {
        uint64_t val, expected;
 
+       SKIP_IF(!ebb_is_supported());
+
        expected = 0x8000000100000000ull;
        mtspr(SPRN_BESCR, expected);
        val = mfspr(SPRN_BESCR);

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c b/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c
index d56607e4ffab26f5bf1b7ed6a835f9889c951e46..1846f4e8463577d4ed8a7f934bf564903891c34e 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/task_event_pinned_vs_ebb_test.c
@@ -42,6 +42,8 @@ int task_event_pinned_vs_ebb(void)
        pid_t pid;
        int rc;
 
+       SKIP_IF(!ebb_is_supported());
+
        FAIL_IF(pipe(read_pipe.fds) == -1);
        FAIL_IF(pipe(write_pipe.fds) == -1);
 

diff --git a/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c b/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c
index eba32196dbbfda097943e2052a21352e2f20fbea..e3bc6e92a6a57e22e236db2c2fca5cc784f0fdc5 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c
+++ b/tools/testing/selftests/powerpc/pmu/ebb/task_event_vs_ebb_test.c
@@ -40,6 +40,8 @@ int task_event_vs_ebb(void)
        pid_t pid;
        int rc;
 
+       SKIP_IF(!ebb_is_supported());
+
        FAIL_IF(pipe(read_pipe.fds) == -1);
        FAIL_IF(pipe(write_pipe.fds) == -1);