A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
Handle OOM in `Func::call_async` and fiber creation (#12954)
Nick Fitzgerald122ddc71c52a
diff --git a/Cargo.lock b/Cargo.lockindex ad1b97177a..6f7f6fd552 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -4888,6 +4888,7 @@ dependencies = ["target-lexicon","tempfile","test-programs-artifacts",+ "tokio","v8","wasm-compose","wasm-encoder 0.246.1",diff --git a/crates/fiber/src/nostd.rs b/crates/fiber/src/nostd.rsindex 594a918d61..13bab3dca5 100644--- a/crates/fiber/src/nostd.rs+++ b/crates/fiber/src/nostd.rs@@ -28,7 +28,6 @@use crate::stackswitch::*;use crate::{Result, RunResult, RuntimeFiberStack};use alloc::boxed::Box;-use alloc::{vec, vec::Vec};use core::cell::Cell;use core::ops::Range;use wasmtime_environ::prelude::*;@@ -42,7 +41,7 @@ pub struct FiberStack {len: usize,/// Backing storage, if owned. Allocated once at startup and then/// not reallocated afterward.- storage: Vec<u8>,+ storage: TryVec<u8>,}struct BasePtr(*mut u8);@@ -66,10 +65,10 @@ impl FiberStack {pub fn new(size: usize, zeroed: bool) -> Result<Self> {// Round up the size to at least one page.let size = core::cmp::max(4096, size);- let mut storage = Vec::new();- storage.try_reserve_exact(size)?;+ let mut storage = TryVec::new();+ storage.reserve_exact(size)?;if zeroed {- storage.resize(size, 0);+ storage.resize(size, 0)?;}let (base, len) = align_ptr(storage.as_mut_ptr(), size, STACK_ALIGN);Ok(FiberStack {@@ -81,7 +80,7 @@ impl FiberStack {pub unsafe fn from_raw_parts(base: *mut u8, guard_size: usize, len: usize) -> Result<Self> {Ok(FiberStack {- storage: vec![],+ storage: TryVec::default(),base: BasePtr(unsafe { base.offset(isize::try_from(guard_size).unwrap()) }),len,})@@ -139,7 +138,7 @@ impl Fiber {bail!("fibers unsupported on this host architecture");}unsafe {- let data = Box::into_raw(Box::new(func)).cast();+ let data = Box::into_raw(try_new::<Box<_>>(func)?).cast();wasmtime_fiber_init(stack.top().unwrap(), fiber_start::<F, A, B, C>, data);}diff --git a/crates/fiber/src/unix.rs b/crates/fiber/src/unix.rsindex 71fe9d4709..d39cb12fd0 100644--- a/crates/fiber/src/unix.rs+++ b/crates/fiber/src/unix.rs@@ -33,12 +33,13 @@ use crate::stackswitch::*;use crate::{RunResult, RuntimeFiberStack};use std::boxed::Box;use std::cell::Cell;-use std::io;use std::ops::Range;use std::ptr;use std::sync::atomic::{AtomicUsize, Ordering};+use wasmtime_environ::error::{OutOfMemory, Result};+use wasmtime_environ::prelude::*;-pub type Error = io::Error;+pub type Error = wasmtime_environ::error::Error;pub struct FiberStack {base: BasePtr,@@ -78,7 +79,7 @@ fn host_page_size() -> usize {}impl FiberStack {- pub fn new(size: usize, zeroed: bool) -> io::Result<Self> {+ pub fn new(size: usize, zeroed: bool) -> Result<Self> {let page_size = host_page_size();// The anonymous `mmap`s we use for `FiberStackStorage` are always// zeroed.@@ -101,7 +102,7 @@ impl FiberStack {})}- pub unsafe fn from_raw_parts(base: *mut u8, guard_size: usize, len: usize) -> io::Result<Self> {+ pub unsafe fn from_raw_parts(base: *mut u8, guard_size: usize, len: usize) -> Result<Self> {// See comments in `mod asan` below for why asan has a different stack// allocation strategy.if cfg!(asan) {@@ -118,7 +119,7 @@ impl FiberStack {matches!(self.storage, FiberStackStorage::Unmanaged(_))}- pub fn from_custom(custom: Box<dyn RuntimeFiberStack>) -> io::Result<Self> {+ pub fn from_custom(custom: Box<dyn RuntimeFiberStack>) -> Result<Self> {let range = custom.range();let page_size = host_page_size();let start_ptr = range.start as *mut u8;@@ -168,7 +169,7 @@ unsafe impl Send for MmapFiberStack {}unsafe impl Sync for MmapFiberStack {}impl MmapFiberStack {- fn new(size: usize) -> io::Result<Self> {+ fn new(size: usize) -> Result<Self> {// Round up our stack size request to the nearest multiple of the// page size.let page_size = host_page_size();@@ -177,7 +178,7 @@ impl MmapFiberStack {} else {let with_extra = size.checked_add(page_size - 1)- .ok_or(io::ErrorKind::OutOfMemory)?;+ .ok_or_else(|| OutOfMemory::new(usize::MAX))?;with_extra & (!(page_size - 1))};@@ -243,20 +244,17 @@ where}impl Fiber {- pub fn new<F, A, B, C>(stack: &FiberStack, func: F) -> io::Result<Self>+ pub fn new<F, A, B, C>(stack: &FiberStack, func: F) -> Result<Self>whereF: FnOnce(A, &mut super::Suspend<A, B, C>) -> C,{// On unsupported platforms `wasmtime_fiber_init` is a panicking shim so// return an error saying the host architecture isn't supported instead.if !SUPPORTED_ARCH {- return Err(io::Error::new(- io::ErrorKind::Other,- "fibers not supported on this host architecture",- ));+ bail!("fibers not supported on this host architecture");}unsafe {- let data = Box::into_raw(Box::new(func)).cast();+ let data = Box::into_raw(try_new::<Box<_>>(func)?).cast();wasmtime_fiber_init(stack.top().unwrap(), fiber_start::<F, A, B, C>, data);}@@ -330,7 +328,7 @@ impl Suspend {/// called around every stack switch with some other fiddly bits as well.#[cfg(asan)]mod asan {- use super::{FiberStack, MmapFiberStack, RuntimeFiberStack, host_page_size};+ use super::*;use alloc::boxed::Box;use alloc::vec::Vec;use std::mem::ManuallyDrop;@@ -442,11 +440,11 @@ mod asan {/// meaning that this should only ever be a relatively small set of stacks.static FIBER_STACKS: Mutex<Vec<MmapFiberStack>> = Mutex::new(Vec::new());- pub fn new_fiber_stack(size: usize) -> std::io::Result<Box<dyn RuntimeFiberStack>> {+ pub fn new_fiber_stack(size: usize) -> Result<Box<dyn RuntimeFiberStack>> {let page_size = host_page_size();let needed_size = size.checked_add(page_size)- .ok_or(std::io::ErrorKind::OutOfMemory)?;+ .ok_or_else(|| OutOfMemory::new(usize::MAX))?;let mut stacks = FIBER_STACKS.lock().unwrap();let stack = match stacks.iter().position(|i| needed_size <= i.mapping_len) {@@ -500,7 +498,7 @@ mod asan {// Shim module that's the same as above but only has stubs.#[cfg(not(asan))]mod asan_disabled {- use super::{FiberStack, RuntimeFiberStack};+ use super::*;use std::boxed::Box;#[derive(Default)]@@ -527,7 +525,7 @@ mod asan_disabled {PreviousStack}- pub fn new_fiber_stack(_size: usize) -> std::io::Result<Box<dyn RuntimeFiberStack>> {+ pub fn new_fiber_stack(_size: usize) -> Result<Box<dyn RuntimeFiberStack>> {unimplemented!()}}diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.tomlindex 0b7955e28e..cd661aad92 100644--- a/crates/fuzzing/Cargo.toml+++ b/crates/fuzzing/Cargo.toml@@ -74,6 +74,7 @@ rand = { version = "0.8.0", features = ["small_rng"] }wasmtime-environ = { workspace = true }cranelift-bforest = { workspace = true }cranelift-bitset = { workspace = true }+tokio = { workspace = true, features = ["rt", "time", "macros", "rt-multi-thread"] }# Only enable the `build-libinterpret` feature when fuzzing is enabled, enabling# commands like `cargo test --workspace` or similar to not need an ocamldiff --git a/crates/fuzzing/tests/oom/func.rs b/crates/fuzzing/tests/oom/func.rsindex 8388d765a3..5f5dcf3873 100644--- a/crates/fuzzing/tests/oom/func.rs+++ b/crates/fuzzing/tests/oom/func.rs@@ -66,6 +66,40 @@ fn func_call() -> Result<()> {})}+#[tokio::test]+async fn func_call_async() -> Result<()> {+ let module_bytes = {+ let mut config = Config::new();+ config.concurrency_support(false);+ let engine = Engine::new(&config)?;+ Module::new(+ &engine,+ r#"(module (func (export "id") (param i32) (result i32) (local.get 0)))"#,+ )?+ .serialize()?+ };+ let mut config = Config::new();+ config.enable_compiler(false);+ config.concurrency_support(false);+ let engine = Engine::new(&config)?;+ let module = unsafe { Module::deserialize(&engine, &module_bytes)? };+ let linker = Linker::<()>::new(&engine);+ let instance_pre = linker.instantiate_pre(&module)?;++ OomTest::new()+ .test_async(|| async {+ let mut store = Store::try_new(&engine, ())?;+ let instance = instance_pre.instantiate_async(&mut store).await?;+ let id = instance.get_func(&mut store, "id").unwrap();+ let mut results = [Val::I32(0)];+ id.call_async(&mut store, &[Val::I32(42)], &mut results)+ .await?;+ assert_eq!(results[0].unwrap_i32(), 42);+ Ok(())+ })+ .await+}+#[test]fn func_typed() -> Result<()> {let module_bytes = {diff --git a/crates/wasmtime/src/runtime/vm/instance/allocator/pooling/generic_stack_pool.rs b/crates/wasmtime/src/runtime/vm/instance/allocator/pooling/generic_stack_pool.rsindex c191580b37..af883d48b1 100644--- a/crates/wasmtime/src/runtime/vm/instance/allocator/pooling/generic_stack_pool.rs+++ b/crates/wasmtime/src/runtime/vm/instance/allocator/pooling/generic_stack_pool.rs@@ -65,7 +65,14 @@ impl StackPool {Ok(stack) => Ok(stack),Err(e) => {self.live_stacks.fetch_sub(1, Ordering::AcqRel);- Err(crate::Error::from(e))++ #[allow(+ clippy::useless_conversion,+ reason = "some `cfg`s have `wasmtime::Error` as the error type, others don't"+ )]+ let e = crate::Error::from(e);++ Err(e)}}}