PCuABI Linuxulator

.vscode/settings.json

@@ -0,0 +1,49 @@
+{
+    "files.associations": {
+        "array": "c",
+        "bitset": "c",
+        "deque": "c",
+        "format": "c",
+        "initializer_list": "c",
+        "list": "c",
+        "queue": "c",
+        "random": "c",
+        "ranges": "c",
+        "regex": "c",
+        "span": "c",
+        "stack": "c",
+        "utility": "c",
+        "valarray": "c",
+        "vector": "c",
+        "xhash": "c",
+        "xstring": "c",
+        "xtree": "c",
+        "xutility": "c",
+        "__hash_table": "c",
+        "__split_buffer": "c",
+        "__tree": "c",
+        "hash_map": "c",
+        "hash_set": "c",
+        "map": "c",
+        "set": "c",
+        "string": "c",
+        "string_view": "c",
+        "unordered_map": "c",
+        "unordered_set": "c",
+        "simd": "c",
+        "chrono": "c",
+        "future": "c",
+        "system_error": "c",
+        "typeindex": "c",
+        "xlocale": "c",
+        "typeinfo": "c",
+        "*.inc": "c",
+        "thread": "c",
+        "__threading_support": "c",
+        "linux_emul.h": "c",
+        "linux.h": "c",
+        "linux32_proto.h": "c",
+        "__config": "cpp",
+        "__locale": "c"
+    }
+}

lib/libgeom/geom_stats.c

@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#include <cheri/cheric.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/disk.h>
@@ -74,7 +75,7 @@ geom_stats_resync(void)
 		err(1, "DIOCGMEDIASIZE(" _PATH_DEV DEVSTAT_DEVICE_NAME ")");
 
 	munmap(statp, npages * pagesize);
