archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152182: Possible overflow in initialzation of _rescan_task_size and _marking_task_size

Browse source 
Add constraints for CMSRescanMultiple and CMSConcMarkMultiple flags

Reviewed-by: jwilhelm, jmasa
This commit is contained in:
Sangheon Kim 2016-04-07 15:34:21 -07:00
parent 10c7cac93e
commit 25f35cda7d
5 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

45
hotspot/src/share/vm/runtime/commandLineFlagConstraintsGC.cpp
View file

@ -457,6 +457,51 @@ Flag::Error MarkStackSizeConstraintFunc(size_t value, bool verbose) {
}
}
static Flag::Error CMSReservedAreaConstraintFunc(const char* name, size_t value, bool verbose) {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepGeneration* cms = (ConcurrentMarkSweepGeneration*)GenCollectedHeap::heap()->old_gen();
const size_t ergo_max = cms->cmsSpace()->max_flag_size_for_task_size();
if (value > ergo_max) {
CommandLineError::print(verbose,
"%s (" SIZE_FORMAT ") must be "
"less than or equal to ergonomic maximum (" SIZE_FORMAT ") "
"which is based on the maximum size of the old generation of the Java heap\n",
name, value, ergo_max);
return Flag::VIOLATES_CONSTRAINT;
}
}
#endif
return Flag::SUCCESS;
}
Flag::Error CMSRescanMultipleConstraintFunc(size_t value, bool verbose) {
Flag::Error status = CMSReservedAreaConstraintFunc("CMSRescanMultiple", value, verbose);
#if INCLUDE_ALL_GCS
if (status == Flag::SUCCESS && UseConcMarkSweepGC) {
// CMSParRemarkTask::do_dirty_card_rescan_tasks requires CompactibleFreeListSpace::rescan_task_size()
// to be aligned to CardTableModRefBS::card_size * BitsPerWord.
// Note that rescan_task_size() will be aligned if CMSRescanMultiple is a multiple of 'HeapWordSize'
// because rescan_task_size() is CardTableModRefBS::card_size / HeapWordSize * BitsPerWord.
if (value % HeapWordSize != 0) {
CommandLineError::print(verbose,
"CMSRescanMultiple (" SIZE_FORMAT ") must be "
"a multiple of " SIZE_FORMAT "\n",
value, HeapWordSize);
status = Flag::VIOLATES_CONSTRAINT;
}
}
#endif
return status;
}
Flag::Error CMSConcMarkMultipleConstraintFunc(size_t value, bool verbose) {
return CMSReservedAreaConstraintFunc("CMSConcMarkMultiple", value, verbose);
}
Flag::Error CMSPrecleanDenominatorConstraintFunc(uintx value, bool verbose) {
#if INCLUDE_ALL_GCS
if (UseConcMarkSweepGC && (value <= CMSPrecleanNumerator)) {