From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 06E236EC55; Wed, 14 Jul 2021 14:14:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 06E236EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1626261275; bh=FglhqtvvCjqAgWazmfpA8VGpgKAFYbwGCC8DM5OuYuc=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=q9BAy9KawhiTGcaIdoalOKp3jq0RG+MrQUVuSL75JzMB5P0K1Su9vird/7PCUIw5r E+P3lBHmohUxM8kUQ/+TdofCPGi7Zi/txLgboSq4+GfeyMoIyMX5CYsfkmDBc+/5DX FMEBhjnWcJEzB42q2yfBj2SvrhcYAsL6r0qEF/+Y= Received: from smtp59.i.mail.ru (smtp59.i.mail.ru [217.69.128.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 0B55A6EC57 for ; Wed, 14 Jul 2021 14:13:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0B55A6EC57 Received: by smtp59.i.mail.ru with esmtpa (envelope-from ) id 1m3cpb-0001Jt-2m; Wed, 14 Jul 2021 14:13:35 +0300 To: gorcunov@tarantool.org, alyapunov@tarantool.org Cc: tarantool-patches@dev.tarantool.org, Egor Elchinov Date: Wed, 14 Jul 2021 14:12:50 +0300 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD97BB0EF39AD2B33D5CFD6F66580F08A9E8DA110284E1A7113182A05F538085040E53FAF991F8F0B42181BB79088F93230D700DE95D939AA3BE4DBC476A19C546C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE710FC7AC39A8009ECEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374D78D7F7271F09E9EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F299D7D5D4662198F9172FEBF8A340A78BCC7F00164DA146DAFE8445B8C89999728AA50765F7900637F6B57BC7E64490618DEB871D839B7333395957E7521B51C2DFABB839C843B9C08941B15DA834481F8AA50765F7900637F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C6E15E3BE9FD72F9A302FCEF25BFAB3454AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C3F8FC95E56CD5E825BA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE14079C09775C1D3CA48CF3D321E7403792E342EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE7EDFA0E72C3EE0C08731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CE68746B1F2AB10C6940F7973DF1FD49CC7CB03A73F84B76C9C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF309DFB797F6729CB699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D346B222596F62B8FA96458801B83B0FE2E90A02E43FF4FA453E4CD498336C619217109BF40DA3E4F781D7E09C32AA3244C9FFC03CB8E21F5A9BF837375C52C54483E8609A02908F271927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojDdSFIg49M1Sd+rmX8oQYOg== X-Mailru-Sender: EFA0F3A8419EF2166B053C73E674FFD58B62FECA294F31AB436F2705AD68D436E2527C969975515C67F54F2D6EFFC80BC77752E0C033A69E17841C44D9B5D58765F2F89A5AFDB6F16C18EFA0BB12DBB0 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v3 2/4] fiber: add option and PoC for Lua parent backtrace X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Egor Elchinov via Tarantool-patches Reply-To: eelchinov@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Egor Elchinov For now Lua backtrace is fully collected at fiber creation moment and stored in a dynamically allocated buffer. This patch also adds option enabling to turn on and off the collection of backtraces of parent fibers when creating new fibers. Needed for: #4002 @TarantoolBot document Title: new option for fiber parent backtrace `fiber.parent_bt_enable()` and `fiber.parent_bt_disable()` turn on and off the ability to trace fiber creation stacks. If present this option may cause up to 40 per cent slowdown of fiber creation. By default parent backtrace is disabled. Note that fibers created while this option was disabled lack their parent backtraces in `fiber.info()` forever. --- src/lib/core/fiber.c | 29 ++- src/lib/core/fiber.h | 18 ++ src/lua/fiber.c | 208 ++++++++++++++++-- src/lua/fiber.h | 19 ++ .../gh-4002-fiber-creation-backtrace.result | 21 ++ .../gh-4002-fiber-creation-backtrace.test.lua | 7 + 6 files changed, 287 insertions(+), 15 deletions(-) diff --git a/src/lib/core/fiber.c b/src/lib/core/fiber.c index 924ff3c82..dd26e2f13 100644 --- a/src/lib/core/fiber.c +++ b/src/lib/core/fiber.c @@ -220,6 +220,10 @@ fiber_mprotect(void *addr, size_t len, int prot) static __thread bool fiber_top_enabled = false; #endif /* ENABLE_FIBER_TOP */ +#if ENABLE_BACKTRACE +static __thread bool fiber_parent_bt_enabled = false; +#endif /* ENABLE_BACKTRACE */ + /** * An action performed each time a context switch happens. * Used to count each fiber's processing time. @@ -1265,7 +1269,10 @@ fiber_new_ex(const char *name, const struct fiber_attr *fiber_attr, fiber->fid = cord->next_fid; fiber_set_name(fiber, name); #if ENABLE_BACKTRACE - backtrace_collect_ip(fiber->parent_bt_ip_buf, FIBER_PARENT_BT_MAX); + if (fiber_parent_bt_enabled) { + backtrace_collect_ip(fiber->parent_bt_ip_buf, + FIBER_PARENT_BT_MAX); + } #endif /* ENABLE_BACKTRACE */ register_fid(fiber); fiber->csw = 0; @@ -1414,6 +1421,26 @@ fiber_top_disable(void) } #endif /* ENABLE_FIBER_TOP */ +#if ENABLE_BACKTRACE +bool +fiber_parent_bt_is_enabled(void) +{ + return fiber_parent_bt_enabled; +} + +void +fiber_parent_bt_enable(void) +{ + fiber_parent_bt_enabled = true; +} + +void +fiber_parent_bt_disable(void) +{ + fiber_parent_bt_enabled = false; +} +#endif /* ENABLE_BACKTRACE */ + size_t box_region_used(void) { diff --git a/src/lib/core/fiber.h b/src/lib/core/fiber.h index beed58866..477b68e4c 100644 --- a/src/lib/core/fiber.h +++ b/src/lib/core/fiber.h @@ -528,6 +528,7 @@ struct txn; struct credentials; struct lua_State; struct ipc_wait_pad; +struct parent_bt_lua; struct fiber { coro_context ctx; @@ -634,6 +635,12 @@ struct fiber { * Optional fiber.storage Lua reference. */ int ref; +#if ENABLE_BACKTRACE + /** + * Lua parent backtrace (may be NULL) + */ + struct parent_bt_lua *parent_bt; +#endif /* ENABLE_BACKTRACE */ } lua; /** * Iproto sync. @@ -871,6 +878,17 @@ void fiber_top_disable(void); #endif /* ENABLE_FIBER_TOP */ +#if ENABLE_BACKTRACE +bool +fiber_parent_bt_is_enabled(void); + +void +fiber_parent_bt_enable(void); + +void +fiber_parent_bt_disable(void); +#endif /* ENABLE_BACKTRACE */ + /** Useful for C unit tests */ static inline int fiber_c_invoke(fiber_func f, va_list ap) diff --git a/src/lua/fiber.c b/src/lua/fiber.c index 7b21361d4..fbf68c561 100644 --- a/src/lua/fiber.c +++ b/src/lua/fiber.c @@ -193,6 +193,18 @@ struct lua_fiber_tb_ctx { int tb_frame; }; +/** + * Lua parent traceback context. + */ +struct lua_parent_tb_ctx { + /* Lua stack to push values. */ + struct lua_State *L; + /* Lua parent backtrace. */ + struct parent_bt_lua *bt; + /* Count of traced frames (both C and Lua). */ + int tb_frame; +}; + #ifdef ENABLE_BACKTRACE static void dump_lua_frame(struct lua_State *L, lua_Debug *ar, int tb_frame) @@ -201,6 +213,24 @@ dump_lua_frame(struct lua_State *L, lua_Debug *ar, int tb_frame) snprintf(buf, sizeof(buf), "%s in %s at line %i", ar->name != NULL ? ar->name : "(unnamed)", ar->source, ar->currentline); + buf[sizeof(buf) - 1] = 0; + lua_pushnumber(L, tb_frame); + lua_newtable(L); + lua_pushstring(L, "L"); + lua_pushstring(L, buf); + lua_settable(L, -3); + lua_settable(L, -3); +} + +static void +dump_parent_lua_frame(struct lua_State *L, const char *name, const char *src, + int currentline, int tb_frame) +{ + char buf[512]; + snprintf(buf, sizeof(buf), "%s in %s at line %i", + name != NULL ? name : "(unnamed)", + src, currentline); + buf[sizeof(buf) - 1] = 0; lua_pushnumber(L, tb_frame); lua_newtable(L); lua_pushstring(L, "L"); @@ -246,11 +276,13 @@ fiber_backtrace_cb(int frameno, void *frameret, const char *func, size_t offset, } } char buf[512]; - int l = snprintf(buf, sizeof(buf), "#%-2d %p in ", frameno, frameret); + int l = snprintf(buf, sizeof(buf), "#%-2d %p in ", + frameno, frameret); if (func) snprintf(buf + l, sizeof(buf) - l, "%s+%zu", func, offset); else snprintf(buf + l, sizeof(buf) - l, "?"); + buf[sizeof(buf) - 1] = 0; tb_ctx->tb_frame++; lua_pushnumber(L, tb_ctx->tb_frame); lua_newtable(L); @@ -260,7 +292,117 @@ fiber_backtrace_cb(int frameno, void *frameret, const char *func, size_t offset, lua_settable(L, -3); return 0; } -#endif + +static int +fiber_parent_backtrace_cb(int frameno, void *frameret, const char *func, + size_t offset, void *cb_ctx) +{ + int lua_frame = 0; + struct lua_parent_tb_ctx *tb_ctx = (struct lua_parent_tb_ctx *)cb_ctx; + struct parent_bt_lua *bt = tb_ctx->bt; + struct lua_State *L = tb_ctx->L; + /* + * There is impossible to get func == NULL until + * https://github.com/tarantool/tarantool/issues/5326 + * will not resolved, but is possible afterwards. + */ + if (bt != NULL && func != NULL && strstr(func, "lj_BC_FUNCC") == func) { + /* We are in the LUA vm. */ + while (lua_frame < bt->cnt) { + tb_ctx->tb_frame++; + dump_parent_lua_frame(L, bt->names[lua_frame], + bt->sources[lua_frame], + bt->lines[lua_frame], + tb_ctx->tb_frame); + lua_frame++; + } + } + char buf[512]; + int l = snprintf(buf, sizeof(buf), "#%-2d %p in ", + frameno, frameret); + if (func) + snprintf(buf + l, sizeof(buf) - l, "%s+%zu", func, offset); + else + snprintf(buf + l, sizeof(buf) - l, "?"); + buf[sizeof(buf) - 1] = 0; + tb_ctx->tb_frame++; + lua_pushnumber(L, tb_ctx->tb_frame); + lua_newtable(L); + lua_pushstring(L, "C"); + lua_pushstring(L, buf); + lua_settable(L, -3); + lua_settable(L, -3); + return 0; +} + +static int +fiber_parent_bt_init(struct fiber *f, struct lua_State *L) +{ + int lua_frame = 0, tb_frame = 0; + lua_Debug ar; + struct parent_bt_lua *bt = NULL; + + bt = (struct parent_bt_lua *)malloc(sizeof(*bt)); + if (bt == NULL){ + diag_set(OutOfMemory, sizeof(*bt), "malloc", "bt"); + return 1; + } + + while (tb_frame < PARENT_BT_LUA_LEN_MAX && + lua_getstack(L, lua_frame, &ar) > 0) { + /* Skip all following C-frames. */ + lua_getinfo(L, "Sln", &ar); + if (*ar.what != 'C') + break; + bt->names[tb_frame][0] = 0; + bt->sources[tb_frame][0] = 0; + if (ar.name != NULL) { + /* Dump frame if it is a C built-in call. */ + bt->lines[tb_frame] = ar.currentline; + strncpy(bt->names[tb_frame], ar.name, + PARENT_BT_LUA_NAME_MAX - 1); + bt->names[tb_frame][PARENT_BT_LUA_NAME_MAX - 1] = 0; + strncpy(bt->sources[tb_frame], ar.source, + PARENT_BT_LUA_NAME_MAX - 1); + bt->sources[tb_frame][PARENT_BT_LUA_NAME_MAX - 1] = 0; + tb_frame++; + } + lua_frame++; + } + while (tb_frame < PARENT_BT_LUA_LEN_MAX && + lua_getstack(L, lua_frame, &ar) > 0) { + /* Trace Lua frame. */ + lua_getinfo(L, "Sln", &ar); + if (*ar.what == 'C') + break; + bt->lines[tb_frame] = ar.currentline; + if (ar.name != NULL) { + strncpy(bt->names[tb_frame], ar.name, + PARENT_BT_LUA_NAME_MAX - 1); + } else { + strncpy(bt->names[tb_frame], "(unnamed)", + PARENT_BT_LUA_NAME_MAX - 1); + } + bt->names[tb_frame][PARENT_BT_LUA_NAME_MAX - 1] = 0; + strncpy(bt->sources[tb_frame], ar.source, + PARENT_BT_LUA_NAME_MAX - 1); + bt->sources[tb_frame][PARENT_BT_LUA_NAME_MAX - 1] = 0; + tb_frame++; + lua_frame++; + } + + bt->cnt = tb_frame; + f->storage.lua.parent_bt = bt; + + return 0; +} + +static void +fiber_parent_bt_free(struct fiber *f) +{ + free(f->storage.lua.parent_bt); +} +#endif /* ENABLE_BACKTRACE */ static int lbox_fiber_statof_map(struct fiber *f, void *cb_ctx, bool backtrace) @@ -299,6 +441,7 @@ lbox_fiber_statof_map(struct fiber *f, void *cb_ctx, bool backtrace) if (backtrace) { #ifdef ENABLE_BACKTRACE struct lua_fiber_tb_ctx tb_ctx; + struct lua_parent_tb_ctx parent_tb_ctx; tb_ctx.L = L; tb_ctx.R = f->storage.lua.stack; tb_ctx.lua_frame = 0; @@ -309,15 +452,18 @@ lbox_fiber_statof_map(struct fiber *f, void *cb_ctx, bool backtrace) f != fiber() ? &f->ctx : NULL, &tb_ctx); lua_settable(L, -3); - tb_ctx.lua_frame = 0; - tb_ctx.tb_frame = 0; - tb_ctx.R = NULL; - lua_pushstring(L, "backtrace_parent"); - lua_newtable(L); - backtrace_foreach_ip(fiber_backtrace_cb, - f->parent_bt_ip_buf, - FIBER_PARENT_BT_MAX, &tb_ctx); - lua_settable(L, -3); + if (fiber_parent_bt_is_enabled()) { + parent_tb_ctx.L = L; + parent_tb_ctx.bt = f->storage.lua.parent_bt; + parent_tb_ctx.tb_frame = 0; + lua_pushstring(L, "backtrace_parent"); + lua_newtable(L); + backtrace_foreach_ip(fiber_parent_backtrace_cb, + f->parent_bt_ip_buf, + FIBER_PARENT_BT_MAX, + &parent_tb_ctx); + lua_settable(L, -3); + } #endif /* ENABLE_BACKTRACE */ } return 0; @@ -441,6 +587,22 @@ lbox_do_backtrace(struct lua_State *L) } return true; } + +static int +lbox_fiber_parent_bt_enable(struct lua_State *L) +{ + (void) L; + fiber_parent_bt_enable(); + return 0; +} + +static int +lbox_fiber_parent_bt_disable(struct lua_State *L) +{ + (void) L; + fiber_parent_bt_disable(); + return 0; +} #endif /* ENABLE_BACKTRACE */ /** @@ -481,10 +643,14 @@ lua_fiber_run_f(MAYBE_UNUSED va_list ap) * We can unref child stack here, * otherwise we have to unref child stack in join */ - if (f->flags & FIBER_IS_JOINABLE) + if (f->flags & FIBER_IS_JOINABLE) { lua_pushinteger(L, coro_ref); - else + } else { +#ifdef ENABLE_BACKTRACE + fiber_parent_bt_free(f); +#endif luaL_unref(L, LUA_REGISTRYINDEX, coro_ref); + } return result; } @@ -506,6 +672,12 @@ fiber_create(struct lua_State *L) luaT_error(L); } +#ifdef ENABLE_BACKTRACE + // TODO: error handling + if (fiber_parent_bt_is_enabled()) + fiber_parent_bt_init(f, L); +#endif + /* Move the arguments to the new coro */ lua_xmove(L, child_L, lua_gettop(L)); /* XXX: 'fiber' is leaked if this throws a Lua error. */ @@ -886,8 +1058,12 @@ lbox_fiber_join(struct lua_State *L) lua_xmove(child_L, L, num_ret); } } - if (child_L != NULL) + if (child_L != NULL) { +#ifdef ENABLE_BACKTRACE + fiber_parent_bt_free(fiber); +#endif luaL_unref(L, LUA_REGISTRYINDEX, coro_ref); + } return num_ret + 1; } @@ -941,6 +1117,10 @@ static const struct luaL_Reg fiberlib[] = { {"top_enable", lbox_fiber_top_enable}, {"top_disable", lbox_fiber_top_disable}, #endif /* ENABLE_FIBER_TOP */ +#if ENABLE_BACKTRACE + {"parent_bt_enable", lbox_fiber_parent_bt_enable}, + {"parent_bt_disable", lbox_fiber_parent_bt_disable}, +#endif /* ENABLE_BACKTRACE */ {"sleep", lbox_fiber_sleep}, {"yield", lbox_fiber_yield}, {"self", lbox_fiber_self}, diff --git a/src/lua/fiber.h b/src/lua/fiber.h index e29898706..450840fb0 100644 --- a/src/lua/fiber.h +++ b/src/lua/fiber.h @@ -36,6 +36,25 @@ extern "C" { struct lua_State; +/** + * Maximal name length (including '\0') + * and backtrace length. + */ +enum { + PARENT_BT_LUA_NAME_MAX = 64, + PARENT_BT_LUA_LEN_MAX = 8 +}; + +/** + * Stores lua parent backtrace for fiber. + */ +struct parent_bt_lua { + int cnt; + char names[PARENT_BT_LUA_LEN_MAX][PARENT_BT_LUA_NAME_MAX]; + char sources[PARENT_BT_LUA_LEN_MAX][PARENT_BT_LUA_NAME_MAX]; + int lines[PARENT_BT_LUA_LEN_MAX]; +}; + /** * Initialize box.fiber system */ diff --git a/test/app/gh-4002-fiber-creation-backtrace.result b/test/app/gh-4002-fiber-creation-backtrace.result index 4934b82d6..6a075911d 100644 --- a/test/app/gh-4002-fiber-creation-backtrace.result +++ b/test/app/gh-4002-fiber-creation-backtrace.result @@ -47,6 +47,17 @@ baz = function(n) bar(n) end | --- | ... +baz(10) + | --- + | ... +assert(parent_stack_len == -1) + | --- + | - true + | ... + +if stack_len ~= -1 then fiber:parent_bt_enable() end + | --- + | ... baz(10) | --- | ... @@ -55,3 +66,13 @@ assert(parent_stack_len > 0 or stack_len == -1) | - true | ... +if stack_len ~= -1 then fiber:parent_bt_disable() end + | --- + | ... +baz(10) + | --- + | ... +assert(parent_stack_len == -1) + | --- + | - true + | ... diff --git a/test/app/gh-4002-fiber-creation-backtrace.test.lua b/test/app/gh-4002-fiber-creation-backtrace.test.lua index 24d41a860..79a516860 100644 --- a/test/app/gh-4002-fiber-creation-backtrace.test.lua +++ b/test/app/gh-4002-fiber-creation-backtrace.test.lua @@ -22,6 +22,13 @@ local bar,baz bar = function(n) if n ~= 0 then baz(n-1) else fiber.create(foo) end end baz = function(n) bar(n) end +baz(10) +assert(parent_stack_len == -1) + +if stack_len ~= -1 then fiber:parent_bt_enable() end baz(10) assert(parent_stack_len > 0 or stack_len == -1) +if stack_len ~= -1 then fiber:parent_bt_disable() end +baz(10) +assert(parent_stack_len == -1) -- 2.31.1