christoph/wamr
1
Fork 0
Code Releases Activity

Refine aot call func procedure and fix zephyr timer overflow issue (#617)

Browse Source 
1. Refine the aot call function procedure

2. fix timer integer overflow issue on zephyr platform

3. move wasm_exec_env_set_thread_info into lower layer
This commit is contained in:
Xu Jun
2021-04-19 21:06:56 +08:00
committed by GitHub
parent 03d45f1d62
commit 684d766e2b
14 changed files with 135 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/shared/platform/android/platform_init.c
View File

@ -20,6 +20,9 @@ bh_platform_init()
void
bh_platform_destroy()
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
}
int os_printf(const char *fmt, ...)

8
core/shared/platform/android/platform_internal.h
View File

@ -56,6 +56,8 @@ typedef pthread_mutex_t korp_mutex;
typedef pthread_cond_t korp_cond;
typedef pthread_t korp_thread;
#define os_thread_local_attribute __thread
#if WASM_DISABLE_HW_BOUND_CHECK == 0
#if defined(BUILD_TARGET_X86_64) \
|| defined(BUILD_TARGET_AMD_64) \
@ -65,8 +67,6 @@ typedef pthread_t korp_thread;
#define OS_ENABLE_HW_BOUND_CHECK
#define os_thread_local_attribute __thread
typedef jmp_buf korp_jmpbuf;
#define os_setjmp setjmp
@ -75,6 +75,10 @@ typedef jmp_buf korp_jmpbuf;
#define os_getpagesize getpagesize
bool os_thread_init_stack_guard_pages();
void os_thread_destroy_stack_guard_pages();
typedef void (*os_signal_handler)(void *sig_addr);
int os_signal_init(os_signal_handler handler);

85
core/shared/platform/common/posix/posix_thread.c
View File

@ -25,6 +25,9 @@ static void *os_thread_wrapper(void *arg)
targ->stack = (void *)((uintptr_t)(&arg) & (uintptr_t)~0xfff);
BH_FREE(targ);
start_func(thread_arg);
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
return NULL;
}
@ -239,22 +242,32 @@ int os_thread_detach(korp_tid thread)
void os_thread_exit(void *retval)
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
return pthread_exit(retval);
}
static os_thread_local_attribute uint8 *thread_stack_boundary = NULL;
uint8 *os_thread_get_stack_boundary()
{
pthread_t self = pthread_self();
pthread_t self;
#ifdef __linux__
pthread_attr_t attr;
size_t guard_size;
#endif
uint8 *addr = NULL;
size_t stack_size;
int page_size = getpagesize();
size_t max_stack_size = (size_t)
(APP_THREAD_STACK_SIZE_MAX + page_size - 1)
& ~(page_size - 1);
size_t stack_size, max_stack_size;
int page_size;
if (thread_stack_boundary)
return thread_stack_boundary;
page_size = getpagesize();
self = pthread_self();
max_stack_size = (size_t)(APP_THREAD_STACK_SIZE_MAX + page_size - 1)
& ~(page_size - 1);
if (max_stack_size < APP_THREAD_STACK_SIZE_DEFAULT)
max_stack_size = APP_THREAD_STACK_SIZE_DEFAULT;
@ -284,6 +297,7 @@ uint8 *os_thread_get_stack_boundary()
}
#endif
thread_stack_boundary = addr;
return addr;
}
@ -291,12 +305,71 @@ uint8 *os_thread_get_stack_boundary()
#define SIG_ALT_STACK_SIZE (32 * 1024)
/* Whether the stack pages are touched and guard pages are set */
static os_thread_local_attribute bool stack_guard_pages_inited = false;
/* The signal alternate stack base addr */
static uint8 *sigalt_stack_base_addr;
/* The signal handler passed to os_signal_init() */
static os_signal_handler signal_handler;
#if defined(__GNUC__)
__attribute__((no_sanitize_address)) static uint32
#else
static uint32
#endif
touch_pages(uint8 *stack_min_addr, uint32 page_size)
{
uint8 sum = 0;
while (1) {
volatile uint8 *touch_addr =
(volatile uint8*)os_alloca(page_size / 2);
if (touch_addr < stack_min_addr + page_size) {
sum += *(stack_min_addr + page_size - 1);
break;
}
*touch_addr = 0;
sum += *touch_addr;
}
return sum;
}
bool
os_thread_init_stack_guard_pages()
{
uint32 page_size = os_getpagesize();
uint32 guard_page_count = STACK_OVERFLOW_CHECK_GUARD_PAGE_COUNT;
uint8 *stack_min_addr = os_thread_get_stack_boundary();
if (!stack_guard_pages_inited) {
/* Touch each stack page to ensure that it has been mapped: the OS
may lazily grow the stack mapping as a guard page is hit. */
(void)touch_pages(stack_min_addr, page_size);
/* First time to call aot function, protect guard pages */
if (os_mprotect(stack_min_addr, page_size * guard_page_count,
MMAP_PROT_NONE) != 0) {
return false;
}
stack_guard_pages_inited = true;
}
return true;
}
void
os_thread_destroy_stack_guard_pages()
{
if (stack_guard_pages_inited) {
uint32 page_size = os_getpagesize();
uint32 guard_page_count = STACK_OVERFLOW_CHECK_GUARD_PAGE_COUNT;
uint8 *stack_min_addr = os_thread_get_stack_boundary();
os_mprotect(stack_min_addr, page_size * guard_page_count,
MMAP_PROT_READ | MMAP_PROT_WRITE);
stack_guard_pages_inited = false;
}
}
static void
mask_signals(int how)
{

3
core/shared/platform/darwin/platform_init.c
View File

@ -14,6 +14,9 @@ bh_platform_init()
void
bh_platform_destroy()
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
}
int