-	p = mmap(statp, mediasize, PROT_READ, MAP_SHARED, statsfd, 0);
+	p = mmap((void *)(uintptr_t)(uint64_t)(uintptr_t)statp, mediasize, PROT_READ, MAP_SHARED, statsfd, 0);
 	if (p == MAP_FAILED)
 		err(1, "mmap(/dev/devstat):");
 	else {

lib/libsysdecode/errno.c

@@ -48,7 +48,8 @@ sysdecode_abi_to_freebsd_errno(enum sysdecode_abi abi, int error)
 		return (error);
 #if defined(__aarch64__) || defined(__amd64__) || defined(__i386__)
 	case SYSDECODE_ABI_LINUX:
-	case SYSDECODE_ABI_LINUX32: {
+	case SYSDECODE_ABI_LINUX32:
+	case SYSDECODE_ABI_LINUX64: {
 		unsigned int i;
 
 		/*
@@ -80,6 +81,7 @@ sysdecode_freebsd_to_abi_errno(enum sysdecode_abi abi, int error)
 #if defined(__aarch64__) || defined(__amd64__) || defined(__i386__)
 	case SYSDECODE_ABI_LINUX:
 	case SYSDECODE_ABI_LINUX32:
+	case SYSDECODE_ABI_LINUX64:
 		if (error >= 0 && error <= ELAST)
 			return (linux_errtbl[error]);
 		break;

lib/libsysdecode/syscallnames.c

@@ -55,6 +55,10 @@ static
 static
 #ifdef __aarch64__
 #include <arm64/linux/linux_syscalls.c>
+#if __has_feature(capabilities)
+static
+#include <arm64/linux64/linux64_syscalls.c>
+#endif
 #elif __amd64__
 #include <amd64/linux/linux_syscalls.c>
 #else
@@ -93,6 +97,12 @@ sysdecode_syscallname(enum sysdecode_abi abi, unsigned int code)
 		if (code < nitems(linux_syscallnames))
 			return (linux_syscallnames[code]);
 		break;
+#if __has_feature(capabilities)
+	case SYSDECODE_ABI_LINUX64:
+		if (code < nitems(linux64_syscallnames))
+			return (linux64_syscallnames[code]);
+		break;
+#endif
 #endif
 #ifdef __amd64__
 	case SYSDECODE_ABI_LINUX32:

lib/libsysdecode/sysdecode.h

@@ -42,6 +42,7 @@ enum sysdecode_abi {
 	 * value when merged upstream.
 	 */
 	SYSDECODE_ABI_FREEBSD64 = 100,
+	SYSDECODE_ABI_LINUX64 = 101,
 };
 
 int	sysdecode_abi_to_freebsd_errno(enum sysdecode_abi _abi, int _error);

sys/arm64/arm64/elf_machdep.c

@@ -268,6 +268,9 @@ elf64c_header_supported(const struct image_params *imgp,
 {
 	uint32_t note_value;
 
+	const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header;
+	if (hdr->e_ident[EI_OSABI] == ELFOSABI_LINUX) return false;
+
 	if (get_benchmark_abi_note(imgp, &note_value))
 		return (note_value == 0);
 
@@ -280,6 +283,9 @@ elf64cb_header_supported(const struct image_params *imgp,
 {
 	uint32_t note_value;
 
+	const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header;
+	if (hdr->e_ident[EI_OSABI] == ELFOSABI_LINUX) return false;
+
 	if (get_benchmark_abi_note(imgp, &note_value))
 		return (note_value == 1);
 

sys/arm64/linux/linux.h

@@ -31,7 +31,12 @@
 #include <sys/abi_compat.h>
 
 #include <compat/linux/linux.h>
+
+#ifdef COMPAT_LINUX64
+#include <arm64/linux64/linux64_syscall.h>
+#else
 #include <arm64/linux/linux_syscall.h>
+#endif
 
 #define	LINUX_DTRACE	linuxulator
 
@@ -43,7 +48,12 @@ typedef uint32_t	l_uint;
 typedef uint64_t	l_ulong;
 typedef uint16_t	l_ushort;
 
+#if defined(COMPAT_LINUX64) || defined(COMPAT_LINUX32)
 typedef l_ulong		l_uintptr_t;
+#else
+typedef uintcap_t	l_uintptr_t;
+#endif
+typedef uintcap_t	l_uintcap_t;
 typedef l_long		l_clock_t;
 typedef l_int		l_daddr_t;
 typedef l_uint		l_gid_t;
@@ -77,7 +87,7 @@ typedef struct {
 #define	l_fd_set	fd_set
 
 /* Miscellaneous */
-#define	LINUX_AT_COUNT		21	/* Count of used aux entry types.
+#define	LINUX_AT_COUNT		41	/* Count of used aux entry types.
 					 * Keep this synchronized with
 					 * linux_copyout_auxargs() code.
 					 */
@@ -157,7 +167,7 @@ struct l_newstat {
 #define	LINUX_SA_NOMASK		0x40000000	/* SA_NODEFER */
 #define	LINUX_SA_ONESHOT	0x80000000	/* SA_RESETHAND */
 
-typedef void	(*l_handler_t)(l_int);
+typedef l_uintptr_t	l_handler_t;
 
 typedef struct {
 	l_handler_t	lsa_handler;
@@ -189,10 +199,10 @@ struct linux_pt_regset {
 	l_ulong cpsr;
 };
 
+
 #ifdef _KERNEL
 struct reg;
 struct syscall_info;
-
 void	bsd_to_linux_regset(const struct reg *b_reg,
 	    struct linux_pt_regset *l_regset);
 void	linux_to_bsd_regset(struct reg *b_reg,
@@ -202,9 +212,9 @@ void	linux_ptrace_get_syscall_info_machdep(const struct reg *reg,
 int	linux_ptrace_getregs_machdep(struct thread *td, pid_t pid,
 	    struct linux_pt_regset *l_regset);
 int	linux_ptrace_peekuser(struct thread *td, pid_t pid,
-	    void *addr, void *data);
+	    void * __capability addr, void * __capability data);
 int	linux_ptrace_pokeuser(struct thread *td, pid_t pid,
-	    void *addr, void *data);
+	    void * __capability addr, void * __capability data);
 #endif /* _KERNEL */
 
 #endif /* _ARM64_LINUX_H_ */

sys/arm64/linux/linux_dummy_machdep.c

@@ -30,8 +30,13 @@
 #include <sys/proc.h>
 #include <sys/sdt.h>
 
+#ifdef COMPAT_LINUX64
+#include <arm64/linux64/linux.h>
+#include <arm64/linux64/linux64_proto.h>
+#else
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
+#endif
 #include <compat/linux/linux_dtrace.h>
 #include <compat/linux/linux_util.h>
 

sys/arm64/linux/linux_locore.asm

@@ -33,21 +33,28 @@
 
 #include <machine/asm.h>
 
+#ifdef COMPAT_LINUX64
+#include <arm64/linux64/linux64_syscall.h>
+#else
 #include <arm64/linux/linux_syscall.h>
+#endif
 
 	.data
 
 	.globl linux_platform
 linux_platform:
 	.asciz "aarch64"
-
 	.text
 
 EENTRY(__kernel_rt_sigreturn)
 	nop	/* This is what Linux calls a "Mysterious NOP". */
 
 	.globl __user_rt_sigreturn
 __user_rt_sigreturn:
+#ifdef COMPAT_LINUX64
+	mov	x8, #LINUX64_SYS_linux_rt_sigreturn
+#else
 	mov	x8, #LINUX_SYS_linux_rt_sigreturn
+#endif
 	svc	#0
 EEND(__kernel_rt_sigreturn)

sys/arm64/linux/linux_machdep.c

@@ -33,8 +33,13 @@
 
 #include <vm/vm_param.h>
 
+#ifdef COMPAT_LINUX64
+#include <arm64/linux64/linux.h>
+#include <arm64/linux64/linux64_proto.h>
+#else
 #include <arm64/linux/linux.h>
 #include <arm64/linux/linux_proto.h>
+#endif
 #include <compat/linux/linux_fork.h>
 #include <compat/linux/linux_misc.h>
 #include <compat/linux/linux_util.h>
@@ -43,11 +48,11 @@
 
 
 int
-linux_set_upcall(struct thread *td, register_t stack)
+linux_set_upcall(struct thread *td, void * __capability stack)
 {
 
 	if (stack)
-		td->td_frame->tf_sp = stack;
+		td->td_frame->tf_sp = (uintcap_t)stack;
 
 	/*
 	 * The newly created Linux thread returns
@@ -58,10 +63,10 @@ linux_set_upcall(struct thread *td, register_t stack)
 }
 
 int
-linux_set_cloned_tls(struct thread *td, void *desc)
+linux_set_cloned_tls(struct thread *td, void * __capability desc)
 {
 
-	if ((uint64_t)desc >= VM_MAXUSER_ADDRESS)
+	if ((uint64_t)(uintcap_t)desc >= VM_MAXUSER_ADDRESS)
 		return (EPERM);
 
 	return (cpu_set_user_tls(td, desc));
@@ -113,19 +118,20 @@ linux_ptrace_getregs_machdep(struct thread *td __unused, pid_t pid __unused,
 }
 
 int
-linux_ptrace_peekuser(struct thread *td, pid_t pid, void *addr, void *data)
+linux_ptrace_peekuser(struct thread *td, pid_t pid, void * __capability addr, void * __capability data)
 {
 
 	LINUX_RATELIMIT_MSG_OPT1("PTRACE_PEEKUSER offset %ld not implemented; "
-	    "returning EINVAL", (uintptr_t)addr);
+	    "returning EINVAL", (__cheri_addr long)addr);
+
 	return (EINVAL);
 }
 
 int
-linux_ptrace_pokeuser(struct thread *td, pid_t pid, void *addr, void *data)
+linux_ptrace_pokeuser(struct thread *td, pid_t pid, void * __capability addr, void * __capability data)
 {
 
 	LINUX_RATELIMIT_MSG_OPT1("PTRACE_POKEUSER offset %ld "
-	    "not implemented; returning EINVAL", (uintptr_t)addr);
+	    "not implemented; returning EINVAL", (__cheri_addr long)addr);
 	return (EINVAL);
 }