Rewrite resource subsystem
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
#include <limine/requests.h>
|
||||
#include <mm/liballoc.h>
|
||||
#include <mm/pmm.h>
|
||||
#include <proc/kpproc_fb.h>
|
||||
#include <proc/proc.h>
|
||||
#include <proc/resource.h>
|
||||
#include <rd/rd.h>
|
||||
@@ -25,7 +26,7 @@
|
||||
#include <amd64/intr_defs.h>
|
||||
#endif
|
||||
|
||||
#define SCHED_REAP_FREQ 200
|
||||
#define SCHED_REAP_FREQ 10
|
||||
|
||||
/*
|
||||
* Lock hierachy:
|
||||
@@ -40,6 +41,9 @@ static rw_spin_lock_t proc_tree_lock = RW_SPIN_LOCK_INIT;
|
||||
|
||||
static atomic_int sched_cycles = 0;
|
||||
|
||||
/* kernel pseudo process */
|
||||
static struct proc kpproc;
|
||||
|
||||
static bool proc_check_elf (uint8_t* elf) {
|
||||
if (!((elf[0] == 0x7F) && (elf[1] == 'E') && (elf[2] == 'L') && (elf[3] == 'F')))
|
||||
return false;
|
||||
@@ -144,7 +148,6 @@ struct elf_aux proc_load_segments (struct proc* proc, uint8_t* elf) {
|
||||
aux.phent = ehdr->e_phentsize;
|
||||
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
int rid_counter = 10;
|
||||
|
||||
for (uint64_t segment = 0; segment < ehdr->e_phnum; segment++) {
|
||||
Elf64_Phdr* phdr =
|
||||
@@ -161,8 +164,9 @@ 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_counter++, PR_MEM, RV_PRIVATE, (void*)&mem_init);
|
||||
proc_create_resource (proc, rid, PR_MEM, RV_PRIVATE, (void*)&mem_init);
|
||||
if (r == NULL) {
|
||||
DEBUG ("pmm oom error while loading ELF segments! (tried to alloc %zu blks)\n", blks);
|
||||
}
|
||||
@@ -197,6 +201,17 @@ static struct proc* proc_spawn_rd (char* name) {
|
||||
return proc_from_elf (rd_file->content);
|
||||
}
|
||||
|
||||
struct proc* proc_find_pid (int pid) {
|
||||
spin_lock_ctx_t ctxprtr;
|
||||
struct proc* proc = NULL;
|
||||
|
||||
rw_spin_read_lock (&proc_tree_lock, &ctxprtr);
|
||||
rbtree_find (struct proc, &proc_tree, pid, proc, proc_tree_link, pid);
|
||||
rw_spin_read_unlock (&proc_tree_lock, &ctxprtr);
|
||||
|
||||
return proc;
|
||||
}
|
||||
|
||||
void proc_register (struct proc* proc, struct cpu* cpu) {
|
||||
spin_lock_ctx_t ctxcpu, ctxprtr;
|
||||
|
||||
@@ -402,7 +417,61 @@ static void proc_irq_sched (void* arg, void* regs) {
|
||||
#endif
|
||||
}
|
||||
|
||||
static void proc_kpproc_init (void) {
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
|
||||
memset (&kpproc, 0, sizeof (kpproc));
|
||||
|
||||
kpproc.lock = SPIN_LOCK_INIT;
|
||||
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;
|
||||
|
||||
rbtree_insert (struct proc, &proc_tree, &kpproc.proc_tree_link, proc_tree_link, pid);
|
||||
|
||||
/* prepare kernel resources */
|
||||
{
|
||||
/* frame buffer */
|
||||
|
||||
struct limine_framebuffer_response* fb = limine_framebuffer_request.response;
|
||||
struct kpproc_fb fb_info = {
|
||||
.paddr = (uintptr_t)fb->framebuffers[0]->address - (uintptr_t)hhdm->offset,
|
||||
.w = fb->framebuffers[0]->width,
|
||||
.h = fb->framebuffers[0]->height,
|
||||
.pitch = fb->framebuffers[0]->pitch,
|
||||
.bpp = fb->framebuffers[0]->bpp,
|
||||
.red_mask_size = fb->framebuffers[0]->red_mask_size,
|
||||
.red_mask_shift = fb->framebuffers[0]->red_mask_shift,
|
||||
.green_mask_size = fb->framebuffers[0]->green_mask_size,
|
||||
.green_mask_shift = fb->framebuffers[0]->green_mask_shift,
|
||||
.blue_mask_size = fb->framebuffers[0]->blue_mask_size,
|
||||
.blue_mask_shift = fb->framebuffers[0]->blue_mask_shift,
|
||||
};
|
||||
|
||||
DEBUG ("Framebuffer address %p\n", fb_info.paddr);
|
||||
|
||||
size_t pages = align_up (sizeof (fb_info), PAGE_SIZE) / PAGE_SIZE;
|
||||
uintptr_t fb_info_memblk_paddr = pmm_alloc (pages);
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
void proc_init (void) {
|
||||
proc_kpproc_init ();
|
||||
|
||||
struct proc* init = proc_spawn_rd ("init.exe");
|
||||
proc_register (init, thiscpu);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user