8
core/shared/platform/darwin/platform_internal.h
View File

@ -57,6 +57,8 @@ typedef pthread_mutex_t korp_mutex;
typedef pthread_cond_t korp_cond;
typedef pthread_t korp_thread;
#define os_thread_local_attribute __thread
#if WASM_DISABLE_HW_BOUND_CHECK == 0
#if defined(BUILD_TARGET_X86_64) \
|| defined(BUILD_TARGET_AMD_64) \
@ -66,8 +68,6 @@ typedef pthread_t korp_thread;
#define OS_ENABLE_HW_BOUND_CHECK
#define os_thread_local_attribute __thread
typedef jmp_buf korp_jmpbuf;
#define os_setjmp setjmp
@ -76,6 +76,10 @@ typedef jmp_buf korp_jmpbuf;
#define os_getpagesize getpagesize
bool os_thread_init_stack_guard_pages();
void os_thread_destroy_stack_guard_pages();
typedef void (*os_signal_handler)(void *sig_addr);
int os_signal_init(os_signal_handler handler);

3
core/shared/platform/linux/platform_init.c
View File

@ -14,6 +14,9 @@ bh_platform_init()
void
bh_platform_destroy()
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
}
int

8
core/shared/platform/linux/platform_internal.h
View File

@ -56,6 +56,8 @@ typedef pthread_mutex_t korp_mutex;
typedef pthread_cond_t korp_cond;
typedef pthread_t korp_thread;
#define os_thread_local_attribute __thread
#if WASM_DISABLE_HW_BOUND_CHECK == 0
#if defined(BUILD_TARGET_X86_64) \
|| defined(BUILD_TARGET_AMD_64) \
@ -65,8 +67,6 @@ typedef pthread_t korp_thread;
#define OS_ENABLE_HW_BOUND_CHECK
#define os_thread_local_attribute __thread
typedef jmp_buf korp_jmpbuf;
#define os_setjmp setjmp
@ -75,6 +75,10 @@ typedef jmp_buf korp_jmpbuf;
#define os_getpagesize getpagesize
bool os_thread_init_stack_guard_pages();
void os_thread_destroy_stack_guard_pages();
typedef void (*os_signal_handler)(void *sig_addr);
int os_signal_init(os_signal_handler handler);

3
core/shared/platform/vxworks/platform_init.c
View File

@ -14,6 +14,9 @@ bh_platform_init()
void
bh_platform_destroy()
{
#ifdef OS_ENABLE_HW_BOUND_CHECK
os_thread_destroy_stack_guard_pages();
#endif
}
int

8
core/shared/platform/vxworks/platform_internal.h
View File

@ -55,6 +55,8 @@ typedef pthread_mutex_t korp_mutex;
typedef pthread_cond_t korp_cond;
typedef pthread_t korp_thread;
#define os_thread_local_attribute __thread
#if WASM_DISABLE_HW_BOUND_CHECK == 0
#if defined(BUILD_TARGET_X86_64) \
|| defined(BUILD_TARGET_AMD_64) \
@ -64,8 +66,6 @@ typedef pthread_t korp_thread;
#define OS_ENABLE_HW_BOUND_CHECK
#define os_thread_local_attribute __thread
typedef jmp_buf korp_jmpbuf;
#define os_setjmp setjmp
@ -74,6 +74,10 @@ typedef jmp_buf korp_jmpbuf;
#define os_getpagesize getpagesize
bool os_thread_init_stack_guard_pages();
void os_thread_destroy_stack_guard_pages();
typedef void (*os_signal_handler)(void *sig_addr);
int os_signal_init(os_signal_handler handler);

2
core/shared/platform/zephyr/zephyr_time.c
View File

@ -8,6 +8,6 @@
uint64
os_time_get_boot_microsecond()
{
return k_uptime_get_32() * 1000;
return k_uptime_get() * 1000;
}