mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-17 17:36:44 +00:00
Code Issues Releases Activity

kern: update KMemoryBlockManagerUpdaterAllocator for new ctor/init semantics

Browse source
This commit is contained in:
Michael Scire 2021-04-07 08:46:06 -07:00 committed by SciresM
parent c216f92a91
commit 1fce7b08b1
2 changed files with 122 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libraries/libmesosphere/include/mesosphere/kern_k_memory_block_manager.hpp
View file

@ -27,18 +27,8 @@ namespace ams::kern {
KMemoryBlock *m_blocks[MaxBlocks]; KMemoryBlock *m_blocks[MaxBlocks];
size_t m_index; size_t m_index;
KMemoryBlockSlabManager *m_slab_manager; KMemoryBlockSlabManager *m_slab_manager;
public: private:
constexpr explicit KMemoryBlockManagerUpdateAllocator(KMemoryBlockSlabManager *sm) : m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) { /* ... */ } ALWAYS_INLINE Result Initialize(size_t num_blocks) {
~KMemoryBlockManagerUpdateAllocator() {
for (const auto &block : m_blocks) {
if (block != nullptr) {
m_slab_manager->Free(block);
}
}
}
Result Initialize(size_t num_blocks) {
/* Check num blocks. */ /* Check num blocks. */
MESOSPHERE_ASSERT(num_blocks <= MaxBlocks); MESOSPHERE_ASSERT(num_blocks <= MaxBlocks);
@ -53,6 +43,18 @@ namespace ams::kern {
return ResultSuccess(); return ResultSuccess();
} }
public:
KMemoryBlockManagerUpdateAllocator(Result *out_result, KMemoryBlockSlabManager *sm, size_t num_blocks = MaxBlocks) : m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) {
*out_result = this->Initialize(num_blocks);
}
~KMemoryBlockManagerUpdateAllocator() {
for (const auto &block : m_blocks) {
if (block != nullptr) {
m_slab_manager->Free(block);
}
}
}
KMemoryBlock *Allocate() { KMemoryBlock *Allocate() {
MESOSPHERE_ABORT_UNLESS(m_index < MaxBlocks); MESOSPHERE_ABORT_UNLESS(m_index < MaxBlocks);

182
libraries/libmesosphere/source/kern_k_page_table_base.cpp
View file

@ -529,8 +529,9 @@ namespace ams::kern {
} }
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* Decide on new perm and attr. */ /* Decide on new perm and attr. */
new_perm = (new_perm != KMemoryPermission_None) ? new_perm : old_perm; new_perm = (new_perm != KMemoryPermission_None) ? new_perm : old_perm;
@ -585,10 +586,9 @@ namespace ams::kern {
KMemoryAttribute new_attr = static_cast<KMemoryAttribute>(old_attr & ~lock_attr); KMemoryAttribute new_attr = static_cast<KMemoryAttribute>(old_attr & ~lock_attr);
/* Create an update allocator. */ /* Create an update allocator. */
/* NOTE: Nintendo does not initialize the allocator with any blocks. */ Result allocator_result;
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator.Initialize(0)); R_TRY(allocator_result);
MESOSPHERE_UNUSED(num_allocator_blocks);
/* Update permission, if we need to. */ /* Update permission, if we need to. */
if (new_perm != old_perm) { if (new_perm != old_perm) {
@ -702,12 +702,14 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator for the source. */ /* Create an update allocator for the source. */
KMemoryBlockManagerUpdateAllocator src_allocator(m_memory_block_slab_manager); Result src_allocator_result;
R_TRY(src_allocator.Initialize(num_src_allocator_blocks)); KMemoryBlockManagerUpdateAllocator src_allocator(std::addressof(src_allocator_result), m_memory_block_slab_manager, num_src_allocator_blocks);
R_TRY(src_allocator_result);
/* Create an update allocator for the destination. */ /* Create an update allocator for the destination. */
KMemoryBlockManagerUpdateAllocator dst_allocator(m_memory_block_slab_manager); Result dst_allocator_result;
R_TRY(dst_allocator.Initialize(num_dst_allocator_blocks)); KMemoryBlockManagerUpdateAllocator dst_allocator(std::addressof(dst_allocator_result), m_memory_block_slab_manager, num_dst_allocator_blocks);
R_TRY(dst_allocator_result);
/* Map the memory. */ /* Map the memory. */
{ {
@ -765,12 +767,14 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(nullptr, std::addressof(dst_perm), nullptr, std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Stack, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_All, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(nullptr, std::addressof(dst_perm), nullptr, std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Stack, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_All, KMemoryAttribute_None));
/* Create an update allocator for the source. */ /* Create an update allocator for the source. */
KMemoryBlockManagerUpdateAllocator src_allocator(m_memory_block_slab_manager); Result src_allocator_result;
R_TRY(src_allocator.Initialize(num_src_allocator_blocks)); KMemoryBlockManagerUpdateAllocator src_allocator(std::addressof(src_allocator_result), m_memory_block_slab_manager, num_src_allocator_blocks);
R_TRY(src_allocator_result);
/* Create an update allocator for the destination. */ /* Create an update allocator for the destination. */
KMemoryBlockManagerUpdateAllocator dst_allocator(m_memory_block_slab_manager); Result dst_allocator_result;
R_TRY(dst_allocator.Initialize(num_dst_allocator_blocks)); KMemoryBlockManagerUpdateAllocator dst_allocator(std::addressof(dst_allocator_result), m_memory_block_slab_manager, num_dst_allocator_blocks);
R_TRY(dst_allocator_result);
/* Unmap the memory. */ /* Unmap the memory. */
{ {
@ -831,12 +835,14 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_dst_allocator_blocks), dst_address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator for the source. */ /* Create an update allocator for the source. */
KMemoryBlockManagerUpdateAllocator src_allocator(m_memory_block_slab_manager); Result src_allocator_result;
R_TRY(src_allocator.Initialize(num_src_allocator_blocks)); KMemoryBlockManagerUpdateAllocator src_allocator(std::addressof(src_allocator_result), m_memory_block_slab_manager, num_src_allocator_blocks);
R_TRY(src_allocator_result);
/* Create an update allocator for the destination. */ /* Create an update allocator for the destination. */
KMemoryBlockManagerUpdateAllocator dst_allocator(m_memory_block_slab_manager); Result dst_allocator_result;
R_TRY(dst_allocator.Initialize(num_dst_allocator_blocks)); KMemoryBlockManagerUpdateAllocator dst_allocator(std::addressof(dst_allocator_result), m_memory_block_slab_manager, num_dst_allocator_blocks);
R_TRY(dst_allocator_result);
/* Map the code memory. */ /* Map the code memory. */
{ {
@ -940,12 +946,14 @@ namespace ams::kern {
R_UNLESS(this->IsValidPageGroup(pg, src_address, num_pages), svc::ResultInvalidMemoryRegion()); R_UNLESS(this->IsValidPageGroup(pg, src_address, num_pages), svc::ResultInvalidMemoryRegion());
/* Create an update allocator for the source. */ /* Create an update allocator for the source. */
KMemoryBlockManagerUpdateAllocator src_allocator(m_memory_block_slab_manager); Result src_allocator_result;
R_TRY(src_allocator.Initialize(num_src_allocator_blocks)); KMemoryBlockManagerUpdateAllocator src_allocator(std::addressof(src_allocator_result), m_memory_block_slab_manager, num_src_allocator_blocks);
R_TRY(src_allocator_result);
/* Create an update allocator for the destination. */ /* Create an update allocator for the destination. */
KMemoryBlockManagerUpdateAllocator dst_allocator(m_memory_block_slab_manager); Result dst_allocator_result;
R_TRY(dst_allocator.Initialize(num_dst_allocator_blocks)); KMemoryBlockManagerUpdateAllocator dst_allocator(std::addressof(dst_allocator_result), m_memory_block_slab_manager, num_dst_allocator_blocks);
R_TRY(dst_allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1335,8 +1343,9 @@ namespace ams::kern {
R_SUCCEED_IF(old_perm == new_perm); R_SUCCEED_IF(old_perm == new_perm);
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1391,8 +1400,9 @@ namespace ams::kern {
R_SUCCEED_IF(old_perm == new_perm && old_state == new_state); R_SUCCEED_IF(old_perm == new_perm && old_state == new_state);
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1436,8 +1446,9 @@ namespace ams::kern {
AttributeTestMask, KMemoryAttribute_None, ~AttributeTestMask)); AttributeTestMask, KMemoryAttribute_None, ~AttributeTestMask));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1483,8 +1494,9 @@ namespace ams::kern {
KMemoryAttribute_All, KMemoryAttribute_None)); KMemoryAttribute_All, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1547,8 +1559,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), m_current_heap_end, allocation_size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), m_current_heap_end, allocation_size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1751,8 +1764,9 @@ namespace ams::kern {
MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(KMemoryBlockManagerUpdateAllocator::MaxBlocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1818,8 +1832,9 @@ namespace ams::kern {
MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(KMemoryBlockManagerUpdateAllocator::MaxBlocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1869,8 +1884,9 @@ namespace ams::kern {
MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, num_pages * PageSize, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, num_pages * PageSize, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(KMemoryBlockManagerUpdateAllocator::MaxBlocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1904,8 +1920,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1932,8 +1949,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, state, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_All, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, state, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_All, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -1966,8 +1984,9 @@ namespace ams::kern {
MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, num_pages * PageSize, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); MESOSPHERE_R_ASSERT(this->CheckMemoryState(addr, num_pages * PageSize, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(KMemoryBlockManagerUpdateAllocator::MaxBlocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -2000,8 +2019,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), addr, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -2036,8 +2056,9 @@ namespace ams::kern {
R_UNLESS(this->IsValidPageGroup(pg, address, num_pages), svc::ResultInvalidCurrentMemory()); R_UNLESS(this->IsValidPageGroup(pg, address, num_pages), svc::ResultInvalidCurrentMemory());
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -2331,8 +2352,9 @@ namespace ams::kern {
} }
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* Update the memory blocks. */ /* Update the memory blocks. */
m_memory_block_manager.UpdateLock(std::addressof(allocator), address, num_pages, &KMemoryBlock::ShareToDevice, KMemoryPermission_None); m_memory_block_manager.UpdateLock(std::addressof(allocator), address, num_pages, &KMemoryBlock::ShareToDevice, KMemoryPermission_None);
@ -2362,8 +2384,9 @@ namespace ams::kern {
KMemoryAttribute_DeviceShared | KMemoryAttribute_Locked, KMemoryAttribute_DeviceShared)); KMemoryAttribute_DeviceShared | KMemoryAttribute_Locked, KMemoryAttribute_DeviceShared));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* Update the memory blocks. */ /* Update the memory blocks. */
m_memory_block_manager.UpdateLock(std::addressof(allocator), address, num_pages, &KMemoryBlock::UnshareToDevice, KMemoryPermission_None); m_memory_block_manager.UpdateLock(std::addressof(allocator), address, num_pages, &KMemoryBlock::UnshareToDevice, KMemoryPermission_None);
@ -2388,8 +2411,9 @@ namespace ams::kern {
KMemoryAttribute_DeviceShared | KMemoryAttribute_Locked, KMemoryAttribute_DeviceShared)); KMemoryAttribute_DeviceShared | KMemoryAttribute_Locked, KMemoryAttribute_DeviceShared));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* Make the page group. */ /* Make the page group. */
R_TRY(this->MakePageGroup(*out, address, num_pages)); R_TRY(this->MakePageGroup(*out, address, num_pages));
@ -2440,12 +2464,14 @@ namespace ams::kern {
} }
/* Create an update allocator for the region. */ /* Create an update allocator for the region. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(allocator_num_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, allocator_num_blocks);
R_TRY(allocator_result);
/* Create an update allocator for the unmapped region. */ /* Create an update allocator for the unmapped region. */
KMemoryBlockManagerUpdateAllocator unmapped_allocator(m_memory_block_slab_manager); Result unmapped_allocator_result;
R_TRY(unmapped_allocator.Initialize(unmapped_allocator_num_blocks)); KMemoryBlockManagerUpdateAllocator unmapped_allocator(std::addressof(unmapped_allocator_result), m_memory_block_slab_manager, unmapped_allocator_num_blocks);
R_TRY(unmapped_allocator_result);
/* Determine parameters for the update lock call. */ /* Determine parameters for the update lock call. */
KMemoryBlockManagerUpdateAllocator *lock_allocator; KMemoryBlockManagerUpdateAllocator *lock_allocator;
@ -3229,8 +3255,9 @@ namespace ams::kern {
MESOSPHERE_ASSERT(this->CanContain(dst_addr, aligned_src_size, dst_state)); MESOSPHERE_ASSERT(this->CanContain(dst_addr, aligned_src_size, dst_state));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(KMemoryBlockManagerUpdateAllocator::MaxBlocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -3429,8 +3456,9 @@ namespace ams::kern {
R_TRY(src_page_table.SetupForIpcClient(updater.GetPageList(), std::addressof(num_allocator_blocks), src_addr, size, test_perm, dst_state)); R_TRY(src_page_table.SetupForIpcClient(updater.GetPageList(), std::addressof(num_allocator_blocks), src_addr, size, test_perm, dst_state));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(src_page_table.m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), src_page_table.m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* Get the mapped extents. */ /* Get the mapped extents. */
const KProcessAddress src_map_start = util::AlignUp(GetInteger(src_addr), PageSize); const KProcessAddress src_map_start = util::AlignUp(GetInteger(src_addr), PageSize);
@ -3472,8 +3500,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, dst_state, KMemoryPermission_UserRead, KMemoryPermission_UserRead, KMemoryAttribute_All, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, dst_state, KMemoryPermission_UserRead, KMemoryPermission_UserRead, KMemoryAttribute_All, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -3675,8 +3704,9 @@ namespace ams::kern {
/* Create an update allocator. */ /* Create an update allocator. */
/* NOTE: Guaranteed zero blocks needed here. */ /* NOTE: Guaranteed zero blocks needed here. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(0)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, 0);
R_TRY(allocator_result);
/* Unlock the pages. */ /* Unlock the pages. */
m_memory_block_manager.UpdateLock(std::addressof(allocator), mapping_start, mapping_size / PageSize, &KMemoryBlock::UnlockForIpc, KMemoryPermission_None); m_memory_block_manager.UpdateLock(std::addressof(allocator), mapping_start, mapping_size / PageSize, &KMemoryBlock::UnlockForIpc, KMemoryPermission_None);
@ -3869,8 +3899,9 @@ namespace ams::kern {
/* Create an update allocator. */ /* Create an update allocator. */
MESOSPHERE_ASSERT(num_allocator_blocks <= KMemoryBlockManagerUpdateAllocator::MaxBlocks); MESOSPHERE_ASSERT(num_allocator_blocks <= KMemoryBlockManagerUpdateAllocator::MaxBlocks);
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -4106,8 +4137,9 @@ namespace ams::kern {
/* Create an update allocator. */ /* Create an update allocator. */
MESOSPHERE_ASSERT(num_allocator_blocks <= KMemoryBlockManagerUpdateAllocator::MaxBlocks); MESOSPHERE_ASSERT(num_allocator_blocks <= KMemoryBlockManagerUpdateAllocator::MaxBlocks);
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -4249,8 +4281,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Free, KMemoryPermission_None, KMemoryPermission_None, KMemoryAttribute_None, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);
@ -4283,8 +4316,9 @@ namespace ams::kern {
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Normal, KMemoryPermission_All, KMemoryPermission_UserReadWrite, KMemoryAttribute_All, KMemoryAttribute_None)); R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks), address, size, KMemoryState_All, KMemoryState_Normal, KMemoryPermission_All, KMemoryPermission_UserReadWrite, KMemoryAttribute_All, KMemoryAttribute_None));
/* Create an update allocator. */ /* Create an update allocator. */
KMemoryBlockManagerUpdateAllocator allocator(m_memory_block_slab_manager); Result allocator_result;
R_TRY(allocator.Initialize(num_allocator_blocks)); KMemoryBlockManagerUpdateAllocator allocator(std::addressof(allocator_result), m_memory_block_slab_manager, num_allocator_blocks);
R_TRY(allocator_result);
/* We're going to perform an update, so create a helper. */ /* We're going to perform an update, so create a helper. */
KScopedPageTableUpdater updater(this); KScopedPageTableUpdater updater(this);