<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214526] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214526">214526</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 21:02:17 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: option to crash if no fast memory is available
https://bugs.webkit.org/show_bug.cgi?id=170219
Reviewed by Mark Lam.
* runtime/Options.h:
* wasm/WasmMemory.cpp:
(JSC::Wasm::webAssemblyCouldntGetFastMemory):
(JSC::Wasm::tryGetFastMemory):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmMemorycpp">trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214525 => 214526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-29 03:51:20 UTC (rev 214525)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-29 04:02:17 UTC (rev 214526)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-28 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: option to crash if no fast memory is available
+ https://bugs.webkit.org/show_bug.cgi?id=170219
+
+ Reviewed by Mark Lam.
+
+ * runtime/Options.h:
+ * wasm/WasmMemory.cpp:
+ (JSC::Wasm::webAssemblyCouldntGetFastMemory):
+ (JSC::Wasm::tryGetFastMemory):
+
</ins><span class="cx"> 2017-03-28 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (214525 => 214526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2017-03-29 03:51:20 UTC (rev 214525)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2017-03-29 04:02:17 UTC (rev 214526)
</span><span class="lines">@@ -434,6 +434,7 @@
</span><span class="cx"> \
</span><span class="cx"> v(bool, simulateWebAssemblyLowMemory, false, Normal, "If true, the Memory object won't mmap the full 'maximum' range and instead will allocate the minimum required amount.") \
</span><span class="cx"> v(bool, useWebAssemblyFastMemory, true, Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
</span><ins>+ v(bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \
</ins><span class="cx"> v(bool, useWebAssemblyFastTLS, true, Normal, "If true, we will try to use fast thread-local storage if available on the current platform.")
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmMemorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp (214525 => 214526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp 2017-03-29 03:51:20 UTC (rev 214525)
+++ trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp 2017-03-29 04:02:17 UTC (rev 214526)
</span><span class="lines">@@ -42,6 +42,11 @@
</span><span class="cx"> const bool verbose = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static NEVER_INLINE NO_RETURN_DUE_TO_CRASH void webAssemblyCouldntGetFastMemory()
+{
+ CRASH();
+}
+
</ins><span class="cx"> inline bool mmapBytes(size_t bytes, void*& memory)
</span><span class="cx"> {
</span><span class="cx"> dataLogIf(verbose, "Attempting to mmap ", bytes, " bytes: ");
</span><span class="lines">@@ -98,16 +103,6 @@
</span><span class="cx">
</span><span class="cx"> inline bool tryGetFastMemory(VM& vm, void*& memory, size_t& mappedCapacity, MemoryMode& mode)
</span><span class="cx"> {
</span><del>- // We might GC here so we should be holding the API lock.
- // FIXME: We should be able to syncronously trigger the GC from another thread.
- ASSERT(vm.currentThreadIsHoldingAPILock());
- if (!fastMemoryEnabled())
- return false;
-
- // We need to be sure we have a stub prior to running code.
- if (!vm.getCTIStub(throwExceptionFromWasmThunkGenerator).size())
- return false;
-
</del><span class="cx"> auto dequeFastMemory = [&] () -> bool {
</span><span class="cx"> // FIXME: We should eventually return these to the OS if we go some number of GCs
</span><span class="cx"> // without using them.
</span><span class="lines">@@ -123,6 +118,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ // We might GC here so we should be holding the API lock.
+ // FIXME: We should be able to syncronously trigger the GC from another thread.
+ ASSERT(vm.currentThreadIsHoldingAPILock());
+ if (UNLIKELY(!fastMemoryEnabled()))
+ goto fail;
+
+ // We need to be sure we have a stub prior to running code.
+ if (UNLIKELY(!vm.getCTIStub(throwExceptionFromWasmThunkGenerator).size()))
+ goto fail;
+
</ins><span class="cx"> ASSERT(allocatedFastMemories <= maxFastMemories);
</span><span class="cx"> if (dequeFastMemory())
</span><span class="cx"> return true;
</span><span class="lines">@@ -131,7 +136,9 @@
</span><span class="cx"> if (allocatedFastMemories == maxFastMemories) {
</span><span class="cx"> // There is a reasonable chance that another module has died but has not been collected yet. Don't lose hope yet!
</span><span class="cx"> vm.heap.collectAllGarbage();
</span><del>- return dequeFastMemory();
</del><ins>+ if (dequeFastMemory())
+ return true;
+ goto fail;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (mmapBytes(fastMemoryMappedBytes, memory)) {
</span><span class="lines">@@ -142,7 +149,16 @@
</span><span class="cx"> auto result = activeFastMemories(locker).add(memory);
</span><span class="cx"> ASSERT_UNUSED(result, result.isNewEntry);
</span><span class="cx"> }
</span><del>- return memory;
</del><ins>+
+ if (memory)
+ return true;
+ goto fail;
+
+fail:
+ if (UNLIKELY(Options::crashIfWebAssemblyCantFastMemory()))
+ webAssemblyCouldntGetFastMemory();
+
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void releaseFastMemory(void*& memory, size_t writableSize, size_t mappedCapacity, MemoryMode mode)
</span></span></pre>
</div>
</div>
</body>
</html>