mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-28 21:28:21 +00:00
syscalls: pread and pwrite
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
Reference in New Issue
Block a user