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 A15836E200; Fri, 18 Jun 2021 21:15:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A15836E200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1624040135; bh=9CwOF7JrtLbVG7AX0LlWzxv5DF0W1rrdhYk9gDzVIHk=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=XDKqaltBAmCD3L7c56ulzaGhWlKU1DQQyZrl2M9bVkVAhspHxGM8U28MYAzcKRcms FMsp528p7BUZ//71fxddXoSXijO8AVk9dE8hqOG81us+txAiGEb5u56sr4Oq7Sjf7s sdAVxDlAvesrWD5dHnhw6Z5MNSh1/Wtipwdsc4Uw= Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [94.100.177.100]) (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 DC4D46E200 for ; Fri, 18 Jun 2021 21:15:33 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DC4D46E200 Received: by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1luJ1g-00078s-BJ; Fri, 18 Jun 2021 21:15:33 +0300 To: Vladislav Shpilevoy , Igor Munkin Date: Fri, 18 Jun 2021 21:14:16 +0300 Message-Id: <20210618181416.25454-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD91C2C07775F13263A70584CC5DB91BD99BA7C94740AA1B03F00894C459B0CD1B91E9609AD6176866F956B663A3C5B846F3FEA0C34EFC2A7FCFEA245EA6D08AB3D X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77E216A0E97507353EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637578F58D66D7052C48638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D81C7A8E64A252688C86FD915DB2E9BF3C117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B613439FA09F3DCB32089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C128C1281A48FD13C4CB61525446CE734B88FFBD64E0823369C2B6934AE262D3EE7EAB7254005DCED004E902A251480721E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0CCA28C6D779E2CD78E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34C1D376EF32BB08960CA894AF27C68E8ADCA1F0B87483DC1B85FBF9249C9711E6FD472D02878139F11D7E09C32AA3244CB7C35AB6DE88CA11CD1D84B5BBD2FC8DB4DF56057A86259F927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0Roc5o5ut96VA5fl5WIQqA== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB458FA25476D00801640E84B6EF001EFF5FE56617FD3DDFF80F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH] lua: refactor port_lua_do_dump and encode_lua_call 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: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" The old code flow was the following: 1) `struct port_lua` given to `port_lua_do_dump()` has Lua stack with arguments to encode to MessagePack 2) The main coroutine `tarantool_L` is used with `lua_cpcall()` to call `encode_lua_call_16()` or `encode_lua_call()` 3) Objects on minor coroutine are encoded via `luamp_encode_call16()` or `luamp_encode()`. This encoding may raise an error on unprotected `port->L` coroutine. This coroutine has no protected frame on it and this call should fail in pure Lua. It is forbidden to call anything on unprotected coroutine [1] (Lua 5.1 sets protection only for specific lua_State [2] and calls a panic function if we raise an error on unprotected lua_State [3]). Netherless, there is no panic at now due to two facts. The first one is LuaJIT's support of C++ exception handling [4] that allows to raise an error in Lua and catch it in C++ or vice versa. But documentation still doesn't permit errors on unprotected coroutines (at least we must set try-catch block). The second one is double monkey-patching of LuaJIT to restore currently executed coroutine, when C function or fast function raises an error [5][6] (see related issue here [7][8]). For these reasons, when an error occurs, the unwinder searches and finds the C-protected stack frame from the `lua_cpcall()` for the `tarantool_L` coroutine and unwinds until that point (without aforementioned patches LuaJIT just calls a panic function and exit). 4) If an error is raised, and `lua_cpcall()` returns not `LUA_OK`, then the error from `port->L` coroutine is converted into a Tarantool error and a diagnostic is set. The auxiliary usage of `tarantool_L` coroutine is redundant and doesn't respect Lua idiomatic of usage. So this patch drops it and uses only minor coroutine instead with `lua_pcall()`. Functions to encode are saved as entrance in the `LUA_REGISTRY` table to reduce GC pressure, like it is done for other handlers [9]. [1]: https://www.lua.org/manual/5.2/manual.html#4.6 > If an error happens outside any protected environment, Lua calls a > panic function [2]: https://www.lua.org/source/5.1/lstate.h.html#lua_State [3]: https://www.lua.org/source/5.1/ldo.c.html#luaD_throw [4]: https://luajit.org/extensions.html#exceptions [5]: https://github.com/tarantool/luajit/commit/ed412cd9f55fe87fd32a69c86e1732690fc5c1b0 [6]: https://github.com/tarantool/luajit/commit/97699d9ee2467389b6aea21a098e38aff3469b5f [7]: https://github.com/tarantool/tarantool/issues/1516 [8]: https://www.freelists.org/post/luajit/Issue-with-PCALL-in-21 [9]: https://github.com/tarantool/tarantool/commit/e88c0d21ab765d4c53bed2437c49d77b3ffe4216 --- Branch: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-refactor-lua-call See the benchmarks sources here [1]. Before patch: | Encode map: 189851357 mcs, 15.8 K ps | Encode seq: 187926351 mcs, 16.0 K ps | Encode str: 185451675 mcs, 16.2 K ps | Encode dig: 184833396 mcs, 16.2 K ps After patch: | Encode map: 187814261 mcs, 16.0 K ps | Encode seq: 183755028 mcs, 16.3 K ps | Encode str: 181571626 mcs, 16.5 K ps | Encode dig: 181572998 mcs, 16.5 K ps Looks like the perf doesn't degrade at least. [1]: https://gist.github.com/Buristan/3e6d6bf2c722874bec55a8c5a44b98f3 src/box/lua/call.c | 71 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 15 deletions(-) diff --git a/src/box/lua/call.c b/src/box/lua/call.c index 0315e720c..3b2572096 100644 --- a/src/box/lua/call.c +++ b/src/box/lua/call.c @@ -61,6 +61,8 @@ enum handlers { HANDLER_CALL, HANDLER_CALL_BY_REF, HANDLER_EVAL, + HANDLER_ENCODE_CALL, + HANDLER_ENCODE_CALL_16, HANDLER_MAX, }; @@ -400,11 +402,26 @@ struct encode_lua_ctx { struct mpstream *stream; }; +/** + * Encode call results to msgpack from Lua stack. + * Lua stack has the following structure -- the last element is + * lightuserdata pointer to encode_lua_ctx, all other values are + * arguments to proceed. + * The function encodes all given Lua objects to msgpack stream + * from context, sets port's size and returns no value on the Lua + * stack. + * XXX: This function *MUST* be called under lua_pcall(), because + * luamp_encode() may raise an error. + */ static int encode_lua_call(lua_State *L) { + assert(lua_islightuserdata(L, -1)); struct encode_lua_ctx *ctx = - (struct encode_lua_ctx *) lua_topointer(L, 1); + (struct encode_lua_ctx *) lua_topointer(L, -1); + assert(ctx->port->L == L); + /* Delete ctx from the stack. */ + lua_pop(L, 1); /* * Add all elements from Lua stack to the buffer. * @@ -413,33 +430,48 @@ encode_lua_call(lua_State *L) struct luaL_serializer *cfg = luaL_msgpack_default; const struct serializer_opts *opts = ¤t_session()->meta.serializer_opts; - int size = lua_gettop(ctx->port->L); + const int size = lua_gettop(L); for (int i = 1; i <= size; ++i) - luamp_encode(ctx->port->L, cfg, opts, ctx->stream, i); + luamp_encode(L, cfg, opts, ctx->stream, i); ctx->port->size = size; mpstream_flush(ctx->stream); return 0; } +/** + * Encode call_16 results to msgpack from Lua stack. + * Lua stack has the following structure -- the last element is + * lightuserdata pointer to encode_lua_ctx, all other values are + * arguments to proceed. + * The function encodes all given Lua objects to msgpack stream + * from context, sets port's size and returns no value on the Lua + * stack. + * XXX: This function *MUST* be called under lua_pcall(), because + * luamp_encode() may raise an error. + */ static int encode_lua_call_16(lua_State *L) { + assert(lua_islightuserdata(L, -1)); struct encode_lua_ctx *ctx = - (struct encode_lua_ctx *) lua_topointer(L, 1); + (struct encode_lua_ctx *) lua_topointer(L, -1); + /* Delete ctx from the stack. */ + lua_pop(L, 1); + assert(ctx->port->L == L); /* * Add all elements from Lua stack to the buffer. * * TODO: forbid explicit yield from __serialize or __index here */ struct luaL_serializer *cfg = luaL_msgpack_default; - ctx->port->size = luamp_encode_call_16(ctx->port->L, cfg, ctx->stream); + ctx->port->size = luamp_encode_call_16(L, cfg, ctx->stream); mpstream_flush(ctx->stream); return 0; } static inline int port_lua_do_dump(struct port *base, struct mpstream *stream, - lua_CFunction handler) + enum handlers handler) { struct port_lua *port = (struct port_lua *) base; assert(port->vtab == &port_lua_vtab); @@ -450,13 +482,20 @@ port_lua_do_dump(struct port *base, struct mpstream *stream, struct encode_lua_ctx ctx; ctx.port = port; ctx.stream = stream; - struct lua_State *L = tarantool_L; - int top = lua_gettop(L); - if (lua_cpcall(L, handler, &ctx) != 0) { - luaT_toerror(port->L); + lua_State *L = port->L; + /* + * At the moment Lua stack holds only values to encode. + * Insert corresponding encoder to the bottom and push + * encode context as lightuserdata to the top. + */ + const int size = lua_gettop(L); + lua_rawgeti(L, LUA_REGISTRYINDEX, execute_lua_refs[handler]); + assert(lua_isfunction(L, -1) && lua_iscfunction(L, -1)); + lua_insert(L, 1); + lua_pushlightuserdata(L, &ctx); + /* nargs -- all arguments + lightuserdata. */ + if (luaT_call(L, size + 1, 0) != 0) return -1; - } - lua_settop(L, top); return port->size; } @@ -467,7 +506,7 @@ port_lua_dump(struct port *base, struct obuf *out) struct mpstream stream; mpstream_init(&stream, out, obuf_reserve_cb, obuf_alloc_cb, luamp_error, port->L); - return port_lua_do_dump(base, &stream, encode_lua_call); + return port_lua_do_dump(base, &stream, HANDLER_ENCODE_CALL); } static int @@ -477,7 +516,7 @@ port_lua_dump_16(struct port *base, struct obuf *out) struct mpstream stream; mpstream_init(&stream, out, obuf_reserve_cb, obuf_alloc_cb, luamp_error, port->L); - return port_lua_do_dump(base, &stream, encode_lua_call_16); + return port_lua_do_dump(base, &stream, HANDLER_ENCODE_CALL_16); } static void @@ -501,7 +540,7 @@ port_lua_get_msgpack(struct port *base, uint32_t *size) mpstream_init(&stream, region, region_reserve_cb, region_alloc_cb, luamp_error, port->L); mpstream_encode_array(&stream, lua_gettop(port->L)); - int rc = port_lua_do_dump(base, &stream, encode_lua_call); + int rc = port_lua_do_dump(base, &stream, HANDLER_ENCODE_CALL); if (rc < 0) { region_truncate(region, region_svp); return NULL; @@ -1049,6 +1088,8 @@ box_lua_call_init(struct lua_State *L) [HANDLER_CALL] = execute_lua_call, [HANDLER_CALL_BY_REF] = execute_lua_call_by_ref, [HANDLER_EVAL] = execute_lua_eval, + [HANDLER_ENCODE_CALL] = encode_lua_call, + [HANDLER_ENCODE_CALL_16] = encode_lua_call_16, }; for (int i = 0; i < HANDLER_MAX; i++) { -- 2.31.0