selftests/powerpc: Skip vmx/vsx/tar/etc tests on older CPUs

Some of our tests use VSX or newer VMX instructions, so need to be
skipped on older CPUs to avoid SIGILL'ing.

Similarly TAR was added in v2.07, and the PMU event used in the stcx
fail test only works on Power8 or later.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200803020719.96114-1-mpe@ellerman.id.au

diff --git a/tools/testing/selftests/powerpc/math/Makefile b/tools/testing/selftests/powerpc/math/Makefile
index 4e2049d2fd8db4eecf63bcdcebb5a2a4dda1573d..fcc91c2059841f360fd60563832553a9ec2c6e39 100644 (file)
--- a/tools/testing/selftests/powerpc/math/Makefile
+++ b/tools/testing/selftests/powerpc/math/Makefile
@@ -11,9 +11,9 @@ $(OUTPUT)/fpu_syscall: fpu_asm.S
 $(OUTPUT)/fpu_preempt: fpu_asm.S
 $(OUTPUT)/fpu_signal:  fpu_asm.S
 
-$(OUTPUT)/vmx_syscall: vmx_asm.S
-$(OUTPUT)/vmx_preempt: vmx_asm.S
-$(OUTPUT)/vmx_signal: vmx_asm.S
+$(OUTPUT)/vmx_syscall: vmx_asm.S ../utils.c
+$(OUTPUT)/vmx_preempt: vmx_asm.S ../utils.c
+$(OUTPUT)/vmx_signal: vmx_asm.S ../utils.c
 
 $(OUTPUT)/vsx_preempt: CFLAGS += -mvsx
-$(OUTPUT)/vsx_preempt: vsx_asm.S
+$(OUTPUT)/vsx_preempt: vsx_asm.S ../utils.c

diff --git a/tools/testing/selftests/powerpc/math/vmx_preempt.c b/tools/testing/selftests/powerpc/math/vmx_preempt.c
index 2e059f154e7757b085efc904088163cedc51b986..6761d6ce30eca92ae0c989470bd8a5a71c401a5f 100644 (file)
--- a/tools/testing/selftests/powerpc/math/vmx_preempt.c
+++ b/tools/testing/selftests/powerpc/math/vmx_preempt.c
@@ -57,6 +57,9 @@ int test_preempt_vmx(void)
        int i, rc, threads;
        pthread_t *tids;
 
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);

diff --git a/tools/testing/selftests/powerpc/math/vmx_signal.c b/tools/testing/selftests/powerpc/math/vmx_signal.c
index 785a48e0976fadd646ac4f7cd3b6361e6d0cb188..b340a5c4e79dde228180c6fbda1e29d6139b2e32 100644 (file)
--- a/tools/testing/selftests/powerpc/math/vmx_signal.c
+++ b/tools/testing/selftests/powerpc/math/vmx_signal.c
@@ -96,6 +96,9 @@ int test_signal_vmx(void)
        void *rc_p;
        pthread_t *tids;
 
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);

diff --git a/tools/testing/selftests/powerpc/math/vmx_syscall.c b/tools/testing/selftests/powerpc/math/vmx_syscall.c
index 9ee293cc868e8f5c13dd28d10791e08b07e9ca25..03c78dfe34440e0aa3d238bde8bab6e60a9b6c59 100644 (file)
--- a/tools/testing/selftests/powerpc/math/vmx_syscall.c
+++ b/tools/testing/selftests/powerpc/math/vmx_syscall.c
@@ -49,9 +49,14 @@ int test_vmx_syscall(void)
         * Setup an environment with much context switching
         */
        pid_t pid2;
-       pid_t pid = fork();
+       pid_t pid;
        int ret;
        int child_ret;
+
+       // vcmpequd used in vmx_asm.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
+       pid = fork();
        FAIL_IF(pid == -1);
 
        pid2 = fork();

diff --git a/tools/testing/selftests/powerpc/math/vsx_preempt.c b/tools/testing/selftests/powerpc/math/vsx_preempt.c
index 63de9c6e2cd3d8d4d435eee284535d8b4cc70221..d1601bb889d4c09020acc71039c33246edc5b5f4 100644 (file)
--- a/tools/testing/selftests/powerpc/math/vsx_preempt.c
+++ b/tools/testing/selftests/powerpc/math/vsx_preempt.c
@@ -92,6 +92,8 @@ int test_preempt_vsx(void)
        int i, rc, threads;
        pthread_t *tids;
 
