dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibWasm: Require virtual storage for wasm32 memory

Browse source 
Reserve the wasm32 virtual address space when creating an i32 memory.
Crash if the reservation fails instead of using ByteBuffer storage.

This keeps wasm32 memory on the virtual path used for fault recovery.
This commit is contained in:
Andreas Kling 2026-06-10 16:20:18 +02:00 committed by Ali Mohammad Pur
parent 45c499d185
commit 8a8625b399
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibWasm/AbstractMachine/AbstractMachine.cpp
View file

@ -142,7 +142,7 @@ void MemoryBuffer::clear()
m_fallback.clear();
}
void MemoryBuffer::try_reserve_wasm32_address_space()
void MemoryBuffer::reserve_wasm32_address_space()
{
if (m_mapping_base)
return;
@ -152,11 +152,9 @@ void MemoryBuffer::try_reserve_wasm32_address_space()
auto mapping_size = reserved_capacity * 2;
auto reservation_size = mapping_size + 2 * host_page_size;
auto mapping_or_error = Core::System::reserve_address_space(reservation_size);
if (mapping_or_error.is_error())
return;
auto mapping_or_error = MUST(Core::System::reserve_address_space(reservation_size));
m_mapping_base = mapping_or_error.value();
m_mapping_base = mapping_or_error;
m_data = reinterpret_cast<u8*>(m_mapping_base) + host_page_size;
m_reserved_capacity = reserved_capacity;
m_mapping_size = mapping_size;
@ -210,7 +208,7 @@ MemoryInstance::MemoryInstance(MemoryType const& type)
: m_type(type)
{
if (type.limits().address_type() == AddressType::I32)
m_data.try_reserve_wasm32_address_space();
m_data.reserve_wasm32_address_space();
}
bool MemoryInstance::grow(size_t size_to_grow, GrowType grow_type, InhibitGrowCallback inhibit_callback)

2
Libraries/LibWasm/AbstractMachine/AbstractMachine.h
View file

@ -508,7 +508,7 @@ public:
MemoryBuffer(MemoryBuffer const&) = delete;
MemoryBuffer& operator=(MemoryBuffer const&) = delete;
void try_reserve_wasm32_address_space();
void reserve_wasm32_address_space();
ErrorOr<void> try_resize(size_t new_size);
auto size() const { return m_size; }