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

Manage RIDs via id_alloc
All checks were successful
Build documentation / build-and-deploy (push) Successful in 2m2s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-02-22 21:09:06 +01:00
parent 084809ac99
commit 62a6543dab
9 changed files with 97 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/proc/procgroup.c
View File

@@ -156,9 +156,17 @@ struct procgroup* procgroup_create (void) {
return NULL;
}
if (!id_alloc_init (&procgroup->rid_alloc, PROCGROUP_RESOURCES_MAX)) {
id_alloc_fini (&procgroup->vfs_handle_id_alloc);
free (procgroup);
return NULL;
}
procgroup->pgid = id_alloc (&pgid_alloc);
if (procgroup->pgid < 0) {
id_alloc_fini (&procgroup->rid_alloc);
id_alloc_fini (&procgroup->vfs_handle_id_alloc);
free (procgroup);
return NULL;
}
@@ -168,7 +176,9 @@ struct procgroup* procgroup_create (void) {
procgroup->pd.cr3_paddr = mm_alloc_user_pd_phys ();
procgroup->map_base = PROC_MAP_BASE;
if (proc_create_resource_mail (procgroup, 1) == NULL) {
if (proc_create_resource_mail (procgroup) == NULL) {
id_alloc_fini (&procgroup->rid_alloc);
id_alloc_fini (&procgroup->vfs_handle_id_alloc);
free (procgroup);
return NULL;
}
@@ -224,7 +234,7 @@ static void procgroup_delete (struct procgroup* procgroup, struct reschedule_ctx
list_remove (resource_delete_list, &resource->delete_list_link);
proc_delete_resource (resource, rctx);
proc_delete_resource (procgroup, resource, rctx);
}
/* unlock VFS owned mountpoints */
@@ -245,6 +255,7 @@ static void procgroup_delete (struct procgroup* procgroup, struct reschedule_ctx
free (procgroup->tls.tls_tmpl);
id_alloc_fini (&procgroup->vfs_handle_id_alloc);
id_alloc_fini (&procgroup->rid_alloc);
id_free (&pgid_alloc, procgroup->pgid);
free (procgroup);

2
kernel/proc/procgroup.h
View File

@@ -11,6 +11,7 @@
#include <sys/procgroup.h>
#define PROCGROUP_VFS_HANDLES_MAX 256
#define PROCGROUP_RESOURCES_MAX 256
struct proc;
struct reschedule_ctx;
@@ -29,6 +30,7 @@ struct procgroup {
struct rb_node_link* memb_proc_tree;
spin_lock_t lock;
struct rb_node_link* resource_tree;
struct id_alloc rid_alloc;
struct pd pd;
struct list_node_link* mappings;
uintptr_t map_base;

96
kernel/proc/resource.c
View File

@@ -1,3 +1,4 @@
#include <id/id_alloc.h>
#include <libk/assert.h>
#include <libk/list.h>
#include <libk/rbtree.h>
@@ -25,64 +26,87 @@ struct proc_resource* proc_find_resource (struct procgroup* procgroup, int rid)
return resource;
}
struct proc_resource* proc_create_resource_mutex (struct procgroup* procgroup, int rid) {
struct proc_resource* proc_create_resource_mutex (struct procgroup* procgroup) {
struct proc_resource* resource;
resource = proc_find_resource (procgroup, rid);
if (resource != NULL)
return resource;
resource = malloc (sizeof (*resource));
if (resource == NULL)
return NULL;
memset (resource, 0, sizeof (*resource));
resource->lock = SPIN_LOCK_INIT;
resource->ops.cleanup = &proc_cleanup_resource_mutex;
resource->u.mutex.resource = resource;
resource->rid = rid;
resource->type = PR_MUTEX;
spin_lock (&procgroup->lock);
rbtree_insert (struct proc_resource, &procgroup->resource_tree, &resource->resource_tree_link,
resource_tree_link, rid);
spin_unlock (&procgroup->lock);
return resource;
}
resource->rid = id_alloc (&procgroup->rid_alloc);
struct proc_resource* proc_create_resource_mail (struct procgroup* procgroup, int rid) {
struct proc_resource* resource;
resource = proc_find_resource (procgroup, rid);
if (resource != NULL)
return resource;
resource = malloc (sizeof (*resource));
if (resource == NULL)
return NULL;
memset (resource, 0, sizeof (*resource));
resource->lock = SPIN_LOCK_INIT;
resource->ops.cleanup = &proc_cleanup_resource_mail;
resource->u.mail.resource = resource;
resource->rid = rid;
resource->type = PR_MAIL;
if (!ringbuffer_init (&resource->u.mail.ringbuffer, PROC_MAIL_MAX, sizeof (struct mail_packet))) {
if (resource->rid < 0) {
free (resource);
spin_unlock (&procgroup->lock);
return NULL;
}
spin_lock (&procgroup->lock);
resource->lock = SPIN_LOCK_INIT;
resource->ops.cleanup = &proc_cleanup_resource_mutex;
resource->u.mutex.resource = resource;
resource->type = PR_MUTEX;
rbtree_insert (struct proc_resource, &procgroup->resource_tree, &resource->resource_tree_link,
resource_tree_link, rid);
spin_unlock (&procgroup->lock);
return resource;
}
void proc_delete_resource (struct proc_resource* resource, struct reschedule_ctx* rctx) {
struct proc_resource* proc_create_resource_mail (struct procgroup* procgroup) {
struct proc_resource* resource;
resource = malloc (sizeof (*resource));
if (resource == NULL)
return NULL;
memset (resource, 0, sizeof (*resource));
spin_lock (&procgroup->lock);
resource->rid = id_alloc (&procgroup->rid_alloc);
if (resource->rid < 0) {
free (resource);
spin_unlock (&procgroup->lock);
return NULL;
}
resource->lock = SPIN_LOCK_INIT;
resource->ops.cleanup = &proc_cleanup_resource_mail;
resource->u.mail.resource = resource;
resource->type = PR_MAIL;
if (!ringbuffer_init (&resource->u.mail.ringbuffer, PROC_MAIL_MAX, sizeof (struct mail_packet))) {
id_free (&procgroup->rid_alloc, resource->rid);
free (resource);
spin_unlock (&procgroup->lock);
return NULL;
}
rbtree_insert (struct proc_resource, &procgroup->resource_tree, &resource->resource_tree_link,
resource_tree_link, rid);
spin_unlock (&procgroup->lock);
return resource;
}
void proc_delete_resource (struct procgroup* procgroup, struct proc_resource* resource,
struct reschedule_ctx* rctx) {
spin_lock (&procgroup->lock);
spin_lock (&resource->lock);
id_free (&procgroup->rid_alloc, resource->rid);
spin_unlock (&resource->lock);
spin_unlock (&procgroup->lock);
resource->ops.cleanup (resource, rctx);
free (resource);
}

7
kernel/proc/resource.h
View File

@@ -33,10 +33,11 @@ struct proc_resource {
struct proc_resource* proc_find_resource (struct procgroup* procgroup, int rid);
struct proc_resource* proc_create_resource_mutex (struct procgroup* procgroup, int rid);
struct proc_resource* proc_create_resource_mutex (struct procgroup* procgroup);
struct proc_resource* proc_create_resource_mail (struct procgroup* procgroup, int rid);
struct proc_resource* proc_create_resource_mail (struct procgroup* procgroup);
void proc_delete_resource (struct proc_resource* resource, struct reschedule_ctx* rctx);
void proc_delete_resource (struct procgroup* procgroup, struct proc_resource* resource,
struct reschedule_ctx* rctx);
#endif // _KERNEL_PROC_RESOURCE_H