+       SKIP_IF(!have_hwcap(PPC_FEATURE_HAS_VSX));
+
        threads = sysconf(_SC_NPROCESSORS_ONLN) * THREAD_FACTOR;
        tids = malloc(threads * sizeof(pthread_t));
        FAIL_IF(!tids);

diff --git a/tools/testing/selftests/powerpc/pmu/count_stcx_fail.c b/tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
index 7b4ac4537702ccfed7a1c8e5d9cbbe5ca84a2a37..2980abca31e0dc5d3eee789def5b6d4170a99439 100644 (file)
--- a/tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
+++ b/tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
@@ -9,6 +9,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <sys/prctl.h>
+#include <asm/cputable.h>
 
 #include "event.h"
 #include "utils.h"
@@ -104,6 +105,9 @@ static int test_body(void)
        struct event events[3];
        u64 overhead;
 
+       // The STCX_FAIL event we use works on Power8 or later
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        setup_event(&events[0], PERF_COUNT_HW_INSTRUCTIONS, PERF_TYPE_HARDWARE, "instructions");
        setup_event(&events[1], PERF_COUNT_HW_CPU_CYCLES, PERF_TYPE_HARDWARE, "cycles");
        setup_event(&events[2], PM_STCX_FAIL, PERF_TYPE_RAW, "stcx_fail");

diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-tar.c b/tools/testing/selftests/powerpc/ptrace/ptrace-tar.c
index 58cb1a860cc9bb432a6264b967b194eee4afd8f2..4436ca9d3caf803bd68a3d69df5c3ed7520c2ace 100644 (file)
--- a/tools/testing/selftests/powerpc/ptrace/ptrace-tar.c
+++ b/tools/testing/selftests/powerpc/ptrace/ptrace-tar.c
@@ -78,6 +78,9 @@ int ptrace_tar(void)
        pid_t pid;
        int ret, status;
 
+       // TAR was added in v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+
        shm_id = shmget(IPC_PRIVATE, sizeof(int) * 3, 0777|IPC_CREAT);
        pid = fork();
        if (pid < 0) {

diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c b/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c
index c4fe0e893306d5ce0b6860bff99d937630f13684..cb9875f764ca23c45d923e8e466fd2ea363cbdba 100644 (file)
--- a/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c
+++ b/tools/testing/selftests/powerpc/ptrace/ptrace-vsx.c
@@ -61,6 +61,8 @@ int ptrace_vsx(void)
        pid_t pid;
        int ret, status, i;
 
+       SKIP_IF(!have_hwcap(PPC_FEATURE_HAS_VSX));
+
        shm_id = shmget(IPC_PRIVATE, sizeof(int) * 2, 0777|IPC_CREAT);
 
        for (i = 0; i < VEC_MAX; i++)

diff --git a/tools/testing/selftests/powerpc/stringloops/Makefile b/tools/testing/selftests/powerpc/stringloops/Makefile
index 7fc0623d85c314636be8cd3d393fb6c35c643edb..9c39f55a58ff3d00569504a443f8b1642628c63a 100644 (file)
--- a/tools/testing/selftests/powerpc/stringloops/Makefile
+++ b/tools/testing/selftests/powerpc/stringloops/Makefile
@@ -8,7 +8,7 @@ build_32bit = $(shell if ($(CC) $(CFLAGS) -m32 -o /dev/null memcmp.c >/dev/null
 
 TEST_GEN_PROGS := memcmp_64 strlen
 
-$(OUTPUT)/memcmp_64: memcmp.c
+$(OUTPUT)/memcmp_64: memcmp.c ../utils.c
 $(OUTPUT)/memcmp_64: CFLAGS += -m64 -maltivec
 
 ifeq ($(build_32bit),1)

diff --git a/tools/testing/selftests/powerpc/stringloops/memcmp.c b/tools/testing/selftests/powerpc/stringloops/memcmp.c
index e4605ca850dc14a9072c30198a1d3ba35ddfc123..979df3d9836854ec15adc79ce6ded9cee13a6e82 100644 (file)
--- a/tools/testing/selftests/powerpc/stringloops/memcmp.c
+++ b/tools/testing/selftests/powerpc/stringloops/memcmp.c
@@ -4,6 +4,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <time.h>
+#include <asm/cputable.h>
 #include "utils.h"
 
 #define SIZE 256
@@ -151,6 +152,11 @@ static int testcase(bool islarge)
 
 static int testcases(void)
 {
+#ifdef __powerpc64__
+       // vcmpequd used in memcmp_64.S is v2.07
+       SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_2_07));
+#endif
+
        testcase(0);
        testcase(1);
        return 0;