faasm · csegarragonz · Apr 4, 2023 · Mar 21, 2023 · Mar 22, 2023 · Mar 22, 2023
diff --git a/.env b/.env
@@ -1,9 +1,9 @@
-FAASM_VERSION=0.9.5
-FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.9.5
-FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.9.5
+FAASM_VERSION=0.9.6
+FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.9.6
+FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.9.6
 
-CPP_VERSION=0.2.4
-CPP_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.4
+CPP_VERSION=0.2.5
+CPP_CLI_IMAGE=faasm.azurecr.io/cpp-sysroot:0.2.5
 
 PYTHON_VERSION=0.2.5
 PYTHON_CLI_IMAGE=faasm.azurecr.io/cpython:0.2.5

diff --git a/.github/workflows/sgx_hw.yml b/.github/workflows/sgx_hw.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: self-hosted
     env:
       VM_BASE_NAME: gha-sgx-hw-vm
-      FAASM_VERSION: 0.9.5
+      FAASM_VERSION: 0.9.6
     steps:
       - name: "Check out the experiment-base code"
         uses: actions/checkout@v3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -23,7 +23,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.9.5
+      image: faasm.azurecr.io/cli:0.9.6
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -52,7 +52,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.9.5
+      image: faasm.azurecr.io/cli:0.9.6
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -68,7 +68,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cpp-sysroot:0.2.4
+      image: faasm.azurecr.io/cpp-sysroot:0.2.5
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -131,7 +131,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.9.5
+      image: faasm.azurecr.io/cli:0.9.6
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -168,18 +168,18 @@ jobs:
       TSAN_OPTIONS: "history_size=0 halt_on_error=1 suppressions=./thread-sanitizer-ignorelist.txt flush_memory_ms=5000"
       UBSAN_OPTIONS: "print_stacktrace=1:halt_on_error=1:suppressions=./ub-sanitizer-ignorelist.txt"
     container:
-      image: faasm.azurecr.io/cli:0.9.5
+      image: faasm.azurecr.io/cli:0.9.6
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.9.5
+        image: faasm.azurecr.io/redis:0.9.6
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.9.5
+        image: faasm.azurecr.io/minio:0.9.6
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -257,18 +257,18 @@ jobs:
       REDIS_QUEUE_HOST: redis
       REDIS_STATE_HOST: redis
     container:
-      image: faasm.azurecr.io/cli-sgx-sim:0.9.5
+      image: faasm.azurecr.io/cli-sgx-sim:0.9.6
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.9.5
+        image: faasm.azurecr.io/redis:0.9.6
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.9.5
+        image: faasm.azurecr.io/minio:0.9.6
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.9.5
+0.9.6
diff --git a/clients/cpp b/clients/cpp
diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake
@@ -111,7 +111,7 @@ FetchContent_Declare(wavm_ext
 
 FetchContent_Declare(wamr_ext
     GIT_REPOSITORY "https://github.com/faasm/wasm-micro-runtime"
-    GIT_TAG "a31e5a4fa299c4f8384f40e157b0a928ad0bda1b"
+    GIT_TAG "5e9dc3c7eb33167389d99b7e5851dc55b5911d33"
 )
 
 # WAMR and WAVM both link to LLVM

diff --git a/deploy/k8s-common/minio.yml b/deploy/k8s-common/minio.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: minio-main
-      image: faasm.azurecr.io/minio:0.9.5
+      image: faasm.azurecr.io/minio:0.9.6
       env:
         - name: MINIO_ROOT_USER
           value: "minio"

diff --git a/deploy/k8s-common/redis.yml b/deploy/k8s-common/redis.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.9.5
+      image: faasm.azurecr.io/redis:0.9.6
       ports:
         - containerPort: 6379
 
@@ -28,7 +28,7 @@ metadata:
 spec:
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.9.5
+      image: faasm.azurecr.io/redis:0.9.6
       ports:
         - containerPort: 6379
 

diff --git a/deploy/k8s-sgx/upload.yml b/deploy/k8s-sgx/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.9.5
+      image: faasm.azurecr.io/upload:0.9.6
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s-sgx/worker.yml b/deploy/k8s-sgx/worker.yml
@@ -31,7 +31,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker-sgx:0.9.5
+        - image: faasm.azurecr.io/worker-sgx:0.9.6
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/deploy/k8s-wamr/upload.yml b/deploy/k8s-wamr/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.9.5
+      image: faasm.azurecr.io/upload:0.9.6
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s-wamr/worker.yml b/deploy/k8s-wamr/worker.yml
@@ -31,7 +31,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.9.5
+        - image: faasm.azurecr.io/worker:0.9.6
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/deploy/k8s/upload.yml b/deploy/k8s/upload.yml
@@ -11,7 +11,7 @@ metadata:
 spec:
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.9.5
+      image: faasm.azurecr.io/upload:0.9.6
       ports:
         - containerPort: 8002
         - containerPort: 5000

diff --git a/deploy/k8s/worker.yml b/deploy/k8s/worker.yml
@@ -31,7 +31,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.9.5
+        - image: faasm.azurecr.io/worker:0.9.6
           name: faasm-worker
           ports:
             - containerPort: 8080

diff --git a/include/wamr/WAMRModuleMixin.h b/include/wamr/WAMRModuleMixin.h
@@ -2,6 +2,7 @@
 
 #include <wasm_export.h>
 
+#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -28,12 +29,15 @@ struct WAMRModuleMixin
 
     // Validate that a memory range defined by a pointer and a size is a valid
     // offset in the module's WASM linear memory.
-    // bool validateNativePointer(void* nativePtr, size_t size);
-    bool validateNativePointer(void* nativePtr, int size)
+    void validateNativePointer(void* nativePtr, int size)
     {
         auto moduleInstance = this->underlying().getModuleInstance();
-        return wasm_runtime_validate_native_addr(
-          moduleInstance, nativePtr, size);
+        bool success =
+          wasm_runtime_validate_native_addr(moduleInstance, nativePtr, size);
+
+        if (!success) {
+            throw std::runtime_error("Failed validating native pointer!");
+        }
     }
 
     void* wasmOffsetToNativePointer(uint32_t wasmOffset)
@@ -50,6 +54,24 @@ struct WAMRModuleMixin
         return wasm_runtime_addr_native_to_app(moduleInstance, nativePtr);
     }
 
