[runtime] Add more tests for wasm runtime

.github/workflows/c-cpp.yml

@@ -13,14 +13,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: get submodule
-      run:  git submodule update --init --recursive
     - name: install deps
       run: |
           sudo make install-deps
           make /opt/wasi-sdk
-          wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
-          sudo dpkg -i tinygo_0.27.0_amd64.deb
+          make tinygo
+    - name: Cache
+      uses: actions/cache@v3.3.0
+      with:
+        path: |
+          Makefile
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+    - name: get submodule
+      run:  git submodule update --init --recursive
     - name: make
       run: make -C runtime/cpp
     - name: make build-lib
@@ -32,4 +37,4 @@ jobs:
     - name: Upload build result
       uses: actions/upload-artifact@v2.3.1
       with:
-        path: "wasm-bpf"
+        path: "wasm-bpf"

.github/workflows/deploy-asserts.yml

@@ -30,25 +30,24 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: get submodule
-        run:  git submodule update --init --recursive
       - name: install deps
         run: |
             sudo make install-deps
             make /opt/wasi-sdk
-            wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
-            sudo dpkg -i tinygo_0.27.0_amd64.deb
+            make tinygo
+      - name: Cache
+        uses: actions/cache@v3.3.0
+
+        with:
+          path: |
+            Makefile
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+      - name: get submodule
+        run:  git submodule update --init --recursive
       - name: make
         run: make -C runtime/cpp
-      - name: Install rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            override: true
-      - name: examples with rust runtime
-        run: IMPL=rust make -C examples
       - name: examples with cpp runtime
-        run: IMPL=cpp  make -C examples
+        run: IMPL=cpp make -C examples
 
       - name: Setup Pages
         uses: actions/configure-pages@v1
@@ -58,5 +57,5 @@ jobs:
           # Upload entire repository
           path: '.'
       - name: Deploy to GitHub Pages
-        id: deployment
+        id: deploymen
         uses: actions/deploy-pages@main

.github/workflows/rust.yml

@@ -16,14 +16,20 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: get submodule
-      run:  git submodule update --init --recursive
-    - name: Install dependencies
+    - name: install deps
       run: |
           sudo make install-deps
           make /opt/wasi-sdk
-          wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
-          sudo dpkg -i tinygo_0.27.0_amd64.deb
+          make tinygo
+    - name: Cache
+      uses: actions/cache@v3.3.0
+
+      with:
+        path: |
+          Makefile
+        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+    - name: get submodule
+      run:  git submodule update --init --recursive
     - name: Build
       run: make build-rust
     - name: test wasm-bpf-rs
@@ -41,4 +47,4 @@ jobs:
     - name: Upload build result
       uses: actions/upload-artifact@v2.3.1
       with:
-        path: "wasm-bpf-rs"
+        path: "wasm-bpf-rs"

.gitignore

@@ -2,3 +2,4 @@
 build/
 examples/wasm-bpf
 wasi-sdk-*-linux.tar.gz
+tinygo_0.27.0_amd64.deb

Makefile

@@ -24,6 +24,10 @@ install-deps: ## install deps
 	tar -zxf wasi-sdk-17.0-linux.tar.gz
 	sudo mkdir -p /opt/wasi-sdk/ && sudo mv wasi-sdk-17.0/* /opt/wasi-sdk/
 
+tinygo:
+	wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
+	sudo dpkg -i tinygo_0.27.0_amd64.deb
+
 test:
 	rm -rf runtime/cpp/build
 	cd runtime/cpp && mkdir build && cd build && cmake .. && make

examples/go-execve/README.md

@@ -0,0 +1,16 @@
+# go example of execve
+
+## build
+
+install go and tinygo:
+
+```sh
+	wget https://github.com/tinygo-org/tinygo/releases/download/v0.27.0/tinygo_0.27.0_amd64.deb
+    sudo dpkg -i tinygo_0.27.0_amd64.deb
+```
+
+run make:
+
+```
+make
+```

examples/go-execve/main.go

@@ -27,7 +27,6 @@ var obj []byte
 
 //export go-callback
 func callback(ctx, data, size uint32) uint32 {
-	// I'm not good at Go...
 	/*
 	   #define COMM_SIZE 352
 	   struct comm_event {

runtime/wasm-bpf-rs/src/lib.rs

@@ -39,8 +39,8 @@ pub struct Config {
 impl Default for Config {
     fn default() -> Self {
         Self {
-            callback_export_name: String::default(),
-            wrapper_module_name: String::default(),
+            callback_export_name: String::from("callback-wrapper"),
+            wrapper_module_name: String::from("go-callback"),
             stdin: Box::new(stdio::stdin()),
             stdout: Box::new(stdio::stdout()),
             stderr: Box::new(stdio::stderr()),
@@ -130,13 +130,15 @@ pub fn run_wasm_bpf_module(
 
 #[cfg(test)]
 mod tests {
+    use wasi_common::pipe::WritePipe;
+
     use super::*;
     use std::fs::File;
     use std::io::Read;
     use std::path::PathBuf;
     use std::thread;
 
-    fn test_example(name: &str, config: Config) {
+    fn test_example(name: &str, config: Config, timeout_sec: u64) {
         let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
         path.push("tests");
         path.push(name);
@@ -149,18 +151,52 @@ mod tests {
             let result = run_wasm_bpf_module(&buffer, &args, config);
             assert!(result.is_ok());
         });
-        thread::sleep(std::time::Duration::from_secs(3));
+        thread::sleep(std::time::Duration::from_secs(timeout_sec));
+        // kill the thread
+    }
+
+    #[test]
+    fn test_run_tracing_wasm_bpf_module() {
+        test_example("execve.wasm", Config::default(), 3);
+        test_example("bootstrap.wasm", Config::default(), 3);
+        test_example("opensnoop.wasm", Config::default(), 3);
+        test_example("lsm.wasm", Config::default(), 3);
+        test_example("rust-bootstrap.wasm", Config::default(), 3);
+    }
+
+    #[test]
+    fn test_run_network_wasm_bpf_module() {
+        test_example("sockfilter.wasm", Config::default(), 3);
+        test_example("sockops.wasm", Config::default(), 3);
+    }
+
+    #[test]
+    fn test_run_wasm_bpf_module_maps() {
+        test_example("runqlat.wasm", Config::default(), 3);
+    }
+
+    #[test]
+    fn test_run_wasm_bpf_module_with_callback() {
+        let mut config = Config::default();
+        config.set_callback_values(
+            String::from("go-callback"),
+            String::from("callback-wrapper"),
+        );
+        test_example("go-execve.wasm", config, 3);
     }
 
     #[test]
-    fn test_run_wasm_bpf_module() {
-        test_example("execve.wasm", Config::default());
-        test_example("bootstrap.wasm", Config::default());
-        test_example("runqlat.wasm", Config::default());
-        test_example("opensnoop.wasm", Config::default());
-        test_example("lsm.wasm", Config::default());
-        test_example("rust-bootstrap.wasm", Config::default());
-        test_example("sockfilter.wasm", Config::default());
-        test_example("sockops.wasm", Config::default());
+    fn test_receive_wasm_bpf_module_output() {
+        let stdout = WritePipe::new_in_memory();
+        let stderr = WritePipe::new_in_memory();
+        let config = Config::new(
+            String::from("go-callback"),
+            String::from("callback-wrapper"),
+            Box::new(stdio::stdin()),
+            Box::new(stdout.clone()),
+            Box::new(stderr),
+        );
+        test_example("execve.wasm", config, 3);
+        // read from the WritePipe
     }
 }