From 4d600dc1d4782d4fece55714df21f7c290fc2ccc Mon Sep 17 00:00:00 2001 From: Ty Lamontagne Date: Sun, 12 Jan 2025 22:49:39 -0500 Subject: [PATCH] Memory Cards: mmap on Linux and MacOS --- common/Darwin/DarwinMisc.cpp | 18 ++++++++++++++++++ common/HostSys.h | 5 +++++ common/Linux/LnxHostSys.cpp | 16 ++++++++++++++++ common/Windows/WinHostSys.cpp | 17 +++++++++++++++++ pcsx2/SIO/Memcard/MemoryCardFile.cpp | 27 ++++++++++----------------- 5 files changed, 66 insertions(+), 17 deletions(-) diff --git a/common/Darwin/DarwinMisc.cpp b/common/Darwin/DarwinMisc.cpp index a4f01ac13d..73c835f67d 100644 --- a/common/Darwin/DarwinMisc.cpp +++ b/common/Darwin/DarwinMisc.cpp @@ -291,6 +291,24 @@ void* HostSys::CreateSharedMemory(const char* name, size_t size) return reinterpret_cast(static_cast(port)); } +void* HostSys::CreateMappingFromFile(FILE* file) +{ + return reinterpret_cast(static_cast(fileno(file))); +} + +void* HostSys::MapMapping(void* handle, const PageProtectionMode& mode) +{ + const u32 mmap_prot = (mode.CanWrite() ? (PROT_READ | PROT_WRITE) : (PROT_READ)) | (mode.CanExecute() ? PROT_EXEC : 0); + + return mmap(nullptr, 0, mmap_prot, MAP_PRIVATE | MAP_ANON, static_cast(reinterpret_cast(handle)), 0); +} + +void HostSys::DestroyMapping(void* handle) +{ + // The handle mmap requires is the same as the file descriptor. + return; +} + void HostSys::DestroySharedMemory(void* ptr) { mach_port_deallocate(mach_task_self(), static_cast(reinterpret_cast(ptr))); diff --git a/common/HostSys.h b/common/HostSys.h index 23646284d9..68d9893a11 100644 --- a/common/HostSys.h +++ b/common/HostSys.h @@ -101,6 +101,11 @@ namespace HostSys extern std::string GetFileMappingName(const char* prefix); extern void* CreateSharedMemory(const char* name, size_t size); + + extern void* CreateMappingFromFile(FILE* file); + extern void* MapMapping(void* handle, const PageProtectionMode& mode); + extern void DestroyMapping(void* handle); + extern void DestroySharedMemory(void* ptr); extern void* MapSharedMemory(void* handle, size_t offset, void* baseaddr, size_t size, const PageProtectionMode& mode); extern void UnmapSharedMemory(void* baseaddr, size_t size); diff --git a/common/Linux/LnxHostSys.cpp b/common/Linux/LnxHostSys.cpp index 54a8e2f24a..c28b6fe1f3 100644 --- a/common/Linux/LnxHostSys.cpp +++ b/common/Linux/LnxHostSys.cpp @@ -115,6 +115,22 @@ void* HostSys::CreateSharedMemory(const char* name, size_t size) return reinterpret_cast(static_cast(fd)); } +void* HostSys::CreateMappingFromFile(FILE* file) +{ + return reinterpret_cast(static_cast(fileno(file))); +} + +void* HostSys::MapMapping(void* handle, const PageProtectionMode& mode) +{ + return HostSys::MapSharedMemory(handle, 0, nullptr, 0, mode); +} + +void HostSys::DestroyMapping(void* handle) +{ + // The handle mmap requires is the same as the file descriptor. + return; +} + void HostSys::DestroySharedMemory(void* ptr) { close(static_cast(reinterpret_cast(ptr))); diff --git a/common/Windows/WinHostSys.cpp b/common/Windows/WinHostSys.cpp index 54e76fa6cc..2fe1479d87 100644 --- a/common/Windows/WinHostSys.cpp +++ b/common/Windows/WinHostSys.cpp @@ -13,6 +13,7 @@ #include "fmt/core.h" #include "fmt/format.h" +#include #include static DWORD ConvertToWinApi(const PageProtectionMode& mode) @@ -72,6 +73,22 @@ void* HostSys::CreateSharedMemory(const char* name, size_t size) static_cast(size >> 32), static_cast(size), StringUtil::UTF8StringToWideString(name).c_str())); } +void* HostSys::CreateMappingFromFile(FILE* fd) +{ + return static_cast(CreateFileMappingW(reinterpret_cast(_get_osfhandle(_fileno(fd))), NULL, PAGE_READWRITE, + 0, 0, nullptr)); +} + +void* HostSys::MapMapping(void* handle, const PageProtectionMode& mode) +{ + return MapViewOfFile(static_cast(handle), FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); +} + +void HostSys::DestroyMapping(void* handle) +{ + CloseHandle(static_cast(handle)); +} + void HostSys::DestroySharedMemory(void* ptr) { CloseHandle(static_cast(ptr)); diff --git a/pcsx2/SIO/Memcard/MemoryCardFile.cpp b/pcsx2/SIO/Memcard/MemoryCardFile.cpp index b89083ce58..ebde768cb3 100644 --- a/pcsx2/SIO/Memcard/MemoryCardFile.cpp +++ b/pcsx2/SIO/Memcard/MemoryCardFile.cpp @@ -10,6 +10,7 @@ #include "common/Console.h" #include "common/Error.h" #include "common/FileSystem.h" +#include "common/HostSys.h" #include "common/Path.h" #include "common/StringUtil.h" @@ -24,11 +25,6 @@ #include -#ifdef _WIN32 -#include -#include -#endif - static constexpr int MCD_SIZE = 1024 * 8 * 16; // Legacy PSX card default size static constexpr int MC2_MBSIZE = 1024 * 528 * 2; // Size of a single megabyte of card data @@ -163,6 +159,7 @@ class FileMemoryCard protected: std::FILE* m_file[8] = {}; u8* m_mappings[8] = {}; + void* m_mapping_handles[8] = {}; s64 m_fileSize[8] = {}; std::string m_filenames[8] = {}; @@ -345,20 +342,16 @@ void FileMemoryCard::Open() Host::ReportErrorAsync("Memory Card Read Failed", "Error reading memory card."); } -#ifdef _WIN32 - const int fd = _fileno(m_file[slot]); - // Doesn't leak, refcounted based on views - const HANDLE hMapping = CreateFileMapping(reinterpret_cast(_get_osfhandle(fd)), nullptr, PAGE_READWRITE, 0, 0, nullptr); - if (!hMapping) + m_mapping_handles[slot] = HostSys::CreateMappingFromFile(m_file[slot]); + if (!m_mapping_handles[slot]) { - Console.Warning("CreateFileMapping failed: %d", GetLastError()); + Console.Warning("CreateMappingFromFile failed!"); } - m_mappings[slot] = reinterpret_cast(MapViewOfFile(hMapping, FILE_MAP_ALL_ACCESS, 0, 0, 0)); + m_mappings[slot] = static_cast(HostSys::MapMapping(m_mapping_handles[slot], PageAccess_ReadWrite())); if (!m_mappings[slot]) { - Console.Warning("MapViewOfFile failed: %d", GetLastError()); + Console.Warning("MapSharedMemory failed!"); } -#endif } } } @@ -386,13 +379,13 @@ void FileMemoryCard::Close() m_filenames[slot] = {}; m_fileSize[slot] = -1; -#ifdef _WIN32 + if (m_mappings[slot]) { - UnmapViewOfFile(m_mappings[slot]); + HostSys::UnmapSharedMemory(m_mappings[slot], 0); + HostSys::DestroyMapping(m_mapping_handles[slot]); m_mappings[slot] = nullptr; } -#endif } }