From b04bc932a10ebd62b5b02d83d7d0370d19f8d47c Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Sat, 20 Apr 2024 09:22:40 +0300 Subject: [PATCH] intial flexible_memory support. Added sceKernelMapNamedFlexibleMemory --- CMakeLists.txt | 4 +- .../kernel/memory/flexible_memory.cpp | 22 +++++++ .../libraries/kernel/memory/flexible_memory.h | 34 +++++++++++ .../libraries/kernel/memory/kernel_memory.cpp | 60 ++++++++++++++++++- .../libraries/kernel/thread_management.cpp | 1 + 5 files changed, 117 insertions(+), 4 deletions(-) create mode 100644 src/core/libraries/kernel/memory/flexible_memory.cpp create mode 100644 src/core/libraries/kernel/memory/flexible_memory.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f534c06d..8fe1c9f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,9 @@ set(GNM_LIB src/core/libraries/gnmdriver/gnmdriver.cpp src/core/libraries/gnmdriver/gnmdriver.h ) -set(KERNEL_LIB src/core/libraries/kernel/memory/kernel_memory.cpp +set(KERNEL_LIB src/core/libraries/kernel/memory/flexible_memory.cpp + src/core/libraries/kernel/memory/flexible_memory.h + src/core/libraries/kernel/memory/kernel_memory.cpp src/core/libraries/kernel/memory/kernel_memory.h src/core/libraries/kernel/cpu_management.cpp src/core/libraries/kernel/cpu_management.h diff --git a/src/core/libraries/kernel/memory/flexible_memory.cpp b/src/core/libraries/kernel/memory/flexible_memory.cpp new file mode 100644 index 000000000..690990e3b --- /dev/null +++ b/src/core/libraries/kernel/memory/flexible_memory.cpp @@ -0,0 +1,22 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "flexible_memory.h" + +namespace Libraries::Kernel { +bool FlexibleMemory::Map(u64 virtual_addr, std::size_t len, int prot, + VirtualMemory::MemoryMode cpu_mode) { + std::scoped_lock lock{mutex}; + + AllocatedBlock block{}; + block.map_virtual_addr = virtual_addr; + block.map_size = len; + block.prot = prot; + block.cpu_mode = cpu_mode; + + allocated_blocks.push_back(block); + allocated_total += len; + + return true; +} +} // namespace Libraries::Kernel \ No newline at end of file diff --git a/src/core/libraries/kernel/memory/flexible_memory.h b/src/core/libraries/kernel/memory/flexible_memory.h new file mode 100644 index 000000000..5aed7508f --- /dev/null +++ b/src/core/libraries/kernel/memory/flexible_memory.h @@ -0,0 +1,34 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include "common/types.h" +#include "core/PS4/GPU/gpu_memory.h" +#include "core/virtual_memory.h" + +namespace Libraries::Kernel { + +class FlexibleMemory { +public: + struct AllocatedBlock { + u64 map_virtual_addr; + u64 map_size; + int prot; + VirtualMemory::MemoryMode cpu_mode; + }; + + FlexibleMemory(){}; + virtual ~FlexibleMemory(){}; + +public: + bool Map(u64 virtual_addr, std::size_t len, int prot, VirtualMemory::MemoryMode cpu_mode); + +private: + std::vector allocated_blocks; + u64 allocated_total = 0; + std::mutex mutex; +}; +} // namespace Libraries::Kernel \ No newline at end of file diff --git a/src/core/libraries/kernel/memory/kernel_memory.cpp b/src/core/libraries/kernel/memory/kernel_memory.cpp index 8fe929730..a372e063a 100644 --- a/src/core/libraries/kernel/memory/kernel_memory.cpp +++ b/src/core/libraries/kernel/memory/kernel_memory.cpp @@ -1,14 +1,68 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include "kernel_memory.h" +#include +#include +#include #include +#include +#include "flexible_memory.h" +#include "kernel_memory.h" namespace Libraries::Kernel { -s32 PS4_SYSV_ABI sceKernelMapNamedFlexibleMemory(void** addrInOut, std::size_t len, int prot, +bool Is16KBMultiple(u64 n) { + return ((n % (16ull * 1024) == 0)); +} +s32 PS4_SYSV_ABI sceKernelMapNamedFlexibleMemory(void** addr_in_out, std::size_t len, int prot, int flags, const char* name) { - return 0; + + LOG_INFO(Kernel_Vmm, "len = {:#x}, prot = {:#x}, flags = {:#x}, name = {}", len, prot, flags, + name); + + if (len == 0 || !Is16KBMultiple(len)) { + LOG_ERROR(Kernel_Vmm, "len is 0 or not 16kb multiple"); + return ORBIS_KERNEL_ERROR_EINVAL; + } + + static constexpr size_t MaxNameSize = 32; + if (std::strlen(name) > MaxNameSize) { + LOG_ERROR(Kernel_Vmm, "name exceeds 32 bytes!"); + return ORBIS_KERNEL_ERROR_ENAMETOOLONG; + } + + if (name == nullptr) { + LOG_ERROR(Kernel_Vmm, "name is invalid!"); + return ORBIS_KERNEL_ERROR_EFAULT; + } + + VirtualMemory::MemoryMode cpu_mode = VirtualMemory::MemoryMode::NoAccess; + + switch (prot) { + case 0x3: + cpu_mode = VirtualMemory::MemoryMode::ReadWrite; + break; + default: + UNREACHABLE(); + } + + auto in_addr = reinterpret_cast(*addr_in_out); + auto out_addr = VirtualMemory::memory_alloc(in_addr, len, cpu_mode); + *addr_in_out = reinterpret_cast(out_addr); + + auto* flexible_memory = Common::Singleton::Instance(); + + if (!flexible_memory->Map(out_addr, len, prot, cpu_mode)) { + UNREACHABLE(); + } + + if (out_addr == 0) { + LOG_ERROR(Kernel_Vmm, "Can't allocate address"); + return ORBIS_KERNEL_ERROR_ENOMEM; + } + LOG_INFO(Kernel_Vmm, "in_addr = {:#x} out_addr = {:#x}", in_addr, out_addr); + + return ORBIS_OK; } void RegisterKernelMemory(Core::Loader::SymbolsResolver* sym) { diff --git a/src/core/libraries/kernel/thread_management.cpp b/src/core/libraries/kernel/thread_management.cpp index a2d7d7eec..e632f190e 100644 --- a/src/core/libraries/kernel/thread_management.cpp +++ b/src/core/libraries/kernel/thread_management.cpp @@ -902,6 +902,7 @@ void pthreadSymbolsRegister(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("bt3CTBKmGyI", "libkernel", 1, "libkernel", 1, 1, scePthreadSetaffinity); LIB_FUNCTION("6UgtwV+0zb4", "libkernel", 1, "libkernel", 1, 1, scePthreadCreate); LIB_FUNCTION("T72hz6ffq08", "libkernel", 1, "libkernel", 1, 1, scePthreadYield); + LIB_FUNCTION("UTXzJbWhhTE", "libkernel", 1, "libkernel", 1, 1, scePthreadAttrSetstacksize); // mutex calls LIB_FUNCTION("cmo1RIYva9o", "libkernel", 1, "libkernel", 1, 1, scePthreadMutexInit);