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 3F1E0544281; Mon, 24 Jul 2023 17:41:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3F1E0544281 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1690209714; bh=EJHI+Z1P+RoRJkoipBH3emKJzk38lfXn05nGFTnDeLw=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mAVAj1rgJ7PGpQNIui8KNJPm/hIY6ZEYjM74/yaOH1npax3B4GjZA1SLAd+0Kr/BE 92VqeYquzNpyyM5yvy3sbvfPpxCAULJZ5MGkSVVtSlMlyiQbv6mvTA/6ISNJB6Kzhk rdMv37gUMxMes9PaHS117wXmnWn1tXG0sfLVgXGI= Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 784965440C0 for ; Mon, 24 Jul 2023 17:41:53 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 784965440C0 Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-4fdd515cebcso6609152e87.0 for ; Mon, 24 Jul 2023 07:41:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690209712; x=1690814512; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=GrziZDSKzOeD/hcAXQWhBx8S0LpprQBduzELecRp1cg=; b=YjYXQcv+HROSAQsK8Phl0lg6bJW4xTDWzDbz01GIQ3kNhbSTi4iX8PP4Goh3cY7G57 g8D/0a+UkxOJU+RMn+ACcjYe9/gEIOH9Mh8p3p+cweyiijlY+NY1YGRCe/xkfzRL1lD9 Ss3wqilsiM0Sq4KJwDRqR7AEZ9ZXQDTTRoze8cHETqAxwGo8c3hIM0wAJittQ1LDLhT1 /0sw9IuFuCYex04loljt9Uvi0g7/id+VW6zN9HyLcAp0iq9drjc8S9GCMQSGH7vp+/4U HnFhurY7iYObtCIczA19CV12+OFArGmTSo15WMul3EHy92PoYivMFiPIo5XErBVYHlXX 3x/w== X-Gm-Message-State: ABy/qLbD9cVlHw20P/fB3cWlp52v6wBfqkUURf3+xL/Z1ANWDzjJk/JK 7ZQ9Z9lA6d72OFw7pm3Q3b/M9s6W2BUhYA== X-Google-Smtp-Source: APBJJlFN1sjuaYqPkhkQ+EOS2VvTcWXZ3xwEmYamJRCfjA0VwT/gKeGoV4LE+UBPGo7c6+ER2h7r6g== X-Received: by 2002:a05:6512:1284:b0:4f8:5e65:b61b with SMTP id u4-20020a056512128400b004f85e65b61bmr6175845lfs.65.1690209712080; Mon, 24 Jul 2023 07:41:52 -0700 (PDT) Received: from fckxorg.mail.msk ([2a00:1148:b0ba:16:a3e8:bdc1:dbed:dbc8]) by smtp.gmail.com with ESMTPSA id eq9-20020a056512488900b004fb7ac67bbdsm2271365lfb.41.2023.07.24.07.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:41:51 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, sergeyb@tarantool.org Date: Mon, 24 Jul 2023 17:41:48 +0300 Message-ID: <20230724144148.289140-1-m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit] Fix frame for on-trace out-of-memory error. 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 Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Reported by ruidong007. (cherry-picked from commit 2d8300c1944f3a62c10f0829e9b7847c5a6f0482) When an on-trace OOM error is triggered from a frame that is child in regard to `jit_base`, and `L->base` is not updated correspondingly (FUNCC, for example), it is possible to encounter an inconsistent Lua stack in the error handler. This patch adds a fixup for OOM errors on trace that always sets the Lua stack base to `jit_base`, so the stack is now consistent. Part of tarantool/tarantool#8825 --- PR: https://github.com/tarantool/tarantool/pull/8909 Branch: https://github.com/tarantool/luajit/tree/fckxorg/lj-1004-oom-error-frame src/lj_err.c | 4 ++++ test/tarantool-tests/CMakeLists.txt | 1 + .../lj-1004-oom-error-frame.test.lua | 24 +++++++++++++++++++ .../lj-1004-oom-error-frame/CMakeLists.txt | 1 + .../lj-1004-oom-error-frame/testoomframe.c | 17 +++++++++++++ 5 files changed, 47 insertions(+) create mode 100644 test/tarantool-tests/lj-1004-oom-error-frame.test.lua create mode 100644 test/tarantool-tests/lj-1004-oom-error-frame/CMakeLists.txt create mode 100644 test/tarantool-tests/lj-1004-oom-error-frame/testoomframe.c diff --git a/src/lj_err.c b/src/lj_err.c index 9903d273..09729791 100644 --- a/src/lj_err.c +++ b/src/lj_err.c @@ -802,6 +802,10 @@ LJ_NOINLINE void lj_err_mem(lua_State *L) { if (L->status == LUA_ERRERR+1) /* Don't touch the stack during lua_open. */ lj_vm_unwind_c(L->cframe, LUA_ERRMEM); + if (LJ_HASJIT) { + TValue *base = tvref(G(L)->jit_base); + if (base) L->base = base; + } if (curr_funcisL(L)) L->top = curr_topL(L); setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM)); lj_err_throw(L, LUA_ERRMEM); diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index 6218f76a..93230677 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -66,6 +66,7 @@ add_subdirectory(lj-416-xor-before-jcc) add_subdirectory(lj-601-fix-gc-finderrfunc) add_subdirectory(lj-727-lightuserdata-itern) add_subdirectory(lj-flush-on-trace) +add_subdirectory(lj-1004-oom-error-frame) # The part of the memory profiler toolchain is located in tools # directory, jit, profiler, and bytecode toolchains are located diff --git a/test/tarantool-tests/lj-1004-oom-error-frame.test.lua b/test/tarantool-tests/lj-1004-oom-error-frame.test.lua new file mode 100644 index 00000000..fd167d14 --- /dev/null +++ b/test/tarantool-tests/lj-1004-oom-error-frame.test.lua @@ -0,0 +1,24 @@ +local tap = require('tap') +local test = tap.test('lj-1004-oom-error-frame'):skipcond({ + ['Test requires JIT enabled'] = not jit.status(), + ['Test requires GC64 mode disabled'] = require('ffi').abi('gc64'), +}) + +test:plan(1) + +local testoomframe = require('testoomframe') + +local anchor = {} +local function extra_frame(val) + table.insert(anchor, val) +end + +local function chomp() + while true do + extra_frame(testoomframe.allocate_userdata()) + end +end + +local st, _ = pcall(chomp) +test:ok(st == false, 'on-trace error handled successfully') +os.exit(test:check() and 0 or 1) diff --git a/test/tarantool-tests/lj-1004-oom-error-frame/CMakeLists.txt b/test/tarantool-tests/lj-1004-oom-error-frame/CMakeLists.txt new file mode 100644 index 00000000..3bca5df8 --- /dev/null +++ b/test/tarantool-tests/lj-1004-oom-error-frame/CMakeLists.txt @@ -0,0 +1 @@ +BuildTestCLib(testoomframe testoomframe.c) diff --git a/test/tarantool-tests/lj-1004-oom-error-frame/testoomframe.c b/test/tarantool-tests/lj-1004-oom-error-frame/testoomframe.c new file mode 100644 index 00000000..13071b4e --- /dev/null +++ b/test/tarantool-tests/lj-1004-oom-error-frame/testoomframe.c @@ -0,0 +1,17 @@ +#include +#include + +static int allocate_userdata(lua_State *L) { + lua_newuserdata(L, 16); + return 1; +} + +static const struct luaL_Reg testoomframe[] = { + {"allocate_userdata", allocate_userdata}, + {NULL, NULL} +}; + +LUA_API int luaopen_testoomframe(lua_State *L) { + luaL_register(L, "testoomframe", testoomframe); + return 1; +} -- 2.41.0