Re-factor SGX directory structure

CMakeLists.txt

@@ -208,10 +208,10 @@ target_include_directories(faasm_common_deps INTERFACE
 
 # Faasm SGX support
 if (SGX_FOUND)
-    add_subdirectory(src/sgx)
+    add_subdirectory(src/enclave)
 else ()
-    add_library(faasm_sgx_dummy INTERFACE)
-    add_library(faasm::sgx ALIAS faasm_sgx_dummy)
+    add_library(faasm_enclave_dummy INTERFACE)
+    add_library(faasm::enclave ALIAS faasm_enclave_dummy)
 endif ()
 
 # Faasm runtime

include/sgx/crypto/encryption.h → include/enclave/inside/crypto/encryption.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <sgx/crypto/types.h>
-#include <sgx/error.h>
+#include <enclave/error.h>
+#include <enclave/inside/crypto/types.h>
 
 #include <sgx_tcrypto.h>
 #include <sgx_trts.h>

include/sgx/crypto/hash.h → include/enclave/inside/crypto/hash.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sgx/crypto/types.h>
+#include <enclave/inside/crypto/types.h>
 
 #include <sgx_tcrypto.h>
 

include/sgx/native.h → include/enclave/inside/native.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <sgx/error.h>
-#include <sgx/ocalls.h>
+#include <enclave/error.h>
+#include <enclave/inside/ocalls.h>
 
 #include <iwasm/aot/aot_runtime.h>
 #include <iwasm/common/wasm_exec_env.h>

include/sgx/SGXWAMRWasmModule.h → include/enclave/outside/SGXWAMRWasmModule.h

@@ -1,7 +1,6 @@
 #pragma once
 
-#include <sgx/attestation.h>
-#include <sgx/error.h>
+#include <enclave/error.h>
 
 #include <storage/FileLoader.h>
 #include <storage/FileSystem.h>
@@ -74,9 +73,6 @@ class SGXWAMRWasmModule final : public WasmModule
 
     uint8_t* getMemoryBase() override;
 
-    // TODO: Move in gs/fs
-    faaslet_sgx_msg_buffer_t sgxWamrMsgResponse;
-
   private:
     uint32_t threadId = 0;
 };

include/sgx/system.h → include/enclave/outside/system.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sgx/error.h>
+#include <enclave/error.h>
 
 #include <sgx_eid.h>
 #include <sgx_error.h>

src/enclave/CMakeLists.txt

@@ -0,0 +1,109 @@
+# --------------------------------------------------------
+# SGX Config and Checks Shared Between Trusted/Untrusted Builds
+# --------------------------------------------------------
+
+# SGX configuration
+set(SGX_SDK_LIB_PATH ${SGX_SDK_PATH}/lib64)
+set(SGX_SDK_ENCLAVE_SIGNER ${SGX_SDK_PATH}/bin/x64/sgx_sign)
+set(SGX_SDK_ENCLAVE_EDGER8R ${SGX_SDK_PATH}/bin/x64/sgx_edger8r)
+set(ENCLAVE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/enclave_trusted.sign.so")
+set(ENCLAVE_EDL_FILENAME "enclave")
+add_definitions(-DFAASM_ENCLAVE_PATH="${ENCLAVE_PATH}")
+
+# Check for SGX SDK
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+if(EXISTS ${SGX_SDK_PATH})
+    message(STATUS "Found SGX-SDK: TRUE")
+else()
+    message(STATUS "Found SGX-SDK: FALSE")
+    message(FATAL_ERROR "SGX-SDK not installed in ${SGX_SDK_PATH}")
+endif()
+
+# NASM configuration
+enable_language(ASM_NASM)
+set(CMAKE_ASM_NASM_FLAGS -felf64)
+set(CMAKE_ASM_NASM_COMPILE_OBJECT
+    "<CMAKE_ASM_NASM_COMPILER> <INCLUDES> ${CMAKE_ASM_NASM_FLAGS} -o <OBJECT> <SOURCE>"
+)
+
+# --------------------------------------------------------
+# Global SGX Compilation Flags
+# --------------------------------------------------------
+
+set(SGX_C_GLOBAL_FLAGS -m64)
+
+if(CMAKE_BUILD_TYPE EQUAL "Debug")
+    set(SGX_C_GLOBAL_FLAGS ${SGX_C_GLOBAL_FLAGS} -O0 -g)
+
+    add_definitions(-DFAASM_SGX_DEBUG)
+else()
+    set(SGX_C_GLOBAL_FLAGS ${SGX_C_GLOBAL_FLAGS} -O2)
+endif()
+
+
+# --------------------------------------------------------
+# WAMR Build Common For Trusted and Untrusted
+#
+# 28/06/2021 - To build WAMR inside SGX, we follow the provided example:
+# https://github.com/bytecodealliance/wasm-micro-runtime/blob/main/product-mini/platforms/linux-sgx/CMakeLists.txt
+# --------------------------------------------------------
+
+# Set target platform details
+set(WAMR_BUILD_PLATFORM "linux-sgx")
+set(WAMR_BUILD_TARGET X86_64)
+set(WAMR_BUILD_SPEC_TEST)
+
+# Set AOT mode, disable JIT
+set(WAMR_BUILD_AOT 1)
+set(WAMR_BUILD_JIT 0)
+set(WAMR_BUILD_LAZY_JIT 0)
+
+# Set libraries
+set(WAMR_BUILD_LIBC_BUILTIN 1)
+set(WAMR_BUILD_LIBC_WASI 0)
+set(WAMR_BUILD_LIB_PTHREAD 0)
+
+# Let WAMR do the including and importing of the sources
+include(${WAMR_ROOT_DIR}/build-scripts/runtime_lib.cmake)
+
+# WAMR Trusted lib
+faasm_private_lib(wamrlib_trusted "${WAMR_RUNTIME_LIB_SOURCE}")
+
+target_include_directories(wamrlib_trusted PRIVATE
+    ${SGX_SDK_PATH}/include
+    ${SGX_SDK_PATH}/include/tlibc
+    ${SGX_SDK_PATH}/include/libcxx
+)
+
+target_compile_options(wamrlib_trusted PRIVATE
+    -std=gnu99
+    -fPIC
+    -ffunction-sections
+    -fdata-sections
+    -Wall
+    -Wno-unused-parameter
+    -Wno-pedantic
+    -nostdinc
+    -fvisibility=hidden
+)
+
+# WAMR untrusted lib
+add_library(wamrlib_untrusted STATIC ${PLATFORM_SHARED_SOURCE_UNTRUSTED})
+
+target_compile_options(wamrlib_untrusted PRIVATE
+    -fPIC
+    -ffunction-sections
+    -fdata-sections
+)
+
+# --------------------------------------------------------
+# Trusted Enclave Library
+# --------------------------------------------------------
+add_subdirectory(inside)
+
+# --------------------------------------------------------
+# Untrusted Enclave Library
+# --------------------------------------------------------
+add_subdirectory(outside)
+