@@ -2,7 +2,7 @@
SIGNAL_CONTEXT_CHK_TESTS := tm-signal-context-chk-gpr tm-signal-context-chk-fpu \
tm-signal-context-chk-vmx tm-signal-context-chk-vsx
-TEST_GEN_PROGS := tm-resched-dscr tm-syscall tm-signal-msr-resv tm-signal-stack \
+TEST_GEN_PROGS := tm-resched-dscr tm-signal-msr-resv tm-signal-stack \
tm-vmxcopy tm-fork tm-tar tm-tmspr tm-vmx-unavail tm-unavailable tm-trap \
tm-signal-drop-transaction \
$(SIGNAL_CONTEXT_CHK_TESTS)
@@ -13,8 +13,6 @@ $(TEST_GEN_PROGS): ../harness.c ../utils.c
CFLAGS += -mhtm
-$(OUTPUT)/tm-syscall: tm-syscall-asm.S
-$(OUTPUT)/tm-syscall: CFLAGS += -I../../../../../usr/include
$(OUTPUT)/tm-tmspr: CFLAGS += -pthread
$(OUTPUT)/tm-vmx-unavail: CFLAGS += -pthread -m64
$(OUTPUT)/tm-resched-dscr: ../pmu/lib.o
deleted file mode 100644
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#include <ppc-asm.h>
-#include <asm/unistd.h>
-
- .text
-FUNC_START(getppid_tm_active)
- tbegin.
- beq 1f
- li r0, __NR_getppid
- sc
- tend.
- blr
-1:
- li r3, -1
- blr
-
-FUNC_START(getppid_tm_suspended)
- tbegin.
- beq 1f
- li r0, __NR_getppid
- tsuspend.
- sc
- tresume.
- tend.
- blr
-1:
- li r3, -1
- blr
deleted file mode 100644
@@ -1,106 +0,0 @@
-/*
- * Copyright 2015, Sam Bobroff, IBM Corp.
- * Licensed under GPLv2.
- *
- * Test the kernel's system call code to ensure that a system call
- * made from within an active HTM transaction is aborted with the
- * correct failure code.
- * Conversely, ensure that a system call made from within a
- * suspended transaction can succeed.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-#include <asm/tm.h>
-#include <sys/time.h>
-#include <stdlib.h>
-
-#include "utils.h"
-#include "tm.h"
-
-extern int getppid_tm_active(void);
-extern int getppid_tm_suspended(void);
-
-unsigned retries = 0;
-
-#define TEST_DURATION 10 /* seconds */
-#define TM_RETRIES 100
-
-pid_t getppid_tm(bool suspend)
-{
- int i;
- pid_t pid;
-
- for (i = 0; i < TM_RETRIES; i++) {
- if (suspend)
- pid = getppid_tm_suspended();
- else
- pid = getppid_tm_active();
-
- if (pid >= 0)
- return pid;
-
- if (failure_is_persistent()) {
- if (failure_is_syscall())
- return -1;
-
- printf("Unexpected persistent transaction failure.\n");
- printf("TEXASR 0x%016lx, TFIAR 0x%016lx.\n",
- __builtin_get_texasr(), __builtin_get_tfiar());
- exit(-1);
- }
-
- retries++;
- }
-
- printf("Exceeded limit of %d temporary transaction failures.\n", TM_RETRIES);
- printf("TEXASR 0x%016lx, TFIAR 0x%016lx.\n",
- __builtin_get_texasr(), __builtin_get_tfiar());
-
- exit(-1);
-}
-
-int tm_syscall(void)
-{
- unsigned count = 0;
- struct timeval end, now;
-
- SKIP_IF(!have_htm_nosc());
-
- setbuf(stdout, NULL);
-
- printf("Testing transactional syscalls for %d seconds...\n", TEST_DURATION);
-
- gettimeofday(&end, NULL);
- now.tv_sec = TEST_DURATION;
- now.tv_usec = 0;
- timeradd(&end, &now, &end);
-
- for (count = 0; timercmp(&now, &end, <); count++) {
- /*
- * Test a syscall within a suspended transaction and verify
- * that it succeeds.
- */
- FAIL_IF(getppid_tm(true) == -1); /* Should succeed. */
-
- /*
- * Test a syscall within an active transaction and verify that
- * it fails with the correct failure code.
- */
- FAIL_IF(getppid_tm(false) != -1); /* Should fail... */
- FAIL_IF(!failure_is_persistent()); /* ...persistently... */
- FAIL_IF(!failure_is_syscall()); /* ...with code syscall. */
- gettimeofday(&now, 0);
- }
-
- printf("%d active and suspended transactions behaved correctly.\n", count);
- printf("(There were %d transaction retries.)\n", retries);
-
- return 0;
-}
-
-int main(void)
-{
- return test_harness(tm_syscall, "tm_syscall");
-}