Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Process now frees up its pages on destruction

This commit is contained in:
Bananymous 2023-04-22 16:54:46 +03:00
parent 1406a75a92
commit 3f1c0ec91b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/Process.h
View File

@ -4,6 +4,7 @@
#include <BAN/StringView.h> #include <BAN/StringView.h>
#include <BAN/Vector.h> #include <BAN/Vector.h>
#include <kernel/FS/Inode.h> #include <kernel/FS/Inode.h>
#include <kernel/Memory/Heap.h>
#include <kernel/Memory/MMU.h> #include <kernel/Memory/MMU.h>
#include <kernel/SpinLock.h> #include <kernel/SpinLock.h>
#include <kernel/Terminal/TTY.h> #include <kernel/Terminal/TTY.h>
@ -78,6 +79,7 @@ namespace Kernel
BAN::ErrorOr<int> get_free_fd(); BAN::ErrorOr<int> get_free_fd();
BAN::Vector<OpenFileDescription> m_open_files; BAN::Vector<OpenFileDescription> m_open_files;
BAN::Vector<Memory::paddr_t> m_allocated_pages;
mutable RecursiveSpinLock m_lock; mutable RecursiveSpinLock m_lock;

13
kernel/kernel/Process.cpp
View File

@ -66,10 +66,12 @@ namespace Kernel
{ {
size_t page_start = elf_program_header.p_vaddr / 4096; size_t page_start = elf_program_header.p_vaddr / 4096;
size_t page_end = BAN::Math::div_round_up<size_t>(elf_program_header.p_vaddr + elf_program_header.p_memsz, 4096); size_t page_end = BAN::Math::div_round_up<size_t>(elf_program_header.p_vaddr + elf_program_header.p_memsz, 4096);
MUST(process->m_allocated_pages.reserve(page_end - page_start + 1));
for (size_t page = page_start; page <= page_end; page++) for (size_t page = page_start; page <= page_end; page++)
{ {
auto addr = Memory::Heap::get().take_free_page(); auto paddr = Memory::Heap::get().take_free_page();
process->m_mmu->map_page_at(addr, page * 4096, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present); MUST(process->m_allocated_pages.push_back(paddr));
process->m_mmu->map_page_at(paddr, page * 4096, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
} }
process->m_mmu->load(); process->m_mmu->load();
memcpy((void*)elf_program_header.p_vaddr, elf->data() + elf_program_header.p_offset, elf_program_header.p_filesz); memcpy((void*)elf_program_header.p_vaddr, elf->data() + elf_program_header.p_offset, elf_program_header.p_filesz);
@ -98,8 +100,11 @@ namespace Kernel
Process::~Process() Process::~Process()
{ {
if (!m_threads.empty()) ASSERT(m_threads.empty());
exit(); if (m_mmu)
delete m_mmu;
for (auto paddr : m_allocated_pages)
Memory::Heap::get().release_page(paddr);
} }
void Process::add_thread(Thread* thread) void Process::add_thread(Thread* thread)