* Optimize `Func::call` and its C API This commit is an alternative to #3298 which achieves effectively the same goal of optimizing the `Func::call` API as well as its C API sibling of `wasmtime_func_call`. The strategy taken here is different than #3298 though where a new API isn't created, rather a small tweak to an existing API is done. Specifically this commit handles the major sources of slowness with `Func::call` with: * Looking up the type of a function, to typecheck the arguments with and use to guide how the results should be loaded, no longer hits the rwlock in the `Engine` but instead each `Func` contains its own `FuncType`. This can be an unnecessary allocation for funcs not used with `Func::call`, so this is a downside of this implementation relative to #3298. A mitigating factor, though, is that instance exports are loaded lazily into the `Store` and in theory not too many funcs are active in the store as `Func` objects. * Temporary storage is amortized with a long-lived `Vec` in the `Store` rather than allocating a new vector on each call. This is basically the same strategy as #3294 only applied to different types in different places. Specifically `wasmtime::Store` now retains a `Vec<u128>` for `Func::call`, and the C API retains a `Vec<Val>` for calling `Func::call`. * Finally, an API breaking change is made to `Func::call` and its type signature (as well as `Func::call_async`). Instead of returning `Box<[Val]>` as it did before this function now takes a `results: &mut [Val]` parameter. This allows the caller to manage the allocation and we can amortize-remove it in `wasmtime_func_call` by using space after the parameters in the `Vec<Val>` we're passing in. This change is naturally a breaking change and we'll want to consider it carefully, but mitigating factors are that most embeddings are likely using `TypedFunc::call` instead and this signature taking a mutable slice better aligns with `Func::new` which receives a mutable slice for the results. Overall this change, in the benchmark of "call a nop function from the C API" is not quite as good as #3298. It's still a bit slower, on the order of 15ns, because there's lots of capacity checks around vectors and the type checks are slightly less optimized than before. Overall though this is still significantly better than today because allocations and the rwlock to acquire the type information are both avoided. I personally feel that this change is the best to do because it has less of an API impact than #3298. * Rebase issues
457 lines
16 KiB
Rust
457 lines
16 KiB
Rust
//! The module that implements the `wasmtime run` command.
|
|
|
|
use crate::{CommonOptions, WasiModules};
|
|
use anyhow::{anyhow, bail, Context as _, Result};
|
|
use std::fs::File;
|
|
use std::io::Read;
|
|
use std::thread;
|
|
use std::time::Duration;
|
|
use std::{
|
|
ffi::{OsStr, OsString},
|
|
path::{Component, Path, PathBuf},
|
|
process,
|
|
};
|
|
use structopt::{clap::AppSettings, StructOpt};
|
|
use wasmtime::{Engine, Func, Linker, Module, Store, Trap, Val, ValType};
|
|
use wasmtime_wasi::sync::{ambient_authority, Dir, WasiCtxBuilder};
|
|
|
|
#[cfg(feature = "wasi-nn")]
|
|
use wasmtime_wasi_nn::WasiNnCtx;
|
|
|
|
#[cfg(feature = "wasi-crypto")]
|
|
use wasmtime_wasi_crypto::WasiCryptoCtx;
|
|
|
|
fn parse_module(s: &OsStr) -> Result<PathBuf, OsString> {
|
|
// Do not accept wasmtime subcommand names as the module name
|
|
match s.to_str() {
|
|
Some("help") | Some("config") | Some("run") | Some("wast") | Some("compile") => {
|
|
Err("module name cannot be the same as a subcommand".into())
|
|
}
|
|
_ => Ok(s.into()),
|
|
}
|
|
}
|
|
|
|
fn parse_env_var(s: &str) -> Result<(String, String)> {
|
|
let parts: Vec<_> = s.splitn(2, '=').collect();
|
|
if parts.len() != 2 {
|
|
bail!("must be of the form `key=value`");
|
|
}
|
|
Ok((parts[0].to_owned(), parts[1].to_owned()))
|
|
}
|
|
|
|
fn parse_map_dirs(s: &str) -> Result<(String, String)> {
|
|
let parts: Vec<&str> = s.split("::").collect();
|
|
if parts.len() != 2 {
|
|
bail!("must contain exactly one double colon ('::')");
|
|
}
|
|
Ok((parts[0].into(), parts[1].into()))
|
|
}
|
|
|
|
fn parse_dur(s: &str) -> Result<Duration> {
|
|
// assume an integer without a unit specified is a number of seconds ...
|
|
if let Ok(val) = s.parse() {
|
|
return Ok(Duration::from_secs(val));
|
|
}
|
|
// ... otherwise try to parse it with units such as `3s` or `300ms`
|
|
let dur = humantime::parse_duration(s)?;
|
|
Ok(dur)
|
|
}
|
|
|
|
fn parse_preloads(s: &str) -> Result<(String, PathBuf)> {
|
|
let parts: Vec<&str> = s.splitn(2, '=').collect();
|
|
if parts.len() != 2 {
|
|
bail!("must contain exactly one equals character ('=')");
|
|
}
|
|
Ok((parts[0].into(), parts[1].into()))
|
|
}
|
|
|
|
lazy_static::lazy_static! {
|
|
static ref AFTER_HELP: String = {
|
|
crate::FLAG_EXPLANATIONS.to_string()
|
|
};
|
|
}
|
|
|
|
/// Runs a WebAssembly module
|
|
#[derive(StructOpt)]
|
|
#[structopt(name = "run", setting = AppSettings::TrailingVarArg, after_help = AFTER_HELP.as_str())]
|
|
pub struct RunCommand {
|
|
#[structopt(flatten)]
|
|
common: CommonOptions,
|
|
|
|
/// Allow unknown exports when running commands.
|
|
#[structopt(long = "allow-unknown-exports")]
|
|
allow_unknown_exports: bool,
|
|
|
|
/// Allow executing precompiled WebAssembly modules as `*.cwasm` files.
|
|
///
|
|
/// Note that this option is not safe to pass if the module being passed in
|
|
/// is arbitrary user input. Only `wasmtime`-precompiled modules generated
|
|
/// via the `wasmtime compile` command or equivalent should be passed as an
|
|
/// argument with this option specified.
|
|
#[structopt(long = "allow-precompiled")]
|
|
allow_precompiled: bool,
|
|
|
|
/// Grant access to the given host directory
|
|
#[structopt(long = "dir", number_of_values = 1, value_name = "DIRECTORY")]
|
|
dirs: Vec<String>,
|
|
|
|
/// Pass an environment variable to the program
|
|
#[structopt(long = "env", number_of_values = 1, value_name = "NAME=VAL", parse(try_from_str = parse_env_var))]
|
|
vars: Vec<(String, String)>,
|
|
|
|
/// The name of the function to run
|
|
#[structopt(long, value_name = "FUNCTION")]
|
|
invoke: Option<String>,
|
|
|
|
/// Grant access to a guest directory mapped as a host directory
|
|
#[structopt(long = "mapdir", number_of_values = 1, value_name = "GUEST_DIR::HOST_DIR", parse(try_from_str = parse_map_dirs))]
|
|
map_dirs: Vec<(String, String)>,
|
|
|
|
/// The path of the WebAssembly module to run
|
|
#[structopt(
|
|
index = 1,
|
|
required = true,
|
|
value_name = "MODULE",
|
|
parse(try_from_os_str = parse_module),
|
|
)]
|
|
module: PathBuf,
|
|
|
|
/// Load the given WebAssembly module before the main module
|
|
#[structopt(
|
|
long = "preload",
|
|
number_of_values = 1,
|
|
value_name = "NAME=MODULE_PATH",
|
|
parse(try_from_str = parse_preloads)
|
|
)]
|
|
preloads: Vec<(String, PathBuf)>,
|
|
|
|
/// Maximum execution time of wasm code before timing out (1, 2s, 100ms, etc)
|
|
#[structopt(
|
|
long = "wasm-timeout",
|
|
value_name = "TIME",
|
|
parse(try_from_str = parse_dur),
|
|
)]
|
|
wasm_timeout: Option<Duration>,
|
|
|
|
// NOTE: this must come last for trailing varargs
|
|
/// The arguments to pass to the module
|
|
#[structopt(value_name = "ARGS")]
|
|
module_args: Vec<String>,
|
|
}
|
|
|
|
impl RunCommand {
|
|
/// Executes the command.
|
|
pub fn execute(&self) -> Result<()> {
|
|
self.common.init_logging();
|
|
|
|
let mut config = self.common.config(None)?;
|
|
if self.wasm_timeout.is_some() {
|
|
config.interruptable(true);
|
|
}
|
|
let engine = Engine::new(&config)?;
|
|
let mut store = Store::new(&engine, Host::default());
|
|
|
|
// Make wasi available by default.
|
|
let preopen_dirs = self.compute_preopen_dirs()?;
|
|
let argv = self.compute_argv();
|
|
|
|
let mut linker = Linker::new(&engine);
|
|
linker.allow_unknown_exports(self.allow_unknown_exports);
|
|
|
|
populate_with_wasi(
|
|
&mut store,
|
|
&mut linker,
|
|
preopen_dirs,
|
|
&argv,
|
|
&self.vars,
|
|
&self.common.wasi_modules.unwrap_or(WasiModules::default()),
|
|
)?;
|
|
|
|
// Load the preload wasm modules.
|
|
for (name, path) in self.preloads.iter() {
|
|
// Read the wasm module binary either as `*.wat` or a raw binary
|
|
let module = self.load_module(&engine, path)?;
|
|
|
|
// Add the module's functions to the linker.
|
|
linker.module(&mut store, name, &module).context(format!(
|
|
"failed to process preload `{}` at `{}`",
|
|
name,
|
|
path.display()
|
|
))?;
|
|
}
|
|
|
|
// Load the main wasm module.
|
|
match self
|
|
.load_main_module(&mut store, &mut linker)
|
|
.with_context(|| format!("failed to run main module `{}`", self.module.display()))
|
|
{
|
|
Ok(()) => (),
|
|
Err(e) => {
|
|
// If the program exited because of a non-zero exit status, print
|
|
// a message and exit.
|
|
if let Some(trap) = e.downcast_ref::<Trap>() {
|
|
// Print the error message in the usual way.
|
|
if let Some(status) = trap.i32_exit_status() {
|
|
// On Windows, exit status 3 indicates an abort (see below),
|
|
// so return 1 indicating a non-zero status to avoid ambiguity.
|
|
if cfg!(windows) && status >= 3 {
|
|
process::exit(1);
|
|
}
|
|
process::exit(status);
|
|
}
|
|
|
|
eprintln!("Error: {:?}", e);
|
|
|
|
// If the program exited because of a trap, return an error code
|
|
// to the outside environment indicating a more severe problem
|
|
// than a simple failure.
|
|
if cfg!(unix) {
|
|
// On Unix, return the error code of an abort.
|
|
process::exit(128 + libc::SIGABRT);
|
|
} else if cfg!(windows) {
|
|
// On Windows, return 3.
|
|
// https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/abort?view=vs-2019
|
|
process::exit(3);
|
|
}
|
|
}
|
|
return Err(e);
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn compute_preopen_dirs(&self) -> Result<Vec<(String, Dir)>> {
|
|
let mut preopen_dirs = Vec::new();
|
|
|
|
for dir in self.dirs.iter() {
|
|
preopen_dirs.push((
|
|
dir.clone(),
|
|
Dir::open_ambient_dir(dir, ambient_authority())
|
|
.with_context(|| format!("failed to open directory '{}'", dir))?,
|
|
));
|
|
}
|
|
|
|
for (guest, host) in self.map_dirs.iter() {
|
|
preopen_dirs.push((
|
|
guest.clone(),
|
|
Dir::open_ambient_dir(host, ambient_authority())
|
|
.with_context(|| format!("failed to open directory '{}'", host))?,
|
|
));
|
|
}
|
|
|
|
Ok(preopen_dirs)
|
|
}
|
|
|
|
fn compute_argv(&self) -> Vec<String> {
|
|
let mut result = Vec::new();
|
|
|
|
// Add argv[0], which is the program name. Only include the base name of the
|
|
// main wasm module, to avoid leaking path information.
|
|
result.push(
|
|
self.module
|
|
.components()
|
|
.next_back()
|
|
.map(Component::as_os_str)
|
|
.and_then(OsStr::to_str)
|
|
.unwrap_or("")
|
|
.to_owned(),
|
|
);
|
|
|
|
// Add the remaining arguments.
|
|
for arg in self.module_args.iter() {
|
|
result.push(arg.clone());
|
|
}
|
|
|
|
result
|
|
}
|
|
|
|
fn load_main_module(&self, store: &mut Store<Host>, linker: &mut Linker<Host>) -> Result<()> {
|
|
if let Some(timeout) = self.wasm_timeout {
|
|
let handle = store.interrupt_handle()?;
|
|
thread::spawn(move || {
|
|
thread::sleep(timeout);
|
|
handle.interrupt();
|
|
});
|
|
}
|
|
|
|
// Read the wasm module binary either as `*.wat` or a raw binary.
|
|
// Use "" as a default module name.
|
|
let module = self.load_module(linker.engine(), &self.module)?;
|
|
linker
|
|
.module(&mut *store, "", &module)
|
|
.context(format!("failed to instantiate {:?}", self.module))?;
|
|
|
|
// If a function to invoke was given, invoke it.
|
|
if let Some(name) = self.invoke.as_ref() {
|
|
self.invoke_export(store, linker, name)
|
|
} else {
|
|
let func = linker.get_default(&mut *store, "")?;
|
|
self.invoke_func(store, func, None)
|
|
}
|
|
}
|
|
|
|
fn invoke_export(
|
|
&self,
|
|
store: &mut Store<Host>,
|
|
linker: &Linker<Host>,
|
|
name: &str,
|
|
) -> Result<()> {
|
|
let func = match linker
|
|
.get(&mut *store, "", Some(name))
|
|
.ok_or_else(|| anyhow!("no export named `{}` found", name))?
|
|
.into_func()
|
|
{
|
|
Some(func) => func,
|
|
None => bail!("export of `{}` wasn't a function", name),
|
|
};
|
|
self.invoke_func(store, func, Some(name))
|
|
}
|
|
|
|
fn invoke_func(&self, store: &mut Store<Host>, func: Func, name: Option<&str>) -> Result<()> {
|
|
let ty = func.ty(&store);
|
|
if ty.params().len() > 0 {
|
|
eprintln!(
|
|
"warning: using `--invoke` with a function that takes arguments \
|
|
is experimental and may break in the future"
|
|
);
|
|
}
|
|
let mut args = self.module_args.iter();
|
|
let mut values = Vec::new();
|
|
for ty in ty.params() {
|
|
let val = match args.next() {
|
|
Some(s) => s,
|
|
None => {
|
|
if let Some(name) = name {
|
|
bail!("not enough arguments for `{}`", name)
|
|
} else {
|
|
bail!("not enough arguments for command default")
|
|
}
|
|
}
|
|
};
|
|
values.push(match ty {
|
|
// TODO: integer parsing here should handle hexadecimal notation
|
|
// like `0x0...`, but the Rust standard library currently only
|
|
// parses base-10 representations.
|
|
ValType::I32 => Val::I32(val.parse()?),
|
|
ValType::I64 => Val::I64(val.parse()?),
|
|
ValType::F32 => Val::F32(val.parse()?),
|
|
ValType::F64 => Val::F64(val.parse()?),
|
|
t => bail!("unsupported argument type {:?}", t),
|
|
});
|
|
}
|
|
|
|
// Invoke the function and then afterwards print all the results that came
|
|
// out, if there are any.
|
|
let mut results = vec![Val::null(); ty.results().len()];
|
|
func.call(store, &values, &mut results).with_context(|| {
|
|
if let Some(name) = name {
|
|
format!("failed to invoke `{}`", name)
|
|
} else {
|
|
format!("failed to invoke command default")
|
|
}
|
|
})?;
|
|
if !results.is_empty() {
|
|
eprintln!(
|
|
"warning: using `--invoke` with a function that returns values \
|
|
is experimental and may break in the future"
|
|
);
|
|
}
|
|
|
|
for result in results {
|
|
match result {
|
|
Val::I32(i) => println!("{}", i),
|
|
Val::I64(i) => println!("{}", i),
|
|
Val::F32(f) => println!("{}", f32::from_bits(f)),
|
|
Val::F64(f) => println!("{}", f64::from_bits(f)),
|
|
Val::ExternRef(_) => println!("<externref>"),
|
|
Val::FuncRef(_) => println!("<funcref>"),
|
|
Val::V128(i) => println!("{}", i),
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn load_module(&self, engine: &Engine, path: &Path) -> Result<Module> {
|
|
// Peek at the first few bytes of the file to figure out if this is
|
|
// something we can pass off to `deserialize_file` which is fastest if
|
|
// we don't actually read the whole file into memory. Note that this
|
|
// behavior is disabled by default, though, because it's not safe to
|
|
// pass arbitrary user input to this command with `--allow-precompiled`
|
|
let mut file =
|
|
File::open(path).with_context(|| format!("failed to open: {}", path.display()))?;
|
|
let mut magic = [0; 4];
|
|
if let Ok(()) = file.read_exact(&mut magic) {
|
|
if &magic == b"\x7fELF" {
|
|
if self.allow_precompiled {
|
|
return unsafe { Module::deserialize_file(engine, path) };
|
|
}
|
|
bail!(
|
|
"cannot load precompiled module `{}` unless --allow-precompiled is passed",
|
|
path.display()
|
|
)
|
|
}
|
|
}
|
|
|
|
Module::from_file(engine, path)
|
|
}
|
|
}
|
|
|
|
#[derive(Default)]
|
|
struct Host {
|
|
wasi: Option<wasmtime_wasi::WasiCtx>,
|
|
#[cfg(feature = "wasi-nn")]
|
|
wasi_nn: Option<WasiNnCtx>,
|
|
#[cfg(feature = "wasi-crypto")]
|
|
wasi_crypto: Option<WasiCryptoCtx>,
|
|
}
|
|
|
|
/// Populates the given `Linker` with WASI APIs.
|
|
fn populate_with_wasi(
|
|
store: &mut Store<Host>,
|
|
linker: &mut Linker<Host>,
|
|
preopen_dirs: Vec<(String, Dir)>,
|
|
argv: &[String],
|
|
vars: &[(String, String)],
|
|
wasi_modules: &WasiModules,
|
|
) -> Result<()> {
|
|
if wasi_modules.wasi_common {
|
|
wasmtime_wasi::add_to_linker(linker, |host| host.wasi.as_mut().unwrap())?;
|
|
|
|
let mut builder = WasiCtxBuilder::new();
|
|
builder = builder.inherit_stdio().args(argv)?.envs(vars)?;
|
|
|
|
for (name, dir) in preopen_dirs.into_iter() {
|
|
builder = builder.preopened_dir(dir, name)?;
|
|
}
|
|
store.data_mut().wasi = Some(builder.build());
|
|
}
|
|
|
|
if wasi_modules.wasi_nn {
|
|
#[cfg(not(feature = "wasi-nn"))]
|
|
{
|
|
bail!("Cannot enable wasi-nn when the binary is not compiled with this feature.");
|
|
}
|
|
#[cfg(feature = "wasi-nn")]
|
|
{
|
|
wasmtime_wasi_nn::add_to_linker(linker, |host| host.wasi_nn.as_mut().unwrap())?;
|
|
store.data_mut().wasi_nn = Some(WasiNnCtx::new()?);
|
|
}
|
|
}
|
|
|
|
if wasi_modules.wasi_crypto {
|
|
#[cfg(not(feature = "wasi-crypto"))]
|
|
{
|
|
bail!("Cannot enable wasi-crypto when the binary is not compiled with this feature.");
|
|
}
|
|
#[cfg(feature = "wasi-crypto")]
|
|
{
|
|
wasmtime_wasi_crypto::add_to_linker(linker, |host| host.wasi_crypto.as_mut().unwrap())?;
|
|
store.data_mut().wasi_crypto = Some(WasiCryptoCtx::new());
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|