vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: fix a race condition in the closure implementation (#14532)

master
spaceface 2022-05-27 16:35:02 +02:00 committed by GitHub
parent f7995c8916
commit 52a3e5e780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 106 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/gen/c/cgen.v
View File

@ -3362,7 +3362,7 @@ fn (mut g Gen) selector_expr(node ast.SelectorExpr) {
sb.write_string('${g.typ(param.typ)} a$i') sb.write_string('${g.typ(param.typ)} a$i')
} }
sb.writeln(') {') sb.writeln(') {')
sb.writeln('\t$data_styp* a0 = *($data_styp**)(__RETURN_ADDRESS() - __CLOSURE_DATA_OFFSET);') sb.writeln('\t$data_styp* a0 = __CLOSURE_GET_DATA();')
if m.return_type != ast.void_type { if m.return_type != ast.void_type {
sb.write_string('\treturn ') sb.write_string('\treturn ')
} else { } else {

148
vlib/v/gen/c/cheaders.v
View File

@ -76,55 +76,67 @@ fn c_closure_helpers(pref &pref.Preferences) string {
#define __RETURN_ADDRESS() ((char*)__builtin_extract_return_addr(__builtin_return_address(0))) #define __RETURN_ADDRESS() ((char*)__builtin_extract_return_addr(__builtin_return_address(0)))
#endif #endif
#define ASSUMED_PAGE_SIZE 0x4000 // 16K static int _V_page_size = 0x4000; // 16K
#define _CLOSURE_SIZE (((3*sizeof(void*) > sizeof(__closure_thunk) ? 3*sizeof(void*) : sizeof(__closure_thunk)) + sizeof(void*) - 1) & ~(sizeof(void*) - 1)) #define ASSUMED_PAGE_SIZE 0x4000
// equal to `max(3*sizeof(void*), sizeof(__closure_thunk))`, rounded up to the next multiple of `sizeof(void*)` #define _CLOSURE_SIZE (((2*sizeof(void*) > sizeof(__closure_thunk) ? 2*sizeof(void*) : sizeof(__closure_thunk)) + sizeof(void*) - 1) & ~(sizeof(void*) - 1))
// equal to `max(2*sizeof(void*), sizeof(__closure_thunk))`, rounded up to the next multiple of `sizeof(void*)`
// refer to https://godbolt.org/z/r7P3EYv6c for a complete assembly // refer to https://godbolt.org/z/r7P3EYv6c for a complete assembly
#ifdef __V_amd64 #ifdef __V_amd64
static const char __closure_thunk[] = { static const char __closure_thunk[] = {
0x8f, 0x05, 0x0a, 0xc0, 0xff, 0xff, // pop QWORD PTR [rip - return_addr] 0xF3, 0x44, 0x0F, 0x7E, 0x3D, 0xF7, 0xBF, 0xFF, 0xFF, // movq xmm15, QWORD PTR [rip - userdata]
0xff, 0x15, 0xfc, 0xbf, 0xff, 0xff, // call QWORD PTR [rip - fn] 0xFF, 0x25, 0xF9, 0xBF, 0xFF, 0xFF // jmp QWORD PTR [rip - fn]
0xff, 0x25, 0xfe, 0xbf, 0xff, 0xff // jmp QWORD PTR [rip - return_addr] };
static char __CLOSURE_GET_DATA_BYTES[] = {
0x66, 0x4C, 0x0F, 0x7E, 0xF8, // movq rax, xmm15
0xC3 // ret
}; };
#define __CLOSURE_DATA_OFFSET 0x400C #define __CLOSURE_DATA_OFFSET 0x400C
#elif defined(__V_x86) #elif defined(__V_x86)
static char __closure_thunk[] = { static char __closure_thunk[] = {
0xe8, 0x00, 0x00, 0x00, 0x00, // call 4 0xe8, 0x00, 0x00, 0x00, 0x00, // call here
// here:
0x59, // pop ecx 0x59, // pop ecx
0x8f, 0x81, 0x03, 0xc0, 0xff, 0xff, // pop DWORD PTR [ecx - 0x3ffd] # <return_addr> 0x66, 0x0F, 0x6E, 0xF9, // movd xmm7, ecx
0xff, 0x91, 0xff, 0xbf, 0xff, 0xff, // call DWORD PTR [ecx - 0x4001] # <fn> 0xff, 0xA1, 0xff, 0xbf, 0xff, 0xff, // jmp DWORD PTR [ecx - 0x4001] # <fn>
0xe8, 0x00, 0x00, 0x00, 0x00, // call 4
0x59, // pop ecx
0xff, 0xa1, 0xf1, 0xbf, 0xff, 0xff // jmp DWORD PTR [ecx - 0x400f] # <return_addr>
}; };
static char __CLOSURE_GET_DATA_BYTES[] = {
0x66, 0x0F, 0x7E, 0xF8, // movd eax, xmm7
0x8B, 0x80, 0xFB, 0xBF, 0xFF, 0xFF, // mov eax, DWORD PTR [eax - 0x4005]
0xc3 // ret
};
#define __CLOSURE_DATA_OFFSET 0x4012 #define __CLOSURE_DATA_OFFSET 0x4012
#elif defined(__V_arm64) #elif defined(__V_arm64)
static char __closure_thunk[] = { static char __closure_thunk[] = {
0x90, 0x00, 0xfe, 0x10, // adr x16, return_addr 0x11, 0x00, 0xFE, 0x58, // ldr x17, userdata
0x1e, 0x02, 0x00, 0xf9, // str x30, [x16] 0x30, 0x00, 0xFE, 0x58, // ldr x16, fn
0x10, 0x00, 0xfe, 0x58, // ldr x16, fn 0x00, 0x02, 0x1F, 0xD6 // br x16
0x00, 0x02, 0x3f, 0xd6, // blr x16 };
0x1e, 0x00, 0xfe, 0x58, // ldr x30, return_addr static char __CLOSURE_GET_DATA_BYTES[] = {
0xc0, 0x03, 0x5f, 0xd6 // ret 0xE0, 0x03, 0x11, 0xAA, // mov x0, x17
0xC0, 0x03, 0x5F, 0xD6 // ret
}; };
#define __CLOSURE_DATA_OFFSET 0x4010
#elif defined(__V_arm32) #elif defined(__V_arm32)
// arm32 needs a small page size because its pc-relative addressing range is just ±4095 bytes
#undef ASSUMED_PAGE_SIZE
#define ASSUMED_PAGE_SIZE 4080
#undef _CLOSURE_SIZE
#define _CLOSURE_SIZE 28
static char __closure_thunk[] = { static char __closure_thunk[] = {
0xf0, 0xef, 0x0f, 0xe5, // str lr, return_addr 0x04, 0xC0, 0x4F, 0xE2, // adr ip, here
0xf8, 0xcf, 0x1f, 0xe5, // ldr ip, fn // here:
0x3c, 0xff, 0x2f, 0xe1, // blx ip 0x01, 0xC9, 0x4C, 0xE2, // sub ip, ip, #4000
0xfc, 0xef, 0x1f, 0xe5, // ldr lr, return_addr 0x90, 0xCA, 0x07, 0xEE, // vmov s15, ip
0x1e, 0xff, 0x2f, 0xe1 // bx lr 0x00, 0xC0, 0x9C, 0xE5, // ldr ip, [ip, 0]
0x1C, 0xFF, 0x2F, 0xE1 // bx ip
};
static char __CLOSURE_GET_DATA_BYTES[] = {
0x90, 0x0A, 0x17, 0xEE,
0x04, 0x00, 0x10, 0xE5,
0x1E, 0xFF, 0x2F, 0xE1
}; };
#define __CLOSURE_DATA_OFFSET 0xFFC #define __CLOSURE_DATA_OFFSET 0xFFC
#endif #endif
static void*(*__CLOSURE_GET_DATA)(void) = 0;
static inline void __closure_set_data(char* closure, void* data) { static inline void __closure_set_data(char* closure, void* data) {
void** p = (void**)(closure - ASSUMED_PAGE_SIZE); void** p = (void**)(closure - ASSUMED_PAGE_SIZE);
p[0] = data; p[0] = data;
@ -150,26 +162,16 @@ static pthread_mutex_t _closure_mtx;
static char* _closure_ptr = 0; static char* _closure_ptr = 0;
static int _closure_cap = 0; static int _closure_cap = 0;
static void* __closure_create(void* fn, void* data) { static void __closure_alloc(void) {
_closure_mtx_lock();
if (_closure_cap == 0) {
#ifdef _WIN32 #ifdef _WIN32
SYSTEM_INFO si; char* p = VirtualAlloc(NULL, _V_page_size * 2, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
GetNativeSystemInfo(&si); if (p == NULL) return;
uint32_t page_size = si.dwPageSize;
page_size = page_size * (((ASSUMED_PAGE_SIZE - 1) / page_size) + 1);
char* p = VirtualAlloc(NULL, page_size * 2, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
if (p == NULL) return 0;
#else #else
uint32_t page_size = sysconf(_SC_PAGESIZE); char* p = mmap(0, _V_page_size * 2, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
page_size = page_size * (((ASSUMED_PAGE_SIZE - 1) / page_size) + 1); if (p == MAP_FAILED) return;
int prot = PROT_READ | PROT_WRITE;
int flags = MAP_ANONYMOUS | MAP_PRIVATE;
char* p = mmap(0, page_size * 2, prot, flags, -1, 0);
if (p == MAP_FAILED) return 0;
#endif #endif
char* x = p + page_size; char* x = p + _V_page_size;
int remaining = page_size / _CLOSURE_SIZE; int remaining = _V_page_size / _CLOSURE_SIZE;
_closure_ptr = x; _closure_ptr = x;
_closure_cap = remaining; _closure_cap = remaining;
while (remaining > 0) { while (remaining > 0) {
@ -179,10 +181,46 @@ static void* __closure_create(void* fn, void* data) {
} }
#ifdef _WIN32 #ifdef _WIN32
DWORD _tmp; DWORD _tmp;
VirtualProtect(_closure_ptr, page_size, PAGE_EXECUTE_READ, &_tmp); VirtualProtect(_closure_ptr, _V_page_size, PAGE_EXECUTE_READ, &_tmp);
#else #else
mprotect(_closure_ptr, page_size, PROT_READ | PROT_EXEC); mprotect(_closure_ptr, _V_page_size, PROT_READ | PROT_EXEC);
#endif #endif
}
#ifdef _WIN32
void __closure_init() {
SYSTEM_INFO si;
GetNativeSystemInfo(&si);
uint32_t page_size = si.dwPageSize * (((ASSUMED_PAGE_SIZE - 1) / si.dwPageSize) + 1);
_V_page_size = page_size;
__closure_alloc();
DWORD _tmp;
VirtualProtect(_closure_ptr, page_size, PAGE_READWRITE, &_tmp);
memcpy(_closure_ptr, __CLOSURE_GET_DATA_BYTES, sizeof(__CLOSURE_GET_DATA_BYTES));
VirtualProtect(_closure_ptr, page_size, PAGE_EXECUTE_READ, &_tmp);
__CLOSURE_GET_DATA = (void*)_closure_ptr;
_closure_ptr += _CLOSURE_SIZE;
_closure_cap--;
}
#else
void __closure_init() {
uint32_t page_size = sysconf(_SC_PAGESIZE);
page_size = page_size * (((ASSUMED_PAGE_SIZE - 1) / page_size) + 1);
_V_page_size = page_size;
__closure_alloc();
mprotect(_closure_ptr, page_size, PROT_READ | PROT_WRITE);
memcpy(_closure_ptr, __CLOSURE_GET_DATA_BYTES, sizeof(__CLOSURE_GET_DATA_BYTES));
mprotect(_closure_ptr, page_size, PROT_READ | PROT_EXEC);
__CLOSURE_GET_DATA = (void*)_closure_ptr;
_closure_ptr += _CLOSURE_SIZE;
_closure_cap--;
}
#endif
static void* __closure_create(void* fn, void* data) {
_closure_mtx_lock();
if (_closure_cap == 0) {
__closure_alloc();
} }
_closure_cap--; _closure_cap--;
void* closure = _closure_ptr; void* closure = _closure_ptr;
@ -192,20 +230,6 @@ static void* __closure_create(void* fn, void* data) {
_closure_mtx_unlock(); _closure_mtx_unlock();
return closure; return closure;
} }
static void __closure_destroy(void *closure) {
#ifdef _WIN32
SYSTEM_INFO si;
GetNativeSystemInfo(&si);
uint32_t page_size = si.dwPageSize;
page_size = page_size * (((ASSUMED_PAGE_SIZE - 1) / page_size) + 1);
VirtualFree(closure, page_size * 2, MEM_RELEASE);
#else
long page_size = sysconf(_SC_PAGESIZE);
page_size = page_size * (((ASSUMED_PAGE_SIZE - 1) / page_size) + 1);
munmap((char*)closure - page_size, page_size * 2);
#endif
}
') ')
return builder.str() return builder.str()
} }

3
vlib/v/gen/c/cmain.v
View File

@ -74,6 +74,9 @@ fn (mut g Gen) gen_c_main_function_header() {
} }
g.writeln('\tg_main_argc = ___argc;') g.writeln('\tg_main_argc = ___argc;')
g.writeln('\tg_main_argv = ___argv;') g.writeln('\tg_main_argv = ___argv;')
if g.nr_closures > 0 {
g.writeln('__closure_init();')
}
} }
fn (mut g Gen) gen_c_main_header() { fn (mut g Gen) gen_c_main_header() {

2
vlib/v/gen/c/fn.v
View File

@ -304,7 +304,7 @@ fn (mut g Gen) gen_fn_decl(node &ast.FnDecl, skip bool) {
g.definitions.writeln(');') g.definitions.writeln(');')
g.writeln(') {') g.writeln(') {')
if is_closure { if is_closure {
g.writeln('$cur_closure_ctx* $c.closure_ctx = *(void**)(__RETURN_ADDRESS() - __CLOSURE_DATA_OFFSET);') g.writeln('$cur_closure_ctx* $c.closure_ctx = __CLOSURE_GET_DATA();')
} }
for i, is_promoted in heap_promoted { for i, is_promoted in heap_promoted {
if is_promoted { if is_promoted {