stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8038268: VM Crashes in MetaspaceShared::generate_vtable_methods while creating CDS archive with limiting SharedMiscCodeSize

Browse Source 
Estimate the minimum required size for the misc code region and check if the specified misc code region size meets the minimum size requirement

Reviewed-by: jiangli, dholmes
This commit is contained in:
Calvin Cheung 2014-10-23 10:08:02 -07:00
parent 397e42b775
commit 1aa3da1067
5 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hotspot/src/share/vm/memory/metaspace.cpp
View File

@ -3157,6 +3157,16 @@ void Metaspace::global_initialize() {
SharedMiscDataSize = align_size_up(SharedMiscDataSize, max_alignment); SharedMiscDataSize = align_size_up(SharedMiscDataSize, max_alignment);
SharedMiscCodeSize = align_size_up(SharedMiscCodeSize, max_alignment); SharedMiscCodeSize = align_size_up(SharedMiscCodeSize, max_alignment);
// the min_misc_code_size estimate is based on MetaspaceShared::generate_vtable_methods()
uintx min_misc_code_size = align_size_up(
(MetaspaceShared::num_virtuals * MetaspaceShared::vtbl_list_size) *
(sizeof(void*) + MetaspaceShared::vtbl_method_size) + MetaspaceShared::vtbl_common_code_size,
max_alignment);
if (SharedMiscCodeSize < min_misc_code_size) {
report_out_of_shared_space(SharedMiscCode);
}
// Initialize with the sum of the shared space sizes. The read-only // Initialize with the sum of the shared space sizes. The read-only
// and read write metaspace chunks will be allocated out of this and the // and read write metaspace chunks will be allocated out of this and the
// remainder is the misc code and data chunks. // remainder is the misc code and data chunks.

15
hotspot/src/share/vm/memory/metaspaceShared.hpp
View File

@ -57,11 +57,16 @@ class MetaspaceShared : AllStatic {
static bool _archive_loading_failed; static bool _archive_loading_failed;
public: public:
enum { enum {
vtbl_list_size = 17, // number of entries in the shared space vtable list. vtbl_list_size = 17, // number of entries in the shared space vtable list.
num_virtuals = 200 // maximum number of virtual functions num_virtuals = 200, // maximum number of virtual functions
// If virtual functions are added to Metadata, // If virtual functions are added to Metadata,
// this number needs to be increased. Also, // this number needs to be increased. Also,
// SharedMiscCodeSize will need to be increased. // SharedMiscCodeSize will need to be increased.
// The following 2 sizes were based on
// MetaspaceShared::generate_vtable_methods()
vtbl_method_size = 16, // conservative size of the mov1 and jmp instructions
// for the x64 platform
vtbl_common_code_size = (1*K) // conservative size of the "common_code" for the x64 platform
}; };
enum { enum {

8
hotspot/src/share/vm/utilities/debug.cpp
View File

@ -256,16 +256,18 @@ void report_out_of_shared_space(SharedSpaceType shared_space) {
static const char* name[] = { static const char* name[] = {
"shared read only space", "shared read only space",
"shared read write space", "shared read write space",
"shared miscellaneous data space" "shared miscellaneous data space",
"shared miscellaneous code space"
}; };
static const char* flag[] = { static const char* flag[] = {
"SharedReadOnlySize", "SharedReadOnlySize",
"SharedReadWriteSize", "SharedReadWriteSize",
"SharedMiscDataSize" "SharedMiscDataSize",
"SharedMiscCodeSize"
}; };
warning("\nThe %s is not large enough\n" warning("\nThe %s is not large enough\n"
"to preload requested classes. Use -XX:%s=\n" "to preload requested classes. Use -XX:%s=<size>\n"
"to increase the initial size of %s.\n", "to increase the initial size of %s.\n",
name[shared_space], flag[shared_space], name[shared_space]); name[shared_space], flag[shared_space], name[shared_space]);
exit(2); exit(2);

3
hotspot/src/share/vm/utilities/debug.hpp
View File

@ -245,7 +245,8 @@ template <> struct StaticAssert<true> {};
enum SharedSpaceType { enum SharedSpaceType {
SharedReadOnly, SharedReadOnly,
SharedReadWrite, SharedReadWrite,
SharedMiscData SharedMiscData,
SharedMiscCode
}; };
void report_out_of_shared_space(SharedSpaceType space_type); void report_out_of_shared_space(SharedSpaceType space_type);

9
hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java
View File

@ -51,9 +51,12 @@ public class LimitSharedSizes {
// Known issue, JDK-8038422 (assert() on Windows) // Known issue, JDK-8038422 (assert() on Windows)
// new SharedSizeTestData("-XX:SharedMiscDataSize", "500k", "miscellaneous data"), // new SharedSizeTestData("-XX:SharedMiscDataSize", "500k", "miscellaneous data"),
// This will cause a VM crash; commenting out for now; see bug JDK-8038268 // Too small of a misc code size should not cause a vm crash.
// @ignore JDK-8038268 // It should result in the following error message:
// new SharedSizeTestData("-XX:SharedMiscCodeSize", "20k", "miscellaneous code"), // The shared miscellaneous code space is not large enough
// to preload requested classes. Use -XX:SharedMiscCodeSize=
// to increase the initial size of shared miscellaneous code space.
new SharedSizeTestData("-XX:SharedMiscCodeSize", "20k", "miscellaneous code"),
// these values are larger than default ones, but should // these values are larger than default ones, but should
// be acceptable and not cause failure // be acceptable and not cause failure