grillchen/bsb2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipc works better, pagefault still

Browse Source
This commit is contained in:
user
2026-02-24 21:16:31 +01:00
parent fcc2e73350
commit e3452cf051
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/syscall/skeleton.cc
View File

@@ -293,18 +293,17 @@ bool copy_from_phys(Vault& vault, uintptr_t phys_ptr, void* virt_ptr, size_t siz
size_t total_size = size + offset;
four_lvl_paging_t* search_table = vault.scheduler.active()->paging_tree;
void* page_ptr = getFreeVirtSpace(search_table, total_size); // page aligned pointer
if (page_ptr == nullptr) {
void* virt_addr = getFreeVirtSpace(search_table, (total_size/4096)+1); // page aligned pointer
if (virt_addr == nullptr) {
return false;
}
uintptr_t virt_addr = (uintptr_t)(page_ptr) + offset;
for(uint8_t i =0; i<size/4096; i++){
setMapping(virt_addr, (void*)phys_ptr, vault.scheduler.active()->paging_tree);
for(uint8_t i =0; i<size/4096 +1; i++){
setMapping((uintptr_t)virt_addr, (void*)phys_ptr, vault.scheduler.active()->paging_tree);
}
memcpy(virt_ptr, (void*)(virt_addr), size);
PageFrameAllocator::free((uintptr_t)(page_ptr));
memcpy(virt_ptr, (void*)((uintptr_t)(virt_addr)+ (uintptr_t)offset), size);
PageFrameAllocator::free((uintptr_t)(virt_addr));
return true;
}
@@ -315,11 +314,17 @@ bool send(Vault& v, int pid, const void* sbuffer, size_t ssize, void* rbuffer, s
Thread* current_thread = v.scheduler.active();
Thread* target_thread = v.thread_list[pid];
uintptr_t sbuffer_ptr = isMapped((uintptr_t)sbuffer,v.scheduler.active()->paging_tree);
uintptr_t sbuffer_ptr = isMapped((uintptr_t)sbuffer,v.scheduler.active()->paging_tree) + ((uintptr_t)sbuffer&0xFFF);
IpcStruct msg {
.ptr = sbuffer_ptr,
.size = ssize,
.pid = current_thread->id,
.is_answer = false,
.queue_link = nullptr
};
// Erstelle Nachichtenobjekt
IpcStruct msg = {sbuffer_ptr, ssize, current_thread->id, false, nullptr};
target_thread->ipc_queue.enqueue(msg);
target_thread->ipc_sem.v(v);
@@ -370,9 +375,8 @@ bool reply(Vault& v, const void* buffer, size_t size) {
Thread* other_thread = v.thread_list[ipc->pid];
if (other_thread == nullptr) return false;
uintptr_t phys_ptr = (uintptr_t) current_thread->paging_tree;
ipc->ptr = phys_ptr;
uintptr_t phys_ptr = isMapped((uintptr_t)buffer, current_thread->paging_tree );
ipc->ptr = phys_ptr + ((uintptr_t)buffer & 0xFFF);
ipc->size = size;
ipc->pid = current_thread->id;
ipc->is_answer = true;