Add support for RISC-V 64-bit (riscv64)

The patch adds support for riscv64 architecture. It was tested on Fedora/RISCV using 5.2-rc7 kernel. Tested on top of libseccomp commit: 2b406e3 SECCOMP patch is included in Fedora/RISCV starting 20190703.n.0: https://dl.fedoraproject.org/pub/alt/risc-v/disk-images/fedora/rawhide/20190703.n.0/Developer/ Kernel SECCOMP selftest is failing one test: [..] # [ RUN ] global.user_notification_signal # [ FAIL ] global.user_notification_signal [..] # [==========] 73 / 74 tests passed. # [ FAILED ] libseccomp test results: ./regression -T live Regression Test Summary tests run: 9 tests skipped: 0 tests passed: 9 tests failed: 0 tests errored: 0 ./regression Regression Test Summary tests run: 5200 tests skipped: 142 tests passed: 5200 tests failed: 0 tests errored: 0 Signed-off-by: David Abdurachmanov <[email protected]>
seccomp · Aug 1, 2019 · 3358ea0 · 3358ea0
1 parent 2b406e3
commit 3358ea0
Show file tree

Hide file tree

Showing 34 changed files with 743 additions and 3 deletions.
diff --git a/include/seccomp.h.in b/include/seccomp.h.in
@@ -195,6 +195,19 @@ struct scmp_arg_cmp {
 #define SCMP_ARCH_PARISC	AUDIT_ARCH_PARISC
 #define SCMP_ARCH_PARISC64	AUDIT_ARCH_PARISC64
 
+/**
+ * The RISC-V architecture tokens
+ */
+#ifndef EM_RISCV
+#define EM_RISCV		243
+#endif /* EM_RISCV */
+
+#ifndef AUDIT_ARCH_RISCV64
+#define AUDIT_ARCH_RISCV64	(EM_RISCV|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE)
+#endif /* AUDIT_ARCH_RISCV64 */
+
+#define SCMP_ARCH_RISCV64	AUDIT_ARCH_RISCV64
+
 /**
  * Convert a syscall name into the associated syscall number
  * @param x the syscall name
@@ -1861,6 +1874,16 @@ int seccomp_export_bpf(const scmp_filter_ctx ctx, int fd);
 #define __NR_rseq		__PNR_rseq
 #endif /* __NR_rseq */
 
+#define __PNR_riscv_flush_icache	-10211
+#ifndef __NR_riscv_flush_icache
+#define __NR_riscv_flush_icache		__PNR_riscv_flush_icache
+#endif /* __NR_riscv_flush_icache */
+
+#define __PNR_renameat		-10212
+#ifndef __NR_renameat
+#define __NR_renameat		__PNR_renameat
+#endif /* __NR_renameat */
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -42,6 +42,7 @@ SOURCES_ALL = \
 	arch-parisc.h arch-parisc.c arch-parisc64.c arch-parisc-syscalls.c \
 	arch-ppc.h arch-ppc.c arch-ppc-syscalls.c \
 	arch-ppc64.h arch-ppc64.c arch-ppc64-syscalls.c \
+	arch-riscv64.h arch-riscv64.c arch-riscv64-syscalls.c \
 	arch-s390.h arch-s390.c arch-s390-syscalls.c \
 	arch-s390x.h arch-s390x.c arch-s390x-syscalls.c
 

diff --git a/src/arch-aarch64-syscalls.c b/src/arch-aarch64-syscalls.c
@@ -299,6 +299,7 @@ const struct arch_syscall_def aarch64_syscall_table[] = { \
 	{ "renameat2", 276 },
 	{ "request_key", 218 },
 	{ "restart_syscall", 128 },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", __PNR_rmdir },
 	{ "rseq", 293 },
 	{ "rt_sigaction", 134 },

diff --git a/src/arch-arm-syscalls.c b/src/arch-arm-syscalls.c
@@ -311,6 +311,7 @@ const struct arch_syscall_def arm_syscall_table[] = { \
 	{ "renameat2", (__SCMP_NR_BASE + 382) },
 	{ "request_key", (__SCMP_NR_BASE + 310) },
 	{ "restart_syscall", (__SCMP_NR_BASE +  0) },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", (__SCMP_NR_BASE + 40) },
 	{ "rseq", (__SCMP_NR_BASE + 398) },
 	{ "rt_sigaction", (__SCMP_NR_BASE + 174) },

diff --git a/src/arch-mips-syscalls.c b/src/arch-mips-syscalls.c
@@ -303,6 +303,7 @@ const struct arch_syscall_def mips_syscall_table[] = { \
 	{ "renameat2", (__SCMP_NR_BASE + 351) },
 	{ "request_key", (__SCMP_NR_BASE + 281) },
 	{ "restart_syscall", (__SCMP_NR_BASE + 253) },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", (__SCMP_NR_BASE + 40) },
 	{ "rseq", (__SCMP_NR_BASE + 367) },
 	{ "rt_sigaction", (__SCMP_NR_BASE + 194) },

diff --git a/src/arch-mips64-syscalls.c b/src/arch-mips64-syscalls.c
@@ -303,6 +303,7 @@ const struct arch_syscall_def mips64_syscall_table[] = { \
 	{ "renameat2", (__SCMP_NR_BASE + 311) },
 	{ "request_key", (__SCMP_NR_BASE + 240) },
 	{ "restart_syscall", (__SCMP_NR_BASE + 213) },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", (__SCMP_NR_BASE + 82) },
 	{ "rseq", (__SCMP_NR_BASE + 327) },
 	{ "rt_sigaction", (__SCMP_NR_BASE + 13) },

diff --git a/src/arch-mips64n32-syscalls.c b/src/arch-mips64n32-syscalls.c
@@ -303,6 +303,7 @@ const struct arch_syscall_def mips64n32_syscall_table[] = { \
 	{ "renameat2", (__SCMP_NR_BASE + 315) },
 	{ "request_key", (__SCMP_NR_BASE + 244) },
 	{ "restart_syscall", (__SCMP_NR_BASE + 214) },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", (__SCMP_NR_BASE + 82) },
 	{ "rseq", (__SCMP_NR_BASE + 331) },
 	{ "rt_sigaction", (__SCMP_NR_BASE + 13) },

diff --git a/src/arch-parisc-syscalls.c b/src/arch-parisc-syscalls.c
@@ -283,6 +283,7 @@ const struct arch_syscall_def parisc_syscall_table[] = { \
 	{ "renameat2",	337 },
 	{ "request_key",	265 },
 	{ "restart_syscall",	0 },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir",	40 },
 	{ "rseq",	__PNR_rseq },
 	{ "rt_sigaction",	174 },

diff --git a/src/arch-ppc-syscalls.c b/src/arch-ppc-syscalls.c
@@ -300,6 +300,7 @@ const struct arch_syscall_def ppc_syscall_table[] = { \
 	{ "renameat2", 357 },
 	{ "request_key", 270 },
 	{ "restart_syscall", 0 },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", 40 },
 	{ "rseq", 387 },
 	{ "rt_sigaction", 173 },

diff --git a/src/arch-ppc64-syscalls.c b/src/arch-ppc64-syscalls.c
@@ -300,6 +300,7 @@ const struct arch_syscall_def ppc64_syscall_table[] = { \
 	{ "renameat2", 357 },
 	{ "request_key", 270 },
 	{ "restart_syscall", 0 },
+	{ "riscv_flush_icache", __PNR_riscv_flush_icache },
 	{ "rmdir", 40 },
 	{ "rseq", 387 },
 	{ "rt_sigaction", 173 },