[common/host_memory] use assert instead of throw on Impl() ctor; abort on error (#316)

Rationale: Throwing when running out of memory just creates sad paths for no reason (and at that point, just abort immediately). We are using MAP_NORESERVE, if there isn't enough memory a crash will follow anyways.

Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: eden-emu/eden#316
Reviewed-by: crueter <crueter@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
This commit is contained in:
lizzie 2025-08-27 22:26:08 +02:00 committed by crueter
parent 09e77fa146
commit 7950c5cca0
Signed by untrusted user: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 8 additions and 35 deletions

View file

@ -477,19 +477,9 @@ class HostMemory::Impl {
public: public:
explicit Impl(size_t backing_size_, size_t virtual_size_) explicit Impl(size_t backing_size_, size_t virtual_size_)
: backing_size{backing_size_}, virtual_size{virtual_size_} { : backing_size{backing_size_}, virtual_size{virtual_size_} {
bool good = false;
SCOPE_EXIT {
if (!good) {
Release();
}
};
long page_size = sysconf(_SC_PAGESIZE); long page_size = sysconf(_SC_PAGESIZE);
if (page_size != 0x1000) { ASSERT_MSG(page_size == 0x1000, "page size {:#x} is incompatible with 4K paging",
LOG_CRITICAL(HW_Memory, "page size {:#x} is incompatible with 4K paging", page_size); page_size);
throw std::bad_alloc{};
}
// Backing memory initialization // Backing memory initialization
#if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__) #if defined(__sun__) || defined(__HAIKU__) || defined(__NetBSD__) || defined(__DragonFly__)
fd = shm_open_anon(O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); fd = shm_open_anon(O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600);
@ -501,38 +491,23 @@ public:
#else #else
fd = memfd_create("HostMemory", 0); fd = memfd_create("HostMemory", 0);
#endif #endif
if (fd < 0) { ASSERT_MSG(fd >= 0, "memfd_create failed: {}", strerror(errno));
LOG_CRITICAL(HW_Memory, "memfd_create failed: {}", strerror(errno));
throw std::bad_alloc{};
}
// Defined to extend the file with zeros // Defined to extend the file with zeros
int ret = ftruncate(fd, backing_size); int ret = ftruncate(fd, backing_size);
if (ret != 0) { ASSERT_MSG(ret == 0, "ftruncate failed with {}, are you out-of-memory?", strerror(errno));
LOG_CRITICAL(HW_Memory, "ftruncate failed with {}, are you out-of-memory?",
strerror(errno));
throw std::bad_alloc{};
}
backing_base = static_cast<u8*>( backing_base = static_cast<u8*>(
mmap(nullptr, backing_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)); mmap(nullptr, backing_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0));
if (backing_base == MAP_FAILED) { ASSERT_MSG(backing_base != MAP_FAILED, "mmap failed: {}", strerror(errno));
LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));
throw std::bad_alloc{};
}
// Virtual memory initialization // Virtual memory initialization
virtual_base = virtual_map_base = static_cast<u8*>(ChooseVirtualBase(virtual_size)); virtual_base = virtual_map_base = static_cast<u8*>(ChooseVirtualBase(virtual_size));
if (virtual_base == MAP_FAILED) { ASSERT_MSG(virtual_base != MAP_FAILED, "mmap failed: {}", strerror(errno));
LOG_CRITICAL(HW_Memory, "mmap failed: {}", strerror(errno));
throw std::bad_alloc{};
}
#if defined(__linux__) #if defined(__linux__)
madvise(virtual_base, virtual_size, MADV_HUGEPAGE); madvise(virtual_base, virtual_size, MADV_HUGEPAGE);
#endif #endif
free_manager.SetAddressSpace(virtual_base, virtual_size); free_manager.SetAddressSpace(virtual_base, virtual_size);
good = true;
} }
~Impl() { ~Impl() {
@ -673,10 +648,9 @@ private:
class HostMemory::Impl { class HostMemory::Impl {
public: public:
explicit Impl(size_t /*backing_size */, size_t /* virtual_size */) { explicit Impl([[maybe_unused]] size_t backing_size, [[maybe_unused]] size_t virtual_size) {
// This is just a place holder. // This is just a place holder.
// Please implement fastmem in a proper way on your platform. ASSERT_MSG(false, "Please implement fastmem in a proper way on your platform.");
throw std::bad_alloc{};
} }
void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm) {} void Map(size_t virtual_offset, size_t host_offset, size_t length, MemoryPermission perm) {}

View file

@ -175,7 +175,6 @@ public:
Kernel::KProcess* m_process{}; Kernel::KProcess* m_process{};
const bool m_debugger_enabled{}; const bool m_debugger_enabled{};
const bool m_check_memory_access{}; const bool m_check_memory_access{};
static constexpr u64 MinimumRunCycles = 10000U;
}; };
std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* page_table) const { std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* page_table) const {