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 1E25A6EC55; Fri, 8 Oct 2021 11:40:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1E25A6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633682454; bh=rLGdT3NBrYdPw9twrvUw3UwCsUcXNVqOw4cGJr9Sq5k=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Bn9ZbenxgzBJUNcup3CIMZw4lzp/lRElv15rOcX3KMYU+L9wPs45MfReTmUqCnYVA hq3+01HozmVvWq+9DD7NpQdAT26yJY+wMiN6DEHqLcg1tOx6H6ozTGHDPkWmOY649r RGf3niJ6RadoO2oVnsOXGyNDHY1Tqce/+jGdXANA= Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [94.100.177.96]) (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 0B4646EC55 for ; Fri, 8 Oct 2021 11:40:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0B4646EC55 Received: by smtp36.i.mail.ru with esmtpa (envelope-from ) id 1mYlQx-000224-0J; Fri, 08 Oct 2021 11:40:51 +0300 Date: Fri, 8 Oct 2021 11:39:11 +0300 To: sergos Message-ID: References: <20211005102829.30267-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7D436932E0370A3249AEA3E77A50CFBF89182A05F5380850402E21ED0649AA9DA0E7754096D2820207D52D7BC99DF8DF2C83C971059E870BFD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE795530B80AF2ADB7BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D08ED87D5614270A8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D81843297467C61C536452428012823F77117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6AC294AFEFA671E80089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A591B69B4D7D343BB83AE78152ED6A3A47D4D7FAEE76669D6CD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA759D2A03B9C34326B3410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3480A9008907CB2FD03C4A1EA9D472E5835D6DFB12988886CF6AF71F9819473E09111F8E665F96FC571D7E09C32AA3244CCBADC8AD8587F3B45C04EFFAE7FA6950B4DF56057A86259FFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbhzlKa2eIcVsMOUikq+bFQ== X-Mailru-Sender: 3B9A0136629DC91206CBC582EFEF4CB4F7D30053C3052D6080624A28DE1DB52006F365114516B2B6F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A89437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] Fix frame traversal for __gc handler frames. 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" Hi, Sergos! Thanks for the review! On 07.10.21, sergos wrote: > Hi! > Thanks for the patch! See my 2 comments below. > > Sergos > > > On 5 Oct 2021, at 13:28, Sergey Kaplun wrote: > > > > From: Mike Pall > > > > Reported by Changochen. > > > > (cherry picked from 53f82e6e2e858a0a62fd1a2ff47e9866693382e6) > > > > Additional stack traversal is needed to find an error function set for > ^^^ ^^^ > Additional to what? > I mean additional to stack traversal during error raising to find protected frame, but it is confusing, so I rephrase it as you suggested. > > handling runtime errors. cframe unwinding is missed for a C protected > > frame during this stack traversal. > > I would rephrase - > A cframe unwinding is miseed for a C protected frame during a serach for > an error function to handle a runtime error. > > > It leads to undefined behaviour or > > crash, when raising a runtime error on stack with the CP frame before an > > error function handler (for example, an error in __gc handler). > > > > This patch adds missing unwinding for CP frame. > > > > Sergey Kaplun: > > * added the description and the test for the problem > > --- The new commit message is the following: | Fix frame traversal for __gc handler frames. | | Reported by Changochen. | | (cherry picked from 53f82e6e2e858a0a62fd1a2ff47e9866693382e6) | | A cframe unwinding is missed for a C protected frame during a search for | an error function to handle a runtime error. It leads to undefined | behaviour or crash, when raising a runtime error on stack with the CP | frame before an error function handler (for example, an error in __gc | handler). | | This patch adds missing unwinding for CP frame. | | Sergey Kaplun: | * added the description and the test for the problem Branch is force-pushed. > > > > Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-601-fix-gc-finderrfunc > > Tarantool branch: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-fix-gc-finderrfunc > > LuaJIT issue: https://github.com/LuaJIT/LuaJIT/issues/601 > > > > src/lj_err.c | 1 + > > .../lj-601-fix-gc-finderrfunc.test.lua | 25 +++++++++++++++++++ > > 2 files changed, 26 insertions(+) > > create mode 100644 test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua > > > > diff --git a/src/lj_err.c b/src/lj_err.c > > index b6be357e..b520b3d3 100644 > > --- a/src/lj_err.c > > +++ b/src/lj_err.c > > @@ -585,6 +585,7 @@ static ptrdiff_t finderrfunc(lua_State *L) > > if (cframe_canyield(cf)) return 0; > > if (cframe_errfunc(cf) >= 0) > > return cframe_errfunc(cf); > > + cf = cframe_prev(cf); > > frame = frame_prevd(frame); > > break; > > case FRAME_PCALL: > > diff --git a/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua b/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua > > new file mode 100644 > > index 00000000..d8d79100 > > --- /dev/null > > +++ b/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua > > Unfortunately the test passes on the ’tarantool’ branch > > s-ostanevich:luajit s.ostanevich$ git checkout tarantool > Switched to branch 'tarantool' > s-ostanevich:luajit s.ostanevich$ git clean -xdff > […] > s-ostanevich:luajit s.ostanevich$ cmake . > […] > s-ostanevich:luajit s.ostanevich$ make > […] > [100%] Built target libluajit_shared > [100%] Built target libluajit > [100%] Built target luajit > s-ostanevich:luajit s.ostanevich$ git checkout skaplun/lj-601-fix-gc-finderrfunc > s-ostanevich:luajit s.ostanevich$ cd test/tarantool-tests > s-ostanevich:tarantool-tests s.ostanevich$ ../../src/luajit lj-601-fix-gc-finderrfunc.test.lua > TAP version 13 > 1..1 > ok - successfully collectgarbage with error Wild guess: it doesn't fail on Mac due to GC64 ;). See CI [1] to check my hypothesis. > > > @@ -0,0 +1,25 @@ > > +local tap = require('tap') > > + > > +local test = tap.test('lj-601-fix-gc-finderrfunc') > > +test:plan(1) > > + > > +-- Test file to demonstrate LuaJIT incorrect behaviour, when > > +-- throwing error in __gc finalizer. > > +-- See also, https://github.com/LuaJIT/LuaJIT/issues/601. > > + > > +collectgarbage() > > + > > +local a = newproxy(true) > > +getmetatable(a).__gc = function() > > + -- Function to raise error via `lj_err_run()` inside __gc. > > + local _ = load(function() collectgarbage()() end) > > +end > > + > > +-- XXX: Generate a small bunch of proxies. Need several to call > > +-- `collectgarbage()` on another proxy inside __gc. N cycles is > > +-- empirical number. > > +for _ = 1, 4 do newproxy(a) end > > +collectgarbage('collect') > > + > > +test:ok(true, 'successfully collectgarbage with error') > > +os.exit(test:check() and 0 or 1) > > -- > > 2.31.0 > > > [1]: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-fix-gc-finderrfunc-no-fix -- Best regards, Sergey Kaplun