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

Organize resources into process groups

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-01-27 14:18:05 +01:00
parent 67b66f2b39
commit 600886a7ee
20 changed files with 387 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
kernel/proc/proc.c
View File

@@ -11,6 +11,7 @@
#include <mm/pmm.h>
#include <proc/kpproc_fb.h>
#include <proc/proc.h>
#include <proc/procgroup.h>
#include <proc/resource.h>
#include <rd/rd.h>
#include <sync/rw_spin_lock.h>
@@ -56,16 +57,16 @@ bool proc_map (struct proc* proc, uintptr_t start_paddr, uintptr_t start_vaddr,
flags &= ~(MM_PD_LOCK | MM_PD_RELOAD); /* clear LOCK flag if present, because we lock manualy */
spin_lock (&proc->pd->lock, &ctxprpd);
spin_lock (&proc->procgroup->pd.lock, &ctxprpd);
list_append (proc->mappings, &mapping->proc_mappings_link);
list_append (proc->procgroup->mappings, &mapping->proc_mappings_link);
for (uintptr_t vpage = start_vaddr, ppage = start_paddr; vpage < start_vaddr + pages * PAGE_SIZE;
vpage += PAGE_SIZE, ppage += PAGE_SIZE) {
mm_map_page (proc->pd, ppage, vpage, flags);
mm_map_page (&proc->procgroup->pd, ppage, vpage, flags);
}
spin_unlock (&proc->pd->lock, &ctxprpd);
spin_unlock (&proc->procgroup->pd.lock, &ctxprpd);
return true;
}
@@ -81,9 +82,9 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
if (tail_mapping == NULL)
return false;
spin_lock (&proc->pd->lock, &ctxprpd);
spin_lock (&proc->procgroup->pd.lock, &ctxprpd);
list_foreach (proc->mappings, mapping_link, mapping_link_tmp) {
list_foreach (proc->procgroup->mappings, mapping_link, mapping_link_tmp) {
struct proc_mapping* mapping =
list_entry (mapping_link, struct proc_mapping, proc_mappings_link);
@@ -99,7 +100,7 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
mapping->size = start_vaddr - mapping->vaddr;
list_insert_after (proc->mappings, &mapping->proc_mappings_link,
list_insert_after (proc->procgroup->mappings, &mapping->proc_mappings_link,
&tail_mapping->proc_mappings_link);
used_tail_mapping = true;
@@ -113,7 +114,7 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
} else if ((start_vaddr > mapping->vaddr) && (end_vaddr >= m_end)) { /* shrink right */
mapping->size = start_vaddr - mapping->vaddr;
} else { /* full overlap */
list_remove (proc->mappings, &mapping->proc_mappings_link);
list_remove (proc->procgroup->mappings, &mapping->proc_mappings_link);
free (mapping);
}
}
@@ -123,10 +124,10 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
free (tail_mapping);
for (uintptr_t vpage = start_vaddr; vpage < end_vaddr; vpage += PAGE_SIZE) {
mm_unmap_page (proc->pd, vpage, 0);
mm_unmap_page (&proc->procgroup->pd, vpage, 0);
}
spin_unlock (&proc->pd->lock, &ctxprpd);
spin_unlock (&proc->procgroup->pd.lock, &ctxprpd);
return true;
}
@@ -155,10 +156,8 @@ struct elf_aux proc_load_segments (struct proc* proc, uint8_t* elf) {
size_t blks = div_align_up (phdr->p_memsz + off, PAGE_SIZE);
struct proc_resource_mem_init mem_init = {.pages = blks};
int rid = atomic_fetch_add (&proc->resources->sys_rids, 1);
struct proc_resource* r =
proc_create_resource (proc, rid, PR_MEM, RV_PRIVATE, (void*)&mem_init);
int rid = procgroup_get_sys_rid (proc->procgroup);
struct proc_resource* r = proc_create_resource_mem (proc->procgroup, rid, blks, 0, false);
if (r == NULL) {
DEBUG ("pmm oom error while loading ELF segments! (tried to alloc %zu blks)\n", blks);
}
@@ -357,14 +356,9 @@ static void proc_kpproc_init (void) {
kpproc.state = PROC_PSEUDO;
kpproc.pid = 0;
kpproc.resources = malloc (sizeof (*kpproc.resources));
kpproc.resources->tree = NULL;
kpproc.resources->lock = RW_SPIN_LOCK_INIT;
kpproc.resources->refs = 1;
kpproc.resources->sys_rids = 0;
kpproc.pd = mm_get_kernel_pd ();
kpproc.cpu = thiscpu;
kpproc.procgroup = procgroup_create ();
procgroup_attach (kpproc.procgroup, &kpproc);
rbtree_insert (struct proc, &proc_tree, &kpproc.proc_tree_link, proc_tree_link, pid);
@@ -394,9 +388,7 @@ static void proc_kpproc_init (void) {
memcpy ((struct kpproc_fb*)((uintptr_t)hhdm->offset + fb_info_memblk_paddr), &fb_info,
sizeof (fb_info));
struct proc_resource_mem_init mem_init = {
.pages = pages, .paddr = fb_info_memblk_paddr, .managed = true};
proc_create_resource (&kpproc, 0, PR_MEM, RV_PUBLIC, &mem_init);
proc_create_resource_mem (kpproc.procgroup, 0, pages, fb_info_memblk_paddr, true);
}
}