ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm: use sparse files to emulate overcommit memory 

Fix shm::map_critical page flags.
This commit is contained in:
Nekotekina 2022-08-05 11:34:16 +03:00 committed by Ivan
parent 7ff4509858
commit 7bb2d94e53
3 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpcs3/Emu/Memory/vm.cpp
View File

@ -727,6 +727,10 @@ namespace vm
else if (!shm)
{
utils::memory_protect(g_base_addr + addr, size, prot);
perf_meter<"PAGE_LCK"_u64> perf;
utils::memory_lock(g_base_addr + addr, size);
utils::memory_lock(g_sudo_addr + addr, size);
}
else if (!map_critical(g_base_addr + addr, prot) || !map_critical(g_sudo_addr + addr, utils::protection::rw) || (map_error = "map_self()", !shm->map_self()))
{
@ -1173,18 +1177,18 @@ namespace vm
auto map_critical = [&](u8* ptr, utils::protection prot)
{
auto [res, error] = m_common->map_critical(ptr, prot);
if (res != ptr)
{
map_error = std::move(error);
return false;
}
return true;
};
// Special path for whole-allocated areas allowing 4k granularity
m_common = std::make_shared<utils::shm>(size);
m_common = std::make_shared<utils::shm>(size, fmt::format("_block_x%08x", addr));
if (!map_critical(vm::_ptr<u8>(addr), this->flags & page_size_4k && utils::c_page_size > 4096 ? utils::protection::rw : utils::protection::no) || !map_critical(vm::get_super_ptr(addr), utils::protection::rw))
{
@ -1507,7 +1511,7 @@ namespace vm
const v128 _4 = p[6] | p[7];
const v128 _5 = _1 | _2;
const v128 _6 = _3 | _4;
const v128 _7 = _5 | _6;
const v128 _7 = _5 | _6;
return _7 == v128{};
}
@ -1601,10 +1605,9 @@ namespace vm
{
if (flags & preallocated)
{
m_common = std::make_shared<utils::shm>(size);
m_common->map_critical(vm::base(addr), utils::protection::no);
m_common = std::make_shared<utils::shm>(size, fmt::format("_block_x%08x", addr));
m_common->map_critical(vm::base(addr), this->flags & page_size_4k && utils::c_page_size > 4096 ? utils::protection::rw : utils::protection::no);
m_common->map_critical(vm::get_super_ptr(addr));
lock_sudo(addr, size);
}
auto& m_map = (m.*block_map)();
@ -1650,7 +1653,7 @@ namespace vm
pflags |= page_size_1m;
}
// Map the memory through the same method as alloc() and falloc()
// Map the memory through the same method as alloc() and falloc()
// Copy the shared handle unconditionally
ensure(try_alloc(addr0, pflags, size0, ::as_rvalue(flags & preallocated ? null_shm : shared[ar.operator usz()])));
@ -2005,7 +2008,7 @@ namespace vm
void save(utils::serial& ar)
{
// Shared memory lookup, sample address is saved for easy memory copy
// Just need one address for this optimization
// Just need one address for this optimization
std::vector<std::pair<utils::shm*, u32>> shared;
for (auto& loc : g_locations)

1
rpcs3/util/vm.hpp
View File

@ -71,6 +71,7 @@ namespace utils
u32 m_flags{};
u64 m_size{};
atomic_t<void*> m_ptr{nullptr};
std::string m_storage;
public:
explicit shm(u64 size, u32 flags = 0);

65
rpcs3/util/vm_native.cpp
View File

@ -567,30 +567,43 @@ namespace utils
return false;
};
const std::string storage2 = fs::get_temp_dir() + "rpcs3_vm_sparse.tmp";
const std::string storage3 = fs::get_cache_dir() + "rpcs3_vm_sparse.tmp";
std::string storage1 = fs::get_cache_dir();
std::string storage2 = fs::get_temp_dir();
if (!storage.empty())
if (storage.empty())
{
// Explicitly specified storage
ensure(f.open(storage, fs::read + fs::write + fs::create));
}
else if (!f.open(storage2, fs::read + fs::write + fs::create) || !set_sparse(f.get_handle(), m_size))
{
// Fallback storage
ensure(f.open(storage3, fs::read + fs::write + fs::create));
storage1 += "rpcs3_vm_sparse.tmp";
storage2 += "rpcs3_vm_sparse.tmp";
}
else
{
goto check;
storage1 += storage;
storage2 += storage;
}
if (!set_sparse(f.get_handle(), m_size))
if (!f.open(storage1, fs::read + fs::write + fs::create) || !set_sparse(f.get_handle(), m_size))
{
MessageBoxW(0, L"Failed to initialize sparse file.\nCan't find a filesystem with sparse file support (NTFS).", L"RPCS3", MB_ICONERROR);
// Fallback storage
ensure(f.open(storage2, fs::read + fs::write + fs::create));
if (!set_sparse(f.get_handle(), m_size))
{
MessageBoxW(0, L"Failed to initialize sparse file.\nCan't find a filesystem with sparse file support (NTFS).", L"RPCS3", MB_ICONERROR);
}
m_storage = std::move(storage2);
}
else
{
m_storage = std::move(storage1);
}
// It seems impossible to automatically delete file on exit when file mapping is used
if (version_major <= 7) [[unlikely]]
{
m_storage.clear();
}
check:
if (f.size() != m_size)
{
// Resize the file gradually (bug workaround)
@ -659,10 +672,13 @@ namespace utils
if (!storage.empty())
{
m_file = ::open(storage.c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
::unlink(storage.c_str());
}
else
{
m_file = ::open((fs::get_cache_dir() + "rpcs3_vm_sparse.tmp").c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
std::string storage = fs::get_cache_dir() + "rpcs3_vm_sparse.tmp";
m_file = ::open(storage.c_str(), O_RDWR | O_CREAT, S_IWUSR | S_IRUSR);
::unlink(storage.c_str());
}
ensure(m_file >= 0);
@ -707,6 +723,9 @@ namespace utils
#else
::close(m_file);
#endif
if (!m_storage.empty())
fs::remove_file(m_storage);
}
u8* shm::map(void* ptr, protection prot, bool cow) const
@ -823,12 +842,22 @@ namespace utils
return {nullptr, "Failed to split allocation end"};
}
if (cow)
DWORD access = 0;
switch (prot)
{
// TODO: Implement it
case protection::rw:
case protection::ro:
case protection::no:
access = cow ? PAGE_WRITECOPY : PAGE_READWRITE;
break;
case protection::wx:
case protection::rx:
access = cow ? PAGE_EXECUTE_WRITECOPY : PAGE_EXECUTE_READWRITE;
break;
}
if (MapViewOfFile3(m_handle, GetCurrentProcess(), target, 0, m_size, MEM_REPLACE_PLACEHOLDER, PAGE_EXECUTE_READWRITE, nullptr, 0))
if (MapViewOfFile3(m_handle, GetCurrentProcess(), target, 0, m_size, MEM_REPLACE_PLACEHOLDER, access, nullptr, 0))
{
if (prot != protection::rw && prot != protection::wx)
{