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

Environments now belong to procgroups, modify env_set () and env_get () accordingly
All checks were successful
Build documentation / build-and-deploy (push) Successful in 3m9s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-03-17 21:52:12 +01:00
parent 0b85d3a0da
commit 090a4e46ea
7 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/amd64/proc.c
View File

@@ -139,8 +139,6 @@ void proc_cleanup (struct proc* proc, struct reschedule_ctx* rctx) {
proc_sqs_cleanup (proc);
proc_mutexes_cleanup (proc, rctx);
proc_env_cleanup (proc);
pmm_free (proc->pdata.kernel_stack, KSTACK_SIZE / PAGE_SIZE);
procgroup_unmap (proc->procgroup, proc->pdata.tls_vaddr, proc->procgroup->tls.tls_tmpl_pages);

30
kernel/proc/env.c
View File

@@ -6,12 +6,12 @@
#include <libk/string.h>
#include <mm/malloc.h>
#include <proc/env.h>
#include <proc/proc.h>
#include <proc/procgroup.h>
#include <status.h>
void proc_env_cleanup (struct proc* proc) {
void proc_env_cleanup (struct procgroup* procgroup) {
for (size_t i = 0; i < fieldlengthof (struct proc_env, env_var_buckets); i++) {
struct hash_node_link* link = proc->env.env_var_buckets[i];
struct hash_node_link* link = procgroup->env.env_var_buckets[i];
if (link == NULL)
continue;
@@ -23,8 +23,8 @@ void proc_env_cleanup (struct proc* proc) {
}
}
int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_size) {
uint64_t fp;
int proc_env_set (struct procgroup* procgroup, const char* key, void* buffer, size_t data_size) {
uint64_t fpg;
struct proc_env_var* var = malloc (sizeof (*var));
@@ -46,30 +46,30 @@ int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_
uint32_t env_hash = hash_fnv32 (var->key, strlen_null (var->key));
spin_lock (&proc->lock, &fp);
spin_lock (&procgroup->lock, &fpg);
hash_insert (&proc->env, &var->env_link, env_hash, lengthof (proc->env.env_var_buckets),
hash_insert (&procgroup->env, &var->env_link, env_hash, lengthof (procgroup->env.env_var_buckets),
env_var_buckets);
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return ST_OK;
}
int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size) {
uint64_t fp;
int proc_env_get (struct procgroup* procgroup, const char* key, void* buffer, size_t size) {
uint64_t fpg;
struct hash_node_link* found_link = NULL;
size_t key_len = strlen_null (key);
uint32_t hash = hash_fnv32 (key, key_len);
spin_lock (&proc->lock, &fp);
spin_lock (&procgroup->lock, &fpg);
hash_find (&proc->env, key, key_len, hash, lengthof (proc->env.env_var_buckets), env_var_buckets,
struct proc_env_var, env_link, key, found_link);
hash_find (&procgroup->env, key, key_len, hash, lengthof (procgroup->env.env_var_buckets),
env_var_buckets, struct proc_env_var, env_link, key, found_link);
if (found_link == NULL) {
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return -ST_NOT_FOUND;
}
@@ -77,7 +77,7 @@ int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size)
memcpy (buffer, var->buffer, min (size, var->data_size));
spin_unlock (&proc->lock, fp);
spin_unlock (&procgroup->lock, fpg);
return ST_OK;
}

8
kernel/proc/env.h
View File

@@ -6,7 +6,7 @@
#define PROC_ENV_VAR_MAX 128
struct proc;
struct procgroup;
struct proc_env_var {
char key[PROC_ENV_VAR_MAX];
@@ -19,10 +19,10 @@ struct proc_env {
struct hash_node_link* env_var_buckets[64];
};
void proc_env_cleanup (struct proc* proc);
void proc_env_cleanup (struct procgroup* procgroup);
int proc_env_set (struct proc* proc, const char* key, void* buffer, size_t data_size);
int proc_env_set (struct procgroup* procgroup, const char* key, void* buffer, size_t data_size);
int proc_env_get (struct proc* proc, const char* key, void* buffer, size_t size);
int proc_env_get (struct procgroup* procgroup, const char* key, void* buffer, size_t size);
#endif // _KERNEL_PROC_ENV_H

2
kernel/proc/proc.h
View File

@@ -7,7 +7,6 @@
#include <libk/rbtree.h>
#include <libk/std.h>
#include <path_defs.h>
#include <proc/env.h>
#include <proc/procgroup.h>
#include <proc/resource.h>
#include <proc/suspension_q.h>
@@ -51,7 +50,6 @@ struct proc {
size_t mail_recv_size;
char cwv[VOLUME_MAX];
struct proc_suspension_q done_sq;
struct proc_env env;
};
void proc_sched (bool user);

3
kernel/proc/procgroup.c
View File

@@ -5,6 +5,7 @@
#include <libk/string.h>
#include <mm/malloc.h>
#include <mm/pmm.h>
#include <proc/env.h>
#include <proc/proc.h>
#include <proc/procgroup.h>
#include <proc/reschedule.h>
@@ -238,6 +239,8 @@ static void procgroup_delete (struct procgroup* procgroup, struct reschedule_ctx
free (mapping);
}
proc_env_cleanup (procgroup);
pmm_free (procgroup->pd.cr3_paddr, 1);
free (procgroup->tls.tls_tmpl);

2
kernel/proc/procgroup.h
View File

@@ -5,6 +5,7 @@
#include <libk/list.h>
#include <libk/rbtree.h>
#include <libk/std.h>
#include <proc/env.h>
#include <proc/resource.h>
#include <sync/spin_lock.h>
#include <sys/mm.h>
@@ -35,6 +36,7 @@ struct procgroup {
struct list_node_link* mappings;
uintptr_t map_base;
struct procgroup_tls tls;
struct proc_env env;
};
struct procgroup* procgroup_create (void);

42
kernel/syscall/syscall.c
View File

@@ -651,7 +651,7 @@ DEFINE_SYSCALL (sys_describe) {
/* int get_procgroup (int pid) */
DEFINE_SYSCALL (sys_get_procgroup) {
uint64_t fp;
uint64_t fp, fpg;
int pid = (int)a1;
@@ -661,9 +661,13 @@ DEFINE_SYSCALL (sys_get_procgroup) {
return SYSRESULT (-ST_NOT_FOUND);
spin_lock (&target_proc->lock, &fp);
int pgid = target_proc->procgroup->pgid;
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
int pgid = procgroup->pgid;
spin_unlock (&procgroup->lock, fpg);
return SYSRESULT (pgid);
}
@@ -932,28 +936,27 @@ DEFINE_SYSCALL (sys_create_volume) {
return SYSRESULT (vfs_create_volume (proc, rctx, key, type, device, false));
}
/* int env_set (int pid, char* key, void* buffer, size_t size) */
/* int env_set (int pgid, char* key, void* buffer, size_t size) */
DEFINE_SYSCALL (sys_env_set) {
uint64_t fp, fpg;
int pid = (int)a1;
int pgid = (int)a1;
uintptr_t uvaddr_key = a2;
uintptr_t uvaddr_buffer = a3;
size_t size = (size_t)a4;
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
struct proc* target_proc = proc_find_pid (pid);
struct procgroup* target_procgroup = procgroup_find (pgid);
if (target_proc == NULL) {
if (target_procgroup == NULL)
return SYSRESULT (-ST_NOT_FOUND);
}
uintptr_t out_paddr;
spin_lock (&target_proc->lock, &fp);
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&proc->lock, &fp);
struct procgroup* procgroup = proc->procgroup;
spin_unlock (&proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
@@ -973,31 +976,30 @@ DEFINE_SYSCALL (sys_env_set) {
if (buffer == NULL)
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
return SYSRESULT (proc_env_set (target_proc, key, buffer, size));
return SYSRESULT (proc_env_set (target_procgroup, key, buffer, size));
}
/* int env_get (int pid, char* key, void* buffer, size_t size) */
/* int env_get (int pgid, char* key, void* buffer, size_t size) */
DEFINE_SYSCALL (sys_env_get) {
uint64_t fp, fpg;
int pid = (int)a1;
int pgid = (int)a1;
uintptr_t uvaddr_key = a2;
uintptr_t uvaddr_buffer = a3;
size_t size = (size_t)a4;
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
struct proc* target_proc = proc_find_pid (pid);
struct procgroup* target_procgroup = procgroup_find (pgid);
if (target_proc == NULL) {
if (target_procgroup == NULL)
return SYSRESULT (-ST_NOT_FOUND);
}
uintptr_t out_paddr;
spin_lock (&target_proc->lock, &fp);
struct procgroup* procgroup = target_proc->procgroup;
spin_unlock (&target_proc->lock, fp);
spin_lock (&proc->lock, &fp);
struct procgroup* procgroup = proc->procgroup;
spin_unlock (&proc->lock, fp);
spin_lock (&procgroup->lock, &fpg);
@@ -1017,7 +1019,7 @@ DEFINE_SYSCALL (sys_env_get) {
if (buffer == NULL)
return SYSRESULT (-ST_BAD_ADDRESS_SPACE);
return SYSRESULT (proc_env_set (target_proc, key, buffer, size));
return SYSRESULT (proc_env_set (target_procgroup, key, buffer, size));
}
static syscall_handler_func_t handler_table[] = {