From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org> Cc: Maxim Kokryashkin <max.kokryashkin@gmail.com>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit v2] Throw any errors before stack changes in trace stitching. Date: Wed, 6 Mar 2024 21:16:41 +0300 [thread overview] Message-ID: <uhi6vohgogq37aekuccchwvflid73q74mtdlblod334xaaqy4y@k5ebynrbdr2m> (raw) In-Reply-To: <ZeXXJmj-GY3yvG6Z@root> Hi, Sergey! Thanks for the review! Here is the new commit message: === Throw any errors before stack changes in trace stitching. Thanks to doujiang24. (cherry-picked from commit 3f9389edc6cdf3f78a6896d550c236860aed62b2) The Lua stack is changed in the `recff_stitch`, so if the trace is aborted, for example, when the `maxsnap` is reached, and an error is thrown from there, the execution continues with an unbalanced stack. This patch adds a check for snapshot overflow to the `recff_stitch` to overcome the issue for the `LJ_TRERR_SNAPOV` case, but other cases remain unresolved and should be fixed in other series. For a detailed description of the remaining cases, see the issue LJ#1166. Maxim Kokryashkin: * added the description and the test for the problem Part of tarantool/tarantool#9595 === And here is the diff with changes: === diff --git a/test/tarantool-tests/lj-720-errors-before-stitch.test.lua b/test/tarantool-tests/lj-720-errors-before-stitch.test.lua index 00fb0b9b..a2c6eef2 100644 --- a/test/tarantool-tests/lj-720-errors-before-stitch.test.lua +++ b/test/tarantool-tests/lj-720-errors-before-stitch.test.lua @@ -5,6 +5,7 @@ local test = tap.test('lj-720-errors-before-stitch'):skipcond({ test:plan(1) -- `math.modf` recording is NYI. +-- Local `modf` simplifies jdump output. local modf = math.modf jit.opt.start('hotloop=1', 'maxsnap=1') === Branch is force-pushed. On Mon, Mar 04, 2024 at 05:13:58PM +0300, Sergey Kaplun via Tarantool-patches wrote: > Hi, Maxim! > Thanks for the fixes! > LGTM, after fixing the comments below. > > On 01.03.24, Maxim Kokryashkin wrote: > > From: Mike Pall <mike> > > > > Thanks to doujiang24. > > > > (cherry-picked from commit 3f9389edc6cdf3f78a6896d550c236860aed62b2) > > > > The Lua stack is changed in the `recff_stitch`, so if the trace > > is aborted, for example, when the `maxsnap` is reached, and an > > error is thrown from there, the execution continues with an > > unbalanced stack. > > > > This patch adds a check for snapshot overflow to the > > `recff_stitch` to overcome the issue for the `LJ_TRERR_SNAPOV` > > case, but other cases remain unresolved and should be fixed in > > other series. For a detailed description of the remaining cases, > > see the issue[1]. > > > > [1]: https://github.com/LuaJIT/LuaJIT/issues/1166 > > I suppose it is better to drop the link (or just mention it in the test) > to avoid excess notification in the upstream repository. > > > > > Maxim Kokryashkin: > > * added the description and the test for the problem > > > > Part of tarantool/tarantool#9595 > > --- > > Changes in v2: > > - Fixed comments as per review by Sergey Kaplun > > > > Branch: https://github.com/tarantool/luajit/tree/fckxorg/lj-720-errors-before-stitch > > > > src/lj_ffrecord.c | 4 ++++ > > .../lj-720-errors-before-stitch.test.lua | 20 +++++++++++++++++++ > > 2 files changed, 24 insertions(+) > > create mode 100644 test/tarantool-tests/lj-720-errors-before-stitch.test.lua > > > > diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c > > index 1b2ddb72..e3ed80fb 100644 > > --- a/src/lj_ffrecord.c > > +++ b/src/lj_ffrecord.c > > <snipped> > > > diff --git a/test/tarantool-tests/lj-720-errors-before-stitch.test.lua b/test/tarantool-tests/lj-720-errors-before-stitch.test.lua > > new file mode 100644 > > index 00000000..00fb0b9b > > --- /dev/null > > +++ b/test/tarantool-tests/lj-720-errors-before-stitch.test.lua > > @@ -0,0 +1,20 @@ > > +local tap = require('tap') > > +local test = tap.test('lj-720-errors-before-stitch'):skipcond({ > > + ['Test requires JIT enabled'] = not jit.status(), > > +}) > > +test:plan(1) > > + > > +-- `math.modf` recording is NYI. > > +local modf = math.modf > > Why do we need to the use local value here? > > > +jit.opt.start('hotloop=1', 'maxsnap=1') > > + > > +-- The loop has only two iterations: the first to detect its > > +-- hotness and the second to record it. The snapshot limit is > > +-- set to one and is certainly reached. > > +for _ = 1, 2 do > > + -- Forcify stitch. > > + modf(1.2) > > +end > > + > > +test:ok(true, 'stack is balanced') > > +test:done(true) > > -- > > 2.43.0 > > > > -- > Best regards, > Sergey Kaplun
next prev parent reply other threads:[~2024-03-06 18:16 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-01 13:21 Maxim Kokryashkin via Tarantool-patches 2024-03-04 13:32 ` Sergey Bronnikov via Tarantool-patches 2024-03-04 14:13 ` Sergey Kaplun via Tarantool-patches 2024-03-06 18:16 ` Maxim Kokryashkin via Tarantool-patches [this message] 2024-03-20 15:03 ` Sergey Kaplun via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=uhi6vohgogq37aekuccchwvflid73q74mtdlblod334xaaqy4y@k5ebynrbdr2m \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v2] Throw any errors before stack changes in trace stitching.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox