From: Igor Munkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] Another fix for lua_yield() from C hook.
Date: Sat, 1 Jul 2023 12:09:01 +0000 [thread overview]
Message-ID: <ZKAXXcHjotEvfoWs@tarantool.org> (raw)
In-Reply-To: <840ae735734b3b0074bb43659c7fb21f54664114.1687439049.git.skaplun@tarantool.org>
Sergey,
Thanks for the patch! LGTM, considering the fixes made to resolve the
comments left by Max.
On 22.06.23, Sergey Kaplun wrote:
> From: Mike Pall <mike>
>
> Reported by Jason Carr.
>
> (cherry picked from commit dd0f09f95f36caf1f2111c10fec02748116003bb)
>
> This commit is the follow up for the previous commit ("Fix lua_yield()
> from C hook."). In GC64 mode stack slot for a GC thread object is still
> miscalculated during creating a continuation frame for `lua_yield()`.
> This happens due to tricky usage of the previous slot instead of the
> given one in `setframe_gc()` macro.
>
> This patch changes the semantics of `setframe_gc()` macro to use the
> given as argument slot as the destination to store GC value. Also, it
> fixups all usages of this macro to match new semantics.
>
> Sergey Kaplun:
> * added the description for the problem
>
> Part of tarantool/tarantool#8516
> ---
> src/lj_ccallback.c | 2 +-
> src/lj_err.c | 2 +-
> src/lj_frame.h | 2 +-
> src/lj_meta.c | 2 +-
> test/tarantool-c-tests/fix-yield-c-hook.test.c | 4 ----
> 5 files changed, 4 insertions(+), 8 deletions(-)
>
<snipped>
> diff --git a/test/tarantool-c-tests/fix-yield-c-hook.test.c b/test/tarantool-c-tests/fix-yield-c-hook.test.c
> index 9068360e..b84cdc7e 100644
> --- a/test/tarantool-c-tests/fix-yield-c-hook.test.c
> +++ b/test/tarantool-c-tests/fix-yield-c-hook.test.c
> @@ -22,10 +22,6 @@ static void yield(lua_State *L, lua_Debug *ar)
> lua_yield(L, 0);
> }
>
> -/*
> - * XXX: This test still leads to core dump in the GC64 mode.
> - * This will be fixed in the next commit.
> - */
Side note: I didn't mention this in the previous commit, but I wonder,
why you simply didn't disable the test for GC64 build? Anyway, I guess
we can ignore the fact that tests doesn't work for the previous patch,
since this one is a fix for the fix.
> static int yield_in_c_hook(void *test_state)
> {
> lua_State *L = test_state;
> --
> 2.34.1
>
--
Best regards,
IM
next prev parent reply other threads:[~2023-07-01 12:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 14:29 [Tarantool-patches] [PATCH luajit 0/2] Fix lua_yield from the " Sergey Kaplun via Tarantool-patches
2023-06-22 14:29 ` [Tarantool-patches] [PATCH luajit 1/2] Fix lua_yield() from " Sergey Kaplun via Tarantool-patches
2023-06-29 8:44 ` Maxim Kokryashkin via Tarantool-patches
2023-06-29 11:11 ` Sergey Kaplun via Tarantool-patches
2023-06-29 22:27 ` Maxim Kokryashkin via Tarantool-patches
2023-07-01 11:44 ` Igor Munkin via Tarantool-patches
2023-06-22 14:29 ` [Tarantool-patches] [PATCH luajit 2/2] Another fix for " Sergey Kaplun via Tarantool-patches
2023-06-29 9:09 ` Maxim Kokryashkin via Tarantool-patches
2023-06-29 11:21 ` Sergey Kaplun via Tarantool-patches
2023-06-29 22:28 ` Maxim Kokryashkin via Tarantool-patches
2023-07-01 12:09 ` Igor Munkin via Tarantool-patches [this message]
2023-07-04 17:10 ` [Tarantool-patches] [PATCH luajit 0/2] Fix lua_yield from the " Igor Munkin 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=ZKAXXcHjotEvfoWs@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=imun@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit 2/2] Another fix for lua_yield() from C hook.' \
/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