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

Use reference counting to track filetime of process PD
All checks were successful
Build documentation / build-and-deploy (push) Successful in 26s
Details

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-01-14 23:11:06 +01:00
parent 270ff507d4
commit 7cd5623d36
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/amd64/mm.h
View File

@@ -9,6 +9,7 @@
struct pd { struct pd {
spin_lock_t lock; spin_lock_t lock;
uintptr_t cr3_paddr; uintptr_t cr3_paddr;
atomic_int refs;
}; };
void amd64_load_kernel_cr3 (void); void amd64_load_kernel_cr3 (void);

30
kernel/amd64/proc.c
View File

@@ -27,9 +27,17 @@ struct proc* proc_from_elf (uint8_t* elf_contents) {
atomic_store (&proc->state, PROC_READY); atomic_store (&proc->state, PROC_READY);
proc->pid = atomic_fetch_add (&pids, 1); proc->pid = atomic_fetch_add (&pids, 1);
proc->pd.lock = SPIN_LOCK_INIT; proc->pd = malloc (sizeof (*proc->pd));
proc->pd.cr3_paddr = mm_alloc_user_pd_phys (); if (proc->pd == NULL) {
if (proc->pd.cr3_paddr == 0) { free (proc);
return NULL;
}
proc->pd->lock = SPIN_LOCK_INIT;
proc->pd->refs = 1;
proc->pd->cr3_paddr = mm_alloc_user_pd_phys ();
if (proc->pd->cr3_paddr == 0) {
free (proc->pd);
free (proc); free (proc);
return NULL; return NULL;
} }
@@ -39,6 +47,8 @@ struct proc* proc_from_elf (uint8_t* elf_contents) {
struct proc_resource* kstk_r = struct proc_resource* kstk_r =
proc_create_resource (proc, kstk_rid, PR_MEM, RV_PRIVATE, (void*)&kstk_mem_init); proc_create_resource (proc, kstk_rid, PR_MEM, RV_PRIVATE, (void*)&kstk_mem_init);
if (kstk_r == NULL) { if (kstk_r == NULL) {
pmm_free (proc->pd->cr3_paddr, 1);
free (proc->pd);
free (proc); free (proc);
return NULL; return NULL;
} }
@@ -52,6 +62,8 @@ struct proc* proc_from_elf (uint8_t* elf_contents) {
if (ustk_r == NULL) { if (ustk_r == NULL) {
kstk_r->ops.cleanup (proc, kstk_r); kstk_r->ops.cleanup (proc, kstk_r);
free (kstk_r); free (kstk_r);
pmm_free (proc->pd->cr3_paddr, 1);
free (proc->pd);
free (proc); free (proc);
return NULL; return NULL;
} }
@@ -78,8 +90,10 @@ void proc_cleanup (struct proc* proc) {
proc_cleanup_resources (proc); proc_cleanup_resources (proc);
if (atomic_fetch_sub (&proc->pd->refs, 1) == 1) {
DEBUG ("PID %d Free virtual address space\n", proc->pid);
struct list_node_link *mapping_link, *mapping_link_tmp; struct list_node_link *mapping_link, *mapping_link_tmp;
spin_lock (&proc->pd.lock, &ctxprpd); spin_lock (&proc->pd->lock, &ctxprpd);
list_foreach (proc->mappings, mapping_link, mapping_link_tmp) { list_foreach (proc->mappings, mapping_link, mapping_link_tmp) {
struct proc_mapping* mapping = struct proc_mapping* mapping =
@@ -89,13 +103,15 @@ void proc_cleanup (struct proc* proc) {
free (mapping); free (mapping);
} }
spin_unlock (&proc->pd.lock, &ctxprpd); pmm_free (proc->pd->cr3_paddr, 1);
spin_unlock (&proc->pd->lock, &ctxprpd);
pmm_free (proc->pd.cr3_paddr, 1); free (proc->pd);
}
pmm_free (proc->pdata.kernel_stack - (uintptr_t)hhdm->offset - KSTACK_SIZE, pmm_free (proc->pdata.kernel_stack - (uintptr_t)hhdm->offset - KSTACK_SIZE,
KSTACK_SIZE / PAGE_SIZE); KSTACK_SIZE / PAGE_SIZE);
pmm_free (proc->pdata.user_stack, USTACK_SIZE / PAGE_SIZE); pmm_free (proc->pdata.user_stack, USTACK_SIZE / PAGE_SIZE);
DEBUG ("PID %d Free stacks\n", proc->pid);
free (proc); free (proc);
} }

2
kernel/amd64/sched1.c
View File

@@ -12,5 +12,5 @@ void do_sched (struct proc* proc) {
thiscpu->tss.rsp0 = proc->pdata.kernel_stack; thiscpu->tss.rsp0 = proc->pdata.kernel_stack;
thiscpu->syscall_kernel_stack = proc->pdata.kernel_stack; thiscpu->syscall_kernel_stack = proc->pdata.kernel_stack;
amd64_do_sched ((void*)&proc->pdata.regs, (void*)proc->pd.cr3_paddr); amd64_do_sched ((void*)&proc->pdata.regs, (void*)proc->pd->cr3_paddr);
} }

12
kernel/proc/proc.c
View File

@@ -60,16 +60,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 */ 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->pd->lock, &ctxprpd);
list_append (proc->mappings, &mapping->proc_mappings_link); list_append (proc->mappings, &mapping->proc_mappings_link);
for (uintptr_t vpage = start_vaddr, ppage = start_paddr; vpage < start_vaddr + pages * PAGE_SIZE; for (uintptr_t vpage = start_vaddr, ppage = start_paddr; vpage < start_vaddr + pages * PAGE_SIZE;
vpage += PAGE_SIZE, ppage += PAGE_SIZE) { vpage += PAGE_SIZE, ppage += PAGE_SIZE) {
mm_map_page (&proc->pd, ppage, vpage, flags); mm_map_page (proc->pd, ppage, vpage, flags);
} }
spin_unlock (&proc->pd.lock, &ctxprpd); spin_unlock (&proc->pd->lock, &ctxprpd);
return true; return true;
} }
@@ -85,7 +85,7 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
if (tail_mapping == NULL) if (tail_mapping == NULL)
return false; return false;
spin_lock (&proc->pd.lock, &ctxprpd); spin_lock (&proc->pd->lock, &ctxprpd);
list_foreach (proc->mappings, mapping_link, mapping_link_tmp) { list_foreach (proc->mappings, mapping_link, mapping_link_tmp) {
struct proc_mapping* mapping = struct proc_mapping* mapping =
@@ -127,10 +127,10 @@ bool proc_unmap (struct proc* proc, uintptr_t start_vaddr, size_t pages) {
free (tail_mapping); free (tail_mapping);
for (uintptr_t vpage = start_vaddr; vpage < end_vaddr; vpage += PAGE_SIZE) { for (uintptr_t vpage = start_vaddr; vpage < end_vaddr; vpage += PAGE_SIZE) {
mm_unmap_page (&proc->pd, vpage, 0); mm_unmap_page (proc->pd, vpage, 0);
} }
spin_unlock (&proc->pd.lock, &ctxprpd); spin_unlock (&proc->pd->lock, &ctxprpd);
return true; return true;
} }

2
kernel/proc/proc.h
View File

@@ -44,7 +44,7 @@ struct proc {
struct list_node_link* mappings; /* pd.lock implicitly protects this field */ struct list_node_link* mappings; /* pd.lock implicitly protects this field */
struct proc_platformdata pdata; struct proc_platformdata pdata;
struct pd pd; struct pd* pd;
spin_lock_t lock; spin_lock_t lock;
struct cpu* cpu; struct cpu* cpu;
atomic_int state; atomic_int state;

10
kernel/syscall/syscall.c
View File

@@ -66,16 +66,16 @@ DEFINE_SYSCALL (sys_proc_create_resource_mem) {
int vis = (int)a2; int vis = (int)a2;
uintptr_t* out_paddr_buf = (uintptr_t*)a3; uintptr_t* out_paddr_buf = (uintptr_t*)a3;
spin_lock (&proc->pd.lock, &ctxprpd); spin_lock (&proc->pd->lock, &ctxprpd);
uintptr_t out_paddr_buf_paddr = mm_v2p (&proc->pd, (uintptr_t)out_paddr_buf, 0); uintptr_t out_paddr_buf_paddr = mm_v2p (proc->pd, (uintptr_t)out_paddr_buf, 0);
if (!mm_validate_buffer (&proc->pd, (uintptr_t)out_paddr_buf, sizeof (uintptr_t), 0)) { if (!mm_validate_buffer (proc->pd, (uintptr_t)out_paddr_buf, sizeof (uintptr_t), 0)) {
spin_unlock (&proc->pd.lock, &ctxprpd); spin_unlock (&proc->pd->lock, &ctxprpd);
return -SR_BAD_ADDRESS_SPACE; return -SR_BAD_ADDRESS_SPACE;
} }
spin_unlock (&proc->pd.lock, &ctxprpd); spin_unlock (&proc->pd->lock, &ctxprpd);
uintptr_t* out_paddr_buf_vaddr = (uintptr_t*)((uintptr_t)hhdm->offset + out_paddr_buf_paddr); uintptr_t* out_paddr_buf_vaddr = (uintptr_t*)((uintptr_t)hhdm->offset + out_paddr_buf_paddr);