mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 06:27:45 +00:00
UserspaceEmulator: Convert backing storage from malloc to mmap
This saves a few bytes for each guest-mmaped region, especially since these are likely to be page-aligned.
This commit is contained in:
parent
968ad0f8d1
commit
7cc8f20a30
3 changed files with 28 additions and 16 deletions
|
@ -31,42 +31,54 @@
|
||||||
|
|
||||||
namespace UserspaceEmulator {
|
namespace UserspaceEmulator {
|
||||||
|
|
||||||
|
static void* mmap_initialized(size_t bytes, char initial_value, const char* name)
|
||||||
|
{
|
||||||
|
auto* ptr = mmap_with_name(nullptr, bytes, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0, name);
|
||||||
|
VERIFY(ptr != MAP_FAILED);
|
||||||
|
memset(ptr, initial_value, bytes);
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void free_pages(void* ptr, size_t bytes)
|
||||||
|
{
|
||||||
|
int rc = munmap(ptr, bytes);
|
||||||
|
VERIFY(rc == 0);
|
||||||
|
}
|
||||||
|
|
||||||
NonnullOwnPtr<MmapRegion> MmapRegion::create_anonymous(u32 base, u32 size, u32 prot)
|
NonnullOwnPtr<MmapRegion> MmapRegion::create_anonymous(u32 base, u32 size, u32 prot)
|
||||||
{
|
{
|
||||||
auto region = adopt_own(*new MmapRegion(base, size, prot));
|
auto data = (u8*)mmap_initialized(size, 0, nullptr);
|
||||||
region->m_file_backed = false;
|
auto shadow_data = (u8*)mmap_initialized(size, 1, "MmapRegion ShadowData");
|
||||||
region->m_data = (u8*)calloc(1, size);
|
auto region = adopt_own(*new MmapRegion(base, size, prot, data, shadow_data));
|
||||||
return region;
|
return region;
|
||||||
}
|
}
|
||||||
|
|
||||||
NonnullOwnPtr<MmapRegion> MmapRegion::create_file_backed(u32 base, u32 size, u32 prot, int flags, int fd, off_t offset, String name)
|
NonnullOwnPtr<MmapRegion> MmapRegion::create_file_backed(u32 base, u32 size, u32 prot, int flags, int fd, off_t offset, String name)
|
||||||
{
|
{
|
||||||
auto region = adopt_own(*new MmapRegion(base, size, prot));
|
auto data = (u8*)mmap_with_name(nullptr, size, prot, flags, fd, offset, name.is_empty() ? nullptr : name.characters());
|
||||||
|
VERIFY(data != MAP_FAILED);
|
||||||
|
auto shadow_data = (u8*)mmap_initialized(size, 1, "MmapRegion ShadowData");
|
||||||
|
auto region = adopt_own(*new MmapRegion(base, size, prot, data, shadow_data));
|
||||||
region->m_file_backed = true;
|
region->m_file_backed = true;
|
||||||
if (!name.is_empty()) {
|
if (!name.is_empty()) {
|
||||||
name = String::formatted("{} (Emulated)", name);
|
name = String::formatted("{} (Emulated)", name);
|
||||||
region->m_name = name;
|
region->m_name = name;
|
||||||
}
|
}
|
||||||
region->m_data = (u8*)mmap_with_name(nullptr, size, prot, flags, fd, offset, name.is_empty() ? nullptr : name.characters());
|
|
||||||
VERIFY(region->m_data != MAP_FAILED);
|
|
||||||
return region;
|
return region;
|
||||||
}
|
}
|
||||||
|
|
||||||
MmapRegion::MmapRegion(u32 base, u32 size, int prot)
|
MmapRegion::MmapRegion(u32 base, u32 size, int prot, u8* data, u8* shadow_data)
|
||||||
: Region(base, size)
|
: Region(base, size)
|
||||||
|
, m_data(data)
|
||||||
|
, m_shadow_data(shadow_data)
|
||||||
{
|
{
|
||||||
set_prot(prot);
|
set_prot(prot);
|
||||||
m_shadow_data = (u8*)malloc(size);
|
|
||||||
memset(m_shadow_data, 1, size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MmapRegion::~MmapRegion()
|
MmapRegion::~MmapRegion()
|
||||||
{
|
{
|
||||||
free(m_shadow_data);
|
free_pages(m_data, size());
|
||||||
if (m_file_backed)
|
free_pages(m_shadow_data, size());
|
||||||
munmap(m_data, size());
|
|
||||||
else
|
|
||||||
free(m_data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ValueWithShadow<u8> MmapRegion::read8(FlatPtr offset)
|
ValueWithShadow<u8> MmapRegion::read8(FlatPtr offset)
|
||||||
|
|
|
@ -64,7 +64,7 @@ public:
|
||||||
const String& name() const { return m_name; }
|
const String& name() const { return m_name; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MmapRegion(u32 base, u32 size, int prot);
|
MmapRegion(u32 base, u32 size, int prot, u8* data, u8* shadow_data);
|
||||||
|
|
||||||
u8* m_data { nullptr };
|
u8* m_data { nullptr };
|
||||||
u8* m_shadow_data { nullptr };
|
u8* m_shadow_data { nullptr };
|
||||||
|
|
|
@ -57,7 +57,7 @@ public:
|
||||||
if (address.selector() == 0x2b)
|
if (address.selector() == 0x2b)
|
||||||
return m_tls_region.ptr();
|
return m_tls_region.ptr();
|
||||||
|
|
||||||
size_t page_index = (address.offset() & ~(PAGE_SIZE - 1)) / PAGE_SIZE;
|
size_t page_index = address.offset() / PAGE_SIZE;
|
||||||
return m_page_to_region_map[page_index];
|
return m_page_to_region_map[page_index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue