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 91B836F805D; Wed, 22 Nov 2023 17:36:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 91B836F805D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1700663771; bh=9czr4I0pPsgcxTaFBBT2DtYDD4A85QVSZYRwmegXmD4=; 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=VPe2xBbmlMveZHguc3eKFzRXMKo1BG6zekHSxvKtZiJwAsGcw6GsPTXpsnW5ChVuV qfAlDwIuPJ6BnQ1EoSaDCibKyPZpUM6zv0p/Xwuf5hXcRMcjVOJBIOUY+nGxGZvbnr T8xGy3TlJ2DAzjtOim9Vyc59ICD2t3tYI84BJQJU= 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 7E1D56F805A for ; Wed, 22 Nov 2023 17:35:44 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7E1D56F805A Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-50a6ff9881fso10017841e87.1 for ; Wed, 22 Nov 2023 06:35:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700663743; x=1701268543; 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=7FQz4wpFdF62p+LNxf+sRC2LOiXTF4WjHVENWGEav5o=; b=YHM9B/U0z1fqK3mbS7u64F5v1X54uqmAfusZrZtNOyror/r/p1ga7JO5osBmvh+ZoD cQny5dnF4/7zQzCtCyukJMTJFcezq0Cs0mT1WGYMFwHZ3BYjiK0nPFidqpHVIToW60qJ MlmrlrRO3jjZRWOhV0kA34zy0a8nBwIM6PHdoYZmVoN7w0rdLfKr0vl5PJpj7gWQbwrf MqQWnhDAwfUTrCC/nSYQh21dML7bwUfqMjJoGD8AXZ3y7TDRB5GxBpCgGpWOsFl94YMq bwD8oBJSQn+8nbnPjkDCKCm3jdK01fFfHiAkpDCR/L0n/e3bfCHm90KopwaxWgqieeoA zmsw== X-Gm-Message-State: AOJu0YwISZ7R8zWBIX1UYzv7f4sa1ac2yJgyRZgk5Ye/C1pkyxP1pNe2 oPevm3kALcEXQhKgH33WcOsQqvANeFDh7jo6 X-Google-Smtp-Source: AGHT+IGAqYSZzhpq6pQvbTz6CUggOVgdqDyrgcEv9jN/u8XYbBsJAsQXQLlRyaJmukUxAaHm/4PR+g== X-Received: by 2002:a05:6512:684:b0:507:c9d5:39a9 with SMTP id t4-20020a056512068400b00507c9d539a9mr502463lfe.52.1700663743348; Wed, 22 Nov 2023 06:35:43 -0800 (PST) Received: from localhost.localdomain ([185.205.79.42]) by smtp.gmail.com with ESMTPSA id x15-20020a19e00f000000b005079a3c872esm1894570lfg.240.2023.11.22.06.35.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Nov 2023 06:35:43 -0800 (PST) To: tarantool-patches@dev.tarantool.org, sergeyb@tarantool.org, skaplun@tarantool.org, m.kokryashkin@tarantool.org Date: Wed, 22 Nov 2023 17:35:32 +0300 Message-Id: <20231122143534.11330-2-max.kokryashkin@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20231122143534.11330-1-max.kokryashkin@gmail.com> References: <20231122143534.11330-1-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 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 | 10 ++++++++++ .../lj-962-stack-overflow-report/script.lua | 3 +++ test/tarantool-tests/utils/exec.lua | 15 ++++++++++++--- 5 files changed, 27 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..45a888f4 --- /dev/null +++ b/test/tarantool-tests/lj-962-stack-overflow-report.test.lua @@ -0,0 +1,10 @@ +local tap = require('tap') +-- The test reproduces the problem only for GC64 mode with enabled JIT. +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..31c5ca33 --- /dev/null +++ b/test/tarantool-tests/lj-962-stack-overflow-report/script.lua @@ -0,0 +1,3 @@ +-- XXX: Function `f` is global to avoid using an additional stack slot. +-- 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..48a08ba5 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 executable_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[executable_idx(args)] +end + +function M.luacmd(args) + -- Return the full command with flags. + return table.concat(args, ' ', executable_idx(args), -1) end local function makeenv(tabenv) -- 2.39.3 (Apple Git-145)