+    // Allocate memory in the WASM's module heap (inside the linear memory).
+    // Returns the WASM offset of the newly allocated memory if succesful, 0
+    // otherwise. If succesful, populate the nativePtr variable with the
+    // native pointer to access the returned offset
+    uint32_t wasmModuleMalloc(size_t size, void** nativePtr)
+    {
+        auto moduleInstance = this->underlying().getModuleInstance();
+        uint32_t wasmOffset =
+          wasm_runtime_module_malloc(moduleInstance, size, nativePtr);
+
+        if (wasmOffset == 0 || nativePtr == nullptr) {
+            throw std::runtime_error(
+              "Failed malloc-ing memory in WASM module!");
+        }
+
+        return wasmOffset;
+    }
+
     // Helper function to write a string array to a buffer in the WASM linear
     // memory, and record the offsets where each new string begins (note that
     // in WASM this strings are now interpreted as char pointers).

diff --git a/include/wamr/native.h b/include/wamr/native.h
@@ -45,8 +45,6 @@
 namespace wasm {
 void initialiseWAMRNatives();
 
-uint32_t getFaasmChainingApi(NativeSymbol** nativeSymbols);
-    
 uint32_t getFaasmDynlinkApi(NativeSymbol** nativeSymbols);
 
 uint32_t getFaasmEnvApi(NativeSymbol** nativeSymbols);

diff --git a/include/wasm/migration.h b/include/wasm/migration.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace wasm {
+void doMigrationPoint(int32_t entrypointFuncWasmOffset,
+                      const std::string& entrypointFuncArg);
+}
diff --git a/src/enclave/inside/EnclaveWasmModule.cpp b/src/enclave/inside/EnclaveWasmModule.cpp
@@ -60,26 +60,30 @@ bool EnclaveWasmModule::loadWasm(void* wasmOpCodePtr, uint32_t wasmOpCodeSize)
 
 bool EnclaveWasmModule::callFunction(uint32_t argcIn, char** argvIn)
 {
+    prepareArgcArgv(argcIn, argvIn);
+
+    WASMExecEnv* execEnv = wasm_runtime_get_exec_env_singleton(moduleInstance);
+    if (execEnv == nullptr) {
+        ocallLogError("Failed to create WAMR exec env");
+        throw std::runtime_error("Failed to create WAMR exec env");
+    }
+
     WASMFunctionInstanceCommon* func =
       wasm_runtime_lookup_function(moduleInstance, WASM_ENTRY_FUNC, nullptr);
-
-    prepareArgcArgv(argcIn, argvIn);
+    if (func == nullptr) {
+        ocallLogError("Did not find named WASM function");
+        throw std::runtime_error("Did not find named wasm function");
+    }
 
     // Set dummy argv to capture return value
     std::vector<uint32_t> argv = { 0 };
-
-    bool success =
-      aot_create_exec_env_and_call_function((AOTModuleInstance*)moduleInstance,
-                                            (AOTFunctionInstance*)func,
-                                            0x0,
-                                            argv.data());
+    bool success = wasm_runtime_call_wasm(execEnv, func, 0, argv.data());
+    uint32_t returnValue = argv[0];
 
     if (success) {
        ocallLogDebug("Success calling WASM function");
     } else {
-        std::string errorMessage(
-          ((AOTModuleInstance*)moduleInstance)->cur_exception);
-        // TODO - better logging
+        std::string errorMessage(wasm_runtime_get_exception(moduleInstance));
         std::string errorText =
           "Caught WASM runtime exception: " + errorMessage;
         ocallLogError(errorText.c_str());

diff --git a/src/runner/local_pool_runner.cpp b/src/runner/local_pool_runner.cpp
@@ -17,13 +17,9 @@ int doRunner(int argc, char* argv[])
 
     if (vm.count("input-data")) {
         msg.set_inputdata(vm["input-data"].as<std::string>());
-        SPDLOG_INFO("Adding input data: {}",
-                    vm["input-data"].as<std::string>());
     }
     if (vm.count("cmdline")) {
         msg.set_cmdline(vm["cmdline"].as<std::string>());
-        SPDLOG_INFO("Adding command line arguments: {}",
-                    vm["cmdline"].as<std::string>());
     }
 
     faabric::scheduler::Scheduler& sch = faabric::scheduler::getScheduler();
@@ -32,7 +28,7 @@ int doRunner(int argc, char* argv[])
     usleep(1000 * 500);
 
     for (const auto& m : req->messages()) {
-        faabric::Message result = sch.getFunctionResult(m.id(), 20000);
+        faabric::Message result = sch.getFunctionResult(m.id(), 20000 * 100);
         if (result.returnvalue() != 0) {
             SPDLOG_ERROR("Message ({}) returned error code: {}",
                          m.id(),
@@ -53,6 +49,13 @@ int main(int argc, char* argv[])
     sch.shutdown();
     sch.addHostToGlobalSet();
 
+    // Set timeout to ensure longer functions can finish
+    faabric::util::SystemConfig& conf = faabric::util::getSystemConfig();
+    conf::FaasmConfig& faasmConf = conf::getFaasmConfig();
+    conf.boundTimeout = 120000 * 100;
+    conf.globalMessageTimeout = 120000 * 100;
+    faasmConf.chainedCallTimeout = 120000 * 100;
+
     // WARNING: All 0MQ-related operations must take place in a self-contined
     // scope to ensure all sockets are destructed before closing the context.
     {

diff --git a/src/wamr/CMakeLists.txt b/src/wamr/CMakeLists.txt
@@ -11,6 +11,7 @@ set(WAMR_BUILD_SPEC_TEST 0)
 add_definitions(-DWAMR_FAASM=1)
 
 # Set AOT mode and JIT for code generation
+set(WAMR_BUILD_INTERPRETER 1)
 set(WAMR_BUILD_AOT 1)
 set(WAMR_BUILD_JIT 1)
 set(WAMR_BUILD_LAZY_JIT 0)
@@ -74,12 +75,11 @@ llvm_map_components_to_libnames(
 # Link everything together
 faasm_private_lib(wamrmodule
     WAMRWasmModule.cpp
-    chaining.cpp
     codegen.cpp
     dynlink.cpp
     env.cpp
+    faasm.cpp
     filesystem.cpp
-    funcs.cpp
     memory.cpp
     mpi.cpp
     native.cpp
+2 −2		.env
+1 −1		.github/workflows/tests.yml
+1 −1		VERSION
+2 −1		faasmtools/build.py
+1 −0		libfaasm/CMakeLists.txt
+2 −0		libfaasm/faasm/core.h
+17 −0		libfaasm/faasm/memory.h
+1 −1		third-party/wasi-libc