WIP: quarantine v4

Makefile

@@ -67,7 +67,7 @@ extract: $(ALL_KRML_FILES)
 	  -bundle Steel.SpinLock= -bundle 'FStar.\*,Steel.\*' \
 	  -bundle 'StarMalloc=Mman2,FatalError,Map.\*,Impl.\*,Spec.\*,Main,Main2,Main.Meta,LargeAlloc'[rename=StarMalloc] \
 	  -bundle 'SlabsCommon,SlabsFree,SlabsAlloc'[rename=Slabs] \
-	  -bundle 'SlotsFree,SlotsAlloc'[rename=Slots] \
+	  -bundle 'SlotsFree,SlotsAlloc,SlotsCommon'[rename=Slots] \
 	  -bundle 'ArrayList,ArrayListGen'[rename=ArrayList] \
 	  -no-prefix LargeAlloc \
 	  -no-prefix Mman \
@@ -93,6 +93,7 @@ FILES = \
   dist/Slots.c \
   dist/Bitmap5.c \
   dist/Utils2.c \
+  dist/Constants.c \
   dist/SizeClass.c \
   dist/SizeClassSelection.c \
   dist/PtrdiffWrapper.c \

dist/Config.c

@@ -13,13 +13,13 @@ size_t Config_guard_pages_interval = (size_t)2U;
 
 bool Config_enable_quarantine = true;
 
+bool Config_enable_quarantine_slot = true;
+
 bool Config_enable_quarantine_trap = true;
 
 bool Config_enable_quarantine_strict_trap = false;
 
-size_t Config_quarantine_queue_length = (size_t)1024U;
-
-size_t Config_quarantine_queue_threshold = (size_t)256U;
+size_t Config_quarantine_queue_length = (size_t)4096U;
 
 bool Config_enable_zeroing_malloc = true;
 

dist/Config.h

@@ -20,14 +20,14 @@ extern size_t Config_guard_pages_interval;
 
 extern bool Config_enable_quarantine;
 
+extern bool Config_enable_quarantine_slot;
+
 extern bool Config_enable_quarantine_trap;
 
 extern bool Config_enable_quarantine_strict_trap;
 
 extern size_t Config_quarantine_queue_length;
 
-extern size_t Config_quarantine_queue_threshold;
-
 extern bool Config_enable_zeroing_malloc;
 
 extern bool Config_enable_zeroing_free;

dist/Constants.c

@@ -5,3 +5,8 @@
 
 uint32_t Constants_page_size = 4096U;
 
+uint32_t Constants_nb_slots(uint32_t size_class)
+{
+  return 4096U / size_class;
+}
+

dist/Constants.h

@@ -8,6 +8,8 @@
 
 extern uint32_t Constants_page_size;
 
+uint32_t Constants_nb_slots(uint32_t size_class);
+
 
 #define __Constants_H_DEFINED
 #endif

dist/SizeClass.c

@@ -12,6 +12,7 @@ uint8_t *SizeClass_allocate_size_class(SizeClass_size_class_struct_ scs)
     SlabsAlloc_allocate_slab(scs.size,
       scs.slab_region,
       scs.md_bm_region,
+      scs.md_bm_region_q,
       scs.md_region,
       scs.md_count,
       scs.slabs_idxs);
@@ -27,6 +28,7 @@ SizeClass_deallocate_size_class(SizeClass_size_class_struct_ scs, uint8_t *ptr,
       scs.size,
       scs.slab_region,
       scs.md_bm_region,
+      scs.md_bm_region_q,
       scs.md_region,
       scs.md_count,
       scs.slabs_idxs,

dist/SizeClass.h

@@ -15,6 +15,7 @@ typedef struct SizeClass_size_class_struct__s
   size_t *md_count;
   uint8_t *slab_region;
   uint64_t *md_bm_region;
+  uint64_t *md_bm_region_q;
   ArrayList_cell *md_region;
 }
 SizeClass_size_class_struct_;