Merge pull request #992 from hydai/hydai/update_wasmedge

wasm: use wasmedge library soname in dlopen

Author: flouthoc

.github/workflows/test.yaml

@@ -177,7 +177,7 @@ jobs:
               ;;
               wasmedge-build)
                   sudo docker build -t wasmedge tests/wasmedge-build
-                  sudo docker run --rm -w /crun -v ${PWD}:/crun wasmedge
+                  sudo docker run --privileged --rm -v /sys/fs/cgroup:/sys/fs/cgroup:rw,rslave  -w /crun -v ${PWD}:/crun wasmedge
               ;;
           esac
 

src/libcrun/handlers/wasmedge.c

@@ -44,9 +44,9 @@ libwasmedge_load (void **cookie, libcrun_error_t *err arg_unused)
 {
   void *handle;
 
-  handle = dlopen ("libwasmedge_c.so", RTLD_NOW);
+  handle = dlopen ("libwasmedge.so.0", RTLD_NOW);
   if (handle == NULL)
-    return crun_make_error (err, 0, "could not load `libwasmedge_c.so`: %s", dlerror ());
+    return crun_make_error (err, 0, "could not load `libwasmedge.so.0`: %s", dlerror ());
   *cookie = handle;
 
   return 0;
@@ -107,7 +107,7 @@ libwasmedge_exec (void *cookie, __attribute__ ((unused)) libcrun_container_t *co
       || WasmEdge_VMRegisterModuleFromFile == NULL || WasmEdge_VMGetImportModuleContext == NULL
       || WasmEdge_ModuleInstanceInitWASI == NULL || WasmEdge_VMRunWasmFromFile == NULL
       || WasmEdge_ResultOK == NULL || WasmEdge_StringCreateByCString == NULL)
-    error (EXIT_FAILURE, 0, "could not find symbol in `libwasmedge.so`");
+    error (EXIT_FAILURE, 0, "could not find symbol in `libwasmedge.so.0`");
 
   configure = WasmEdge_ConfigureCreate ();
   if (UNLIKELY (configure == NULL))

tests/wasmedge-build/Dockerfile

@@ -1,14 +1,30 @@
-FROM debian:bullseye-slim
-ARG WASM_EDGE_VERSION="0.10.0"
+FROM fedora:rawhide
+ARG WASM_EDGE_VERSION="0.11.0"
 
-RUN apt-get update && apt-get install -y make git gcc build-essential pkgconf libtool \
-  libsystemd-dev libprotobuf-c-dev libcap-dev libseccomp-dev libyajl-dev \
-  go-md2man autoconf python3 automake curl libc6
+# Install the deps for building crun
+RUN dnf update -y && dnf install -y make python git gcc automake autoconf libcap-devel \
+		systemd-devel yajl-devel libseccomp-devel pkg-config \
+		go-md2man glibc-static python3-libmount libtool buildah podman
 
-#ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-RUN rm /etc/ld.so.conf.d/libc.conf
+# Install WasmEdge
 RUN curl -sSf -o install.sh https://raw.githubusercontent.com/WasmEdge/WasmEdge/master/utils/install.sh
-RUN bash ./install.sh -p /usr/local -v $WASM_EDGE_VERSION 
+RUN bash ./install.sh -p /usr/local -v $WASM_EDGE_VERSION
+
+# The hello_wasm contains:
+# 1. The example rust application called hello, which will print something to console.
+# 2. The Containerfile for building the image including hello.wasm
+ADD hello_wasm /hello_wasm
+
+# Install Rust for building wasm application
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+SHELL ["/bin/bash", "-c"]
+RUN source "$HOME/.cargo/env" && \
+		rustup target add wasm32-wasi && \
+		cd /hello_wasm/hello && \
+		cargo build --release --target wasm32-wasi && \
+		cp ./target/wasm32-wasi/release/hello.wasm /hello_wasm && \
+		cd / && \
+		rm -rf /hello_wasm/hello
 
 COPY run-tests.sh /usr/local/bin
 

tests/wasmedge-build/hello_wasm/Containerfile

@@ -0,0 +1,3 @@
+FROM scratch
+COPY hello.wasm /
+CMD ["/hello.wasm"]

tests/wasmedge-build/hello_wasm/hello/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "hello"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

tests/wasmedge-build/hello_wasm/hello/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("{}", "This is from a main function from a wasm module");
+}

tests/wasmedge-build/run-tests.sh

@@ -1,9 +1,37 @@
 #!/bin/bash
 
 set -e
+
+# Build crun with wasmedge support
 cd /crun
 
+git config --global --add safe.directory /crun
 git clean -fdx
 ./autogen.sh
 ./configure CFLAGS='-Wall -Wextra -Werror' --with-wasmedge
 make -j "$(nproc)"
+make install
+
+# Remove the installed crun to make sure the built crun is used
+rm -rf /usr/bin/crun
+ln -s /usr/local/bin/crun /usr/bin/crun
+
+# Test crun is used in podman
+if [[ $(podman info | grep SYSTEMD) != *WASM:wasmedge* ]]; then
+	echo "podman cannot find the built crun with +WASM:wasmedge"
+	exit 1
+fi
+
+# Build hellowasm image
+cd /hello_wasm && \
+	chmod +x ./hello.wasm && \
+	buildah build --annotation "module.wasm.image/variant=compat-smart" -t hellowasm-image .
+
+# Run hello.wasm with crun
+OUTPUT=$(podman run hellowasm-image:latest)
+EXPECTED_OUTPUT="This is from a main function from a wasm module"
+echo "$OUTPUT"
+if [[ "$OUTPUT" != "$EXPECTED_OUTPUT" ]]; then
+	echo "Run wasm failed. The execution result is not matched"
+	exit 1
+fi