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

Kernel: Allow MAP_FIXED in mmap

This commit is contained in:
Bananymous 2024-08-27 22:45:49 +03:00
parent 68f9dc1f8a
commit da0b4cd40e
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/kernel/Process.cpp
View File

@ -1575,9 +1575,6 @@ namespace Kernel
if (args->prot != PROT_NONE && (args->prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC))) if (args->prot != PROT_NONE && (args->prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)))
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
if (args->flags & MAP_FIXED)
return BAN::Error::from_errno(ENOTSUP);
if (!(args->flags & MAP_PRIVATE) == !(args->flags & MAP_SHARED)) if (!(args->flags & MAP_PRIVATE) == !(args->flags & MAP_SHARED))
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
auto region_type = (args->flags & MAP_PRIVATE) ? MemoryRegion::Type::PRIVATE : MemoryRegion::Type::SHARED; auto region_type = (args->flags & MAP_PRIVATE) ? MemoryRegion::Type::PRIVATE : MemoryRegion::Type::SHARED;
@ -1595,17 +1592,23 @@ namespace Kernel
else else
page_flags |= PageTable::Flags::UserSupervisor; page_flags |= PageTable::Flags::UserSupervisor;
AddressRange address_range { .start = 0x400000, .end = KERNEL_OFFSET };
if (args->flags & MAP_FIXED)
{
vaddr_t base_addr = reinterpret_cast<vaddr_t>(args->addr);
address_range.start = BAN::Math::div_round_up<vaddr_t>(base_addr, PAGE_SIZE) * PAGE_SIZE;
address_range.end = BAN::Math::div_round_up<vaddr_t>(base_addr + args->len, PAGE_SIZE) * PAGE_SIZE;
}
if (args->flags & MAP_ANONYMOUS) if (args->flags & MAP_ANONYMOUS)
{ {
if (args->addr != nullptr)
return BAN::Error::from_errno(ENOTSUP);
if (args->off != 0) if (args->off != 0)
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
auto region = TRY(MemoryBackedRegion::create( auto region = TRY(MemoryBackedRegion::create(
page_table(), page_table(),
args->len, args->len,
{ .start = 0x400000, .end = KERNEL_OFFSET }, address_range,
region_type, page_flags region_type, page_flags
)); ));
@ -1614,9 +1617,6 @@ namespace Kernel
return m_mapped_regions.back()->vaddr(); return m_mapped_regions.back()->vaddr();
} }
if (args->addr != nullptr)
return BAN::Error::from_errno(ENOTSUP);
LockGuard _(m_process_lock); LockGuard _(m_process_lock);
auto inode = TRY(m_open_file_descriptors.inode_of(args->fildes)); auto inode = TRY(m_open_file_descriptors.inode_of(args->fildes));
@ -1635,7 +1635,7 @@ namespace Kernel
inode, inode,
page_table(), page_table(),
args->off, args->len, args->off, args->len,
{ .start = 0x400000, .end = KERNEL_OFFSET }, address_range,
region_type, page_flags region_type, page_flags
)); ));
} }
@ -1644,7 +1644,7 @@ namespace Kernel
memory_region = TRY(static_cast<Device&>(*inode).mmap_region( memory_region = TRY(static_cast<Device&>(*inode).mmap_region(
page_table(), page_table(),
args->off, args->len, args->off, args->len,
{ .start = 0x400000, .end = KERNEL_OFFSET }, address_range,
region_type, page_flags region_type, page_flags
)); ));
} }