summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/init/main.c6
-rw-r--r--src/init/syscalls.c9
-rw-r--r--src/init/tar.c4
-rw-r--r--src/init/tar.h2
-rw-r--r--src/kernel/proc.c1
-rw-r--r--src/kernel/proc.h3
-rw-r--r--src/kernel/syscalls.c40
-rw-r--r--src/shared/syscalls.h5
8 files changed, 29 insertions, 41 deletions
diff --git a/src/init/main.c b/src/init/main.c
index 73df25b..5df6bb3 100644
--- a/src/init/main.c
+++ b/src/init/main.c
@@ -32,11 +32,11 @@ int main(void) {
}
void fs_prep(void) {
- handle_t front, back;
- front = _syscall_fs_create(&back);
+ handle_t front;
+ front = _syscall_fs_create();
if (!_syscall_fork()) {
- tar_driver(back, &_initrd);
+ tar_driver(&_initrd);
_syscall_exit(1);
}
diff --git a/src/init/syscalls.c b/src/init/syscalls.c
index 57a7344..e14dfe8 100644
--- a/src/init/syscalls.c
+++ b/src/init/syscalls.c
@@ -34,13 +34,12 @@ int _syscall_close(handle_t handle) {
return _syscall(_SYSCALL_CLOSE, handle, 0, 0, 0);
}
-handle_t _syscall_fs_create(handle_t __user *back) {
- return _syscall(_SYSCALL_FS_CREATE, (int)back, 0, 0, 0);
+handle_t _syscall_fs_create(void) {
+ return _syscall(_SYSCALL_FS_CREATE, 0, 0, 0, 0);
}
-int _syscall_fs_wait(handle_t back, char __user *buf, int max_len,
- struct fs_wait_response __user *res) {
- return _syscall(_SYSCALL_FS_WAIT, back, (int)buf, max_len, (int)res);
+int _syscall_fs_wait(char __user *buf, int max_len, struct fs_wait_response __user *res) {
+ return _syscall(_SYSCALL_FS_WAIT, (int)buf, max_len, (int)res, 0);
}
int _syscall_fs_respond(char __user *buf, int ret) {
diff --git a/src/init/tar.c b/src/init/tar.c
index 42efcdf..89f4e69 100644
--- a/src/init/tar.c
+++ b/src/init/tar.c
@@ -13,11 +13,11 @@ static int tar_size(void *sector);
static void *tar_find(const char *path, size_t path_len, void *base, size_t base_len);
static int oct_parse(char *str, size_t len);
-void tar_driver(handle_t back, void *base) {
+void tar_driver(void *base) {
static char buf[BUF_SIZE];
struct fs_wait_response res;
for (;;) {
- switch (_syscall_fs_wait(back, buf, BUF_SIZE, &res)) {
+ switch (_syscall_fs_wait(buf, BUF_SIZE, &res)) {
case VFSOP_OPEN:
_syscall_fs_respond(NULL, tar_open(buf, res.len, base, ~0));
break;
diff --git a/src/init/tar.h b/src/init/tar.h
index 71c30fe..c1dee78 100644
--- a/src/init/tar.h
+++ b/src/init/tar.h
@@ -1,4 +1,4 @@
#pragma once
#include <shared/types.h>
-_Noreturn void tar_driver(handle_t back, void *base);
+_Noreturn void tar_driver(void *base);
diff --git a/src/kernel/proc.c b/src/kernel/proc.c
index 4df6bd7..aebd509 100644
--- a/src/kernel/proc.c
+++ b/src/kernel/proc.c
@@ -21,6 +21,7 @@ struct process *process_seed(void) {
proc->mount = vfs_mount_seed();
proc->id = next_pid++;
proc->handled_req = NULL;
+ proc->controlled = NULL;
process_first = proc;
diff --git a/src/kernel/proc.h b/src/kernel/proc.h
index 7c338bb..6723e23 100644
--- a/src/kernel/proc.h
+++ b/src/kernel/proc.h
@@ -36,6 +36,9 @@ struct process {
};
struct vfs_request *handled_req;
+ /* vfs_backend controlled (not exclusively) by this process */
+ struct vfs_backend *controlled;
+
struct vfs_mount *mount;
struct handle handles[HANDLE_MAX];
diff --git a/src/kernel/syscalls.c b/src/kernel/syscalls.c
index 22bf1f6..d5c2c8f 100644
--- a/src/kernel/syscalls.c
+++ b/src/kernel/syscalls.c
@@ -165,8 +165,8 @@ int _syscall_close(handle_t handle) {
return -1;
}
-handle_t _syscall_fs_create(handle_t __user *back_user) {
- handle_t front, back = 0;
+handle_t _syscall_fs_create(void) {
+ handle_t front = 0;
struct vfs_backend *backend;
front = process_find_handle(process_current);
@@ -174,52 +174,38 @@ handle_t _syscall_fs_create(handle_t __user *back_user) {
// the type needs to be set here so process_find_handle skips this handle
process_current->handles[front].type = HANDLE_FS_FRONT;
- back = process_find_handle(process_current);
- if (back < 0) goto fail;
- process_current->handles[back].type = HANDLE_FS_BACK;
-
- // copy the back handle to back_user
- if (!virt_cpy_to(process_current->pages, back_user, &back, sizeof(back)))
- goto fail;
-
backend = kmalloc(sizeof *backend); // TODO never freed
backend->type = VFS_BACK_USER;
backend->handler = NULL;
backend->queue = NULL;
process_current->handles[front].fs.backend = backend;
- process_current->handles[back ].fs.backend = backend;
+
+ process_current->controlled = backend;
return front;
fail:
if (front >= 0)
process_current->handles[front].type = HANDLE_EMPTY;
- if (back >= 0)
- process_current->handles[back].type = HANDLE_EMPTY;
return -1;
}
-int _syscall_fs_wait(handle_t back, char __user *buf, int max_len,
- struct fs_wait_response __user *res) {
- struct handle *back_handle;
-
- if (back < 0 || back >= HANDLE_MAX) return -1;
- back_handle = &process_current->handles[back];
- if (back_handle->type != HANDLE_FS_BACK)
- return -1;
+int _syscall_fs_wait(char __user *buf, int max_len, struct fs_wait_response __user *res) {
+ struct vfs_backend *backend = process_current->controlled;
+ if (!backend) return -1;
process_current->state = PS_WAITS4REQUEST;
- back_handle->fs.backend->handler = process_current;
+ backend->handler = process_current;
/* checking the validity of those pointers here would make
* vfs_request_pass2handler simpler. TODO? */
process_current->awaited_req.buf = buf;
process_current->awaited_req.max_len = max_len;
process_current->awaited_req.res = res;
- if (back_handle->fs.backend->queue) {
+ if (backend->queue) {
// handle queued requests
- struct process *queued = back_handle->fs.backend->queue;
- back_handle->fs.backend->queue = NULL; // TODO get the next queued proc
+ struct process *queued = backend->queue;
+ backend->queue = NULL; // TODO get the next queued proc
vfs_request_pass2handler(&queued->pending_req);
} else {
process_switch_any();
@@ -284,9 +270,9 @@ int _syscall(int num, int a, int b, int c, int d) {
case _SYSCALL_CLOSE:
return _syscall_close(a);
case _SYSCALL_FS_CREATE:
- return _syscall_fs_create((userptr_t)a);
+ return _syscall_fs_create();
case _SYSCALL_FS_WAIT:
- return _syscall_fs_wait(a, (userptr_t)b, c, (userptr_t)d);
+ return _syscall_fs_wait((userptr_t)a, b, (userptr_t)c);
case _SYSCALL_FS_RESPOND:
return _syscall_fs_respond((userptr_t)a, b);
case _SYSCALL_MEMFLAG:
diff --git a/src/shared/syscalls.h b/src/shared/syscalls.h
index 3a21b66..1779dc8 100644
--- a/src/shared/syscalls.h
+++ b/src/shared/syscalls.h
@@ -50,14 +50,13 @@ int _syscall_close(handle_t);
/** Creates a pair of front/back filesystem handles.
* @param back a pointer to a handle_t which will store the back pointer
*/
-handle_t _syscall_fs_create(handle_t __user *back);
+handle_t _syscall_fs_create(void);
struct fs_wait_response {
int len; // how much was put in *buf
int id; // file id (returned by the open handler, passed to other calls)
int offset;
};
-int _syscall_fs_wait(handle_t back, char __user *buf, int max_len,
- struct fs_wait_response __user *res);
+int _syscall_fs_wait(char __user *buf, int max_len, struct fs_wait_response __user *res);
int _syscall_fs_respond(char __user *buf, int ret);
int _syscall_memflag(void __user *addr, size_t len, int flags);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 23:09:06 +0000