kamkow1/mop3
1
1
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

suspension queue resume process with value

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-04-28 00:12:41 +02:00
parent 90084652fa
commit 71522e4df5
8 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/amd64/proc.c
View File

@@ -114,7 +114,7 @@ void proc_cleanup(struct proc* proc, struct reschedule_ctx* rctx) {
struct proc_sq_entry* sq_entry = list_entry(node, struct proc_sq_entry, sq_link);
struct proc* suspended_proc = sq_entry->proc;
proc_sq_resume(suspended_proc, sq_entry, rctx);
proc_sq_resume(suspended_proc, sq_entry, rctx, (uintptr_t)proc->pid);
}
proc_sqs_cleanup(proc);
@@ -158,3 +158,5 @@ void proc_init_tls(struct proc* proc) {
proc->pdata.fs_base = utcb;
proc->pdata.tls_vaddr = tls_vaddr;
}
void proc_set_syscall_value(struct proc* proc, uintptr_t value) { proc->pdata.regs.rax = value; }

28
kernel/device/ps2/ps2_kb.c
View File

@@ -154,17 +154,19 @@ static void ps2kb_irq(void* arg, void* regs, bool user, struct reschedule_ctx* r
if (keycode <= 0 || keycode == 0xFA)
return;
ringbuffer_push(uint8_t, &ps2kb_ringbuffer, (uint8_t)keycode);
struct list_node_link* node = ps2kb_sq.proc_list;
if (node != NULL) {
struct proc_sq_entry* sq_entry = list_entry(node, struct proc_sq_entry, sq_link);
struct proc* resumed_proc = sq_entry->proc;
proc_sq_resume(resumed_proc, sq_entry, rctx);
*(uint8_t*)sq_entry->udata = (uint8_t)keycode;
proc_sq_resume(resumed_proc, sq_entry, rctx, ST_OK);
return;
}
ringbuffer_push(uint8_t, &ps2kb_ringbuffer, (uint8_t)keycode);
}
DEFINE_DEVICE_OP(ps2kb_read_key) {
@@ -173,25 +175,13 @@ DEFINE_DEVICE_OP(ps2kb_read_key) {
if (chbuf == NULL)
return -ST_BAD_ADDRESS_SPACE;
size_t prev_count = ps2kb_ringbuffer.count;
ringbuffer_pop(uint8_t, &ps2kb_ringbuffer, chbuf);
size_t new_count = ps2kb_ringbuffer.count;
/* didn't pop anything */
if (prev_count == new_count) {
struct list_node_link* node = ps2kb_sq.proc_list;
if (node != NULL) {
return -ST_PERMISSION_ERROR;
}
proc_sq_suspend(proc, &ps2kb_sq, rctx, NULL, NULL);
if (ps2kb_ringbuffer.count == 0) {
proc_sq_suspend(proc, &ps2kb_sq, rctx, chbuf, NULL);
return ST_OK;
}
ringbuffer_pop(uint8_t, &ps2kb_ringbuffer, chbuf);
return ST_OK;
}

2
kernel/fs/vfs.c
View File

@@ -213,7 +213,7 @@ int vfs_volume_close(struct proc* proc, const char* volume_name, struct reschedu
volume->owner = resumed_proc;
volume->locked = true;
proc_sq_resume(resumed_proc, sq_entry, rctx);
proc_sq_resume(resumed_proc, sq_entry, rctx, 0);
return ST_OK;
}

9
kernel/proc/mail.c
View File

@@ -20,7 +20,7 @@ void proc_cleanup_resource_mail(struct proc_resource* resource, struct reschedul
struct proc_sq_entry* sq_entry = list_entry(node, struct proc_sq_entry, sq_link);
struct proc* suspended_proc = sq_entry->proc;
proc_sq_resume(suspended_proc, sq_entry, rctx);
proc_sq_resume(suspended_proc, sq_entry, rctx, 0);
}
}
@@ -48,7 +48,7 @@ void proc_mail_send(struct proc* proc, struct proc_mail* mail, struct reschedule
size_t copy_size = min(data_size, saved_buffer->size);
memcpy(saved_buffer->buffer, data, copy_size);
proc_sq_resume(resumed_proc, sq_entry, rctx);
proc_sq_resume(resumed_proc, sq_entry, rctx, copy_size);
return;
}
@@ -80,7 +80,8 @@ void proc_mail_receive(struct proc* proc, struct proc_mail* mail, struct resched
list_remove(mail->packets, &packet->packets_link);
mail->packets_count--;
memcpy(recv_buffer, packet->packet_buffer, min(recv_size, packet->packet_size));
size_t copy_size = min(recv_size, packet->packet_size);
memcpy(recv_buffer, packet->packet_buffer, copy_size);
free(packet->packet_buffer);
free(packet);
@@ -90,7 +91,7 @@ void proc_mail_receive(struct proc* proc, struct proc_mail* mail, struct resched
struct proc_sq_entry* sq_entry = list_entry(node, struct proc_sq_entry, sq_link);
struct proc* resumed_proc = sq_entry->proc;
proc_sq_resume(resumed_proc, sq_entry, rctx);
proc_sq_resume(resumed_proc, sq_entry, rctx, copy_size);
return;
}

4
kernel/proc/mutex.c
View File

@@ -43,7 +43,7 @@ void proc_cleanup_resource_mutex(struct proc_resource* resource, struct reschedu
struct proc_sq_entry* sq_entry = list_entry(node, struct proc_sq_entry, sq_link);
struct proc* suspended_proc = sq_entry->proc;
proc_sq_resume(suspended_proc, sq_entry, rctx);
proc_sq_resume(suspended_proc, sq_entry, rctx, 0);
}
mutex->locked = false;
@@ -74,7 +74,7 @@ void proc_mutex_unlock(struct proc* proc, struct proc_mutex* mutex, struct resch
mutex->owner = resumed_proc;
mutex->locked = true;
proc_sq_resume(resumed_proc, sq_entry, rctx);
proc_sq_resume(resumed_proc, sq_entry, rctx, 0);
return;
}

5
kernel/proc/suspension_q.c
View File

@@ -7,6 +7,7 @@
#include <proc/suspension_q.h>
#include <status.h>
#include <sync/spin_lock.h>
#include <sys/proc.h>
#include <sys/smp.h>
#include <sys/spin_lock.h>
@@ -41,7 +42,8 @@ int proc_sq_suspend(struct proc* proc, struct proc_suspension_q* sq, struct resc
return state;
}
int proc_sq_resume(struct proc* proc, struct proc_sq_entry* sq_entry, struct reschedule_ctx* rctx) {
int proc_sq_resume(struct proc* proc, struct proc_sq_entry* sq_entry, struct reschedule_ctx* rctx,
uintptr_t value) {
struct cpu* cpu = cpu_find_lightest();
struct proc_suspension_q* sq = sq_entry->sq;
@@ -52,6 +54,7 @@ int proc_sq_resume(struct proc* proc, struct proc_sq_entry* sq_entry, struct res
list_remove(proc->sq_entries, &sq_entry->proc_link);
proc->cpu = cpu;
proc_set_syscall_value(proc, value);
if (proc->sq_entries == NULL)
proc->state = PROC_READY;

3
kernel/proc/suspension_q.h
View File

@@ -28,6 +28,7 @@ void proc_sqs_cleanup(struct proc* proc);
int proc_sq_suspend(struct proc* proc, struct proc_suspension_q* sq, struct reschedule_ctx* rctx,
void* udata, sq_entry_free_udata_func_t free_func);
int proc_sq_resume(struct proc* proc, struct proc_sq_entry* sq_entry, struct reschedule_ctx* rctx);
int proc_sq_resume(struct proc* proc, struct proc_sq_entry* sq_entry, struct reschedule_ctx* rctx,
uintptr_t value);
#endif // _KERNEL_PROC_SUSPENTION_Q_H

2
kernel/sys/proc.h
View File

@@ -16,4 +16,6 @@ void proc_cleanup(struct proc* proc, struct reschedule_ctx* rctx);
void proc_init_tls(struct proc* proc);
void proc_set_syscall_value(struct proc* proc, uintptr_t value);
#endif // _KERNEL_SYS_PROC_H