Commit 2216a3b
authored
deps: V8: cherry-pick 1e190bbb0396
Original commit message:
[segmented-table] Disable segments pool if pages can be too large
The segments pool can only be used if we have 16Kb allocation
granularity. On OSs where the page size can be configured larger we have
to disable it, since it is currently not runtime configurabe.
Fixed: 425634685
Change-Id: If77e46b034fc2e324d7eabf19eff54958ea6f7cb
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6973467
Reviewed-by: Dominik Inführ <dinfuehr@chromium.org>
Auto-Submit: Olivier Flückiger <olivf@chromium.org>
Commit-Queue: Olivier Flückiger <olivf@chromium.org>
Cr-Commit-Position: refs/heads/main@{#102700}
Refs: v8/v8@1e190bb
PR-URL: #60206
Fixes: nodejs/build#4172
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>1 parent 3ac88a7 commit 2216a3b
2 files changed
Lines changed: 4 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.9', | ||
| 41 | + 'v8_embedder_string': '-node.10', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -41,16 +41,14 @@ class V8_EXPORT_PRIVATE SegmentedTable { | |||
| 41 | 41 | static constexpr bool kUseContiguousMemory = true; | |
| 42 | 42 | static constexpr size_t kReservationSize = size; | |
| 43 | 43 | static constexpr size_t kMaxCapacity = kReservationSize / kEntrySize; | |
| 44 | - #if defined(V8_TARGET_OS_WIN) || defined(V8_HOST_ARCH_PPC64) | ||
| 44 | + #if defined(V8_TARGET_OS_WIN) | ||
| 45 | 45 | // On windows the allocation granularity is 64KB and thus we cannot make a | |
| 46 | 46 | // segment smaller than that. | |
| 47 | - // PPC64 can utilize a 64KB page size. | ||
| 48 | 47 | static constexpr bool kUseSegmentPool = false; | |
| 49 | - static constexpr size_t kSegmentSize = 64 * KB; | ||
| 50 | 48 | #else | |
| 51 | - static constexpr bool kUseSegmentPool = true; | ||
| 52 | - static constexpr size_t kSegmentSize = 16 * KB; | ||
| 49 | + static constexpr bool kUseSegmentPool = kMinimumOSPageSize <= 16 * KB; | ||
| 53 | 50 | #endif | |
| 51 | + static constexpr size_t kSegmentSize = kUseSegmentPool ? 16 * KB : 64 * KB; | ||
| 54 | 52 | #else | |
| 55 | 53 | // On 32 bit, segments are individually mapped. | |
| 56 | 54 | static constexpr bool kUseContiguousMemory = false; | |
0 commit comments