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 9B361A4A101; Wed, 31 Jan 2024 12:29:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9B361A4A101 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1706693345; bh=XOlZLgYgXfSMBS/WpNIA3jroxp+iEcY7egESkbWBIwI=; 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=SAsxUC76kf554OpqwYqIevDRjh80vLd3yue02XF+I6+6vuVGtZy9c+wHH8M6Ww5DI hZ580+rn3yFY0375/vavnVM9/JTnnqNb0sRPGJeqHThWyAauUOyj74T534JP46LUnQ CVaZuO26K7TBwLGUyx2vvN9Qg8/4dh50pw0w/45E= Received: from smtp40.i.mail.ru (smtp40.i.mail.ru [95.163.41.81]) (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 2EDEDA4A101 for ; Wed, 31 Jan 2024 12:29:04 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2EDEDA4A101 Received: by smtp40.i.mail.ru with esmtpa (envelope-from ) id 1rV6tz-00000004pKM-1W7J; Wed, 31 Jan 2024 12:29:03 +0300 Date: Wed, 31 Jan 2024 12:29:03 +0300 To: Sergey Kaplun Message-ID: References: <0d003159c9a1811d98e30a863cc75c11bab658a3.1706104777.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0d003159c9a1811d98e30a863cc75c11bab658a3.1706104777.git.skaplun@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9DF1FFD52FB7F4A95673ECF64E36F2111A6B5DFCFD0A62BAF00894C459B0CD1B952C4D20692B6F714003E82DEF542FAFD6EEA4AFD08837599E3D11B61A6F287170DE140DF427568CF X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE79FF7180C05A1FF7CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063739E242D0556ED1DD8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D822381DD73E276BE89CF30D032898A9031D376F2193F16AC9CC7F00164DA146DAFE8445B8C89999728AA50765F79006372A3B24BF85B2E607389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8D2DCF9CF1F528DBCF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CAD0E433DBF1FBFA39735652A29929C6C4AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C391041352CAA6A1D7BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3C9BE88FFEDFA497A35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5D545F0A316DAA8985002B1117B3ED696DCD69E6E67A5C2C572305013E4AE841E823CB91A9FED034534781492E4B8EEAD01200A96CB7104FFBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFFC58F5C273334080992E3901ADA73537BE46A02A54FB2C45DF55851ED45C71920505AA998FFA684FBAF4CF3B87E910B1B69CE59E39812B808F2A1A2F8D633076480D8A98D068B4365F4332CA8FE04980913E6812662D5F2A54F6898A6FDCBDC72A617DFBE5FEC2C6383653B6C8D9AE0FD16FCAA6493B703A X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojHUK3TkZYwr8QIjBrvkZrEw== X-Mailru-Sender: 7940E2A4EB16C9970E7603824FE97C2052C4D20692B6F714003E82DEF542FAFDC088B86DF7491014B6F7D78CE1F58EAD61AD1BC23DFB21333DDE9B364B0DF289BB83A8C3DAEBA78A61AAEF30F77CACB9EAB4BC95F72C04283CDA0F3B3F5B9367 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] Only emit proper parent references in snapshot replay. 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the patch! LGTM On Wed, Jan 24, 2024 at 05:11:09PM +0300, Sergey Kaplun wrote: > From: Mike Pall > > Thanks to Peter Cawley. > > (cherry picked from commit 9bdfd34dccb913777be0efcc6869b6eeb5b9b43b) > > Assume we have a trace containing the IR instruction: > | {sink} tab TNEW #32762 #0 > > `lj_snap_replay()` assumes that 32762 (0x7ffa) (op1 of TNEW) is a > constant reference. It is passed to the `snap_replay_const()` lookup to > the IR constant in the 0x7ffa slot. If this slot contains the second > part of the IR constant number 0.5029296875 (step of the cycle) in its > raw form (0x3fe0180000000000). The 0x18 part is treated as IROp > (IR_KGC), and JIT is trying to continue with a store of an invalid GC > object, which leads to a crash. > Oh, god... > This patch checks that only the IRMref IR operand is needed to restore. > > Sergey Kaplun: > * added the description and the test for the problem > > Part of tarantool/tarantool#9595 > --- > src/lj_snap.c | 12 ++++--- > .../lj-1132-bad-snap-refs.test.lua | 36 +++++++++++++++++++ > 2 files changed, 44 insertions(+), 4 deletions(-) > create mode 100644 test/tarantool-tests/lj-1132-bad-snap-refs.test.lua > > diff --git a/src/lj_snap.c b/src/lj_snap.c > index 3f0fccec..3eb0cd28 100644 > --- a/src/lj_snap.c > +++ b/src/lj_snap.c > @@ -516,13 +516,15 @@ void lj_snap_replay(jit_State *J, GCtrace *T) > IRRef refp = snap_ref(sn); > IRIns *ir = &T->ir[refp]; > if (regsp_reg(ir->r) == RID_SUNK) { > + uint8_t m; > if (J->slot[snap_slot(sn)] != snap_slot(sn)) continue; > pass23 = 1; > lj_assertJ(ir->o == IR_TNEW || ir->o == IR_TDUP || > ir->o == IR_CNEW || ir->o == IR_CNEWI, > "sunk parent IR %04d has bad op %d", refp - REF_BIAS, ir->o); > - if (ir->op1 >= T->nk) snap_pref(J, T, map, nent, seen, ir->op1); > - if (ir->op2 >= T->nk) snap_pref(J, T, map, nent, seen, ir->op2); > + m = lj_ir_mode[ir->o]; > + if (irm_op1(m) == IRMref) snap_pref(J, T, map, nent, seen, ir->op1); > + if (irm_op2(m) == IRMref) snap_pref(J, T, map, nent, seen, ir->op2); > if (LJ_HASFFI && ir->o == IR_CNEWI) { > if (LJ_32 && refp+1 < T->nins && (ir+1)->o == IR_HIOP) > snap_pref(J, T, map, nent, seen, (ir+1)->op2); > @@ -550,14 +552,16 @@ void lj_snap_replay(jit_State *J, GCtrace *T) > IRIns *ir = &T->ir[refp]; > if (regsp_reg(ir->r) == RID_SUNK) { > TRef op1, op2; > + uint8_t m; > if (J->slot[snap_slot(sn)] != snap_slot(sn)) { /* De-dup allocs. */ > J->slot[snap_slot(sn)] = J->slot[J->slot[snap_slot(sn)]]; > continue; > } > op1 = ir->op1; > - if (op1 >= T->nk) op1 = snap_pref(J, T, map, nent, seen, op1); > + m = lj_ir_mode[ir->o]; > + if (irm_op1(m) == IRMref) op1 = snap_pref(J, T, map, nent, seen, op1); > op2 = ir->op2; > - if (op2 >= T->nk) op2 = snap_pref(J, T, map, nent, seen, op2); > + if (irm_op2(m) == IRMref) op2 = snap_pref(J, T, map, nent, seen, op2); > if (LJ_HASFFI && ir->o == IR_CNEWI) { > if (LJ_32 && refp+1 < T->nins && (ir+1)->o == IR_HIOP) { > lj_needsplit(J); /* Emit joining HIOP. */ > diff --git a/test/tarantool-tests/lj-1132-bad-snap-refs.test.lua b/test/tarantool-tests/lj-1132-bad-snap-refs.test.lua > new file mode 100644 > index 00000000..1f2b5400 > --- /dev/null > +++ b/test/tarantool-tests/lj-1132-bad-snap-refs.test.lua > @@ -0,0 +1,36 @@ > +local tap = require('tap') > + > +-- Test file to demonstrate LuaJIT's crash in cases of sunk > +-- restore for huge tables. > +-- See also https://github.com/LuaJIT/LuaJIT/issues/1132. > + > +local test = tap.test('lj-1132-bad-snap-refs'):skipcond({ > + ['Test requires JIT enabled'] = not jit.status(), > +}) > + > +test:plan(1) > + > +local table_new = require('table.new') > + > +jit.opt.start('hotloop=1', 'hotexit=1') > + > +local result_tab > +-- Create a trace containing the IR instruction: > +-- | {sink} tab TNEW #32762 #0 > +-- `lj_snap_replay()` assumes that 32762 (0x7ffa) (op1 of TNEW) is > +-- a constant reference. It is passed to the `snap_replay_const()` > +-- lookup to the IR constant in the 0x7ffa slot. > +-- This slot contains the second part of the IR constant > +-- number 0.5029296875 (step of the cycle) in its raw form > +-- (0x3fe0180000000000). The 0x18 part is treated as IROp > +-- (IR_KGC), and JIT is trying to continue with a store of an > +-- invalid GC object, which leads to a crash. > +for i = 1, 2.5, 0.5029296875 do > + local sunk_tab = table_new(0x7ff9, 0) > + -- Force the side exit with restoration of the sunk table. > + if i > 2 then result_tab = sunk_tab end > +end > + > +test:ok(type(result_tab) == 'table', 'no crash during sunk restore') > + > +test:done(true) > -- > 2.43.0 >