<!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>[200983] trunk/Source/bmalloc</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/200983">200983</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 17:15:31 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (200035): changes in "WebKit Malloc" VM regions are causing 'leaks' to spew "Failed to map remote region" messages
https://bugs.webkit.org/show_bug.cgi?id=157764
Reviewed by Gavin Barraclough.
We need to allow for guard pages and only report unguarded pages to the
leaks tool -- otherwise, it will try to remote map our guarded pages,
and crash.
* bmalloc/VMHeap.cpp:
(bmalloc::VMHeap::tryAllocateLargeChunk):
(bmalloc::VMHeap::allocateSmallChunk): Adopt the new API for reporting
a range instead of a Chunk*, and report the unguarded range.
This also fixes a separate bug -- very large allocations would not
fully participate in pointer scanning because they would only report 2MB
(chunkSize) in size. This could cause false-positive leak reports.
* bmalloc/Zone.cpp:
(bmalloc::enumerator): Updated to scan ranges instead of fixed-sized
Chunk pointers.
* bmalloc/Zone.h:
(bmalloc::Zone::ranges):
(bmalloc::Zone::addRange): Store ranges instead of fixed-sized Chunk
pointers because our VM ranges have variable sizes -- both due to guard
pages and due to large allocations.
(bmalloc::Zone::chunks): Deleted.
(bmalloc::Zone::addChunk): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocVMHeapcpp">trunk/Source/bmalloc/bmalloc/VMHeap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocZonecpp">trunk/Source/bmalloc/bmalloc/Zone.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocZoneh">trunk/Source/bmalloc/bmalloc/Zone.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (200982 => 200983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2016-05-16 23:49:52 UTC (rev 200982)
+++ trunk/Source/bmalloc/ChangeLog 2016-05-17 00:15:31 UTC (rev 200983)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-05-16 Geoffrey Garen <ggaren@apple.com>
+
+ REGRESSION (200035): changes in "WebKit Malloc" VM regions are causing 'leaks' to spew "Failed to map remote region" messages
+ https://bugs.webkit.org/show_bug.cgi?id=157764
+
+ Reviewed by Gavin Barraclough.
+
+ We need to allow for guard pages and only report unguarded pages to the
+ leaks tool -- otherwise, it will try to remote map our guarded pages,
+ and crash.
+
+ * bmalloc/VMHeap.cpp:
+ (bmalloc::VMHeap::tryAllocateLargeChunk):
+ (bmalloc::VMHeap::allocateSmallChunk): Adopt the new API for reporting
+ a range instead of a Chunk*, and report the unguarded range.
+
+ This also fixes a separate bug -- very large allocations would not
+ fully participate in pointer scanning because they would only report 2MB
+ (chunkSize) in size. This could cause false-positive leak reports.
+
+ * bmalloc/Zone.cpp:
+ (bmalloc::enumerator): Updated to scan ranges instead of fixed-sized
+ Chunk pointers.
+
+ * bmalloc/Zone.h:
+ (bmalloc::Zone::ranges):
+ (bmalloc::Zone::addRange): Store ranges instead of fixed-sized Chunk
+ pointers because our VM ranges have variable sizes -- both due to guard
+ pages and due to large allocations.
+
+ (bmalloc::Zone::chunks): Deleted.
+ (bmalloc::Zone::addChunk): Deleted.
+
</ins><span class="cx"> 2016-05-10 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc should automatically disable itself when ThreadSanitizer is used
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (200982 => 200983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-05-16 23:49:52 UTC (rev 200982)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2016-05-17 00:15:31 UTC (rev 200983)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> Chunk* chunk = static_cast<Chunk*>(memory);
</span><span class="cx">
</span><span class="cx"> #if BOS(DARWIN)
</span><del>- m_zone.addChunk(chunk);
</del><ins>+ m_zone.addRange(Range(chunk->bytes(), size));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return XLargeRange(chunk->bytes(), size, 0);
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> new (chunk) Chunk(lock);
</span><span class="cx">
</span><span class="cx"> #if BOS(DARWIN)
</span><del>- m_zone.addChunk(chunk);
</del><ins>+ m_zone.addRange(Range(begin.address(), end.address() - begin.address()));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (Object it = begin; it + pageSize <= end; it = it + pageSize) {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.cpp (200982 => 200983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.cpp 2016-05-16 23:49:52 UTC (rev 200982)
+++ trunk/Source/bmalloc/bmalloc/Zone.cpp 2016-05-17 00:15:31 UTC (rev 200983)
</span><span class="lines">@@ -88,14 +88,14 @@
</span><span class="cx"> static kern_return_t enumerator(task_t task, void* context, unsigned type_mask, vm_address_t zone_address, memory_reader_t reader, vm_range_recorder_t recorder)
</span><span class="cx"> {
</span><span class="cx"> Zone remoteZone(task, reader, zone_address);
</span><del>- for (auto* chunk : remoteZone.chunks()) {
- vm_range_t range = { reinterpret_cast<vm_address_t>(chunk), chunkSize };
</del><ins>+ for (auto& range : remoteZone.ranges()) {
+ vm_range_t vmRange = { reinterpret_cast<vm_address_t>(range.begin()), range.size() };
</ins><span class="cx">
</span><span class="cx"> if ((type_mask & MALLOC_PTR_REGION_RANGE_TYPE))
</span><del>- (*recorder)(task, context, MALLOC_PTR_REGION_RANGE_TYPE, &range, 1);
</del><ins>+ (*recorder)(task, context, MALLOC_PTR_REGION_RANGE_TYPE, &vmRange, 1);
</ins><span class="cx">
</span><span class="cx"> if ((type_mask & MALLOC_PTR_IN_USE_RANGE_TYPE))
</span><del>- (*recorder)(task, context, MALLOC_PTR_IN_USE_RANGE_TYPE, &range, 1);
</del><ins>+ (*recorder)(task, context, MALLOC_PTR_IN_USE_RANGE_TYPE, &vmRange, 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocZoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Zone.h (200982 => 200983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Zone.h 2016-05-16 23:49:52 UTC (rev 200982)
+++ trunk/Source/bmalloc/bmalloc/Zone.h 2016-05-17 00:15:31 UTC (rev 200983)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define Zone_h
</span><span class="cx">
</span><span class="cx"> #include "FixedVector.h"
</span><ins>+#include "Range.h"
</ins><span class="cx"> #include <malloc/malloc.h>
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="lines">@@ -41,8 +42,8 @@
</span><span class="cx"> Zone();
</span><span class="cx"> Zone(task_t, memory_reader_t, vm_address_t);
</span><span class="cx">
</span><del>- void addChunk(Chunk*);
- FixedVector<Chunk*, capacity>& chunks() { return m_chunks; }
</del><ins>+ void addRange(Range);
+ FixedVector<Range, capacity>& ranges() { return m_ranges; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // This vector has two purposes:
</span><span class="lines">@@ -56,15 +57,15 @@
</span><span class="cx"> // This prevents the leaks tool from reporting false positive leaks for
</span><span class="cx"> // objects pointed to from bmalloc memory -- though it also prevents the
</span><span class="cx"> // leaks tool from finding any leaks in bmalloc memory.
</span><del>- FixedVector<Chunk*, capacity> m_chunks;
</del><ins>+ FixedVector<Range, capacity> m_ranges;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline void Zone::addChunk(Chunk* chunk)
</del><ins>+inline void Zone::addRange(Range range)
</ins><span class="cx"> {
</span><del>- if (m_chunks.size() == m_chunks.capacity())
</del><ins>+ if (m_ranges.size() == m_ranges.capacity())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_chunks.push(chunk);
</del><ins>+ m_ranges.push(range);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>