Implement multi-module feature and bulk-memory feature (#271)

Refine wasm loader and aot loader
Fix potential issue of os_mmap/os_munmap
Update document

core/shared/platform/common/posix/posix_memmap.c

@@ -11,13 +11,11 @@ os_mmap(void *hint, uint32 size, int prot, int flags)
     int map_prot = PROT_NONE;
     int map_flags = MAP_ANONYMOUS | MAP_PRIVATE;
     uint64 request_size, page_size;
-    uint8 *addr, *addr_aligned;
+    uint8 *addr;
     uint32 i;
 
-    /* align to 2M if no less than 2M, else align to 4K */
-    page_size = size < 2 * 1024 * 1024 ? 4096 : 2 * 1024 * 1024;
+    page_size = getpagesize();
     request_size = (size + page_size - 1) & ~(page_size - 1);
-    request_size += page_size;
 
     if (request_size >= UINT32_MAX)
         return NULL;
@@ -47,43 +45,25 @@ os_mmap(void *hint, uint32 size, int prot, int flags)
         if (addr != MAP_FAILED)
             break;
     }
+
     if (addr == MAP_FAILED)
         return NULL;
 
-    addr_aligned = (uint8*)(uintptr_t)
-        (((uint64)(uintptr_t)addr + page_size - 1) & ~(page_size - 1));
-
-    /* Unmap memory allocated before the aligned base address */
-    if (addr != addr_aligned) {
-        uint32 prefix_size = (uint32)(addr_aligned - addr);
-        munmap(addr, prefix_size);
-        request_size -= prefix_size;
-    }
-
-    /* Unmap memory allocated after the potentially unaligned end */
-    if (size != request_size) {
-        uint32 suffix_size = (uint32)(request_size - size);
-        munmap(addr_aligned + size, suffix_size);
-        request_size -= size;
-    }
-
-#ifndef __APPLE__
-    if (size >= 2 * 1024 * 1024) {
-        /* Try to use huge page to improve performance */
-        if (!madvise(addr, size, MADV_HUGEPAGE))
-            /* make huge page become effective */
-            memset(addr, 0, size);
-    }
-#endif
-
-    return addr_aligned;
+    return addr;
 }
 
 void
 os_munmap(void *addr, uint32 size)
 {
-    if (addr)
-        munmap(addr, size);
+    uint64 page_size = getpagesize();
+    uint64 request_size = (size + page_size - 1) & ~(page_size - 1);
+
+    if (addr) {
+        if (munmap(addr, request_size)) {
+            os_printf("os_munmap error addr:%p, size:0x%lx, errno:%d\n",
+                      addr, request_size, errno);
+        }
+    }
 }
 
 int

core/shared/platform/common/posix/posix_thread.c

@@ -249,5 +249,4 @@ uint8 *os_thread_get_stack_boundary()
 #endif
 
     return addr;
-}
-
+}

core/shared/platform/linux-sgx/sgx_platform.c

@@ -82,29 +82,39 @@ int os_vprintf(const char * format, va_list arg)
     return 0;
 }
 
-void* os_mmap(void *hint, unsigned int size, int prot, int flags)
+void* os_mmap(void *hint, uint32 size, int prot, int flags)
 {
 #if WASM_ENABLE_AOT != 0
     int mprot = 0;
-    unsigned alignedSize = (size+4095) & (unsigned)~4095; //Page aligned
+    uint64 aligned_size, page_size;
     void* ret = NULL;
     sgx_status_t st = 0;
 
-    ret = sgx_alloc_rsrv_mem(alignedSize);
+    page_size = getpagesize();
+    aligned_size = (size + page_size - 1) & ~(page_size - 1);
+
+    if (aligned_size >= UINT32_MAX)
+        return NULL;
+
+    ret = sgx_alloc_rsrv_mem(aligned_size);
     if (ret == NULL) {
-        os_printf("os_mmap(size=%d, alignedSize=%d, prot=0x%x) failed.",size, alignedSize, prot);
+        os_printf("os_mmap(size=%u, aligned size=%lu, prot=0x%x) failed.",
+                  size, aligned_size, prot);
         return NULL;
     }
+
     if (prot & MMAP_PROT_READ)
         mprot |= SGX_PROT_READ;
     if (prot & MMAP_PROT_WRITE)
         mprot |= SGX_PROT_WRITE;
     if (prot & MMAP_PROT_EXEC)
         mprot |= SGX_PROT_EXEC;
-    st = sgx_tprotect_rsrv_mem(ret, alignedSize, mprot);
-    if (st != SGX_SUCCESS){
-        os_printf("os_mmap(size=%d,prot=0x%x) failed to set protect.",size, prot);
-        sgx_free_rsrv_mem(ret, alignedSize);
+
+    st = sgx_tprotect_rsrv_mem(ret, aligned_size, mprot);
+    if (st != SGX_SUCCESS) {
+        os_printf("os_mmap(size=%u, prot=0x%x) failed to set protect.",
+                  size, prot);
+        sgx_free_rsrv_mem(ret, aligned_size);
         return NULL;
     }
 
@@ -117,7 +127,11 @@ void* os_mmap(void *hint, unsigned int size, int prot, int flags)
 void os_munmap(void *addr, uint32 size)
 {
 #if WASM_ENABLE_AOT != 0
-    sgx_free_rsrv_mem(addr, size);
+    uint64 aligned_size, page_size;
+
+    page_size = getpagesize();
+    aligned_size = (size + page_size - 1) & ~(page_size - 1);
+    sgx_free_rsrv_mem(addr, aligned_size);
 #endif
 }
 
@@ -135,7 +149,8 @@ int os_mprotect(void *addr, uint32 size, int prot)
         mprot |= SGX_PROT_EXEC;
     st = sgx_tprotect_rsrv_mem(addr, size, mprot);
     if (st != SGX_SUCCESS)
-        os_printf("os_mprotect(addr=0x%lx,size=%d,prot=0x%x) failed.", addr, size, prot);
+        os_printf("os_mprotect(addr=0x%lx, size=%u, prot=0x%x) failed.",
+                  addr, size, prot);
 
     return (st == SGX_SUCCESS? 0:-1);
 #else