[PA] Remove "GigaCage" references, 2 of N

This change adjusts the `PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE` `#define`
to a more pool-centric value.

Bug: 1369834
Change-Id: Ic60dc6ae50baade6ca72f1f61bc862881efa370d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3924566
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Commit-Queue: Kalvin Lee <kdlee@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1054072}

base/allocator/partition_allocator/partition_address_space.cc

@@ -40,7 +40,7 @@ namespace {
 
 #if BUILDFLAG(IS_WIN)
 
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 bool IsLegacyWindowsVersion() {
   // Use ::RtlGetVersion instead of ::GetVersionEx or helpers from
   // VersionHelpers.h because those alternatives change their behavior depending
@@ -64,7 +64,7 @@ bool IsLegacyWindowsVersion() {
   return version_info.dwMajorVersion < 6 ||
          (version_info.dwMajorVersion == 6 && version_info.dwMinorVersion < 3);
 }
-#endif  // defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#endif  // defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 
 PA_NOINLINE void HandleGigaCageAllocFailureOutOfVASpace() {
   PA_NO_CODE_FOLDING();
@@ -110,7 +110,7 @@ std::ptrdiff_t PartitionAddressSpace::regular_pool_shadow_offset_ = 0;
 std::ptrdiff_t PartitionAddressSpace::brp_pool_shadow_offset_ = 0;
 #endif
 
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 #if BUILDFLAG(IS_IOS)
 namespace {
 bool IsIOSTestProcess() {
@@ -161,7 +161,7 @@ PA_ALWAYS_INLINE size_t PartitionAddressSpace::BRPPoolSize() {
   return IsLegacyWindowsVersion() ? kBRPPoolSizeForLegacyWindows : kBRPPoolSize;
 }
 #endif  // BUILDFLAG(IS_IOS)
-#endif  // defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#endif  // defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 
 void PartitionAddressSpace::Init() {
   if (IsInitialized())
@@ -179,7 +179,7 @@ void PartitionAddressSpace::Init() {
                  PageTag::kPartitionAlloc, regular_pool_fd);
   if (!setup_.regular_pool_base_address_)
     HandleGigaCageAllocFailure();
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   setup_.regular_pool_base_mask_ = ~(regular_pool_size - 1);
 #endif
   PA_DCHECK(!(setup_.regular_pool_base_address_ & (regular_pool_size - 1)));
@@ -212,7 +212,7 @@ void PartitionAddressSpace::Init() {
   if (!base_address)
     HandleGigaCageAllocFailure();
   setup_.brp_pool_base_address_ = base_address + kForbiddenZoneSize;
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   setup_.brp_pool_base_mask_ = ~(brp_pool_size - 1);
 #endif
   PA_DCHECK(!(setup_.brp_pool_base_address_ & (brp_pool_size - 1)));

base/allocator/partition_allocator/partition_address_space.h

@@ -40,7 +40,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
     return setup_.regular_pool_;
   }
 
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   static PA_ALWAYS_INLINE uintptr_t RegularPoolBaseMask() {
     return setup_.regular_pool_base_mask_;
   }
@@ -121,7 +121,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
 
   // Returns false for nullptr.
   static PA_ALWAYS_INLINE bool IsInRegularPool(uintptr_t address) {
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
     const uintptr_t regular_pool_base_mask = setup_.regular_pool_base_mask_;
 #else
     constexpr uintptr_t regular_pool_base_mask = kRegularPoolBaseMask;
@@ -136,7 +136,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
 
   // Returns false for nullptr.
   static PA_ALWAYS_INLINE bool IsInBRPPool(uintptr_t address) {
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
     const uintptr_t brp_pool_base_mask = setup_.brp_pool_base_mask_;
 #else
     constexpr uintptr_t brp_pool_base_mask = kBRPPoolBaseMask;
@@ -181,7 +181,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
   void* operator new(size_t, void*) = delete;
 
  private:
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   static PA_ALWAYS_INLINE size_t RegularPoolSize();
   static PA_ALWAYS_INLINE size_t BRPPoolSize();
 #else
@@ -192,7 +192,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
   constexpr static PA_ALWAYS_INLINE size_t BRPPoolSize() {
     return kBRPPoolSize;
   }
-#endif  // defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#endif  // defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 
   // On 64-bit systems, GigaCage is split into disjoint pools. The BRP pool, is
   // where all allocations have a BRP ref-count, thus pointers pointing there
@@ -217,7 +217,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
   static constexpr size_t kBRPPoolSize = kPoolMaxSize;
   static_assert(base::bits::IsPowerOfTwo(kRegularPoolSize) &&
                 base::bits::IsPowerOfTwo(kBRPPoolSize));
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   // We can't afford pool sizes as large as kPoolMaxSize on Windows <8.1 (see
   // crbug.com/1101421 and crbug.com/1217759).
   static constexpr size_t kRegularPoolSizeForLegacyWindows = 4 * kGiB;
@@ -226,7 +226,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
   static_assert(kBRPPoolSizeForLegacyWindows < kBRPPoolSize);
   static_assert(base::bits::IsPowerOfTwo(kRegularPoolSizeForLegacyWindows) &&
                 base::bits::IsPowerOfTwo(kBRPPoolSizeForLegacyWindows));
-#endif  // defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#endif  // defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   static constexpr size_t kConfigurablePoolMaxSize = kPoolMaxSize;
   static constexpr size_t kConfigurablePoolMinSize = 1 * kGiB;
   static_assert(kConfigurablePoolMinSize <= kConfigurablePoolMaxSize);
@@ -235,7 +235,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
 
 #if BUILDFLAG(IS_IOS)
 
-#if !defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if !defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 #error iOS is only supported with a dynamically sized GigaCase.
 #endif
 
@@ -250,15 +250,15 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
                 base::bits::IsPowerOfTwo(kBRPPoolSizeForIOSTestProcess));
 #endif  // BUILDFLAG(IOS_IOS)
 
-#if !defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if !defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
   // Masks used to easy determine belonging to a pool.
   static constexpr uintptr_t kRegularPoolOffsetMask =
       static_cast<uintptr_t>(kRegularPoolSize) - 1;
   static constexpr uintptr_t kRegularPoolBaseMask = ~kRegularPoolOffsetMask;
   static constexpr uintptr_t kBRPPoolOffsetMask =
       static_cast<uintptr_t>(kBRPPoolSize) - 1;
   static constexpr uintptr_t kBRPPoolBaseMask = ~kBRPPoolOffsetMask;
-#endif  // !defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#endif  // !defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
 
   // This must be set to such a value that IsIn*Pool() always returns false when
   // the pool isn't initialized.
@@ -273,7 +273,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
         : regular_pool_base_address_(kUninitializedPoolBaseAddress),
           brp_pool_base_address_(kUninitializedPoolBaseAddress),
           configurable_pool_base_address_(kUninitializedPoolBaseAddress),
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
           regular_pool_base_mask_(0),
           brp_pool_base_mask_(0),
 #endif
@@ -289,7 +289,7 @@ class PA_COMPONENT_EXPORT(PARTITION_ALLOC) PartitionAddressSpace {
         uintptr_t regular_pool_base_address_;
         uintptr_t brp_pool_base_address_;
         uintptr_t configurable_pool_base_address_;
-#if defined(PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE)
+#if defined(PA_DYNAMICALLY_SELECT_POOL_SIZE)
         uintptr_t regular_pool_base_mask_;
         uintptr_t brp_pool_base_mask_;
 #endif

base/allocator/partition_allocator/partition_alloc_config.h

@@ -31,18 +31,18 @@ static_assert(sizeof(void*) != 8, "");
 #endif
 
 #if defined(PA_HAS_64_BITS_POINTERS) && (BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN))
-// Use dynamically sized GigaCage. This allows to query the size at run-time,
-// before initialization, instead of using a hardcoded constexpr.
+// Allow PA to select an alternate pool size at run-time before initialization,
+// rather than using a single constexpr value.
 //
-// This is needed on iOS because iOS test processes can't handle a large cage
+// This is needed on iOS because iOS test processes can't handle large pools
 // (see crbug.com/1250788).
 //
 // This is needed on Windows, because OS versions <8.1 incur commit charge even
-// on reserved address space, thus don't handle large cage well (see
+// on reserved address space, thus don't handle large pools well (see
 // crbug.com/1101421 and crbug.com/1217759).
 //
 // This setting is specific to 64-bit, as 32-bit has a different implementation.
-#define PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE
+#define PA_DYNAMICALLY_SELECT_POOL_SIZE
 #endif  // defined(PA_HAS_64_BITS_POINTERS) &&
         // (BUILDFLAG(IS_IOS) || BUILDFLAG(IS_WIN))
 

base/allocator/partition_allocator/partition_alloc_constants.h

@@ -265,7 +265,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffsetMask;
 // The 3rd, Configurable Pool is only available in 64-bit mode.
 constexpr size_t kNumPools = 3;
 // Maximum pool size. With exception of Configurable Pool, it is also
-// the actual size, unless PA_USE_DYNAMICALLY_SIZED_GIGA_CAGE is set, which
+// the actual size, unless PA_DYNAMICALLY_SELECT_POOL_SIZE is set, which
 // allows to choose a different size at initialization time for certain
 // configurations.
 //