PageProtect GC (#75)

* Paging GC support
* Increase max_map_count for PageProtect tests.
* use per-page side metadata for LOS

Co-authored-by: Yi Lin <[email protected]>
Co-authored-by: Javad Amiri <[email protected]>

Author: 3 people

.github/scripts/ci-test.sh

@@ -75,7 +75,7 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar fop
 #build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar jython - does not work for stock build
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar luindex
-# build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar lusearch 
+# build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar lusearch
 #- validation failed
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar pmd
 #build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar xalan - mmtk-core gets stuck in slowdebug build
@@ -84,3 +84,13 @@ build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHea
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar hsqldb
 build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms500M -Xmx500M -jar benchmarks/dacapo-2006-10-MR2.jar eclipse
 
+# --- PageProtect ---
+# Make sure this runs last in our tests unless we want to set it back to the default limit.
+sudo sysctl -w vm.max_map_count=655300
+
+export MMTK_PLAN=PageProtect
+
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms4G -Xmx4G -jar benchmarks/dacapo-2006-10-MR2.jar antlr
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms4G -Xmx4G -jar benchmarks/dacapo-2006-10-MR2.jar fop
+build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms4G -Xmx4G -jar benchmarks/dacapo-2006-10-MR2.jar luindex
+# build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms4G -Xmx4G -jar benchmarks/dacapo-2006-10-MR2.jar pmd

mmtk/Cargo.toml

@@ -20,7 +20,7 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI.
-mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "a288b40997e148817d5b9fed7d8b6039f8e944c7" }
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "62964b7e552296f2200fbc3ed3df0e472c435631" }
 # Uncomment the following to build locally
 # mmtk = { path = "../repos/mmtk-core" }
 
@@ -37,3 +37,4 @@ nogc = []
 semispace = []
 gencopy = []
 marksweep = []
+pageprotect = []

mmtk/src/lib.rs

@@ -106,6 +106,8 @@ lazy_static! {
         std::env::set_var("MMTK_PLAN", "GenCopy");
         #[cfg(feature = "marksweep")]
         std::env::set_var("MMTK_PLAN", "MarkSweep");
+        #[cfg(feature = "pageprotect")]
+        std::env::set_var("MMTK_PLAN", "PageProtect");
         MMTK::new()
     };
 }

mmtk/src/vm_metadata/constants.rs

@@ -1,8 +1,9 @@
 pub(super) use mmtk::util::constants::LOG_BITS_IN_WORD;
+use mmtk::util::constants::LOG_BYTES_IN_PAGE;
 use mmtk::util::metadata::header_metadata::HeaderMetadataSpec;
-#[cfg(target_pointer_width = "32")]
-use mmtk::util::metadata::metadata_bytes_per_chunk;
-use mmtk::util::metadata::side_metadata::{SideMetadataSpec, GLOBAL_SIDE_METADATA_BASE_ADDRESS};
+use mmtk::util::metadata::side_metadata::{
+    SideMetadataSpec, GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS, LOCAL_SIDE_METADATA_VM_BASE_ADDRESS,
+};
 use mmtk::util::metadata::MetadataSpec;
 
 #[cfg(target_pointer_width = "64")]
@@ -19,7 +20,7 @@ pub(crate) const FORWARDING_POINTER_OFFSET: usize = 0;
 pub(crate) const LOGGING_SIDE_METADATA_SPEC: MetadataSpec =
     MetadataSpec::OnSide(SideMetadataSpec {
         is_global: true,
-        offset: GLOBAL_SIDE_METADATA_BASE_ADDRESS.as_usize(),
+        offset: GLOBAL_SIDE_METADATA_VM_BASE_ADDRESS.as_usize(),
         log_num_of_bits: 0,
         log_min_obj_size: 3,
     });
@@ -53,9 +54,15 @@ pub(crate) const MARKING_METADATA_SPEC: MetadataSpec = MetadataSpec::InHeader(He
 
 /// PolicySpecific mark-and-nursery bits metadata spec
 /// 2-bits per object
-pub(crate) const LOS_METADATA_SPEC: MetadataSpec = MetadataSpec::InHeader(HeaderMetadataSpec {
-    bit_offset: FORWARDING_BITS_OFFSET as isize,
-    num_of_bits: 2,
+pub(crate) const LOS_METADATA_SPEC: MetadataSpec = MetadataSpec::OnSide(SideMetadataSpec {
+    is_global: false,
+    offset: if cfg!(target_pointer_width = "64") {
+        LOCAL_SIDE_METADATA_VM_BASE_ADDRESS.as_usize()
+    } else {
+        0
+    },
+    log_num_of_bits: 1,
+    log_min_obj_size: LOG_BYTES_IN_PAGE as usize,
 });
 
 // PolicySpecific MetadataSpecs - End

openjdk/mmtkBarrierSetAssembler_x86.cpp

@@ -44,7 +44,7 @@ void MMTkBarrierSetAssembler::eden_allocate(MacroAssembler* masm, Register threa
     // But we need to figure out which allocator we are using by querying MMTk.
     AllocatorSelector selector = get_allocator_mapping(AllocatorDefault);
 
-    if (selector.tag == TAG_MALLOC) {
+    if (selector.tag == TAG_MALLOC || selector.tag == TAG_LARGE_OBJECT) {
       __ jmp(slow_case);
       return;
     }

openjdk/mmtkBarrierSetC2.cpp

@@ -81,7 +81,7 @@ void MMTkBarrierSetC2::expand_allocate(
 
   if (x->C->env()->dtrace_alloc_probes() || !MMTK_ENABLE_ALLOCATION_FASTPATH
     // Malloc allocator has no fastpath
-    || (selector.tag == TAG_MALLOC)) {
+    || (selector.tag == TAG_MALLOC) || selector.tag == TAG_LARGE_OBJECT) {
     // Force slow-path allocation
     always_slow = true;
     initial_slow_test = NULL;