add wasm-mico-runtime shim implementation #642
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 3 commits
July 13, 2024 21:16
Mossaka
reviewed
Jul 19, 2024
|
|
||
| impl Clone for WamrEngine { | ||
| fn clone(&self) -> Self { | ||
| let runtime = Runtime::new().unwrap(); |
There was a problem hiding this comment.
question: is this a deep clone or shallow clone? Runwasi clones the runtime so that it could share to different instances. (i.e. https://github.com/containerd/runwasi/blob/main/crates/containerd-shim-wasm/src/sandbox/instance.rs#L98)
There was a problem hiding this comment.
In wamr-rust-sdk, it'll execute +1 on runtime's reference counter.
lum1n0us
reviewed
Jul 25, 2024
| log::info!("Create a WASI context"); | ||
|
|
||
| let wasi_ctx = WasiCtxBuilder::new() | ||
| .set_pre_open_path(vec!["/"], vec!["/"]) |
There was a problem hiding this comment.
Suggested change
| .set_pre_open_path(vec!["/"], vec!["/"]) | |
| .set_pre_open_path(vec!["/"], vec![]) |
lum1n0us
reviewed
Jul 25, 2024
| let wasi_ctx = WasiCtxBuilder::new() | ||
| .set_pre_open_path(vec!["/"], vec!["/"]) | ||
| .set_env_vars(envs.iter().map(String::as_str).collect()) | ||
| .build(); |
There was a problem hiding this comment.
Suggested change
| .build(); | |
| .set_arguments(args.iter().map(String::as_str).collect()) | |
| .build(); |
There was a problem hiding this comment.
in order to pass arguments (like "wasi-demo-oci.wasm echo 'hi'") to wasm functions.
lum1n0us
reviewed
Jul 25, 2024
| let function = Function::find_export_func(&instance, &func) | ||
| .map_err(|e| anyhow::Error::msg(format!("Failed to find function: {:?}", e)))?; | ||
| let status = function | ||
| .call(&instance, &Vec::new()) |
There was a problem hiding this comment.
just in case.
Suggested change
| .call(&instance, &Vec::new()) | |
| .call(&instance, &vec![])) |
diff --git a/crates/containerd-shim-wamr/Cargo.toml b/crates/containerd-shim-wamr/Cargo.toml
index 2dd3178..7ea5e0a 100644
--- a/crates/containerd-shim-wamr/Cargo.toml
+++ b/crates/containerd-shim-wamr/Cargo.toml
@@ -13,7 +13,7 @@ oci-spec = { workspace = true, features = ["runtime"] }
ttrpc = { workspace = true }
sha256 = { workspace = true }
-wamr-rust-sdk = { git = "https://github.com/macko99/wamr-rust-sdk", branch = "main" }
+wamr-rust-sdk = { git = "https://github.com/bytecodealliance/wamr-rust-sdk", branch = "main" }
[dev-dependencies]
containerd-shim-wasm = { workspace = true, features = ["testing"] }
diff --git a/crates/containerd-shim-wamr/src/instance.rs b/crates/containerd-shim-wamr/src/instance.rs
index b1f15e3..8632a53 100644
--- a/crates/containerd-shim-wamr/src/instance.rs
+++ b/crates/containerd-shim-wamr/src/instance.rs
@@ -66,9 +66,10 @@ impl Engine for WamrEngine {
log::info!("Create a WASI context");
let wasi_ctx = WasiCtxBuilder::new()
- .set_pre_open_path(vec!["/"], vec![])
- .set_env_vars(envs.iter().map(String::as_str).collect())
- .build();
+ .set_pre_open_path(vec!["/"], vec![])
+ .set_env_vars(envs.iter().map(String::as_str).collect())
+ .set_arguments(args.iter().map(String::as_str).collect())
+ .build();
module.set_wasi_context(wasi_ctx);Then it should work |
|
@Mossaka any update? Let me know if you need any help. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this is an updated PR using adding addtional shim implementation: Wamr using latest wamr-rust-sdk.
It is still not working, the shim exits with one of the errors:
-"thread signal env initialized failed"
-without any error
-"error running start function: Failed to create instance: InstantiationFailure("error while pre-opening mapped directory: invalid map"
-"Running "_start"" then "Error: ExecutionError("Exception: unreachable")"
My module has only the main function defined.
I have tried disabling hardware checks in WAMR since I'm working on the VM, commit
FYI @squillace @0xE282B0 @lum1n0us @Mossaka