diff --git a/common.gypi b/common.gypi index ecb5dd907f2b75..851816e084565d 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.8', + 'v8_embedder_string': '-node.9', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/api/api.cc b/deps/v8/src/api/api.cc index a0ab21d71a378a..393f5471914dd8 100644 --- a/deps/v8/src/api/api.cc +++ b/deps/v8/src/api/api.cc @@ -483,7 +483,6 @@ SnapshotCreator::SnapshotCreator(const intptr_t* external_references, SnapshotCreator::~SnapshotCreator() { SnapshotCreatorData* data = SnapshotCreatorData::cast(data_); - DCHECK(data->created_); Isolate* isolate = data->isolate_; isolate->Exit(); isolate->Dispose(); @@ -590,8 +589,12 @@ StartupData SnapshotCreator::CreateBlob( SnapshotCreator::FunctionCodeHandling function_code_handling) { SnapshotCreatorData* data = SnapshotCreatorData::cast(data_); i::Isolate* isolate = reinterpret_cast(data->isolate_); - DCHECK(!data->created_); - DCHECK(!data->default_context_.IsEmpty()); + Utils::ApiCheck(!data->created_, "v8::SnapshotCreator::CreateBlob", + "CreateBlob() cannot be called more than once on the same " + "SnapshotCreator."); + Utils::ApiCheck( + !data->default_context_.IsEmpty(), "v8::SnapshotCreator::CreateBlob", + "CreateBlob() cannot be called before the default context is set."); const int num_additional_contexts = static_cast(data->contexts_.Size()); const int num_contexts = num_additional_contexts + 1; // The default context. diff --git a/deps/v8/test/cctest/test-serialize.cc b/deps/v8/test/cctest/test-serialize.cc index 8c4d6b4722cb61..7d3e57af49d92c 100644 --- a/deps/v8/test/cctest/test-serialize.cc +++ b/deps/v8/test/cctest/test-serialize.cc @@ -2840,6 +2840,31 @@ TEST(Regress503552) { delete cache_data; } +UNINITIALIZED_TEST(SnapshotCreatorBlobNotCreated) { + DisableAlwaysOpt(); + DisableEmbeddedBlobRefcounting(); + { + v8::SnapshotCreator creator; + v8::Isolate* isolate = creator.GetIsolate(); + { + v8::HandleScope handle_scope(isolate); + v8::Local context = v8::Context::New(isolate); + v8::Context::Scope context_scope(context); + v8::TryCatch try_catch(isolate); + v8::Local code = v8_str("throw new Error('test');"); + CHECK(v8::Script::Compile(context, code) + .ToLocalChecked() + ->Run(context) + .IsEmpty()); + CHECK(try_catch.HasCaught()); + } + // SnapshotCreator should be destroyed just fine even when no + // blob is created. + } + + FreeCurrentEmbeddedBlob(); +} + UNINITIALIZED_TEST(SnapshotCreatorMultipleContexts) { DisableAlwaysOpt(); DisableEmbeddedBlobRefcounting(); diff --git a/doc/api/process.md b/doc/api/process.md index 4b48a6590b7d2a..538020ff868983 100644 --- a/doc/api/process.md +++ b/doc/api/process.md @@ -3822,6 +3822,9 @@ cases: options were set, but the port number chosen was invalid or unavailable. * `13` **Unfinished Top-Level Await**: `await` was used outside of a function in the top-level code, but the passed `Promise` never resolved. +* `14` **Snapshot Failure**: Node.js was started to build a V8 startup + snapshot and it failed because certain requirements of the state of + the application were not met. * `>128` **Signal Exits**: If Node.js receives a fatal signal such as `SIGKILL` or `SIGHUP`, then its exit code will be `128` plus the value of the signal code. This is a standard POSIX practice, since diff --git a/src/env.h b/src/env.h index 9c6cf21c176bc4..077600fbd8ef82 100644 --- a/src/env.h +++ b/src/env.h @@ -991,13 +991,17 @@ struct EnvSerializeInfo { }; struct SnapshotData { - // The result of v8::SnapshotCreator::CreateBlob() during the snapshot - // building process. - v8::StartupData v8_snapshot_blob_data; + enum class DataOwnership { kOwned, kNotOwned }; static const size_t kNodeBaseContextIndex = 0; static const size_t kNodeMainContextIndex = kNodeBaseContextIndex + 1; + DataOwnership data_ownership = DataOwnership::kOwned; + + // The result of v8::SnapshotCreator::CreateBlob() during the snapshot + // building process. + v8::StartupData v8_snapshot_blob_data{nullptr, 0}; + std::vector isolate_data_indices; // TODO(joyeecheung): there should be a vector of env_info once we snapshot // the worker environments. @@ -1007,6 +1011,15 @@ struct SnapshotData { // read only space. We use native_module::CodeCacheInfo because // v8::ScriptCompiler::CachedData is not copyable. std::vector code_cache; + + ~SnapshotData(); + + SnapshotData(const SnapshotData&) = delete; + SnapshotData& operator=(const SnapshotData&) = delete; + SnapshotData(SnapshotData&&) = delete; + SnapshotData& operator=(SnapshotData&&) = delete; + + SnapshotData() = default; }; class Environment : public MemoryRetainer { diff --git a/src/node_snapshot_builder.h b/src/node_snapshot_builder.h index c5d2ee2a4bcd83..7a82c00255e780 100644 --- a/src/node_snapshot_builder.h +++ b/src/node_snapshot_builder.h @@ -15,13 +15,14 @@ struct SnapshotData; class NODE_EXTERN_PRIVATE SnapshotBuilder { public: - static std::string Generate(const std::vector args, - const std::vector exec_args); + static int Generate(std::ostream& out, + const std::vector args, + const std::vector exec_args); // Generate the snapshot into out. - static void Generate(SnapshotData* out, - const std::vector args, - const std::vector exec_args); + static int Generate(SnapshotData* out, + const std::vector args, + const std::vector exec_args); // If nullptr is returned, the binary is not built with embedded // snapshot. diff --git a/src/node_snapshotable.cc b/src/node_snapshotable.cc index b71c46acabed72..7375c8cdecf286 100644 --- a/src/node_snapshotable.cc +++ b/src/node_snapshotable.cc @@ -29,7 +29,6 @@ using v8::FunctionCallbackInfo; using v8::HandleScope; using v8::Isolate; using v8::Local; -using v8::MaybeLocal; using v8::Object; using v8::ScriptCompiler; using v8::ScriptOrigin; @@ -39,8 +38,15 @@ using v8::String; using v8::TryCatch; using v8::Value; +SnapshotData::~SnapshotData() { + if (data_ownership == DataOwnership::kOwned && + v8_snapshot_blob_data.data != nullptr) { + delete[] v8_snapshot_blob_data.data; + } +} + template -void WriteVector(std::ostringstream* ss, const T* vec, size_t size) { +void WriteVector(std::ostream* ss, const T* vec, size_t size) { for (size_t i = 0; i < size; i++) { *ss << std::to_string(vec[i]) << (i == size - 1 ? '\n' : ','); } @@ -70,15 +76,14 @@ static std::string FormatSize(size_t size) { return buf; } -static void WriteStaticCodeCacheData(std::ostringstream* ss, +static void WriteStaticCodeCacheData(std::ostream* ss, const native_module::CodeCacheInfo& info) { *ss << "static const uint8_t " << GetCodeCacheDefName(info.id) << "[] = {\n"; WriteVector(ss, info.data.data(), info.data.size()); *ss << "};"; } -static void WriteCodeCacheInitializer(std::ostringstream* ss, - const std::string& id) { +static void WriteCodeCacheInitializer(std::ostream* ss, const std::string& id) { std::string def_name = GetCodeCacheDefName(id); *ss << " { \"" << id << "\",\n"; *ss << " {" << def_name << ",\n"; @@ -87,9 +92,7 @@ static void WriteCodeCacheInitializer(std::ostringstream* ss, *ss << " },\n"; } -std::string FormatBlob(SnapshotData* data) { - std::ostringstream ss; - +void FormatBlob(std::ostream& ss, SnapshotData* data) { ss << R"(#include #include "env.h" #include "node_snapshot_builder.h" @@ -116,6 +119,9 @@ static const int v8_snapshot_blob_size = )" } ss << R"(SnapshotData snapshot_data { + // -- data_ownership begins -- + SnapshotData::DataOwnership::kNotOwned, + // -- data_ownership ends -- // -- v8_snapshot_blob_data begins -- { v8_snapshot_blob_data, v8_snapshot_blob_size }, // -- v8_snapshot_blob_data ends -- @@ -148,8 +154,6 @@ const SnapshotData* SnapshotBuilder::GetEmbeddedSnapshotData() { } } // namespace node )"; - - return ss.str(); } Mutex SnapshotBuilder::snapshot_data_mutex_; @@ -166,175 +170,185 @@ void SnapshotBuilder::InitializeIsolateParams(const SnapshotData* data, const_cast(&(data->v8_snapshot_blob_data)); } -void SnapshotBuilder::Generate(SnapshotData* out, - const std::vector args, - const std::vector exec_args) { +// TODO(joyeecheung): share these exit code constants across the code base. +constexpr int UNCAUGHT_EXCEPTION_ERROR = 1; +constexpr int BOOTSTRAP_ERROR = 10; +constexpr int SNAPSHOT_ERROR = 14; + +int SnapshotBuilder::Generate(SnapshotData* out, + const std::vector args, + const std::vector exec_args) { + const std::vector& external_references = + CollectExternalReferences(); Isolate* isolate = Isolate::Allocate(); - isolate->SetCaptureStackTraceForUncaughtExceptions( - true, 10, v8::StackTrace::StackTraceOptions::kDetailed); + // Must be done before the SnapshotCreator creation so that the + // memory reducer can be initialized. per_process::v8_platform.Platform()->RegisterIsolate(isolate, uv_default_loop()); - std::unique_ptr main_instance; - std::string result; + + SnapshotCreator creator(isolate, external_references.data()); + + isolate->SetCaptureStackTraceForUncaughtExceptions( + true, 10, v8::StackTrace::StackTraceOptions::kDetailed); + + Environment* env = nullptr; + std::unique_ptr main_instance = + NodeMainInstance::Create(isolate, + uv_default_loop(), + per_process::v8_platform.Platform(), + args, + exec_args); + + // The cleanups should be done in case of an early exit due to errors. + auto cleanup = OnScopeLeave([&]() { + // Must be done while the snapshot creator isolate is entered i.e. the + // creator is still alive. The snapshot creator destructor will destroy + // the isolate. + if (env != nullptr) { + FreeEnvironment(env); + } + main_instance->Dispose(); + per_process::v8_platform.Platform()->UnregisterIsolate(isolate); + }); { - const std::vector& external_references = - CollectExternalReferences(); - SnapshotCreator creator(isolate, external_references.data()); - Environment* env; - { - main_instance = - NodeMainInstance::Create(isolate, - uv_default_loop(), - per_process::v8_platform.Platform(), - args, - exec_args); - out->isolate_data_indices = - main_instance->isolate_data()->Serialize(&creator); - - HandleScope scope(isolate); - - // The default context with only things created by V8. - creator.SetDefaultContext(Context::New(isolate)); - - auto CreateBaseContext = [&]() { - TryCatch bootstrapCatch(isolate); - // Run the per-context scripts. - Local base_context = NewContext(isolate); - if (bootstrapCatch.HasCaught()) { - PrintCaughtException(isolate, base_context, bootstrapCatch); - abort(); - } - return base_context; - }; - - // The Node.js-specific context with primodials, can be used by workers - // TODO(joyeecheung): investigate if this can be used by vm contexts - // without breaking compatibility. - { - size_t index = creator.AddContext(CreateBaseContext()); - CHECK_EQ(index, SnapshotData::kNodeBaseContextIndex); + HandleScope scope(isolate); + TryCatch bootstrapCatch(isolate); + + auto print_Exception = OnScopeLeave([&]() { + if (bootstrapCatch.HasCaught()) { + PrintCaughtException( + isolate, isolate->GetCurrentContext(), bootstrapCatch); } + }); - // The main instance context. - { - Local main_context = CreateBaseContext(); - Context::Scope context_scope(main_context); - TryCatch bootstrapCatch(isolate); - - // Create the environment. - env = new Environment(main_instance->isolate_data(), - main_context, - args, - exec_args, - nullptr, - node::EnvironmentFlags::kDefaultFlags, - {}); - - // Run scripts in lib/internal/bootstrap/ - MaybeLocal result = env->RunBootstrapping(); - if (bootstrapCatch.HasCaught()) { - // TODO(joyeecheung): fail by exiting with a non-zero exit code. - PrintCaughtException(isolate, main_context, bootstrapCatch); - abort(); - } - result.ToLocalChecked(); - // If --build-snapshot is true, lib/internal/main/mksnapshot.js would be - // loaded via LoadEnvironment() to execute process.argv[1] as the entry - // point (we currently only support this kind of entry point, but we - // could also explore snapshotting other kinds of execution modes - // in the future). - if (per_process::cli_options->build_snapshot) { + out->isolate_data_indices = + main_instance->isolate_data()->Serialize(&creator); + + // The default context with only things created by V8. + Local default_context = Context::New(isolate); + + // The Node.js-specific context with primodials, can be used by workers + // TODO(joyeecheung): investigate if this can be used by vm contexts + // without breaking compatibility. + Local base_context = NewContext(isolate); + if (base_context.IsEmpty()) { + return BOOTSTRAP_ERROR; + } + + Local main_context = NewContext(isolate); + if (main_context.IsEmpty()) { + return BOOTSTRAP_ERROR; + } + // Initialize the main instance context. + { + Context::Scope context_scope(main_context); + + // Create the environment. + env = new Environment(main_instance->isolate_data(), + main_context, + args, + exec_args, + nullptr, + node::EnvironmentFlags::kDefaultFlags, + {}); + + // Run scripts in lib/internal/bootstrap/ + if (env->RunBootstrapping().IsEmpty()) { + return BOOTSTRAP_ERROR; + } + // If --build-snapshot is true, lib/internal/main/mksnapshot.js would be + // loaded via LoadEnvironment() to execute process.argv[1] as the entry + // point (we currently only support this kind of entry point, but we + // could also explore snapshotting other kinds of execution modes + // in the future). + if (per_process::cli_options->build_snapshot) { #if HAVE_INSPECTOR - env->InitializeInspector({}); + // TODO(joyeecheung): move this before RunBootstrapping(). + env->InitializeInspector({}); #endif - // TODO(joyeecheung): we could use the result for something special, - // like setting up initializers that should be invoked at snapshot - // dehydration. - MaybeLocal result = - LoadEnvironment(env, StartExecutionCallback{}); - if (bootstrapCatch.HasCaught()) { - // TODO(joyeecheung): fail by exiting with a non-zero exit code. - PrintCaughtException(isolate, main_context, bootstrapCatch); - abort(); - } - result.ToLocalChecked(); - // FIXME(joyeecheung): right now running the loop in the snapshot - // builder seems to introduces inconsistencies in JS land that need to - // be synchronized again after snapshot restoration. - int exit_code = SpinEventLoop(env).FromMaybe(1); - CHECK_EQ(exit_code, 0); - if (bootstrapCatch.HasCaught()) { - // TODO(joyeecheung): fail by exiting with a non-zero exit code. - PrintCaughtException(isolate, main_context, bootstrapCatch); - abort(); - } + if (LoadEnvironment(env, StartExecutionCallback{}).IsEmpty()) { + return UNCAUGHT_EXCEPTION_ERROR; } - - if (per_process::enabled_debug_list.enabled( - DebugCategory::MKSNAPSHOT)) { - env->PrintAllBaseObjects(); - printf("Environment = %p\n", env); + // FIXME(joyeecheung): right now running the loop in the snapshot + // builder seems to introduces inconsistencies in JS land that need to + // be synchronized again after snapshot restoration. + int exit_code = SpinEventLoop(env).FromMaybe(UNCAUGHT_EXCEPTION_ERROR); + if (exit_code != 0) { + return exit_code; } + } - // Serialize the native states - out->env_info = env->Serialize(&creator); - // Serialize the context - size_t index = creator.AddContext( - main_context, {SerializeNodeContextInternalFields, env}); - CHECK_EQ(index, SnapshotData::kNodeMainContextIndex); + if (per_process::enabled_debug_list.enabled(DebugCategory::MKSNAPSHOT)) { + env->PrintAllBaseObjects(); + printf("Environment = %p\n", env); + } + + // Serialize the native states + out->env_info = env->Serialize(&creator); #ifdef NODE_USE_NODE_CODE_CACHE - // Regenerate all the code cache. - CHECK(native_module::NativeModuleEnv::CompileAllModules(main_context)); - native_module::NativeModuleEnv::CopyCodeCache(&(out->code_cache)); - for (const auto& item : out->code_cache) { - std::string size_str = FormatSize(item.data.size()); - per_process::Debug(DebugCategory::MKSNAPSHOT, - "Generated code cache for %d: %s\n", - item.id.c_str(), - size_str.c_str()); - } -#endif + // Regenerate all the code cache. + if (!native_module::NativeModuleEnv::CompileAllModules(main_context)) { + return UNCAUGHT_EXCEPTION_ERROR; + } + native_module::NativeModuleEnv::CopyCodeCache(&(out->code_cache)); + for (const auto& item : out->code_cache) { + std::string size_str = FormatSize(item.data.size()); + per_process::Debug(DebugCategory::MKSNAPSHOT, + "Generated code cache for %d: %s\n", + item.id.c_str(), + size_str.c_str()); } +#endif } - // Must be out of HandleScope - out->v8_snapshot_blob_data = - creator.CreateBlob(SnapshotCreator::FunctionCodeHandling::kClear); - - // We must be able to rehash the blob when we restore it or otherwise - // the hash seed would be fixed by V8, introducing a vulnerability. - CHECK(out->v8_snapshot_blob_data.CanBeRehashed()); - - // We cannot resurrect the handles from the snapshot, so make sure that - // no handles are left open in the environment after the blob is created - // (which should trigger a GC and close all handles that can be closed). - if (!env->req_wrap_queue()->IsEmpty() - || !env->handle_wrap_queue()->IsEmpty() - || per_process::enabled_debug_list.enabled(DebugCategory::MKSNAPSHOT)) { - PrintLibuvHandleInformation(env->event_loop(), stderr); - } - CHECK(env->req_wrap_queue()->IsEmpty()); - CHECK(env->handle_wrap_queue()->IsEmpty()); + // Global handles to the contexts can't be disposed before the + // blob is created. So initialize all the contexts before adding them. + // TODO(joyeecheung): figure out how to remove this restriction. + creator.SetDefaultContext(default_context); + size_t index = creator.AddContext(base_context); + CHECK_EQ(index, SnapshotData::kNodeBaseContextIndex); + index = creator.AddContext(main_context, + {SerializeNodeContextInternalFields, env}); + CHECK_EQ(index, SnapshotData::kNodeMainContextIndex); + } - // Must be done while the snapshot creator isolate is entered i.e. the - // creator is still alive. - FreeEnvironment(env); - main_instance->Dispose(); + // Must be out of HandleScope + out->v8_snapshot_blob_data = + creator.CreateBlob(SnapshotCreator::FunctionCodeHandling::kClear); + + // We must be able to rehash the blob when we restore it or otherwise + // the hash seed would be fixed by V8, introducing a vulnerability. + if (!out->v8_snapshot_blob_data.CanBeRehashed()) { + return SNAPSHOT_ERROR; } - per_process::v8_platform.Platform()->UnregisterIsolate(isolate); + // We cannot resurrect the handles from the snapshot, so make sure that + // no handles are left open in the environment after the blob is created + // (which should trigger a GC and close all handles that can be closed). + bool queues_are_empty = + env->req_wrap_queue()->IsEmpty() && env->handle_wrap_queue()->IsEmpty(); + if (!queues_are_empty || + per_process::enabled_debug_list.enabled(DebugCategory::MKSNAPSHOT)) { + PrintLibuvHandleInformation(env->event_loop(), stderr); + } + if (!queues_are_empty) { + return SNAPSHOT_ERROR; + } + return 0; } -std::string SnapshotBuilder::Generate( - const std::vector args, - const std::vector exec_args) { +int SnapshotBuilder::Generate(std::ostream& out, + const std::vector args, + const std::vector exec_args) { SnapshotData data; - Generate(&data, args, exec_args); - std::string result = FormatBlob(&data); - delete[] data.v8_snapshot_blob_data.data; - return result; + int exit_code = Generate(&data, args, exec_args); + if (exit_code != 0) { + return exit_code; + } + FormatBlob(out, &data); + return exit_code; } SnapshotableObject::SnapshotableObject(Environment* env, diff --git a/test/fixtures/snapshot/error.js b/test/fixtures/snapshot/error.js new file mode 100644 index 00000000000000..bc9eaa01354ace --- /dev/null +++ b/test/fixtures/snapshot/error.js @@ -0,0 +1 @@ +throw new Error('test'); diff --git a/tools/snapshot/node_mksnapshot.cc b/tools/snapshot/node_mksnapshot.cc index d166559a715b14..15f96070a7e3a9 100644 --- a/tools/snapshot/node_mksnapshot.cc +++ b/tools/snapshot/node_mksnapshot.cc @@ -83,17 +83,18 @@ int BuildSnapshot(int argc, char* argv[]) { return 1; } + int exit_code = 0; { - std::string snapshot = - node::SnapshotBuilder::Generate(result.args, result.exec_args); - out << snapshot; - - if (!out) { - std::cerr << "Failed to write " << out_path << "\n"; - return 1; + exit_code = + node::SnapshotBuilder::Generate(out, result.args, result.exec_args); + if (exit_code == 0) { + if (!out) { + std::cerr << "Failed to write " << out_path << "\n"; + exit_code = 1; + } } } node::TearDownOncePerProcess(); - return 0; + return exit_code; }