[Tarantool-patches] [PATCH luajit v3] sysprof: fix crash during FFUNC stream
Igor Munkin
imun at tarantool.org
Thu Nov 23 09:32:41 MSK 2023
Max,
I've checked the patchset into all long-term branches in
tarantool/luajit and bumped a new version in master, release/2.11 and
release/2.10.
On 10.07.23, Maxim Kokryashkin via Tarantool-patches wrote:
> Sometimes, the Lua stack can be inconsistent during
> the FFUNC execution, which may lead to a sysprof
> crash during the stack unwinding.
>
> This patch replaces the `top_frame` property of `global_State`
> with `lj_sysprof_topframe` structure, which contains `top_frame`
> and `ffid` properties. `ffid` property makes sense only when the
> LuaJIT VM state is set to `FFUNC`. That property is set to the
> ffid of the fast function that VM is about to execute.
> In the same time, `top_frame` property is not updated now, so
> the top frame of the Lua stack can be streamed based on the ffid,
> and the rest of the Lua stack can be streamed as usual.
>
> Also, this patch fixes build with plain makefile, by adding
> the `LJ_HASSYSPROF` flag support to it.
>
> Resolves tarantool/tarantool#8594
> ---
> Changes in v3:
> - Fixed comments as per review by Sergey
>
> Branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-8594-sysprof-ffunc-crash
> PR: https://github.com/tarantool/tarantool/pull/8737
> src/Makefile.original | 3 ++
> src/lj_obj.h | 7 +++-
> src/lj_sysprof.c | 26 ++++++++++++---
> src/vm_x64.dasc | 22 +++++++++++--
> src/vm_x86.dasc | 31 ++++++++++++++---
> .../gh-8594-sysprof-ffunc-crash.test.lua | 33 +++++++++++++++++++
> 6 files changed, 109 insertions(+), 13 deletions(-)
> create mode 100644 test/tarantool-tests/gh-8594-sysprof-ffunc-crash.test.lua
>
<snipped>
> --
> 2.40.1
>
--
Best regards,
IM
More information about the Tarantool-patches
mailing list