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 C830D6D4666; Wed, 22 Nov 2023 02:17:25 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C830D6D4666 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700608645; bh=CaHlLD/du1L1sCnto/em6T2A9m3ejbeQ/s9eAzj03qg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=mqzLJ1N50p6TNFTGX9GdsEgtV49LhDnaIhsbG1ydeVmwy8C3lHNRV6sBjEe+iTXpw oruGZH/ZAV4Z7S5kH50p/co4ZOXaD3IOCI0To4z74jYTaUB8Ki/pHsf5wm+iv0NKaR ixjzDRP7x3sMDIH5pI9WJKm9sf8DAt5UdrdQpzTQ= Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 9BC2D6D4666 for ; Wed, 22 Nov 2023 02:17:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9BC2D6D4666 Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-507a0907896so8732782e87.2 for ; Tue, 21 Nov 2023 15:17:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700608620; x=1701213420; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yl6EwoJ9A9DQtm9zyrN4Ojglev8DFwr+lGV5Ac/btRc=; b=xTh/LZI/8r3fjLLPP+DA/wObp3KofS/O+tA48riOMKGPKlsYz3V5AwCDKFDa3GelSS JuA24q7+xgN6JnyMYPQkoVDC0t5ZSkU39NNDp/Y6pBMaXfDetn4wF01w7i+7efVTLuqp aWAZfodjs2GiO9SwHHEh8Goa31iZgfdpzZ7DDBDIQ+dhFcCCQNr5fvEf2YjjJIuvtiBx GWaljyYnSLZZVHT94UDbh+JgDxgNkx9n1JMIKZ6zFJXOxTh6GxvfliWs7YnPhBaNsnZK J9bXI1pO2PD2j1SBC8RXJZQPcaIo1vdkpfXtobEOGa1T0rttGMi1p1dbYMW5wR8mBaXz jeRA== X-Gm-Message-State: AOJu0YxXqQqYlFYyAQiq56FYxhM7k7HUFlunt4ochzN01DhL3qIn4w6e NGVFCbnW7MyIBSqsaNaJc9fW7Hl9LHm7SA== X-Google-Smtp-Source: AGHT+IGsUJEQg/eAZolPMQMUHygpesQBSE+J8DVJ+bSB7+p+UhaOUOYm6mhQFEnnYgu8qjbSQVIZTw== X-Received: by 2002:ac2:4466:0:b0:509:4559:27a9 with SMTP id y6-20020ac24466000000b00509455927a9mr434482lfl.8.1700608619417; Tue, 21 Nov 2023 15:16:59 -0800 (PST) Received: from localhost.localdomain (95-24-1-238.broadband.corbina.ru. [95.24.1.238]) by smtp.gmail.com with ESMTPSA id z1-20020a056512370100b004f755ceafbcsm1636371lfr.217.2023.11.21.15.16.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 21 Nov 2023 15:16:59 -0800 (PST) To: tarantool-patches@dev.tarantool.org, sergeyb@tarantool.org, skaplun@tarantool.org, m.kokryashkin@tarantool.org Date: Wed, 22 Nov 2023 02:16:45 +0300 Message-Id: <20231121231647.92696-2-max.kokryashkin@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231121231647.92696-1-max.kokryashkin@gmail.com> References: <20231121231647.92696-1-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v2 1/3] Improve error reporting on stack overflow. 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: Maksim Kokryashkin via Tarantool-patches Reply-To: Maksim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall Thanks to Nicolas Lebedenco. (cherry-picked from commit 8135de2a0204e6acd92b231131c4a1e0be03ac1c) The `lj_state_growstack` doesn't account for a potential error handler invocation by xpcall, which may lead to the second error while handling a stack overflow, resulting in a misleading error "error in error handling", while the real issue is a stack overflow. This patch addresses this issue by fixing the condition at which stack overflow errors are thrown. Now it's thrown if the stack size is at least at the limit, instead of when it is over the limit. This commit also disables the second test from `lj-603-err-snap-restore`, since after this patch and the two follow-ups for it, there is no such amount of stack slots with which the test works the way it should. Lastly, this patch adds an alternative to `luacmd` to the `utils.exec` module, which is called `luabin`. That function is similar to the `luacmd`, with the only difference of returning only the executable itself without any additional CLI options passed. Maxim Kokryashkin: * added the description and the test for the problem Part of tarantool/tarantool#9145 --- src/lj_state.c | 2 +- .../lj-603-err-snap-restore.test.lua | 1 + .../lj-962-stack-overflow-report.test.lua | 9 +++++++++ .../lj-962-stack-overflow-report/script.lua | 2 ++ test/tarantool-tests/utils/exec.lua | 15 ++++++++++++--- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 test/tarantool-tests/lj-962-stack-overflow-report.test.lua create mode 100644 test/tarantool-tests/lj-962-stack-overflow-report/script.lua diff --git a/src/lj_state.c b/src/lj_state.c index 684336d5..76153bad 100644 --- a/src/lj_state.c +++ b/src/lj_state.c @@ -132,7 +132,7 @@ void LJ_FASTCALL lj_state_growstack(lua_State *L, MSize need) n = LJ_STACK_MAX; } resizestack(L, n); - if (L->stacksize > LJ_STACK_MAXEX) + if (L->stacksize >= LJ_STACK_MAXEX) lj_err_msg(L, LJ_ERR_STKOV); } diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua index 96ebf92c..f5c8474f 100644 --- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua +++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua @@ -36,6 +36,7 @@ local function do_test() -- Tarantool at start, so just skip test for it. -- luacheck: no global ['Disable test for Tarantool'] = _TARANTOOL, + ['Stack overflow is now handled differently'] = true, }) test:ok(not handler_is_called) diff --git a/test/tarantool-tests/lj-962-stack-overflow-report.test.lua b/test/tarantool-tests/lj-962-stack-overflow-report.test.lua new file mode 100644 index 00000000..26a90f8d --- /dev/null +++ b/test/tarantool-tests/lj-962-stack-overflow-report.test.lua @@ -0,0 +1,9 @@ +local tap = require('tap') +local test = tap.test('lj-962-stack-overflow-report') +test:plan(1) + +local LUABIN = require('utils').exec.luabin(arg) +local SCRIPT = arg[0]:gsub('%.test%.lua$', '/script.lua') +local output = io.popen(LUABIN .. ' 2>&1 ' .. SCRIPT, 'r'):read('*all') +test:like(output, 'stack overflow', 'stack overflow reported correctly') +test:done(true) diff --git a/test/tarantool-tests/lj-962-stack-overflow-report/script.lua b/test/tarantool-tests/lj-962-stack-overflow-report/script.lua new file mode 100644 index 00000000..52734f2c --- /dev/null +++ b/test/tarantool-tests/lj-962-stack-overflow-report/script.lua @@ -0,0 +1,2 @@ +-- luacheck: no global +f = function() f() end; f() diff --git a/test/tarantool-tests/utils/exec.lua b/test/tarantool-tests/utils/exec.lua index a56ca2dc..7ed0a9d8 100644 --- a/test/tarantool-tests/utils/exec.lua +++ b/test/tarantool-tests/utils/exec.lua @@ -1,14 +1,23 @@ local M = {} -function M.luacmd(args) +local function cmd_start_idx(args) -- arg[-1] is guaranteed to be not nil. local idx = -2 while args[idx] do assert(type(args[idx]) == 'string', 'Command part have to be a string') idx = idx - 1 end - -- return the full command with flags. - return table.concat(args, ' ', idx + 1, -1) + return idx + 1 +end + +function M.luabin(args) + -- Return only the executable. + return args[cmd_start_idx(args)] +end + +function M.luacmd(args) + -- Return the full command with flags. + return table.concat(args, ' ', cmd_start_idx(args), -1) end local function makeenv(tabenv) -- 2.39.3 (Apple Git-145)