hle: kernel: k_page_table: ReadAndWrite -> UserReadWrite.
This commit is contained in:
parent
081669c334
commit
6123b6ea45
@ -307,7 +307,7 @@ ResultCode KPageTable::MapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size_t
|
|||||||
KMemoryPermission perm{};
|
KMemoryPermission perm{};
|
||||||
CASCADE_CODE(CheckMemoryState(&state, &perm, nullptr, nullptr, src_addr, size,
|
CASCADE_CODE(CheckMemoryState(&state, &perm, nullptr, nullptr, src_addr, size,
|
||||||
KMemoryState::All, KMemoryState::Normal, KMemoryPermission::All,
|
KMemoryState::All, KMemoryState::Normal, KMemoryPermission::All,
|
||||||
KMemoryPermission::ReadAndWrite, KMemoryAttribute::Mask,
|
KMemoryPermission::UserReadWrite, KMemoryAttribute::Mask,
|
||||||
KMemoryAttribute::None, KMemoryAttribute::IpcAndDeviceMapped));
|
KMemoryAttribute::None, KMemoryAttribute::IpcAndDeviceMapped));
|
||||||
|
|
||||||
if (IsRegionMapped(dst_addr, size)) {
|
if (IsRegionMapped(dst_addr, size)) {
|
||||||
@ -361,7 +361,7 @@ ResultCode KPageTable::UnmapCodeMemory(VAddr dst_addr, VAddr src_addr, std::size
|
|||||||
|
|
||||||
block_manager->Update(dst_addr, num_pages, KMemoryState::Free);
|
block_manager->Update(dst_addr, num_pages, KMemoryState::Free);
|
||||||
block_manager->Update(src_addr, num_pages, KMemoryState::Normal,
|
block_manager->Update(src_addr, num_pages, KMemoryState::Normal,
|
||||||
KMemoryPermission::ReadAndWrite);
|
KMemoryPermission::UserReadWrite);
|
||||||
|
|
||||||
system.InvalidateCpuInstructionCacheRange(dst_addr, size);
|
system.InvalidateCpuInstructionCacheRange(dst_addr, size);
|
||||||
|
|
||||||
@ -416,7 +416,7 @@ void KPageTable::MapPhysicalMemory(KPageLinkedList& page_linked_list, VAddr star
|
|||||||
}
|
}
|
||||||
|
|
||||||
const std::size_t num_pages{std::min(src_num_pages, dst_num_pages)};
|
const std::size_t num_pages{std::min(src_num_pages, dst_num_pages)};
|
||||||
Operate(dst_addr, num_pages, KMemoryPermission::ReadAndWrite, OperationType::Map,
|
Operate(dst_addr, num_pages, KMemoryPermission::UserReadWrite, OperationType::Map,
|
||||||
map_addr);
|
map_addr);
|
||||||
|
|
||||||
dst_addr += num_pages * PageSize;
|
dst_addr += num_pages * PageSize;
|
||||||
@ -470,7 +470,7 @@ ResultCode KPageTable::MapPhysicalMemory(VAddr addr, std::size_t size) {
|
|||||||
const std::size_t num_pages{size / PageSize};
|
const std::size_t num_pages{size / PageSize};
|
||||||
block_manager->Update(addr, num_pages, KMemoryState::Free, KMemoryPermission::None,
|
block_manager->Update(addr, num_pages, KMemoryState::Free, KMemoryPermission::None,
|
||||||
KMemoryAttribute::None, KMemoryState::Normal,
|
KMemoryAttribute::None, KMemoryState::Normal,
|
||||||
KMemoryPermission::ReadAndWrite, KMemoryAttribute::None);
|
KMemoryPermission::UserReadWrite, KMemoryAttribute::None);
|
||||||
|
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
@ -554,7 +554,7 @@ ResultCode KPageTable::Map(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
|||||||
KMemoryState src_state{};
|
KMemoryState src_state{};
|
||||||
CASCADE_CODE(CheckMemoryState(
|
CASCADE_CODE(CheckMemoryState(
|
||||||
&src_state, nullptr, nullptr, nullptr, src_addr, size, KMemoryState::FlagCanAlias,
|
&src_state, nullptr, nullptr, nullptr, src_addr, size, KMemoryState::FlagCanAlias,
|
||||||
KMemoryState::FlagCanAlias, KMemoryPermission::All, KMemoryPermission::ReadAndWrite,
|
KMemoryState::FlagCanAlias, KMemoryPermission::All, KMemoryPermission::UserReadWrite,
|
||||||
KMemoryAttribute::Mask, KMemoryAttribute::None, KMemoryAttribute::IpcAndDeviceMapped));
|
KMemoryAttribute::Mask, KMemoryAttribute::None, KMemoryAttribute::IpcAndDeviceMapped));
|
||||||
|
|
||||||
if (IsRegionMapped(dst_addr, size)) {
|
if (IsRegionMapped(dst_addr, size)) {
|
||||||
@ -568,13 +568,13 @@ ResultCode KPageTable::Map(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
|||||||
|
|
||||||
{
|
{
|
||||||
auto block_guard = detail::ScopeExit([&] {
|
auto block_guard = detail::ScopeExit([&] {
|
||||||
Operate(src_addr, num_pages, KMemoryPermission::ReadAndWrite,
|
Operate(src_addr, num_pages, KMemoryPermission::UserReadWrite,
|
||||||
OperationType::ChangePermissions);
|
OperationType::ChangePermissions);
|
||||||
});
|
});
|
||||||
|
|
||||||
CASCADE_CODE(Operate(src_addr, num_pages, KMemoryPermission::None,
|
CASCADE_CODE(Operate(src_addr, num_pages, KMemoryPermission::None,
|
||||||
OperationType::ChangePermissions));
|
OperationType::ChangePermissions));
|
||||||
CASCADE_CODE(MapPages(dst_addr, page_linked_list, KMemoryPermission::ReadAndWrite));
|
CASCADE_CODE(MapPages(dst_addr, page_linked_list, KMemoryPermission::UserReadWrite));
|
||||||
|
|
||||||
block_guard.Cancel();
|
block_guard.Cancel();
|
||||||
}
|
}
|
||||||
@ -582,7 +582,7 @@ ResultCode KPageTable::Map(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
|||||||
block_manager->Update(src_addr, num_pages, src_state, KMemoryPermission::None,
|
block_manager->Update(src_addr, num_pages, src_state, KMemoryPermission::None,
|
||||||
KMemoryAttribute::Locked);
|
KMemoryAttribute::Locked);
|
||||||
block_manager->Update(dst_addr, num_pages, KMemoryState::Stack,
|
block_manager->Update(dst_addr, num_pages, KMemoryState::Stack,
|
||||||
KMemoryPermission::ReadAndWrite);
|
KMemoryPermission::UserReadWrite);
|
||||||
|
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
@ -617,13 +617,13 @@ ResultCode KPageTable::Unmap(VAddr dst_addr, VAddr src_addr, std::size_t size) {
|
|||||||
auto block_guard = detail::ScopeExit([&] { MapPages(dst_addr, dst_pages, dst_perm); });
|
auto block_guard = detail::ScopeExit([&] { MapPages(dst_addr, dst_pages, dst_perm); });
|
||||||
|
|
||||||
CASCADE_CODE(Operate(dst_addr, num_pages, KMemoryPermission::None, OperationType::Unmap));
|
CASCADE_CODE(Operate(dst_addr, num_pages, KMemoryPermission::None, OperationType::Unmap));
|
||||||
CASCADE_CODE(Operate(src_addr, num_pages, KMemoryPermission::ReadAndWrite,
|
CASCADE_CODE(Operate(src_addr, num_pages, KMemoryPermission::UserReadWrite,
|
||||||
OperationType::ChangePermissions));
|
OperationType::ChangePermissions));
|
||||||
|
|
||||||
block_guard.Cancel();
|
block_guard.Cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
block_manager->Update(src_addr, num_pages, src_state, KMemoryPermission::ReadAndWrite);
|
block_manager->Update(src_addr, num_pages, src_state, KMemoryPermission::UserReadWrite);
|
||||||
block_manager->Update(dst_addr, num_pages, KMemoryState::Free);
|
block_manager->Update(dst_addr, num_pages, KMemoryState::Free);
|
||||||
|
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
@ -785,7 +785,7 @@ ResultCode KPageTable::ReserveTransferMemory(VAddr addr, std::size_t size, KMemo
|
|||||||
&state, nullptr, &attribute, nullptr, addr, size,
|
&state, nullptr, &attribute, nullptr, addr, size,
|
||||||
KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
|
KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted,
|
||||||
KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, KMemoryPermission::All,
|
KMemoryState::FlagCanTransfer | KMemoryState::FlagReferenceCounted, KMemoryPermission::All,
|
||||||
KMemoryPermission::ReadAndWrite, KMemoryAttribute::Mask, KMemoryAttribute::None,
|
KMemoryPermission::UserReadWrite, KMemoryAttribute::Mask, KMemoryAttribute::None,
|
||||||
KMemoryAttribute::IpcAndDeviceMapped));
|
KMemoryAttribute::IpcAndDeviceMapped));
|
||||||
|
|
||||||
block_manager->Update(addr, size / PageSize, state, perm, attribute | KMemoryAttribute::Locked);
|
block_manager->Update(addr, size / PageSize, state, perm, attribute | KMemoryAttribute::Locked);
|
||||||
@ -805,7 +805,7 @@ ResultCode KPageTable::ResetTransferMemory(VAddr addr, std::size_t size) {
|
|||||||
KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::Mask,
|
KMemoryPermission::None, KMemoryPermission::None, KMemoryAttribute::Mask,
|
||||||
KMemoryAttribute::Locked, KMemoryAttribute::IpcAndDeviceMapped));
|
KMemoryAttribute::Locked, KMemoryAttribute::IpcAndDeviceMapped));
|
||||||
|
|
||||||
block_manager->Update(addr, size / PageSize, state, KMemoryPermission::ReadAndWrite);
|
block_manager->Update(addr, size / PageSize, state, KMemoryPermission::UserReadWrite);
|
||||||
return ResultSuccess;
|
return ResultSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -906,7 +906,7 @@ ResultCode KPageTable::SetHeapSize(VAddr* out, std::size_t size) {
|
|||||||
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks),
|
R_TRY(this->CheckMemoryState(std::addressof(num_allocator_blocks),
|
||||||
heap_region_start + size, GetHeapSize() - size,
|
heap_region_start + size, GetHeapSize() - size,
|
||||||
KMemoryState::All, KMemoryState::Normal,
|
KMemoryState::All, KMemoryState::Normal,
|
||||||
KMemoryPermission::All, KMemoryPermission::ReadAndWrite,
|
KMemoryPermission::All, KMemoryPermission::UserReadWrite,
|
||||||
KMemoryAttribute::All, KMemoryAttribute::None));
|
KMemoryAttribute::All, KMemoryAttribute::None));
|
||||||
|
|
||||||
// Unmap the end of the heap.
|
// Unmap the end of the heap.
|
||||||
@ -981,7 +981,7 @@ ResultCode KPageTable::SetHeapSize(VAddr* out, std::size_t size) {
|
|||||||
|
|
||||||
// Apply the memory block update.
|
// Apply the memory block update.
|
||||||
block_manager->Update(current_heap_end, num_pages, KMemoryState::Normal,
|
block_manager->Update(current_heap_end, num_pages, KMemoryState::Normal,
|
||||||
KMemoryPermission::ReadAndWrite, KMemoryAttribute::None);
|
KMemoryPermission::UserReadWrite, KMemoryAttribute::None);
|
||||||
|
|
||||||
// Update the current heap end.
|
// Update the current heap end.
|
||||||
current_heap_end = heap_region_start + size;
|
current_heap_end = heap_region_start + size;
|
||||||
|
@ -509,7 +509,7 @@ VAddr KProcess::CreateTLSRegion() {
|
|||||||
const VAddr tls_page_addr{page_table
|
const VAddr tls_page_addr{page_table
|
||||||
->AllocateAndMapMemory(1, PageSize, true, start, size / PageSize,
|
->AllocateAndMapMemory(1, PageSize, true, start, size / PageSize,
|
||||||
KMemoryState::ThreadLocal,
|
KMemoryState::ThreadLocal,
|
||||||
KMemoryPermission::ReadAndWrite,
|
KMemoryPermission::UserReadWrite,
|
||||||
tls_map_addr)
|
tls_map_addr)
|
||||||
.ValueOr(0)};
|
.ValueOr(0)};
|
||||||
|
|
||||||
@ -550,7 +550,7 @@ void KProcess::LoadModule(CodeSet code_set, VAddr base_addr) {
|
|||||||
|
|
||||||
ReprotectSegment(code_set.CodeSegment(), KMemoryPermission::ReadAndExecute);
|
ReprotectSegment(code_set.CodeSegment(), KMemoryPermission::ReadAndExecute);
|
||||||
ReprotectSegment(code_set.RODataSegment(), KMemoryPermission::Read);
|
ReprotectSegment(code_set.RODataSegment(), KMemoryPermission::Read);
|
||||||
ReprotectSegment(code_set.DataSegment(), KMemoryPermission::ReadAndWrite);
|
ReprotectSegment(code_set.DataSegment(), KMemoryPermission::UserReadWrite);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool KProcess::IsSignaled() const {
|
bool KProcess::IsSignaled() const {
|
||||||
@ -587,7 +587,7 @@ ResultCode KProcess::AllocateMainThreadStack(std::size_t stack_size) {
|
|||||||
CASCADE_RESULT(main_thread_stack_top,
|
CASCADE_RESULT(main_thread_stack_top,
|
||||||
page_table->AllocateAndMapMemory(
|
page_table->AllocateAndMapMemory(
|
||||||
main_thread_stack_size / PageSize, PageSize, false, start, size / PageSize,
|
main_thread_stack_size / PageSize, PageSize, false, start, size / PageSize,
|
||||||
KMemoryState::Stack, KMemoryPermission::ReadAndWrite));
|
KMemoryState::Stack, KMemoryPermission::UserReadWrite));
|
||||||
|
|
||||||
main_thread_stack_top += main_thread_stack_size;
|
main_thread_stack_top += main_thread_stack_size;
|
||||||
|
|
||||||
|
@ -402,7 +402,7 @@ public:
|
|||||||
ro_start, data_start - ro_start, Kernel::KMemoryPermission::Read));
|
ro_start, data_start - ro_start, Kernel::KMemoryPermission::Read));
|
||||||
|
|
||||||
return process->PageTable().SetProcessMemoryPermission(
|
return process->PageTable().SetProcessMemoryPermission(
|
||||||
data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::ReadAndWrite);
|
data_start, bss_end_addr - data_start, Kernel::KMemoryPermission::UserReadWrite);
|
||||||
}
|
}
|
||||||
|
|
||||||
void LoadModule(Kernel::HLERequestContext& ctx) {
|
void LoadModule(Kernel::HLERequestContext& ctx) {
|
||||||
|
Loading…
Reference in New Issue
Block a user