Handle IRQs inside the kernel
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m42s
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m42s
This commit is contained in:
@@ -30,21 +30,21 @@
|
||||
|
||||
#define SYSRESULT(x) ((uintptr_t)(x))
|
||||
|
||||
static void* sys_get_user_buffer (struct proc* proc, uintptr_t uvaddr, size_t size) {
|
||||
static void* sys_get_user_buffer (struct procgroup* procgroup, uintptr_t uvaddr, size_t size) {
|
||||
uint64_t fpg;
|
||||
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
|
||||
if (!mm_validate_buffer (&proc->procgroup->pd, (uintptr_t)uvaddr, size)) {
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
if (!mm_validate_buffer (&procgroup->pd, (uintptr_t)uvaddr, size)) {
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uintptr_t out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr);
|
||||
uintptr_t out_paddr = mm_v2p (&procgroup->pd, uvaddr);
|
||||
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
uintptr_t out_kvaddr = (uintptr_t)hhdm->offset + out_paddr;
|
||||
|
||||
@@ -67,6 +67,8 @@ DEFINE_SYSCALL (sys_test) {
|
||||
|
||||
/* int map (uintptr_t vaddr, size_t pages, uint32_t flags) */
|
||||
DEFINE_SYSCALL (sys_map) {
|
||||
uint64_t fp;
|
||||
|
||||
uintptr_t vaddr = a1;
|
||||
size_t pages = (size_t)a2;
|
||||
uint32_t flags = (uint32_t)a3;
|
||||
@@ -74,18 +76,28 @@ DEFINE_SYSCALL (sys_map) {
|
||||
if (vaddr % PAGE_SIZE != 0)
|
||||
return SYSRESULT (-ST_UNALIGNED);
|
||||
|
||||
return SYSRESULT (procgroup_map (proc->procgroup, vaddr, pages, flags, NULL));
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
return SYSRESULT (procgroup_map (procgroup, vaddr, pages, flags, NULL));
|
||||
}
|
||||
|
||||
/* int unmap (uintptr_t vaddr, size_t pages) */
|
||||
DEFINE_SYSCALL (sys_unmap) {
|
||||
uint64_t fp;
|
||||
|
||||
uintptr_t vaddr = a1;
|
||||
size_t pages = (size_t)a2;
|
||||
|
||||
if (vaddr % PAGE_SIZE != 0)
|
||||
return SYSRESULT (-ST_UNALIGNED);
|
||||
|
||||
return SYSRESULT (procgroup_unmap (proc->procgroup, vaddr, pages));
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
return SYSRESULT (procgroup_unmap (procgroup, vaddr, pages));
|
||||
}
|
||||
|
||||
/* int clone (uintptr_t vstack_top, void* entry, void* argument_ptr) */
|
||||
@@ -126,9 +138,13 @@ DEFINE_SYSCALL (sys_sched) {
|
||||
|
||||
/* int mutex_create (void) */
|
||||
DEFINE_SYSCALL (sys_mutex_create) {
|
||||
uint64_t fr;
|
||||
uint64_t fr, fp;
|
||||
|
||||
struct proc_resource* mutex_resource = proc_create_resource_mutex (proc->procgroup);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
struct proc_resource* mutex_resource = proc_create_resource_mutex (procgroup);
|
||||
|
||||
if (mutex_resource == NULL)
|
||||
return SYSRESULT (-ST_OOM_ERROR);
|
||||
@@ -142,23 +158,35 @@ DEFINE_SYSCALL (sys_mutex_create) {
|
||||
|
||||
/* int mutex_delete (int mutex_rid) */
|
||||
DEFINE_SYSCALL (sys_mutex_delete) {
|
||||
uint64_t fp;
|
||||
|
||||
int mutex_rid = (int)a1;
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (proc->procgroup, mutex_rid);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (procgroup, mutex_rid);
|
||||
|
||||
if (mutex_resource == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
|
||||
proc_delete_resource (proc->procgroup, mutex_resource, rctx);
|
||||
proc_delete_resource (procgroup, mutex_resource, rctx);
|
||||
|
||||
return SYSRESULT (ST_OK);
|
||||
}
|
||||
|
||||
/* int mutex_lock (int mutex_rid) */
|
||||
DEFINE_SYSCALL (sys_mutex_lock) {
|
||||
uint64_t fp;
|
||||
|
||||
int mutex_rid = (int)a1;
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (proc->procgroup, mutex_rid);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (procgroup, mutex_rid);
|
||||
|
||||
if (mutex_resource == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
@@ -170,9 +198,15 @@ DEFINE_SYSCALL (sys_mutex_lock) {
|
||||
|
||||
/* int mutex_unlock (int mutex_rid) */
|
||||
DEFINE_SYSCALL (sys_mutex_unlock) {
|
||||
uint64_t fp;
|
||||
|
||||
int mutex_rid = (int)a1;
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (proc->procgroup, mutex_rid);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
struct proc_resource* mutex_resource = proc_find_resource (procgroup, mutex_rid);
|
||||
|
||||
if (mutex_resource == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
@@ -184,21 +218,27 @@ DEFINE_SYSCALL (sys_mutex_unlock) {
|
||||
|
||||
/* int mail_send (int pgid, void* mesg, size_t mesg_size) */
|
||||
DEFINE_SYSCALL (sys_mail_send) {
|
||||
uint64_t fp;
|
||||
|
||||
int pgid = (int)a1;
|
||||
uintptr_t uvaddr_mesg = a2;
|
||||
size_t mesg_size = (size_t)a3;
|
||||
|
||||
void* mesg = sys_get_user_buffer (proc, uvaddr_mesg, mesg_size);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
void* mesg = sys_get_user_buffer (procgroup, uvaddr_mesg, mesg_size);
|
||||
|
||||
if (mesg == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
struct procgroup* procgroup = procgroup_find (pgid);
|
||||
struct procgroup* procgroup1 = procgroup_find (pgid);
|
||||
|
||||
if (procgroup == NULL)
|
||||
if (procgroup1 == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
|
||||
struct proc_resource* mail_resource = proc_find_resource (procgroup, 0);
|
||||
struct proc_resource* mail_resource = proc_find_resource (procgroup1, 0);
|
||||
|
||||
if (mail_resource == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
@@ -210,15 +250,21 @@ DEFINE_SYSCALL (sys_mail_send) {
|
||||
|
||||
/* int mail_receive (void* recv_mesg, size_t mesg_size) */
|
||||
DEFINE_SYSCALL (sys_mail_receive) {
|
||||
uint64_t fp;
|
||||
|
||||
uintptr_t uvaddr_mesg = a1;
|
||||
size_t mesg_size = (size_t)a2;
|
||||
|
||||
void* mesg = sys_get_user_buffer (proc, uvaddr_mesg, mesg_size);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
void* mesg = sys_get_user_buffer (procgroup, uvaddr_mesg, mesg_size);
|
||||
|
||||
if (mesg == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
struct proc_resource* mail_resource = proc_find_resource (proc->procgroup, 0);
|
||||
struct proc_resource* mail_resource = proc_find_resource (procgroup, 0);
|
||||
|
||||
if (mail_resource == NULL)
|
||||
return SYSRESULT (-ST_NOT_FOUND);
|
||||
@@ -230,7 +276,7 @@ DEFINE_SYSCALL (sys_mail_receive) {
|
||||
|
||||
/* int device_do (int device_id, int cmd, void* a1, void* a2, void* a3, void* a4) */
|
||||
DEFINE_SYSCALL (sys_device_do) {
|
||||
uint64_t fpg, fd;
|
||||
uint64_t fpg, fd, fp;
|
||||
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
|
||||
@@ -242,37 +288,41 @@ DEFINE_SYSCALL (sys_device_do) {
|
||||
uintptr_t ua4 = a6, ka4 = 0;
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
if (!(cmd >= 0 && cmd < (int)fieldlengthof (struct device, ops)))
|
||||
return SYSRESULT (-ST_BAD_DEVICE_OP);
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_key);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_key);
|
||||
|
||||
if (out_paddr == 0) {
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
}
|
||||
|
||||
const char* key = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, ua1);
|
||||
out_paddr = mm_v2p (&procgroup->pd, ua1);
|
||||
if (out_paddr != 0)
|
||||
ka1 = (uintptr_t)hhdm->offset + out_paddr;
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, ua2);
|
||||
out_paddr = mm_v2p (&procgroup->pd, ua2);
|
||||
if (out_paddr != 0)
|
||||
ka2 = (uintptr_t)hhdm->offset + out_paddr;
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, ua3);
|
||||
out_paddr = mm_v2p (&procgroup->pd, ua3);
|
||||
if (out_paddr != 0)
|
||||
ka3 = (uintptr_t)hhdm->offset + out_paddr;
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, ua4);
|
||||
out_paddr = mm_v2p (&procgroup->pd, ua4);
|
||||
if (out_paddr != 0)
|
||||
ka4 = (uintptr_t)hhdm->offset + out_paddr;
|
||||
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
struct device* device = device_find (key);
|
||||
|
||||
@@ -295,7 +345,7 @@ DEFINE_SYSCALL (sys_device_do) {
|
||||
|
||||
/* int exec (char* volume, char* path) */
|
||||
DEFINE_SYSCALL (sys_exec) {
|
||||
uint64_t fpg;
|
||||
uint64_t fpg, fp;
|
||||
|
||||
uintptr_t uvaddr_volume = a1;
|
||||
uintptr_t uvaddr_path = a2;
|
||||
@@ -304,31 +354,42 @@ DEFINE_SYSCALL (sys_exec) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
int pid1 = proc->pid;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_volume);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_volume);
|
||||
|
||||
if (out_paddr == 0) {
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
}
|
||||
|
||||
const char* volume = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
struct proc* new = proc_from_file (proc, volume, path, rctx);
|
||||
|
||||
if (new == NULL)
|
||||
if (new == NULL) {
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return SYSRESULT (-ST_EXEC_ERROR);
|
||||
}
|
||||
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
int pid = new->pid;
|
||||
new->exec_pid = proc->pid;
|
||||
new->exec_pid = pid1;
|
||||
|
||||
proc_register (new, NULL, rctx);
|
||||
|
||||
@@ -345,9 +406,13 @@ DEFINE_SYSCALL (sys_volume_open) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_volume);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_volume);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
@@ -399,25 +464,26 @@ DEFINE_SYSCALL (sys_read_file) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
uint8_t* buffer = sys_get_user_buffer (proc, uvaddr_buffer, size);
|
||||
uint8_t* buffer = sys_get_user_buffer (procgroup, uvaddr_buffer, size);
|
||||
|
||||
if (buffer == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_read_file (proc, rctx, cwv, path, buffer, off, size);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -434,25 +500,26 @@ DEFINE_SYSCALL (sys_describe) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
struct desc* desc = sys_get_user_buffer (proc, uvaddr_desc, sizeof (struct desc));
|
||||
struct desc* desc = sys_get_user_buffer (procgroup, uvaddr_desc, sizeof (struct desc));
|
||||
|
||||
if (desc == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_describe (proc, rctx, cwv, path, desc);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -495,25 +562,27 @@ DEFINE_SYSCALL (sys_read_dir_entry) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
struct dir_entry* entry = sys_get_user_buffer (proc, uvaddr_entry, sizeof (struct dir_entry));
|
||||
struct dir_entry* entry =
|
||||
sys_get_user_buffer (procgroup, uvaddr_entry, sizeof (struct dir_entry));
|
||||
|
||||
if (entry == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_read_dir_entry (proc, rctx, cwv, path, entry, entry_num);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -529,20 +598,21 @@ DEFINE_SYSCALL (sys_create_file) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_create_file (proc, rctx, cwv, path);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -562,25 +632,26 @@ DEFINE_SYSCALL (sys_write_file) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
uint8_t* buffer = sys_get_user_buffer (proc, uvaddr_buffer, size);
|
||||
uint8_t* buffer = sys_get_user_buffer (procgroup, uvaddr_buffer, size);
|
||||
|
||||
if (buffer == NULL)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_write_file (proc, rctx, cwv, path, buffer, off, size, flags);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -658,20 +729,21 @@ DEFINE_SYSCALL (sys_create_dir) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_create_dir (proc, rctx, cwv, path);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -687,20 +759,21 @@ DEFINE_SYSCALL (sys_remove) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_path);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
if (out_paddr == 0)
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
|
||||
const char* path = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
int ret = vfs_remove (proc, rctx, cwv, path);
|
||||
|
||||
return SYSRESULT (ret);
|
||||
@@ -708,7 +781,7 @@ DEFINE_SYSCALL (sys_remove) {
|
||||
|
||||
/* int create_volume (char* key, int fs_type, char* device_key) */
|
||||
DEFINE_SYSCALL (sys_create_volume) {
|
||||
uint64_t fpg;
|
||||
uint64_t fpg, fp;
|
||||
|
||||
uintptr_t uvaddr_key = a1;
|
||||
int type = (int)a2;
|
||||
@@ -718,27 +791,33 @@ DEFINE_SYSCALL (sys_create_volume) {
|
||||
|
||||
uintptr_t out_paddr;
|
||||
|
||||
spin_lock (&proc->procgroup->lock, &fpg);
|
||||
char cwv[VOLUME_MAX];
|
||||
spin_lock (&proc->lock, &fp);
|
||||
struct procgroup* procgroup = proc->procgroup;
|
||||
memcpy (cwv, proc->cwv, sizeof (proc->cwv));
|
||||
spin_unlock (&proc->lock, fp);
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_key);
|
||||
spin_lock (&procgroup->lock, &fpg);
|
||||
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_key);
|
||||
|
||||
if (out_paddr == 0) {
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
}
|
||||
|
||||
const char* key = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
out_paddr = mm_v2p (&proc->procgroup->pd, uvaddr_device_key);
|
||||
out_paddr = mm_v2p (&procgroup->pd, uvaddr_device_key);
|
||||
|
||||
if (out_paddr == 0) {
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
|
||||
}
|
||||
|
||||
const char* device_key = (const char*)((uintptr_t)hhdm->offset + out_paddr);
|
||||
|
||||
spin_unlock (&proc->procgroup->lock, fpg);
|
||||
spin_unlock (&procgroup->lock, fpg);
|
||||
|
||||
struct device* device = device_find (device_key);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user