syscalls: pread and pwrite

kernel-src/arch/x86-64/syscall.asm

@@ -75,6 +75,8 @@ extern syscall_getpeername
 extern syscall_chroot
 extern syscall_pause
 extern syscall_ppoll
+extern syscall_pread
+extern syscall_pwrite
 syscalltab:
 dq syscall_print
 dq syscall_mmap
@@ -152,7 +154,9 @@ dq syscall_getpeername
 dq syscall_chroot
 dq syscall_pause
 dq syscall_ppoll
-syscallcount equ 76
+dq syscall_pread
+dq syscall_pwrite
+syscallcount equ 78
 section .text
 global arch_syscall_entry
 ; on entry:

kernel-src/arch/x86-64/syscalllog.c

@@ -5,7 +5,7 @@
 
 #ifdef SYSCALL_LOGGING
 
-#define SYSCALL_COUNT 76
+#define SYSCALL_COUNT 78
 #define LOGSTR(x) arch_e9_puts(x)
 
 static char *name[] = {
@@ -84,7 +84,9 @@ static char *name[] = {
 	"getpeername",
 	"chroot",
 	"pause",
-	"ppoll"
+	"ppoll",
+	"pread",
+	"pwrite"
 };
 
 static char *args[] = {
@@ -164,6 +166,8 @@ static char *args[] = {
 	"path %s", // chroot
 	"N/A", // pause
 	"fds %p nfds %d timeout %p sigmask %p" // ppoll
+	"fd %d buffer %p count %lu offset %lu\n", // pread
+	"fd %d buffer %p count %lu offset %lu\n", // pwrite
 };
 
 #endif

kernel-src/sys/syscalls/pread.c

@@ -0,0 +1,56 @@
+#include <kernel/syscalls.h>
+#include <kernel/vfs.h>
+#include <kernel/file.h>
+#include <arch/cpu.h>
+#include <errno.h>
+#include <logging.h>
+
+syscallret_t syscall_pread(context_t *context, int fd, void *buffer, size_t size, uintmax_t offset) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	void *kernelbuff = vmm_map(NULL, size, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
+	if (kernelbuff == NULL) {
+		ret.errno = ENOMEM;
+		return ret;
+	}
+
+	file_t *file = fd_get(fd);
+
+	if (file == NULL || (file->flags & FILE_READ) == 0) {
+		ret.errno = EBADF;
+		goto cleanup;
+	}
+
+	if (size == 0) {
+		ret.ret = 0;
+		ret.errno = 0;
+		goto cleanup;
+	}
+	
+	size_t tmp;
+	if (file->vnode->type == V_TYPE_SOCKET || file->vnode->type == V_TYPE_FIFO || (file->vnode->type == V_TYPE_CHDEV && VOP_MAXSEEK(file->vnode, &tmp))) {
+		ret.errno = ESPIPE;
+		goto cleanup;
+	}
+	
+
+	vattr_t attr;
+	VOP_GETATTR(file->vnode, &attr, NULL);
+
+	size_t bytesread;
+	ret.errno = vfs_read(file->vnode, kernelbuff, size, offset, &bytesread, fileflagstovnodeflags(file->flags));
+
+	if (ret.errno)
+		goto cleanup;
+
+	ret.errno = usercopy_touser(buffer, kernelbuff, bytesread);
+	ret.ret = ret.errno ? -1 : bytesread;
+cleanup:
+	if (file)
+		fd_release(file);
+
+	vmm_unmap(kernelbuff, size, 0);
+	return ret;
+}

kernel-src/sys/syscalls/pwrite.c

@@ -0,0 +1,54 @@
+#include <kernel/syscalls.h>
+#include <kernel/vfs.h>
+#include <kernel/file.h>
+#include <errno.h>
+
+syscallret_t syscall_pwrite(context_t *context, int fd, void *buffer, size_t size, uintmax_t offset) {
+	syscallret_t ret = {
+		.ret = -1
+	};
+
+	void *kernelbuff = vmm_map(NULL, size, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
+	if (kernelbuff == NULL) {
+		ret.errno = ENOMEM;
+		return ret;
+	}
+
+	file_t *file = fd_get(fd);
+
+	if (file == NULL || (file->flags & FILE_WRITE) == 0) {
+		ret.errno = EBADF;
+		goto cleanup;
+	}
+
+	if (size == 0) {
+		ret.ret = 0;
+		ret.errno = 0;
+		goto cleanup;
+	}
+
+	ret.errno = usercopy_fromuser(kernelbuff, buffer, size);
+	if (ret.errno)
+		goto cleanup;
+
+	size_t tmp;
+	if (file->vnode->type == V_TYPE_SOCKET || file->vnode->type == V_TYPE_FIFO || (file->vnode->type == V_TYPE_CHDEV && VOP_MAXSEEK(file->vnode, &tmp))) {
+		ret.errno = ESPIPE;
+		goto cleanup;
+	}
+
+	size_t byteswritten;
+	ret.errno = vfs_write(file->vnode, kernelbuff, size, offset, &byteswritten, fileflagstovnodeflags(file->flags));
+
+	if (ret.errno)
+		goto cleanup;
+
+	ret.ret = byteswritten;
+	ret.errno = 0;
+cleanup:
+	if (file)
+		fd_release(file);
+
+	vmm_unmap(kernelbuff, size, 0);
+	return ret;
+}

patches/mlibc/jinx-working-patch.patch

@@ -207,10 +207,10 @@ index 0000000..e5b087a
 +
 diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp
 new file mode 100644
-index 0000000..29795a8
+index 0000000..a20c9cd
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp
-@@ -0,0 +1,934 @@
+@@ -0,0 +1,952 @@
 +#include <bits/ensure.h>
 +#include <mlibc/debug.hpp>
 +#include <mlibc/all-sysdeps.hpp>
@@ -330,6 +330,24 @@ index 0000000..29795a8
 +		return 0;
 +	}
 +
++	int sys_rmdir(const char *path) {
++		return sys_unlinkat(AT_FDCWD, path, AT_REMOVEDIR);
++	}
++
++	int sys_pread(int fd, void *buf, size_t n, off_t off, ssize_t *bytes_read) {
++		long readc;
++		long error = syscall(SYSCALL_PREAD, &readc, fd, (uint64_t)buf, n, off);
++		*bytes_read = readc;
++		return error;
++	}
++
++	int sys_pwrite(int fd, const void *buf, size_t n, off_t off, ssize_t *bytes_written) {
++		long writec;
++		long error = syscall(SYSCALL_PWRITE, &writec, fd, (uint64_t)buf, n, off);
++		*bytes_written = writec;
++		return error;
++	}
++	
 +	#ifndef MLIBC_BUILDING_RTLD
 +
 +	typedef struct {
@@ -1164,10 +1182,10 @@ index 0000000..990eca0
 +#endif
 diff --git mlibc-workdir/sysdeps/astral/include/astral/syscall.h mlibc-workdir/sysdeps/astral/include/astral/syscall.h
 new file mode 100644
-index 0000000..6b2e7da
+index 0000000..144207f
 --- /dev/null
 +++ mlibc-workdir/sysdeps/astral/include/astral/syscall.h
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,101 @@
 +#ifndef _SYSCALL_H_INCLUDE
 +#define _SYSCALL_H_INCLUDE
 +
@@ -1247,6 +1265,8 @@ index 0000000..6b2e7da
 +#define SYSCALL_CHROOT 73
 +#define SYSCALL_PAUSE 74
 +#define SYSCALL_PPOLL 75
++#define SYSCALL_PREAD 76
++#define SYSCALL_PWRITE 77
 +
 +#include <stddef.h>
 +#include <stdint.h>