@@ -42,6 +42,7 @@ AC_CHECK_DECLS([SEM_STAT_ANY],,,[#include <sys/sem.h>])
AC_CHECK_HEADERS_ONCE([ \
asm/ldt.h \
+ emmintrin.h \
ifaddrs.h \
keyutils.h \
linux/can.h \
@@ -6,8 +6,6 @@
#include "config.h"
#include "tst_test.h"
-#if defined(__x86_64__) || defined(__i386__)
-
#include <stdio.h>
#include <string.h>
#include <signal.h>
@@ -17,6 +15,7 @@
#include <ctype.h>
#include <sys/utsname.h>
+#ifdef HAVE_EMMINTRIN_H
#include <emmintrin.h>
#include "tst_tsc.h"
@@ -378,14 +377,17 @@ static struct tst_test test = {
.test_all = run,
.cleanup = cleanup,
.min_kver = "2.6.32",
+ .supported_archs = (const char *const []) {
+ "i386",
+ "x86_64",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"CVE", "2017-5754"},
{}
}
};
-#else /* #if defined(__x86_64__) || defined(__i386__) */
-
-TST_TEST_TCONF("not x86_64 or i386");
-
-#endif /* #else #if defined(__x86_64__) || defined(__i386__) */
+#else /* HAVE_EMMINTRIN_H */
+ TST_TEST_TCONF("<emmintrin.h> is not supported");
+#endif
@@ -48,13 +48,13 @@
# define NT_X86_XSTATE 0x202
#endif
-#ifdef __x86_64__
static void check_regs_loop(uint32_t initval)
{
const unsigned long num_iters = 1000000000;
uint32_t xmm0[4] = { initval, initval, initval, initval };
int status = 1;
+#ifdef __x86_64__
asm volatile(" movdqu %0, %%xmm0\n"
" mov %0, %%rbx\n"
"1: dec %2\n"
@@ -68,6 +68,7 @@ static void check_regs_loop(uint32_t initval)
"3:\n"
: "+m" (xmm0), "+r" (status)
: "r" (num_iters) : "rax", "rbx", "xmm0");
+#endif
if (status) {
tst_res(TFAIL,
@@ -178,6 +179,10 @@ static struct tst_test test = {
.test_all = do_test,
.forks_child = 1,
.needs_checkpoints = 1,
+ .supported_archs = (const char *const []) {
+ "x86_64",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "814fb7bb7db5"},
{"CVE", "2017-15537"},
@@ -185,7 +190,3 @@ static struct tst_test test = {
}
};
-
-#else /* !__x86_64__ */
- TST_TEST_TCONF("this test is only supported on x86_64");
-#endif /* __x86_64__ */
@@ -43,18 +43,16 @@
#include "tst_test.h"
#include "tst_safe_stdio.h"
-#if defined(__i386__) || defined(__x86_64__)
-
static pid_t child_pid;
-#if defined(__x86_64__)
-# define KERN_ADDR_MIN 0xffff800000000000
-# define KERN_ADDR_MAX 0xffffffffffffffff
-# define KERN_ADDR_BITS 64
-#elif defined(__i386__)
+#if defined(__i386__)
# define KERN_ADDR_MIN 0xc0000000
# define KERN_ADDR_MAX 0xffffffff
# define KERN_ADDR_BITS 32
+#else
+# define KERN_ADDR_MIN 0xffff800000000000
+# define KERN_ADDR_MAX 0xffffffffffffffff
+# define KERN_ADDR_BITS 64
#endif
static int deffered_check;
@@ -106,6 +104,7 @@ static void ptrace_try_kern_addr(unsigned long kern_addr)
if (SAFE_WAITPID(child_pid, &status, WUNTRACED) != child_pid)
tst_brk(TBROK, "Received event from unexpected PID");
+#if defined(__i386__) || defined(__x86_64__)
SAFE_PTRACE(PTRACE_ATTACH, child_pid, NULL, NULL);
SAFE_PTRACE(PTRACE_POKEUSER, child_pid,
(void *)offsetof(struct user, u_debugreg[0]), (void *)1);
@@ -135,6 +134,7 @@ static void ptrace_try_kern_addr(unsigned long kern_addr)
addr = ptrace(PTRACE_PEEKUSER, child_pid,
(void*)offsetof(struct user, u_debugreg[0]), NULL);
+#endif
if (!deffered_check && addr == kern_addr)
tst_res(TFAIL, "Was able to set breakpoint on kernel addr");
@@ -164,6 +164,11 @@ static struct tst_test test = {
.setup = setup,
.cleanup = cleanup,
.forks_child = 1,
+ .supported_archs = (const char *const []) {
+ "i386",
+ "x86_64",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "f67b15037a7a"},
{"CVE", "2018-1000199"},
@@ -171,6 +176,3 @@ static struct tst_test test = {
{}
}
};
-#else
-TST_TEST_TCONF("This test is only supported on x86 systems");
-#endif
@@ -22,7 +22,6 @@
#include <signal.h>
#include "tst_test.h"
-#if defined(__i386__) || defined(__x86_64__)
static short watchpoint;
static pid_t child_pid;
@@ -46,6 +45,7 @@ static void run(void)
{
int status;
+#if defined(__i386__) || defined(__x86_64__)
child_pid = SAFE_FORK();
if (!child_pid) {
@@ -60,6 +60,7 @@ static void run(void)
SAFE_PTRACE(PTRACE_POKEUSER, child_pid,
(void *)offsetof(struct user, u_debugreg[7]), (void *)0x30001);
SAFE_PTRACE(PTRACE_CONT, child_pid, NULL, NULL);
+#endif
while (1) {
if (SAFE_WAITPID(child_pid, &status, 0) != child_pid)
@@ -92,12 +93,14 @@ static struct tst_test test = {
.test_all = run,
.cleanup = cleanup,
.forks_child = 1,
+ .supported_archs = (const char *const []) {
+ "i386",
+ "x86_64",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "d8ba61ba58c8"},
{"CVE", "2018-8897"},
{}
}
};
-#else
-TST_TEST_TCONF("This test is only supported on x86 systems");
-#endif
@@ -22,8 +22,6 @@
#include <signal.h>
#include "tst_test.h"
-#if defined(__i386__) || defined(__x86_64__)
-
static pid_t child_pid;
static void child_main(void)
@@ -45,6 +43,7 @@ static void run(void)
if (SAFE_WAITPID(child_pid, &status, WUNTRACED) != child_pid)
tst_brk(TBROK, "Received event from unexpected PID");
+#if defined(__i386__) || defined(__x86_64__)
SAFE_PTRACE(PTRACE_ATTACH, child_pid, NULL, NULL);
SAFE_PTRACE(PTRACE_POKEUSER, child_pid,
(void *)offsetof(struct user, u_debugreg[0]), (void *)1);
@@ -53,6 +52,7 @@ static void run(void)
addr = ptrace(PTRACE_PEEKUSER, child_pid,
(void*)offsetof(struct user, u_debugreg[0]), NULL);
+#endif
if (addr == 2)
tst_res(TPASS, "The rd0 was set on second PTRACE_POKEUSR");
@@ -76,11 +76,13 @@ static struct tst_test test = {
.test_all = run,
.cleanup = cleanup,
.forks_child = 1,
+ .supported_archs = (const char *const []) {
+ "i386",
+ "x86_64",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "bd14406b78e6"},
{}
}
};
-#else
-TST_TEST_TCONF("This test is only supported on x86 systems");
-#endif
@@ -37,18 +37,10 @@
#include "config.h"
#include "tst_test.h"
-#if defined(__i386__) || defined(__powerpc__)
-
#include <string.h>
static unsigned int i;
static int sys_ret;
-#ifdef __i386__
-static const int sys_num = 276;
-static const int mode;
-static const int node_mask_ptr = UINT_MAX;
-static const int node_mask_sz = UINT_MAX;
-#endif
static volatile char *stack_ptr;
static void run(void)
@@ -58,6 +50,11 @@ static void run(void)
register long mode __asm__("r3");
register long node_mask_ptr __asm__("r4");
register long node_mask_sz __asm__("r5");
+#else
+ static const int sys_num = 276;
+ static const int mode;
+ static const int node_mask_ptr = UINT_MAX;
+ static const int node_mask_sz = UINT_MAX;
#endif
char stack_pattern[0x400];
@@ -78,7 +75,8 @@ static void run(void)
:
"memory", "cr0", "r6", "r7", "r8", "r9", "r10", "r11", "r12");
sys_ret = mode;
-#else /* __i386__ */
+#endif
+#ifdef __i386__
asm volatile (
"add $0x400, %%esp\n\t"
"int $0x80\n\t"
@@ -114,15 +112,14 @@ static void run(void)
static struct tst_test test = {
.test_all = run,
+ .supported_archs = (const char *const []) {
+ "i386",
+ "ppc",
+ NULL
+ },
.tags = (const struct tst_tag[]) {
{"linux-git", "cf01fb9985e8"},
{"CVE", "CVE-2017-7616"},
{}
}
};
-
-#else /* #if defined(__x86_64__) || defined(__powerpc__) */
-
-TST_TEST_TCONF("not i386 or powerpc");
-
-#endif /* #else #if defined(__x86_64__) || defined(__powerpc__) */
In some places, we have to keep ifdefs to make the compiler work with unportable code. Signed-off-by: Li Wang <liwang@redhat.com> --- configure.ac | 1 + testcases/cve/meltdown.c | 16 ++++++----- testcases/kernel/syscalls/ptrace/ptrace07.c | 11 ++++---- testcases/kernel/syscalls/ptrace/ptrace08.c | 22 ++++++++------- testcases/kernel/syscalls/ptrace/ptrace09.c | 11 +++++--- testcases/kernel/syscalls/ptrace/ptrace10.c | 12 +++++---- .../syscalls/set_mempolicy/set_mempolicy05.c | 27 +++++++++---------- 7 files changed, 54 insertions(+), 46 deletions(-)