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 5ABB46E7427; Mon, 20 Nov 2023 16:49:31 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5ABB46E7427 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700488171; bh=NWQmZrVCAU0xwJXfqHPb/sC9eaoKkENtkKjmZe9Ac3U=; 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=j+LJs3qANCRn6gceNt4Wtxi+pUAE2q2YNHjUJDyEqPgMoXkM5FLOlt+v5DZncotf3 4dcUATxXvFEEA9LdQc0J5gtyilyXEfxB/DMxh9dVpaSwV29J1SUUkbW/ttj9dfkKvh XocBWOIDrE9wcov7LdLK2An4v1ZlH0BTCBB7pJZc= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [95.163.41.99]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 8C50D6E7427 for ; Mon, 20 Nov 2023 16:49:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8C50D6E7427 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1r54eV-002nyS-2I; Mon, 20 Nov 2023 16:49:28 +0300 Date: Mon, 20 Nov 2023 16:44:55 +0300 To: Maksim Kokryashkin Message-ID: References: <20231117234116.60037-1-max.kokryashkin@gmail.com> <20231117234116.60037-4-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231117234116.60037-4-max.kokryashkin@gmail.com> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD93F1575C7510F554723A238A7750C30189FE0704E88CB56E400894C459B0CD1B9B44F0354326F1538C2657267A931D3228B9F23DDA55643545E8F1FB5DE347A04 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78CB87876C5D626D4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063748424D8FCCA3295D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DE1B57DB3F6DBFE873E43C4AA2EDEACE117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE140C956E756FBB7A7F16001415B11694D8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE3E753FA5741D1AD02040F9FF01DFDA4A8C4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947CD2DCF9CF1F528DBC2E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F0A35B161A8BF67C1262FEC7FBD7D1F5BB5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A5170122C1762A688B53CEE8642718C9999CA7FDC079330CF9F87CCE6106E1FC07E67D4AC08A07B9B0CF7CD7A0D5AA5F25CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF7E563A105B0BD1CB1C05222E993393DCFDA50D6D64E2F181F20EB907A7047A76A2F8A0A94712AD9D88AD3775A6B0C834FA77F5D2AF11022AC96577E2983AE570A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojmRIjd71J0y0UcoW8SRauvg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A7696FC3D782A1303AC3A067BE2BFC17BA48D776CA2DFBE07C79DEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 3/3] Follow-up fix for stack overflow handling cleanup. 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, Maksim! Thanks for the patch! LGTM, except an insignificant nit below. On 18.11.23, Maksim Kokryashkin wrote: > From: Mike Pall > > (cherry-picked from commit aa6b15c1a8922848bd6f596ba384824ca3fe0f5f) > > The stack overflow error is thrown in `lj_state_growstack` only > if the coroutine status is `OK`, however, stack overflow can > happen on a yielded coroutine too. This patch fixes the condition > for status, so now the error thrown on yielded coroutines too. > > Maxim Kokryashkin: > * added the description and the test for the patch > > Part of tarantool/tarantool#9145 > --- > src/lj_state.c | 2 +- > .../lj-962-premature-stack-overflow.test.c | 23 +++++++++++++++++++ > 2 files changed, 24 insertions(+), 1 deletion(-) > > diff --git a/src/lj_state.c b/src/lj_state.c > index d8a5134c..01d4901a 100644 > --- a/src/lj_state.c > +++ b/src/lj_state.c > @@ -126,7 +126,7 @@ void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need) > if (L->stacksize > LJ_STACK_MAXEX) > lj_err_throw(L, LUA_ERRERR); /* Does not invoke an error handler. */ > /* 1. We are _at_ the limit after the last growth. */ > - if (!L->status) { /* 2. Throw 'stack overflow'. */ > + if (L->status < LUA_ERRRUN) { /* 2. Throw 'stack overflow'. */ > L->status = LUA_ERRRUN; /* Prevent ending here again for pushed msg. */ > lj_err_msg(L, LJ_ERR_STKOV); /* May invoke an error handler. */ > } > diff --git a/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c b/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c > index 0873636a..7a03038b 100644 > --- a/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c > +++ b/test/tarantool-c-tests/lj-962-premature-stack-overflow.test.c > @@ -21,6 +21,20 @@ static int fill_stack(lua_State *L) > return 1; > } > > +static int immediate_yield(lua_State *L) > +{ > + return lua_yield(L, 0); > +} > + > +static int overflow_suspended_coro(lua_State *L) > +{ > + lua_State *newL = lua_newthread(L); > + lua_pushcfunction(newL, immediate_yield); > + lua_resume(newL, 0); > + fill_stack(newL); > + return 1; Why do we return something from this Lua function? What is this value on Lua stack? > +} > + > static int premature_stackoverflow(void *test_state) > { > lua_State *L = test_state; > @@ -29,11 +43,20 @@ static int premature_stackoverflow(void *test_state) > return TEST_EXIT_SUCCESS; > } > > +static int stackoverflow_on_suspended_coro(void *test_state) > +{ > + lua_State *L = test_state; > + int status = lua_cpcall(L, overflow_suspended_coro, NULL); > + assert_true(status == LUA_ERRRUN); > + return TEST_EXIT_SUCCESS; > +} > + > int main(void) > { > lua_State *L = utils_lua_init(); > const struct test_unit tgroup[] = { > test_unit_def(premature_stackoverflow), > + test_unit_def(stackoverflow_on_suspended_coro), > }; > const int test_result = test_run_group(tgroup, L); > utils_lua_close(L); > -- > 2.39.3 (Apple Git-145) > -- Best regards, Sergey Kaplun