From 98ad36e35a1944318f68db3e6734e847b2300160 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 23 Apr 2024 17:51:47 +0900 Subject: [PATCH] core/config.h: Bump the default WASM_STACK_GUARD_SIZE (#3344) The old value (1KB) doesn't seem sufficient for many cases. I suspect that the new value is still not sufficient for some cases. But it's far safer than the old value. Consider if the classic interpreter loop (2600 bytes) calls host snprintf. (2000 bytes) Fixes: https://github.com/bytecodealliance/wasm-micro-runtime/issues/3314 --- core/config.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/core/config.h b/core/config.h index c341a9ad..70ebb795 100644 --- a/core/config.h +++ b/core/config.h @@ -486,7 +486,26 @@ /* UVWASI requires larger native stack */ #define WASM_STACK_GUARD_SIZE (4096 * 6) #else -#define WASM_STACK_GUARD_SIZE (1024) +/* + * Use a larger default for platforms like macOS/Linux. + * + * For example, wasm_interp_call_func_bytecode + wasm_runtime_set_exception + * would consume >4KB stack on x86-64 macOS. + * + * Although product-mini/platforms/nuttx always overrides + * WASM_STACK_GUARD_SIZE, exclude NuttX here just in case. + */ +#if defined(__APPLE__) || (defined(__unix__) && !defined(__NuttX__)) +#define WASM_STACK_GUARD_SIZE (1024 * 5) +#else +/* + * Otherwise, assume very small requirement for now. + * + * Embedders for very small devices likely fine-tune WASM_STACK_GUARD_SIZE + * for their specific applications anyway. + */ +#define WASM_STACK_GUARD_SIZE 1024 +#endif #endif #endif