Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Memory: use MADV_DONTDUMP if available (Linux) #9604

Merged
merged 3 commits into from Jan 15, 2021
Merged

Memory: use MADV_DONTDUMP if available (Linux) #9604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5837d1
Memory: use MADV_DONTDUMP if available (Linux)
Nekotekina Jan 14, 2021
4ed76a1
Use different approach in shm::unmap_critical (Linux)
Nekotekina Jan 15, 2021
aaaeb66
vm: Minor fix in vm::close
Nekotekina Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/Memory/vm.cpp
View file
Open in desktop
Expand Up @@ -1659,7 +1659,7 @@ namespace vm
g_locations.clear();

utils::memory_decommit(g_base_addr, 0x200000000);
utils::memory_decommit(g_exec_addr, 0x100000000);
utils::memory_decommit(g_exec_addr, 0x200000000);
utils::memory_decommit(g_stat_addr, 0x100000000);
}
}
Expand Down
84 changes: 61 additions & 23 deletions rpcs3/util/vm_native.cpp
View file
Open in desktop
Expand Up @@ -27,24 +27,44 @@

static int memfd_create_(const char *name, uint flags)
{
return syscall(__NR_memfd_create, name, flags);
return syscall(__NR_memfd_create, name, flags);
}
#endif

namespace utils
{
#ifdef MAP_NORESERVE
constexpr auto c_map_noreserve = MAP_NORESERVE;
constexpr int c_map_noreserve = MAP_NORESERVE;
#else
constexpr int c_map_noreserve = 0;
#endif

#ifdef MADV_FREE
constexpr auto c_madv_free = MADV_FREE;
constexpr int c_madv_free = MADV_FREE;
#elif defined(MADV_DONTNEED)
constexpr auto c_madv_free = MADV_DONTNEED;
constexpr int c_madv_free = MADV_DONTNEED;
#else
constexpr auto c_madv_free = 0;
constexpr int c_madv_free = 0;
#endif

#ifdef MADV_HUGEPAGE
constexpr int c_madv_hugepage = MADV_HUGEPAGE;
#else
constexpr int c_madv_hugepage = 0;
#endif

#if defined(MADV_DONTDUMP) && defined(MADV_DODUMP)
constexpr int c_madv_no_dump = MADV_DONTDUMP;
constexpr int c_madv_dump = MADV_DODUMP;
#else
constexpr int c_madv_no_dump = 0;
constexpr int c_madv_dump = 0;
#endif

#if defined(MFD_HUGETLB) && defined(MFD_HUGE_2MB)
constexpr int c_mfd_huge_2mb = MFD_HUGETLB | MFD_HUGE_2MB;
#else
constexpr int c_mfd_huge_2mb = 0;
#endif

#ifdef _WIN32
Expand Down Expand Up @@ -90,7 +110,7 @@ namespace utils
return nullptr;
}

[[maybe_unused]] const auto orig_size = size;
const auto orig_size = size;

if (!use_addr)
{
Expand Down Expand Up @@ -125,10 +145,18 @@ namespace utils
ptr = static_cast<u8*>(ptr) + (0x10000 - misalign);
}

#ifdef MADV_HUGEPAGE
if (orig_size % 0x200000 == 0)
::madvise(ptr, orig_size, MADV_HUGEPAGE);
#endif
if constexpr (c_madv_hugepage != 0)
{
if (orig_size % 0x200000 == 0)
{
::madvise(ptr, orig_size, c_madv_hugepage);
}
}

if constexpr (c_madv_no_dump != 0)
{
ensure(::madvise(ptr, orig_size, c_madv_no_dump) != -1);
}

return ptr;
#endif
Expand All @@ -141,7 +169,7 @@ namespace utils
#else
const u64 ptr64 = reinterpret_cast<u64>(pointer);
ensure(::mprotect(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), +prot) != -1);
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1);
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED | c_madv_dump) != -1);
#endif
}

Expand All @@ -152,7 +180,11 @@ namespace utils
#else
const u64 ptr64 = reinterpret_cast<u64>(pointer);
ensure(::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0) != reinterpret_cast<void*>(-1));
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_free) != -1);

if constexpr (c_madv_no_dump != 0)
{
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_no_dump) != -1);
}
#endif
}

Expand All @@ -163,14 +195,17 @@ namespace utils
memory_commit(pointer, size, prot);
#else
const u64 ptr64 = reinterpret_cast<u64>(pointer);
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_free) != -1);
ensure(::mmap(pointer, size, +prot, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0) != reinterpret_cast<void*>(-1));
ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1);

#ifdef MADV_HUGEPAGE
if (size % 0x200000 == 0)
::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_HUGEPAGE);
#endif
if constexpr (c_madv_hugepage != 0)
{
if (size % 0x200000 == 0)
{
::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), c_madv_hugepage);
}
}

ensure(::madvise(reinterpret_cast<void*>(ptr64 & -4096), size + (ptr64 & 4095), MADV_WILLNEED) != -1);
#endif
}

Expand Down Expand Up @@ -225,13 +260,16 @@ namespace utils
ensure(m_handle != INVALID_HANDLE_VALUE);
#elif __linux__
m_file = -1;
#ifdef MFD_HUGETLB

// Try to use 2MB pages for 2M-aligned shm
if (m_size % 0x200000 == 0 && flags & 2)
if constexpr (c_mfd_huge_2mb)
{
m_file = ::memfd_create_("2M", MFD_HUGETLB | MFD_HUGE_2MB);
if (m_size % 0x200000 == 0 && flags & 2)
{
m_file = ::memfd_create_("2M", c_mfd_huge_2mb);
}
}
#endif

if (m_file == -1)
{
m_file = ::memfd_create_("", 0);
Expand Down Expand Up @@ -423,7 +461,7 @@ namespace utils
return;
}
#else
::mmap(reinterpret_cast<void*>(target), m_size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE | c_map_noreserve, -1, 0);
ensure(::mprotect(target, m_size, PROT_NONE) != -1);
#endif
}

Expand Down