GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-27 01:35:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure mappings are always aligned to big page size when deallocated and

Browse Source 
mapped

Since we align up when allocating, not doing so when deallocating would result in a gradual buildup of boundary pages that eventually fill the whole address space.
This commit is contained in:
Billy Laws 2023-01-29 22:18:31 +00:00
parent d659b4f55e
commit 94ac457ce0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/cpp/skyline/services/nvdrv/devices/nvhost/as_gpu.cpp
View File

@ -93,8 +93,9 @@ namespace skyline::service::nvdrv::device::nvhost {
if (!mapping->fixed) { if (!mapping->fixed) {
auto &allocator{mapping->bigPage ? *vm.bigPageAllocator : *vm.smallPageAllocator}; auto &allocator{mapping->bigPage ? *vm.bigPageAllocator : *vm.smallPageAllocator};
u32 pageSizeBits{mapping->bigPage ? vm.bigPageSizeBits : VM::PageSizeBits}; u32 pageSizeBits{mapping->bigPage ? vm.bigPageSizeBits : VM::PageSizeBits};
u32 pageSize{mapping->bigPage ? vm.bigPageSize : VM::PageSize};
allocator.Free(static_cast<u32>(mapping->offset >> pageSizeBits), static_cast<u32>(mapping->size >> pageSizeBits)); allocator.Free(static_cast<u32>(mapping->offset >> pageSizeBits), static_cast<u32>(util::AlignUp(mapping->size, pageSize) >> pageSizeBits));
} }
// Sparse mappings shouldn't be fully unmapped, just returned to their sparse state // Sparse mappings shouldn't be fully unmapped, just returned to their sparse state
@ -128,8 +129,9 @@ namespace skyline::service::nvdrv::device::nvhost {
if (allocation.sparse) if (allocation.sparse)
asCtx->gmmu.Unmap(offset, allocation.size); asCtx->gmmu.Unmap(offset, allocation.size);
auto &allocator{pageSize == VM::PageSize ? *vm.smallPageAllocator : *vm.bigPageAllocator}; bool bigPage{pageSize != VM::PageSize};
u32 pageSizeBits{pageSize == VM::PageSize ? VM::PageSizeBits : vm.bigPageSizeBits}; auto &allocator{bigPage ? *vm.bigPageAllocator : *vm.smallPageAllocator};
u32 pageSizeBits{bigPage ? vm.bigPageSizeBits : VM::PageSizeBits};
allocator.Free(static_cast<u32>(offset >> pageSizeBits), static_cast<u32>(allocation.size >> pageSizeBits)); allocator.Free(static_cast<u32>(offset >> pageSizeBits), static_cast<u32>(allocation.size >> pageSizeBits));
allocationMap.erase(offset); allocationMap.erase(offset);
@ -226,7 +228,7 @@ namespace skyline::service::nvdrv::device::nvhost {
if (!offset) if (!offset)
throw exception("Failed to allocate free space in the GPU AS!"); throw exception("Failed to allocate free space in the GPU AS!");
asCtx->gmmu.Map(offset, cpuPtr, size); asCtx->gmmu.Map(offset, cpuPtr, util::AlignUp(size, pageSize));
auto mapping{std::make_shared<Mapping>(cpuPtr, offset, size, false, bigPage, false)}; auto mapping{std::make_shared<Mapping>(cpuPtr, offset, size, false, bigPage, false)};
mappingMap[offset] = mapping; mappingMap[offset] = mapping;