diff options
| author | Andres Freund | 2021-09-14 01:07:19 +0000 |
|---|---|---|
| committer | Andres Freund | 2021-09-14 01:26:18 +0000 |
| commit | dccffd9a274dfbf343008c4da8029ed8b1f35ea2 (patch) | |
| tree | 83cc0100d3b888de2357482e0cfa9afc4cce7353 | |
| parent | bdd6ce48d0356fbfaa0fe4a1fee20068f99abb70 (diff) | |
jit: Do not try to shut down LLVM state in case of LLVM triggered errors.
If an allocation failed within LLVM it is not safe to call back into LLVM as
LLVM is not generally safe against exceptions / stack-unwinding. Thus errors
while in LLVM code are promoted to FATAL. However llvm_shutdown() did call
back into LLVM even in such cases, while llvm_release_context() was careful
not to do so.
We cannot generally skip shutting down LLVM, as that can break profiling. But
it's OK to do so if there was an error from within LLVM.
Reported-By: Jelte Fennema <Jelte.Fennema@microsoft.com>
Author: Andres Freund <andres@anarazel.de>
Author: Justin Pryzby <pryzby@telsasoft.com>
Discussion: https://postgr.es/m/AM5PR83MB0178C52CCA0A8DEA0207DC14F7FF9@AM5PR83MB0178.EURPRD83.prod.outlook.com
Backpatch: 11-, where jit was introduced
| -rw-r--r-- | src/backend/jit/llvm/llvmjit.c | 18 | ||||
| -rw-r--r-- | src/backend/jit/llvm/llvmjit_error.cpp | 10 | ||||
| -rw-r--r-- | src/include/jit/llvmjit.h | 1 |
3 files changed, 27 insertions, 2 deletions
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 75b2d260b85..b1954c4764e 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -181,8 +181,6 @@ llvm_release_context(JitContext *context) { LLVMJitContext *llvm_context = (LLVMJitContext *) context; - llvm_enter_fatal_on_oom(); - /* * When this backend is exiting, don't clean up LLVM. As an error might * have occurred from within LLVM, we do not want to risk reentering. All @@ -191,6 +189,8 @@ llvm_release_context(JitContext *context) if (proc_exit_inprogress) return; + llvm_enter_fatal_on_oom(); + if (llvm_context->module) { LLVMDisposeModule(llvm_context->module); @@ -849,6 +849,20 @@ llvm_session_initialize(void) static void llvm_shutdown(int code, Datum arg) { + /* + * If llvm_shutdown() is reached while in a fatal-on-oom section an error + * has occurred in the middle of LLVM code. It is not safe to call back + * into LLVM (which is why a FATAL error was thrown). + * + * We do need to shutdown LLVM in other shutdown cases, otherwise + * e.g. profiling data won't be written out. + */ + if (llvm_in_fatal_on_oom()) + { + Assert(proc_exit_inprogress); + return; + } + #if LLVM_VERSION_MAJOR > 11 { if (llvm_opt3_orc) diff --git a/src/backend/jit/llvm/llvmjit_error.cpp b/src/backend/jit/llvm/llvmjit_error.cpp index baabfc4eb4c..904ea586c42 100644 --- a/src/backend/jit/llvm/llvmjit_error.cpp +++ b/src/backend/jit/llvm/llvmjit_error.cpp @@ -84,6 +84,16 @@ llvm_leave_fatal_on_oom(void) } /* + * Are we currently in an fatal-on-oom section? Useful to skip cleanup in case + * of errors. + */ +bool +llvm_in_fatal_on_oom(void) +{ + return fatal_new_handler_depth > 0; +} + +/* * Reset fatal error handling. This should only be called in error recovery * loops like PostgresMain()'s. */ diff --git a/src/include/jit/llvmjit.h b/src/include/jit/llvmjit.h index 4beb013a1e1..c111ed802a4 100644 --- a/src/include/jit/llvmjit.h +++ b/src/include/jit/llvmjit.h @@ -90,6 +90,7 @@ extern LLVMValueRef FuncExecAggInitGroup; extern void llvm_enter_fatal_on_oom(void); extern void llvm_leave_fatal_on_oom(void); +extern bool llvm_in_fatal_on_oom(void); extern void llvm_reset_after_error(void); extern void llvm_assert_in_fatal_section(void); |