fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2024-12-13 06:15:33 +00:00
Code Issues Projects Releases Wiki Activity

[WIP] Improved memory handling (#56)

Browse Source 
* Improved memory handling

* Fix memory accessibility

* Fix formatting
This commit is contained in:
Syrus Akbary 2018-12-15 10:30:53 -08:00 committed by Lachlan Sneff
parent 64eff86395
commit ff45aea0ea
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/mmap/unix.rs
View File

@ -43,7 +43,6 @@ impl Mmap {
libc::mmap(
ptr::null_mut(),
alloc_size,
// libc::PROT_READ | libc::PROT_WRITE,
libc::PROT_NONE,
libc::MAP_PRIVATE | libc::MAP_ANON,
-1,

4
src/common/mmap/windows.rs
View File

@ -7,7 +7,7 @@ use std::ptr;
use std::slice;
use std::string::String;
use winapi::um::memoryapi::{VirtualAlloc, VirtualFree};
use winapi::um::winnt::{MEM_COMMIT, MEM_RELEASE, MEM_RESERVE, PAGE_READWRITE};
use winapi::um::winnt::{MEM_COMMIT, MEM_RELEASE, MEM_RESERVE, PAGE_NOACCESS};
use super::common::round_up_to_page_size;
@ -39,7 +39,7 @@ impl Mmap {
ptr::null_mut(),
size,
MEM_COMMIT | MEM_RESERVE,
PAGE_READWRITE,
PAGE_NOACCESS,
)
};
if !ptr.is_null() {

2
src/webassembly/instance.rs
View File

@ -509,7 +509,7 @@ impl Instance {
let mem = &mut memories[init.memory_index.index()];
let end_of_init = offset + init.data.len();
if end_of_init > mem.current_size() {
let grow_pages = (end_of_init / LinearMemory::WASM_PAGE_SIZE) + 1;
let grow_pages = (end_of_init / LinearMemory::PAGE_SIZE as usize) + 1;
mem.grow(grow_pages as u32)
.expect("failed to grow memory for data initializers");
}

19
src/webassembly/memory.rs
View File

@ -35,7 +35,6 @@ pub struct LinearMemory {
impl LinearMemory {
pub const PAGE_SIZE: u32 = 65536;
pub const MAX_PAGES: u32 = 65536;
pub const WASM_PAGE_SIZE: usize = 1 << 16; // 64 KiB
pub const DEFAULT_HEAP_SIZE: usize = 1 << 32; // 4 GiB
pub const DEFAULT_GUARD_SIZE: usize = 1 << 31; // 2 GiB
pub const DEFAULT_SIZE: usize = Self::DEFAULT_HEAP_SIZE + Self::DEFAULT_GUARD_SIZE; // 6 GiB
@ -51,18 +50,17 @@ impl LinearMemory {
initial, maximum
);
let offset_guard_size = LinearMemory::DEFAULT_SIZE as usize;
let mut mmap = Mmap::with_size(offset_guard_size).expect("Can't create mmap");
let mut mmap = Mmap::with_size(Self::DEFAULT_SIZE).expect("Can't create mmap");
let base = mmap.as_mut_ptr();
// map initial pages as readwrite since the inital mmap is mapped as not accessible.
if initial != 0 {
unsafe {
region::protect(
base as _,
base,
initial as usize * Self::PAGE_SIZE as usize,
region::Protection::Read | region::Protection::Write,
// region::Protection::None,
region::Protection::ReadWrite,
)
}
.expect("unable to make memory inaccessible");
@ -82,7 +80,7 @@ impl LinearMemory {
Self {
mmap,
current: initial,
offset_guard_size,
offset_guard_size: LinearMemory::DEFAULT_GUARD_SIZE,
maximum,
}
}
@ -137,15 +135,16 @@ impl LinearMemory {
let prev_bytes = (prev_pages * Self::PAGE_SIZE) as usize;
let new_bytes = (new_pages * Self::PAGE_SIZE) as usize;
// if new_bytes > self.mmap.len() - self.offset_guard_size {
unsafe {
region::protect(
self.mmap.as_mut_ptr().add(prev_bytes) as _,
self.mmap.as_ptr().add(prev_bytes) as _,
new_bytes - prev_bytes,
region::Protection::Read | region::Protection::Write,
// region::Protection::None,
region::Protection::ReadWrite,
)
}
.expect("unable to make memory inaccessible");
// };
// if new_bytes > self.mmap.len() - self.offset_guard_size {
// // If we have no maximum, this is a "dynamic" heap, and it's allowed to move.
// assert!(self.maximum.is_none());