gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-05-09 13:16:26 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix shared heap enhancement bugs and format code

Browse Source
This commit is contained in:
TL 2025-01-27 14:12:22 +08:00
parent aebb391cf5
commit add69585b9
5 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/iwasm/common/wasm_memory.c
View File

@ -183,6 +183,11 @@ wasm_runtime_create_shared_heap(SharedHeapInitArgs *init_args)
heap->start_off_mem32 = UINT32_MAX - heap->size + 1; heap->start_off_mem32 = UINT32_MAX - heap->size + 1;
heap->attached_count = 0; heap->attached_count = 0;
if (size > APP_HEAP_SIZE_MAX || size < APP_HEAP_SIZE_MIN) {
LOG_WARNING("Invalid size of shared heap");
goto fail1;
}
if (init_args->pre_allocated_addr != NULL) { if (init_args->pre_allocated_addr != NULL) {
/* Create shared heap from a pre allocated buffer, its size need to /* Create shared heap from a pre allocated buffer, its size need to
* align with system page */ * align with system page */
@ -193,6 +198,7 @@ wasm_runtime_create_shared_heap(SharedHeapInitArgs *init_args)
} }
heap->heap_handle = NULL; heap->heap_handle = NULL;
heap->base_addr = init_args->pre_allocated_addr;
} }
else { else {
if (!(heap->heap_handle = if (!(heap->heap_handle =
@ -200,11 +206,6 @@ wasm_runtime_create_shared_heap(SharedHeapInitArgs *init_args)
goto fail2; goto fail2;
} }
if (size > APP_HEAP_SIZE_MAX || size < APP_HEAP_SIZE_MIN) {
LOG_WARNING("Invalid size of shared heap");
goto fail3;
}
#ifndef OS_ENABLE_HW_BOUND_CHECK #ifndef OS_ENABLE_HW_BOUND_CHECK
map_size = size; map_size = size;
#else #else
@ -286,8 +287,8 @@ wasm_runtime_chain_shared_heaps(WASMSharedHeap *head, WASMSharedHeap *body)
heap_handle_exist = true; heap_handle_exist = true;
} }
head->start_off_mem64 = body->start_off_mem64 - head->size + 1; head->start_off_mem64 = body->start_off_mem64 - head->size;
head->start_off_mem32 = body->start_off_mem32 - head->size + 1; head->start_off_mem32 = body->start_off_mem32 - head->size;
head->chain_next = body; head->chain_next = body;
os_mutex_unlock(&shared_heap_list_lock); os_mutex_unlock(&shared_heap_list_lock);
return head; return head;
@ -505,8 +506,9 @@ is_app_addr_in_shared_heap(WASMModuleInstanceCommon *module_inst,
for (cur = heap; cur; cur = cur->chain_next) { for (cur = heap; cur; cur = cur->chain_next) {
shared_heap_start = shared_heap_start =
is_memory64 ? cur->start_off_mem64 : cur->start_off_mem32; is_memory64 ? cur->start_off_mem64 : cur->start_off_mem32;
shared_heap_end = shared_heap_start + cur->size; shared_heap_end = shared_heap_start - 1 + cur->size;
if (app_offset >= shared_heap_start && app_offset <= shared_heap_end) { if (app_offset >= shared_heap_start
&& app_offset <= shared_heap_end - bytes + 1) {
if (target_heap) if (target_heap)
*target_heap = cur; *target_heap = cur;
return true; return true;
@ -535,19 +537,16 @@ is_native_addr_in_shared_heap(WASMModuleInstanceCommon *module_inst,
for (cur = heap_head; cur != NULL; cur = cur->chain_next) { for (cur = heap_head; cur != NULL; cur = cur->chain_next) {
base_addr = (uintptr_t)cur->base_addr; base_addr = (uintptr_t)cur->base_addr;
addr_int = (uintptr_t)addr; addr_int = (uintptr_t)addr;
if (addr_int < base_addr) { if (addr_int < base_addr)
continue; continue;
}
end_addr = addr_int + bytes; end_addr = addr_int + bytes;
/* Check for overflow */ /* Check for overflow */
if (end_addr <= addr_int) { if (end_addr <= addr_int)
continue; continue;
}
if (end_addr > base_addr + cur->size) { if (end_addr > base_addr + cur->size)
continue; continue;
}
if (target_heap) if (target_heap)
*target_heap = cur; *target_heap = cur;
@ -1041,9 +1040,11 @@ wasm_runtime_addr_app_to_native(WASMModuleInstanceCommon *module_inst_comm,
{ {
WASMModuleInstance *module_inst = (WASMModuleInstance *)module_inst_comm; WASMModuleInstance *module_inst = (WASMModuleInstance *)module_inst_comm;
WASMMemoryInstance *memory_inst; WASMMemoryInstance *memory_inst;
WASMSharedHeap *shared_heap;
uint8 *addr; uint8 *addr;
bool bounds_checks; bool bounds_checks;
#if WASM_ENABLE_SHARED_HEAP != 0
WASMSharedHeap *shared_heap;
#endif
bh_assert(module_inst_comm->module_type == Wasm_Module_Bytecode bh_assert(module_inst_comm->module_type == Wasm_Module_Bytecode
|| module_inst_comm->module_type == Wasm_Module_AoT); || module_inst_comm->module_type == Wasm_Module_AoT);

14
core/iwasm/interpreter/wasm_interp_classic.c
View File

@ -72,7 +72,7 @@ typedef float64 CellType_F64;
for (cur = shared_heap; cur; cur = cur->chain_next) { \ for (cur = shared_heap; cur; cur = cur->chain_next) { \
cur_shared_heap_start_off = get_shared_heap_start_off(cur); \ cur_shared_heap_start_off = get_shared_heap_start_off(cur); \
cur_shared_heap_end_off = \ cur_shared_heap_end_off = \
cur_shared_heap_start_off + cur->size - 1; \ cur_shared_heap_start_off - 1 + cur->size; \
if ((app_addr) >= cur_shared_heap_start_off \ if ((app_addr) >= cur_shared_heap_start_off \
&& (app_addr) <= cur_shared_heap_end_off - bytes + 1) { \ && (app_addr) <= cur_shared_heap_end_off - bytes + 1) { \
shared_heap_start_off = cur_shared_heap_start_off; \ shared_heap_start_off = cur_shared_heap_start_off; \
@ -1679,7 +1679,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
shared_heap ? get_shared_heap_start_off(shared_heap) : 0; shared_heap ? get_shared_heap_start_off(shared_heap) : 0;
uint64 shared_heap_end_off = uint64 shared_heap_end_off =
shared_heap shared_heap
? (get_shared_heap_start_off(shared_heap) + shared_heap->size - 1) ? (get_shared_heap_start_off(shared_heap) - 1 + shared_heap->size)
: 0; : 0;
#endif /* end of WASM_ENABLE_SHARED_HEAP != 0 */ #endif /* end of WASM_ENABLE_SHARED_HEAP != 0 */
#if WASM_ENABLE_MULTI_MEMORY != 0 #if WASM_ENABLE_MULTI_MEMORY != 0
@ -1719,7 +1719,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
goto got_exception; goto got_exception;
} }
HANDLE_OP(WASM_OP_NOP) { HANDLE_OP_END(); } HANDLE_OP(WASM_OP_NOP)
{
HANDLE_OP_END();
}
#if WASM_ENABLE_EXCE_HANDLING != 0 #if WASM_ENABLE_EXCE_HANDLING != 0
HANDLE_OP(WASM_OP_RETHROW) HANDLE_OP(WASM_OP_RETHROW)
@ -5656,7 +5659,10 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
HANDLE_OP(WASM_OP_I32_REINTERPRET_F32) HANDLE_OP(WASM_OP_I32_REINTERPRET_F32)
HANDLE_OP(WASM_OP_I64_REINTERPRET_F64) HANDLE_OP(WASM_OP_I64_REINTERPRET_F64)
HANDLE_OP(WASM_OP_F32_REINTERPRET_I32) HANDLE_OP(WASM_OP_F32_REINTERPRET_I32)
HANDLE_OP(WASM_OP_F64_REINTERPRET_I64) { HANDLE_OP_END(); } HANDLE_OP(WASM_OP_F64_REINTERPRET_I64)
{
HANDLE_OP_END();
}
HANDLE_OP(WASM_OP_I32_EXTEND8_S) HANDLE_OP(WASM_OP_I32_EXTEND8_S)
{ {

6
core/iwasm/interpreter/wasm_interp_fast.c
View File

@ -53,7 +53,7 @@ typedef float64 CellType_F64;
for (cur = shared_heap; cur; cur = cur->chain_next) { \ for (cur = shared_heap; cur; cur = cur->chain_next) { \
cur_shared_heap_start_off = get_shared_heap_start_off(cur); \ cur_shared_heap_start_off = get_shared_heap_start_off(cur); \
cur_shared_heap_end_off = \ cur_shared_heap_end_off = \
cur_shared_heap_start_off + cur->size - 1; \ cur_shared_heap_start_off - 1 + cur->size; \
if ((app_addr) >= cur_shared_heap_start_off \ if ((app_addr) >= cur_shared_heap_start_off \
&& (app_addr) <= cur_shared_heap_end_off - bytes + 1) { \ && (app_addr) <= cur_shared_heap_end_off - bytes + 1) { \
shared_heap_start_off = cur_shared_heap_start_off; \ shared_heap_start_off = cur_shared_heap_start_off; \
@ -67,7 +67,7 @@ typedef float64 CellType_F64;
}) })
#define shared_heap_addr_app_to_native(app_addr, native_addr) \ #define shared_heap_addr_app_to_native(app_addr, native_addr) \
native_addr = shared_heap_base_addr + ((app_addr)-shared_heap_start_off) native_addr = shared_heap_base_addr + ((app_addr) - shared_heap_start_off)
#define CHECK_SHARED_HEAP_OVERFLOW(app_addr, bytes, native_addr) \ #define CHECK_SHARED_HEAP_OVERFLOW(app_addr, bytes, native_addr) \
if (app_addr_in_shared_heap(app_addr, bytes)) \ if (app_addr_in_shared_heap(app_addr, bytes)) \
@ -1568,7 +1568,7 @@ wasm_interp_call_func_bytecode(WASMModuleInstance *module,
shared_heap ? get_shared_heap_start_off(shared_heap) : 0; shared_heap ? get_shared_heap_start_off(shared_heap) : 0;
uint64 shared_heap_end_off = uint64 shared_heap_end_off =
shared_heap shared_heap
? (get_shared_heap_start_off(shared_heap) + shared_heap->size - 1) ? (get_shared_heap_start_off(shared_heap) - 1 + shared_heap->size)
: 0; : 0;
/* #endif */ /* #endif */
#endif /* end of WASM_ENABLE_SHARED_HEAP != 0 */ #endif /* end of WASM_ENABLE_SHARED_HEAP != 0 */

8
samples/shared-heap/src/main.c
View File

@ -55,7 +55,7 @@ thread1_callback(void *arg)
i + 1); i + 1);
printf("wasm app1 send buf: %s\n\n", buf); printf("wasm app1 send buf: %s\n\n", buf);
if (!bh_post_msg(queue, 1, buf, 1024 * i)) { if (!bh_post_msg(queue, 1, buf, 1024 * (i + 1))) {
printf("Failed to post message to queue\n"); printf("Failed to post message to queue\n");
wasm_runtime_shared_heap_free(module_inst, offset); wasm_runtime_shared_heap_free(module_inst, offset);
break; break;
@ -84,7 +84,7 @@ thread1_callback(void *arg)
buf = wasm_runtime_addr_app_to_native(module_inst, argv[0]); buf = wasm_runtime_addr_app_to_native(module_inst, argv[0]);
printf("wasm app1 send buf: %s\n\n", buf); printf("wasm app1 send buf: %s\n\n", buf);
if (!bh_post_msg(queue, 1, buf, 1024 * i)) { if (!bh_post_msg(queue, 1, buf, 1024 * (i+1))) {
printf("Failed to post message to queue\n"); printf("Failed to post message to queue\n");
wasm_runtime_shared_heap_free(module_inst, argv[0]); wasm_runtime_shared_heap_free(module_inst, argv[0]);
break; break;
@ -268,7 +268,7 @@ main(int argc, char **argv)
} }
/* create thread 1 */ /* create thread 1 */
struct thread_arg targ1 = { 0 }; thread_arg targ1 = { 0 };
korp_tid tid1; korp_tid tid1;
targ1.queue = queue; targ1.queue = queue;
targ1.module_inst = module_inst1; targ1.module_inst = module_inst1;
@ -279,7 +279,7 @@ main(int argc, char **argv)
} }
/* create thread 2 */ /* create thread 2 */
struct thread_arg targ2 = { 0 }; thread_arg targ2 = { 0 };
korp_tid tid2; korp_tid tid2;
targ2.queue = queue; targ2.queue = queue;
targ2.module_inst = module_inst2; targ2.module_inst = module_inst2;

50
tests/unit/shared-heap/shared_heap_test.cc
View File

@ -92,7 +92,9 @@ destroy_module_env(struct ret_env module_env)
} }
} }
static void test_shared_heap(WASMSharedHeap *shared_heap, const char *file, const char *func_name, uint32 argc, uint32 argv[]) static void
test_shared_heap(WASMSharedHeap *shared_heap, const char *file,
const char *func_name, uint32 argc, uint32 argv[])
{ {
struct ret_env tmp_module_env; struct ret_env tmp_module_env;
WASMFunctionInstanceCommon *func_test = nullptr; WASMFunctionInstanceCommon *func_test = nullptr;
@ -101,7 +103,8 @@ static void test_shared_heap(WASMSharedHeap *shared_heap, const char *file, cons
tmp_module_env = load_wasm((char *)file, 0); tmp_module_env = load_wasm((char *)file, 0);
if (!wasm_runtime_attach_shared_heap(tmp_module_env.wasm_module_inst, shared_heap)) { if (!wasm_runtime_attach_shared_heap(tmp_module_env.wasm_module_inst,
shared_heap)) {
printf("Failed to attach shared heap\n"); printf("Failed to attach shared heap\n");
goto test_failed; goto test_failed;
} }
@ -116,7 +119,8 @@ static void test_shared_heap(WASMSharedHeap *shared_heap, const char *file, cons
wasm_runtime_call_wasm(tmp_module_env.exec_env, func_test, argc, argv); wasm_runtime_call_wasm(tmp_module_env.exec_env, func_test, argc, argv);
if (!ret) { if (!ret) {
printf("\nFailed to wasm_runtime_call_wasm!\n"); printf("\nFailed to wasm_runtime_call_wasm!\n");
const char *s = wasm_runtime_get_exception(tmp_module_env.wasm_module_inst); const char *s =
wasm_runtime_get_exception(tmp_module_env.wasm_module_inst);
printf("exception: %s\n", s); printf("exception: %s\n", s);
goto test_failed; goto test_failed;
} }
@ -131,7 +135,7 @@ test_failed:
TEST_F(shared_heap_test, test_shared_heap_basic) TEST_F(shared_heap_test, test_shared_heap_basic)
{ {
SharedHeapInitArgs args; SharedHeapInitArgs args = { 0 };
WASMSharedHeap *shared_heap = nullptr; WASMSharedHeap *shared_heap = nullptr;
uint32 argv[1] = { 0 }; uint32 argv[1] = { 0 };
@ -150,12 +154,11 @@ TEST_F(shared_heap_test, test_shared_heap_basic)
// test aot // test aot
test_shared_heap(shared_heap, "test.aot", "test", 1, argv); test_shared_heap(shared_heap, "test.aot", "test", 1, argv);
EXPECT_EQ(10, argv[0]); EXPECT_EQ(10, argv[0]);
} }
TEST_F(shared_heap_test, test_shared_heap_malloc_fail) TEST_F(shared_heap_test, test_shared_heap_malloc_fail)
{ {
SharedHeapInitArgs args; SharedHeapInitArgs args = { 0 };
WASMSharedHeap *shared_heap = nullptr; WASMSharedHeap *shared_heap = nullptr;
uint32 argv[1] = { 0 }; uint32 argv[1] = { 0 };
@ -177,36 +180,36 @@ TEST_F(shared_heap_test, test_shared_heap_malloc_fail)
} }
#ifndef native_function #ifndef native_function
/* clang-format off */
#define native_function(func_name, signature) \ #define native_function(func_name, signature) \
{ #func_name, (void *)glue_##func_name, signature, NULL } { #func_name, (void *)glue_##func_name, signature, NULL }
/* clang-format on */
#endif #endif
#ifndef nitems #ifndef nitems
#define nitems(_a) (sizeof(_a) / sizeof(0 [(_a)])) #define nitems(_a) (sizeof(_a) / sizeof(0 [(_a)]))
#endif /* nitems */ #endif /* nitems */
uintptr_t glue_test_addr_conv(wasm_exec_env_t env, uintptr_t addr) uintptr_t
glue_test_addr_conv(wasm_exec_env_t env, uintptr_t addr)
{ {
wasm_module_inst_t module_inst = get_module_inst(env); wasm_module_inst_t module_inst = get_module_inst(env);
uintptr_t ret; uintptr_t ret;
void *native_addr = (void *)addr; void *native_addr = (void *)addr;
uintptr_t app_addr = addr_native_to_app(native_addr); uintptr_t app_addr = addr_native_to_app(native_addr);
native_addr = addr_app_to_native(app_addr); native_addr = addr_app_to_native(app_addr);
if (native_addr != (void *)addr) if (native_addr != (void *)addr) {
{ EXPECT_EQ(1, 0);
EXPECT_EQ(1, 0); }
} return app_addr;
return app_addr;
} }
static NativeSymbol g_test_native_symbols[] = static NativeSymbol g_test_native_symbols[] = {
{ native_function(test_addr_conv, "(*)i"),
native_function(test_addr_conv,"(*)i"),
}; };
TEST_F(shared_heap_test, test_addr_conv) TEST_F(shared_heap_test, test_addr_conv)
{ {
SharedHeapInitArgs args; SharedHeapInitArgs args = { 0 };
WASMSharedHeap *shared_heap = nullptr; WASMSharedHeap *shared_heap = nullptr;
uint32 argv[1] = { 0 }; uint32 argv[1] = { 0 };
struct ret_env tmp_module_env; struct ret_env tmp_module_env;
@ -217,8 +220,7 @@ TEST_F(shared_heap_test, test_addr_conv)
ret = wasm_native_register_natives("env", g_test_native_symbols, ret = wasm_native_register_natives("env", g_test_native_symbols,
nitems(g_test_native_symbols)); nitems(g_test_native_symbols));
if (!ret) if (!ret) {
{
EXPECT_EQ(1, 0); EXPECT_EQ(1, 0);
return; return;
} }