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 6626F6EC55; Thu, 10 Jun 2021 16:51:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6626F6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1623333088; bh=Fxr2F8GWNso4/GCm3DnhRm2GV96JuNalHHpjZ7NMDlM=; 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=OzsEQh/eYtFsVkvlUb0RkCcwaFin4FlQ6S/Wepo81ljJxVymytxp59bDsI2G04Jsm X+SPwMuwIWdjDz8weQSS/vq+NIS0FUYSwyLknlvUG4Qpk6lGn5aI2hbxIrNYPHCjWz kFgUV+8TbwgOdqr8cJyj7RU5E8KzzpUS/wG++/bU= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 6A9D66EC55 for ; Thu, 10 Jun 2021 16:51:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6A9D66EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lrL5h-0000zi-BI; Thu, 10 Jun 2021 16:51:25 +0300 Date: Thu, 10 Jun 2021 16:51:19 +0300 To: Sergey Kaplun Message-ID: <20210610135119.GX3944@tarantool.org> References: <51e2abaf644791331a077cab0852aa54d04941ff.1621859367.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <51e2abaf644791331a077cab0852aa54d04941ff.1621859367.git.skaplun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C540E30C2BDD69416C6E46C178CD572CB10182A05F5380850407CDF3216777A142A15DBC741847BC843A5C57EB6B43643271067F1060B755C1E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E50EC9128971FD6EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006375549E03BCBF89E018638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D85015DB9B78C1EC7F9CBB99E939105889117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18E5D25F19253116ADD2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B60425ED1B70270490089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A55D8F88B1D08440113A58B681D393AFF00D1C9ACDDE8C6194D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75448CF9D3A7B2C848410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D341ADA1A41A420E9B237E3F3496022A3C01331A5FB10602B1704E36DD5F26F59C145A00F6865CD04961D7E09C32AA3244CD933AC4CB4F7FB01EE9A3E02070ED94C81560E2432555DBB927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojCpYK6nkTlbHM8aXwGy4bjw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638221DAF338CC7F867ECC885FEB451BD3DDDA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 1/4] ARM, ARM64, PPC: Fix TSETR fallback. 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for the patch! LGTM, with several nits below. On 24.05.21, Sergey Kaplun wrote: > From: Mike Pall > > Thanks to Javier Guerra Giraldez. > > (cherry picked from commit ae20998ff5aaacc8e3afd46c64e28a8e039b58a1) > > This patch fixes the issue introduced by commits > f307d0adafc7e35d2dc1c461d50f6572c5e6bca8 ('ARM64: Add build > infrastructure and initial port of interpreter.') for arm64 and > 73ef845fcaf65937ad63e9cf6b681cb3e61f4504 ('Add special bytecodes for > builtins.') for arm and ppc. Within the mentioned commits the new > bytecode TSETR is introduced for the corresponding architectures. > > When the new index of the table processed during this bytecode is the > integer, that is greater than asize of the table, the VM fallbacks to > vmeta_tsetr, for calling > lj_tab_setinth(lua_State *L, GCtab *t, int32_t key). The first argument > CARG1 is not set by the VM and contains an invalid value, so the > mentioned call leads to crash. Minor: IMHO, it's worth to explicitly mention the value that need to be set before the call (strictly saying CARG1 is set by VM, but this is a wrong value). Feel free to ignore. > This patch adds the missed set of CARG1 to the right value. > > Sergey Kaplun: > * added the description and the test for the problem > > Resolves tarantool/tarantool#6084 > Part of tarantool/tarantool#5629 > --- > src/vm_arm.dasc | 1 + > src/vm_arm64.dasc | 1 + > src/vm_ppc.dasc | 1 + > test/tarantool-tests/CMakeLists.txt | 9 ++++--- > ...-missed-carg1-in-bctsetr-fallback.test.lua | 25 +++++++++++++++++++ > test/tarantool-tests/utils.lua | 22 ++++++++++++++++ > 6 files changed, 55 insertions(+), 4 deletions(-) > create mode 100644 test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > > diff --git a/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > new file mode 100644 > index 00000000..26344274 > --- /dev/null > +++ b/test/tarantool-tests/gh-6084-missed-carg1-in-bctsetr-fallback.test.lua > @@ -0,0 +1,25 @@ > +local tap = require("tap") > +local utils = require("utils") > + > +local test = tap.test("gh-6084-missed-carg1-in-bctsetr-fallback") > +test:plan(1) > + > +-- Bytecode TSETR appears only in built-ins libraries, when doing Minor: It's worth to use 'XXX:' here. > +-- fixups for fast function written in Lua (i.e. `table.move()`), > +-- by replacing all TSETV bytecodes with the TSETR. > +-- See for more details. > + > +-- This test checks that fallback path, when the index of the new > +-- set element is greater than the table's asize, doesn't lead > +-- to a crash. > + > +-- We need to make sure the bytecode is present in the chosen Ditto. > +-- built-in to make sure our test is still valid. > +assert(utils.hasbc(table.move, "TSETR")) > + > +-- Empty table has asize equals 0. Just copy its element (equals Typo: s/Empty table has asize equals 0/Empty table asize equals 0/. > +-- nil) to the field by index 1 > 0, to fallback inside TSETR. > +table.move({}, 1, 1, 1) Side note: Totally agree with Sergos; Seen the changes on the branch. > + > +test:ok(true) > +os.exit(test:check() and 0 or 1) > diff --git a/test/tarantool-tests/utils.lua b/test/tarantool-tests/utils.lua > index c0403cf1..61d4de7a 100644 > --- a/test/tarantool-tests/utils.lua > +++ b/test/tarantool-tests/utils.lua > @@ -2,11 +2,14 @@ local M = {} > > local ffi = require('ffi') > local tap = require('tap') > +local bc = require('jit.bc') > > ffi.cdef([[ > int setenv(const char *name, const char *value, int overwrite); > ]]) > > +local function noop() end This is a dummy function that is only required by , so move the helper closer to it. I would even suggest to move it directly to , or even use `function() end` three times, but this is not our style ;) > + > local function luacmd(args) > -- arg[-1] is guaranteed to be not nil. > local idx = -2 > @@ -89,4 +92,23 @@ function M.tweakenv(condition, variable) > ffi.C.setenv(variable, testvar, 0) > end > > +function M.hasbc(f, bytecode) > + assert(type(f) == 'function', 'argument #1 should be a function') > + assert(type(bytecode) == 'string', 'argument #2 should be a string') > + local hasbc = false > + -- Check the bytecode entry line by line. > + local out = { > + write = function(out, line) > + if line:match(bytecode) then > + hasbc = true > + out.write = noop > + end > + end, > + flush = noop, > + close = noop, Minor: This is excess for this function, since it doesn't close the stream explicitly. Feel free to ignore. > + } > + bc.dump(f, out) > + return hasbc > +end > + > return M > -- > 2.31.0 > -- Best regards, IM