Commit 5707ada
deps: V8: cherry-pick 0c8b6e415c30
Original commit message:
[mac][wasm] Work around MacOS 11.2 code page decommit failures
MacOS 11.2 refuses to set "no access" permissions on memory that
we previously used for JIT-compiled code. It is still unclear
whether this is WAI on the part of the kernel. In the meantime,
as a workaround, we use madvise(..., MADV_FREE_REUSABLE) instead
of mprotect(..., NONE) when discarding code pages. This is inspired
by what Chromium's gin platform does.
Fixed: v8:11389
Change-Id: I866586932573b4253002436ae5eee4e0411c45fc
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2679688
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Auto-Submit: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72559}
Backport-PR-URL: #38051
Co-authored-by: BoHong Li <a60814billy@gmail.com>
Refs: v8/v8@0c8b6e4
Fixes: #37061
PR-URL: #37276
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ash Cripps <acripps@redhat.com>1 parent db04ae6 commit 5707ada
2 files changed
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.24', | ||
| 39 | + 'v8_embedder_string': '-node.25', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -390,6 +390,16 @@ bool OS::SetPermissions(void* address, size_t size, MemoryPermission access) { | |||
| 390 | 390 | ||
| 391 | 391 | int prot = GetProtectionFromMemoryPermission(access); | |
| 392 | 392 | int ret = mprotect(address, size, prot); | |
| 393 | + | ||
| 394 | + // MacOS 11.2 on Apple Silicon refuses to switch permissions from | ||
| 395 | + // rwx to none. Just use madvise instead. | ||
| 396 | + #if defined(V8_OS_MACOSX) | ||
| 397 | + if (ret != 0 && access == OS::MemoryPermission::kNoAccess) { | ||
| 398 | + ret = madvise(address, size, MADV_FREE_REUSABLE); | ||
| 399 | + return ret == 0; | ||
| 400 | + } | ||
| 401 | + #endif | ||
| 402 | + | ||
| 393 | 403 | if (ret == 0 && access == OS::MemoryPermission::kNoAccess) { | |
| 394 | 404 | // This is advisory; ignore errors and continue execution. | |
| 395 | 405 | USE(DiscardSystemPages(address, size)); | |
0 commit comments