archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix possible inconsistencies for sys_memory mem stats report

Browse source
This commit is contained in:
Eladash 2019-07-04 21:27:06 +03:00 • committed by Ivan
parent ad10eb391e
commit 4c2fb54b99
2 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rpcs3/Emu/Cell/lv2/sys_memory.cpp
View file

@ -7,6 +7,9 @@
LOG_CHANNEL(sys_memory); LOG_CHANNEL(sys_memory);
//
static shared_mutex s_memstats_mtx;
lv2_memory_alloca::lv2_memory_alloca(u32 size, u32 align, u64 flags, const std::shared_ptr<lv2_memory_container>& ct) lv2_memory_alloca::lv2_memory_alloca(u32 size, u32 align, u64 flags, const std::shared_ptr<lv2_memory_container>& ct)
: size(size) : size(size)
, align(align) , align(align)
@ -202,6 +205,8 @@ error_code sys_memory_get_page_attribute(u32 addr, vm::ptr<sys_page_attr_t> attr
sys_memory.trace("sys_memory_get_page_attribute(addr=0x%x, attr=*0x%x)", addr, attr); sys_memory.trace("sys_memory_get_page_attribute(addr=0x%x, attr=*0x%x)", addr, attr);
vm::reader_lock rlock;
if (!vm::check_addr(addr)) if (!vm::check_addr(addr))
{ {
return CELL_EINVAL; return CELL_EINVAL;
@ -240,6 +245,8 @@ error_code sys_memory_get_user_memory_size(vm::ptr<sys_memory_info_t> mem_info)
// Get "default" memory container // Get "default" memory container
const auto dct = fxm::get<lv2_memory_container>(); const auto dct = fxm::get<lv2_memory_container>();
::reader_lock lock(s_memstats_mtx);
mem_info->total_user_memory = dct->size; mem_info->total_user_memory = dct->size;
mem_info->available_user_memory = dct->size - dct->used; mem_info->available_user_memory = dct->size - dct->used;
@ -268,6 +275,8 @@ error_code sys_memory_container_create(vm::ptr<u32> cid, u32 size)
const auto dct = fxm::get<lv2_memory_container>(); const auto dct = fxm::get<lv2_memory_container>();
std::lock_guard lock(s_memstats_mtx);
// Try to obtain "physical memory" from the default container // Try to obtain "physical memory" from the default container
if (!dct->take(size)) if (!dct->take(size))
{ {
@ -286,6 +295,8 @@ error_code sys_memory_container_destroy(u32 cid)
sys_memory.warning("sys_memory_container_destroy(cid=0x%x)", cid); sys_memory.warning("sys_memory_container_destroy(cid=0x%x)", cid);
std::lock_guard lock(s_memstats_mtx);
const auto ct = idm::withdraw<lv2_memory_container>(cid, [](lv2_memory_container& ct) -> CellError const auto ct = idm::withdraw<lv2_memory_container>(cid, [](lv2_memory_container& ct) -> CellError
{ {
// Check if some memory is not deallocated (the container cannot be destroyed in this case) // Check if some memory is not deallocated (the container cannot be destroyed in this case)

10
rpcs3/Emu/Memory/vm.cpp
View file

@ -514,9 +514,15 @@ namespace vm
bool check_addr(u32 addr, u32 size, u8 flags) bool check_addr(u32 addr, u32 size, u8 flags)
{ {
for (u32 i = addr / 4096; i <= (addr + size - 1) / 4096; i++) // Overflow checking
if (addr + size < addr && (addr + size) != 0)
{ {
if (UNLIKELY((g_pages[i % g_pages.size()].flags & flags) != flags)) return false;
}
for (u32 i = addr / 4096, max = (addr + size - 1) / 4096; i <= max; i++)
{
if (UNLIKELY((g_pages[i].flags & flags) != flags))
{ {
return false; return false;
} }