Skip to content
Permalink
Browse files
8253262: Allocate in DumpRegion is not thread safe
Reviewed-by: ccheung
  • Loading branch information
yminqi committed Sep 17, 2020
1 parent 3570f5a commit 12dfe1c9b616eba83ce21290d50cea8942a01d83
Showing with 12 additions and 7 deletions.
  1. +9 −7 src/hotspot/share/oops/symbol.cpp
  2. +2 −0 src/hotspot/share/runtime/mutexLocker.cpp
  3. +1 −0 src/hotspot/share/runtime/mutexLocker.hpp
@@ -35,6 +35,7 @@
#include "memory/universe.hpp"
#include "oops/symbol.hpp"
#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"
#include "runtime/signature.hpp"
#include "utilities/utf8.hpp"
@@ -63,13 +64,14 @@ Symbol::Symbol(const u1* name, int length, int refcount) {
void* Symbol::operator new(size_t sz, int len) throw() {
#if INCLUDE_CDS
if (DumpSharedSpaces) {
// To get deterministic output from -Xshare:dump, we ensure that Symbols are allocated in
// increasing addresses. When the symbols are copied into the archive, we preserve their
// relative address order (see SortedSymbolClosure in metaspaceShared.cpp)
//
// We cannot use arena because arena chunks are allocated by the OS. As a result, for example,
// the archived symbol of "java/lang/Object" may sometimes be lower than "java/lang/String", and
// sometimes be higher. This would cause non-deterministic contents in the archive.
MutexLocker ml(DumpRegion_lock, Mutex::_no_safepoint_check_flag);
// To get deterministic output from -Xshare:dump, we ensure that Symbols are allocated in
// increasing addresses. When the symbols are copied into the archive, we preserve their
// relative address order (sorted, see ArchiveBuilder::gather_klasses_and_symbols).
//
// We cannot use arena because arena chunks are allocated by the OS. As a result, for example,
// the archived symbol of "java/lang/Object" may sometimes be lower than "java/lang/String", and
// sometimes be higher. This would cause non-deterministic contents in the archive.
DEBUG_ONLY(static void* last = 0);
void* p = (void*)MetaspaceShared::symbol_space_alloc(size(len)*wordSize);
assert(p > last, "must increase monotonically");
@@ -151,6 +151,7 @@ Mutex* CDSClassFileStream_lock = NULL;
#endif
Mutex* DumpTimeTable_lock = NULL;
Mutex* CDSLambda_lock = NULL;
Mutex* DumpRegion_lock = NULL;
#endif // INCLUDE_CDS

#if INCLUDE_JVMCI
@@ -346,6 +347,7 @@ void mutex_init() {
#endif
def(DumpTimeTable_lock , PaddedMutex , leaf - 1, true, _safepoint_check_never);
def(CDSLambda_lock , PaddedMutex , leaf, true, _safepoint_check_never);
def(DumpRegion_lock , PaddedMutex , leaf, true, _safepoint_check_never);
#endif // INCLUDE_CDS

#if INCLUDE_JVMCI
@@ -130,6 +130,7 @@ extern Mutex* CDSClassFileStream_lock; // FileMapInfo::open_stream_for
#endif
extern Mutex* DumpTimeTable_lock; // SystemDictionaryShared::find_or_allocate_info_for
extern Mutex* CDSLambda_lock; // SystemDictionaryShared::get_shared_lambda_proxy_class
extern Mutex* DumpRegion_lock; // Symbol::operator new(size_t sz, int len)
#endif // INCLUDE_CDS
#if INCLUDE_JFR
extern Mutex* JfrStacktrace_lock; // used to guard access to the JFR stacktrace table

1 comment on commit 12dfe1c

@bridgekeeper

This comment has been minimized.

Copy link

@bridgekeeper bridgekeeper bot commented on 12dfe1c Sep 17, 2020

Please sign in to comment.