forked from Bananymous/banan-os
Kernel: Remove GeneralAllocator since it was not used
This commit is contained in:
parent
1c5985148c
commit
4dbe15aa0e
|
|
@ -36,7 +36,6 @@ set(KERNEL_SOURCES
|
|||
kernel/kernel.cpp
|
||||
kernel/Memory/DMARegion.cpp
|
||||
kernel/Memory/FileBackedRegion.cpp
|
||||
kernel/Memory/GeneralAllocator.cpp
|
||||
kernel/Memory/Heap.cpp
|
||||
kernel/Memory/kmalloc.cpp
|
||||
kernel/Memory/MemoryBackedRegion.cpp
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include <BAN/LinkedList.h>
|
||||
#include <BAN/Optional.h>
|
||||
#include <BAN/UniqPtr.h>
|
||||
#include <kernel/Memory/Heap.h>
|
||||
#include <kernel/Memory/PageTable.h>
|
||||
|
||||
namespace Kernel
|
||||
{
|
||||
|
||||
class GeneralAllocator
|
||||
{
|
||||
BAN_NON_COPYABLE(GeneralAllocator);
|
||||
BAN_NON_MOVABLE(GeneralAllocator);
|
||||
|
||||
public:
|
||||
static BAN::ErrorOr<BAN::UniqPtr<GeneralAllocator>> create(PageTable&, vaddr_t first_vaddr);
|
||||
~GeneralAllocator();
|
||||
|
||||
BAN::ErrorOr<BAN::UniqPtr<GeneralAllocator>> clone(PageTable&);
|
||||
|
||||
BAN::Optional<paddr_t> paddr_of(vaddr_t);
|
||||
|
||||
vaddr_t allocate(size_t);
|
||||
bool deallocate(vaddr_t);
|
||||
|
||||
private:
|
||||
GeneralAllocator(PageTable&, vaddr_t first_vaddr);
|
||||
|
||||
private:
|
||||
struct Allocation
|
||||
{
|
||||
vaddr_t address { 0 };
|
||||
BAN::Vector<paddr_t> pages;
|
||||
|
||||
bool contains(vaddr_t);
|
||||
};
|
||||
|
||||
private:
|
||||
PageTable& m_page_table;
|
||||
BAN::LinkedList<Allocation> m_allocations;
|
||||
const vaddr_t m_first_vaddr;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,145 +0,0 @@
|
|||
#include <kernel/Memory/GeneralAllocator.h>
|
||||
|
||||
namespace Kernel
|
||||
{
|
||||
|
||||
BAN::ErrorOr<BAN::UniqPtr<GeneralAllocator>> GeneralAllocator::create(PageTable& page_table, vaddr_t first_vaddr)
|
||||
{
|
||||
auto* allocator = new GeneralAllocator(page_table, first_vaddr);
|
||||
if (allocator == nullptr)
|
||||
return BAN::Error::from_errno(ENOMEM);
|
||||
return BAN::UniqPtr<GeneralAllocator>::adopt(allocator);
|
||||
}
|
||||
|
||||
GeneralAllocator::GeneralAllocator(PageTable& page_table, vaddr_t first_vaddr)
|
||||
: m_page_table(page_table)
|
||||
, m_first_vaddr(first_vaddr)
|
||||
{ }
|
||||
|
||||
GeneralAllocator::~GeneralAllocator()
|
||||
{
|
||||
while (!m_allocations.empty())
|
||||
deallocate(m_allocations.front().address);
|
||||
}
|
||||
|
||||
vaddr_t GeneralAllocator::allocate(size_t bytes)
|
||||
{
|
||||
size_t needed_pages = BAN::Math::div_round_up<size_t>(bytes, PAGE_SIZE);
|
||||
|
||||
Allocation allocation;
|
||||
if (allocation.pages.resize(needed_pages, 0).is_error())
|
||||
return 0;
|
||||
|
||||
for (size_t i = 0; i < needed_pages; i++)
|
||||
{
|
||||
paddr_t paddr = Heap::get().take_free_page();
|
||||
if (paddr == 0)
|
||||
{
|
||||
for (size_t j = 0; j < i; j++)
|
||||
Heap::get().release_page(allocation.pages[j]);
|
||||
return 0;
|
||||
}
|
||||
allocation.pages[i] = paddr;
|
||||
}
|
||||
|
||||
m_page_table.lock();
|
||||
|
||||
allocation.address = m_page_table.reserve_free_contiguous_pages(needed_pages, m_first_vaddr);
|
||||
ASSERT(allocation.address);
|
||||
|
||||
for (size_t i = 0; i < needed_pages; i++)
|
||||
{
|
||||
vaddr_t vaddr = allocation.address + i * PAGE_SIZE;
|
||||
m_page_table.map_page_at(allocation.pages[i], vaddr, PageTable::Flags::UserSupervisor | PageTable::Flags::ReadWrite | PageTable::Flags::Present);
|
||||
}
|
||||
|
||||
if (&m_page_table == &PageTable::current())
|
||||
m_page_table.load();
|
||||
|
||||
m_page_table.unlock();
|
||||
|
||||
MUST(m_allocations.push_back(BAN::move(allocation)));
|
||||
return allocation.address;
|
||||
}
|
||||
|
||||
bool GeneralAllocator::deallocate(vaddr_t address)
|
||||
{
|
||||
for (auto it = m_allocations.begin(); it != m_allocations.end(); it++)
|
||||
{
|
||||
if (it->address != address)
|
||||
continue;
|
||||
|
||||
m_page_table.unmap_range(it->address, it->pages.size() * PAGE_SIZE);
|
||||
for (auto paddr : it->pages)
|
||||
Heap::get().release_page(paddr);
|
||||
|
||||
m_allocations.remove(it);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
BAN::ErrorOr<BAN::UniqPtr<GeneralAllocator>> GeneralAllocator::clone(PageTable& new_page_table)
|
||||
{
|
||||
auto allocator = TRY(GeneralAllocator::create(new_page_table, m_first_vaddr));
|
||||
|
||||
m_page_table.lock();
|
||||
|
||||
ASSERT(m_page_table.is_page_free(0));
|
||||
|
||||
for (auto& allocation : m_allocations)
|
||||
{
|
||||
Allocation new_allocation;
|
||||
ASSERT(new_page_table.is_range_free(allocation.address, allocation.pages.size() * PAGE_SIZE));
|
||||
|
||||
new_allocation.address = allocation.address;
|
||||
MUST(new_allocation.pages.reserve(allocation.pages.size()));
|
||||
|
||||
PageTable::flags_t flags = m_page_table.get_page_flags(allocation.address);
|
||||
for (size_t i = 0; i < allocation.pages.size(); i++)
|
||||
{
|
||||
paddr_t paddr = Heap::get().take_free_page();
|
||||
ASSERT(paddr);
|
||||
|
||||
vaddr_t vaddr = allocation.address + i * PAGE_SIZE;
|
||||
|
||||
MUST(new_allocation.pages.push_back(paddr));
|
||||
new_page_table.map_page_at(paddr, vaddr, flags);
|
||||
|
||||
m_page_table.map_page_at(paddr, 0, PageTable::Flags::ReadWrite | PageTable::Flags::Present);
|
||||
memcpy((void*)0, (void*)vaddr, PAGE_SIZE);
|
||||
}
|
||||
|
||||
MUST(allocator->m_allocations.push_back(BAN::move(new_allocation)));
|
||||
}
|
||||
m_page_table.unmap_page(0);
|
||||
|
||||
m_page_table.unlock();
|
||||
|
||||
return allocator;
|
||||
}
|
||||
|
||||
BAN::Optional<paddr_t> GeneralAllocator::paddr_of(vaddr_t vaddr)
|
||||
{
|
||||
for (auto& allocation : m_allocations)
|
||||
{
|
||||
if (!allocation.contains(vaddr))
|
||||
continue;
|
||||
|
||||
size_t offset = vaddr - allocation.address;
|
||||
size_t page_index = offset / PAGE_SIZE;
|
||||
size_t page_offset = offset % PAGE_SIZE;
|
||||
return allocation.pages[page_index] + page_offset;
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
bool GeneralAllocator::Allocation::contains(vaddr_t vaddr)
|
||||
{
|
||||
return this->address <= vaddr && vaddr < this->address + this->pages.size() * PAGE_SIZE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#include <BAN/Errors.h>
|
||||
#include <kernel/CriticalScope.h>
|
||||
#include <kernel/kprint.h>
|
||||
#include <kernel/Memory/GeneralAllocator.h>
|
||||
#include <kernel/Memory/kmalloc.h>
|
||||
|
||||
#include <kernel/Thread.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue