From d889178ec78930538d9d6a66c3df9ee9afaffbb4 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Sun, 2 Mar 2014 13:28:37 -0800 Subject: Guard entrypoint changing by runtime shutdown lock. There was a race when we changed the allocation entrypoints where a new thread would be starting (Thread::Init) and initialize to the wrong entrypoints. Guarding allocation entrypoint changing with the runtime shutdown lock fixes this race condition since Thread::Init is only called with the runtime shutdown lock held. Bug: 13250963 Change-Id: I8eb209c124b6bf17020de874e1b0083f158b8200 --- runtime/arch/arm/entrypoints_init_arm.cc | 3 +- runtime/arch/mips/entrypoints_init_mips.cc | 1 + runtime/arch/quick_alloc_entrypoints.cc | 108 ------------------------- runtime/arch/x86/entrypoints_init_x86.cc | 1 + runtime/arch/x86_64/entrypoints_init_x86_64.cc | 1 + 5 files changed, 4 insertions(+), 110 deletions(-) delete mode 100644 runtime/arch/quick_alloc_entrypoints.cc (limited to 'runtime/arch') diff --git a/runtime/arch/arm/entrypoints_init_arm.cc b/runtime/arch/arm/entrypoints_init_arm.cc index fc85ae3..23e3433 100644 --- a/runtime/arch/arm/entrypoints_init_arm.cc +++ b/runtime/arch/arm/entrypoints_init_arm.cc @@ -16,6 +16,7 @@ #include "entrypoints/interpreter/interpreter_entrypoints.h" #include "entrypoints/portable/portable_entrypoints.h" +#include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/entrypoint_utils.h" #include "entrypoints/math_entrypoints.h" @@ -130,8 +131,6 @@ extern "C" void art_quick_throw_stack_overflow(void*); // Generic JNI downcall extern "C" void art_quick_generic_jni_trampoline(mirror::ArtMethod*); -extern void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints); - void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, PortableEntryPoints* ppoints, QuickEntryPoints* qpoints) { // Interpreter diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index 41d79c2..500a2eb 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -15,6 +15,7 @@ */ #include "entrypoints/portable/portable_entrypoints.h" +#include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/entrypoint_utils.h" #include "entrypoints/math_entrypoints.h" diff --git a/runtime/arch/quick_alloc_entrypoints.cc b/runtime/arch/quick_alloc_entrypoints.cc deleted file mode 100644 index 9363f81..0000000 --- a/runtime/arch/quick_alloc_entrypoints.cc +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "entrypoints/quick/quick_entrypoints.h" -#include "gc/heap.h" - -#define GENERATE_ENTRYPOINTS(suffix) \ -extern "C" void* art_quick_alloc_array##suffix(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_alloc_array_resolved##suffix(void* klass, void*, int32_t); \ -extern "C" void* art_quick_alloc_array_with_access_check##suffix(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_alloc_object##suffix(uint32_t type_idx, void* method); \ -extern "C" void* art_quick_alloc_object_resolved##suffix(void* klass, void* method); \ -extern "C" void* art_quick_alloc_object_initialized##suffix(void* klass, void* method); \ -extern "C" void* art_quick_alloc_object_with_access_check##suffix(uint32_t type_idx, void* method); \ -extern "C" void* art_quick_check_and_alloc_array##suffix(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_check_and_alloc_array_with_access_check##suffix(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_alloc_array##suffix##_instrumented(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_alloc_array_resolved##suffix##_instrumented(void* klass, void*, int32_t); \ -extern "C" void* art_quick_alloc_array_with_access_check##suffix##_instrumented(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_alloc_object##suffix##_instrumented(uint32_t type_idx, void* method); \ -extern "C" void* art_quick_alloc_object_resolved##suffix##_instrumented(void* klass, void* method); \ -extern "C" void* art_quick_alloc_object_initialized##suffix##_instrumented(void* klass, void* method); \ -extern "C" void* art_quick_alloc_object_with_access_check##suffix##_instrumented(uint32_t type_idx, void* method); \ -extern "C" void* art_quick_check_and_alloc_array##suffix##_instrumented(uint32_t, void*, int32_t); \ -extern "C" void* art_quick_check_and_alloc_array_with_access_check##suffix##_instrumented(uint32_t, void*, int32_t); \ -void SetQuickAllocEntryPoints##suffix(QuickEntryPoints* qpoints, bool instrumented) { \ - if (instrumented) { \ - qpoints->pAllocArray = art_quick_alloc_array##suffix##_instrumented; \ - qpoints->pAllocArrayResolved = art_quick_alloc_array_resolved##suffix##_instrumented; \ - qpoints->pAllocArrayWithAccessCheck = art_quick_alloc_array_with_access_check##suffix##_instrumented; \ - qpoints->pAllocObject = art_quick_alloc_object##suffix##_instrumented; \ - qpoints->pAllocObjectResolved = art_quick_alloc_object_resolved##suffix##_instrumented; \ - qpoints->pAllocObjectInitialized = art_quick_alloc_object_initialized##suffix##_instrumented; \ - qpoints->pAllocObjectWithAccessCheck = art_quick_alloc_object_with_access_check##suffix##_instrumented; \ - qpoints->pCheckAndAllocArray = art_quick_check_and_alloc_array##suffix##_instrumented; \ - qpoints->pCheckAndAllocArrayWithAccessCheck = art_quick_check_and_alloc_array_with_access_check##suffix##_instrumented; \ - } else { \ - qpoints->pAllocArray = art_quick_alloc_array##suffix; \ - qpoints->pAllocArrayResolved = art_quick_alloc_array_resolved##suffix; \ - qpoints->pAllocArrayWithAccessCheck = art_quick_alloc_array_with_access_check##suffix; \ - qpoints->pAllocObject = art_quick_alloc_object##suffix; \ - qpoints->pAllocObjectResolved = art_quick_alloc_object_resolved##suffix; \ - qpoints->pAllocObjectInitialized = art_quick_alloc_object_initialized##suffix; \ - qpoints->pAllocObjectWithAccessCheck = art_quick_alloc_object_with_access_check##suffix; \ - qpoints->pCheckAndAllocArray = art_quick_check_and_alloc_array##suffix; \ - qpoints->pCheckAndAllocArrayWithAccessCheck = art_quick_check_and_alloc_array_with_access_check##suffix; \ - } \ -} - -namespace art { - -// Generate the entrypoint functions. -GENERATE_ENTRYPOINTS(_dlmalloc); -GENERATE_ENTRYPOINTS(_rosalloc); -GENERATE_ENTRYPOINTS(_bump_pointer); -GENERATE_ENTRYPOINTS(_tlab); - -static bool entry_points_instrumented = false; -static gc::AllocatorType entry_points_allocator = gc::kAllocatorTypeDlMalloc; - -void SetQuickAllocEntryPointsAllocator(gc::AllocatorType allocator) { - entry_points_allocator = allocator; -} - -void SetQuickAllocEntryPointsInstrumented(bool instrumented) { - entry_points_instrumented = instrumented; -} - -void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints) { - switch (entry_points_allocator) { - case gc::kAllocatorTypeDlMalloc: { - SetQuickAllocEntryPoints_dlmalloc(qpoints, entry_points_instrumented); - break; - } - case gc::kAllocatorTypeRosAlloc: { - SetQuickAllocEntryPoints_rosalloc(qpoints, entry_points_instrumented); - break; - } - case gc::kAllocatorTypeBumpPointer: { - CHECK(kMovingCollector); - SetQuickAllocEntryPoints_bump_pointer(qpoints, entry_points_instrumented); - break; - } - case gc::kAllocatorTypeTLAB: { - CHECK(kMovingCollector); - SetQuickAllocEntryPoints_tlab(qpoints, entry_points_instrumented); - break; - } - default: { - LOG(FATAL) << "Unimplemented"; - } - } -} - -} // namespace art diff --git a/runtime/arch/x86/entrypoints_init_x86.cc b/runtime/arch/x86/entrypoints_init_x86.cc index 763cbde..c4a7b1b 100644 --- a/runtime/arch/x86/entrypoints_init_x86.cc +++ b/runtime/arch/x86/entrypoints_init_x86.cc @@ -15,6 +15,7 @@ */ #include "entrypoints/portable/portable_entrypoints.h" +#include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/entrypoint_utils.h" diff --git a/runtime/arch/x86_64/entrypoints_init_x86_64.cc b/runtime/arch/x86_64/entrypoints_init_x86_64.cc index fe298c8..30067cf 100644 --- a/runtime/arch/x86_64/entrypoints_init_x86_64.cc +++ b/runtime/arch/x86_64/entrypoints_init_x86_64.cc @@ -15,6 +15,7 @@ */ #include "entrypoints/portable/portable_entrypoints.h" +#include "entrypoints/quick/quick_alloc_entrypoints.h" #include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/entrypoint_utils.h" -- cgit v1.1