<!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>[288090] trunk/Source/WebKit</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/288090">288090</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2022-01-17 00:21:24 -0800 (Mon, 17 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Frequent GPU process jetsams due to RemoteRenderingBackendProxy not claiming ownership of SharedMemory buffers
https://bugs.webkit.org/show_bug.cgi?id=235226

Patch by Kimmo Kinnunen <kkinnunen@apple.com> on 2022-01-17
Reviewed by Simon Fraser.

Claim memory from SharedBitmaps and SharedMemory that RemoteRenderingBackendProxy
asks and receives from RemoteRenderingBackend. This is not very good,
as GPUP allocates most of the memory and thus might jetsam
before WP claims them. However, that is a bigger change to be done
after this one.

No new tests, hard to test currently.

* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::Handle::takeOwnershipOfMemory const):
* Shared/ShareableBitmap.h:
* WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
(WebKit::RemoteRenderingBackendProxy::getShareableBitmap):
(WebKit::RemoteRenderingBackendProxy::getFilteredImage):
* WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
(WebKit::RemoteResourceCacheProxy::recordNativeImageUse):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedShareableBitmapcpp">trunk/Source/WebKit/Shared/ShareableBitmap.cpp</a></li>
<li><a href="#trunkSourceWebKitSharedShareableBitmaph">trunk/Source/WebKit/Shared/ShareableBitmap.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxycpp">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxycpp">trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (288089 => 288090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2022-01-17 08:16:15 UTC (rev 288089)
+++ trunk/Source/WebKit/ChangeLog       2022-01-17 08:21:24 UTC (rev 288090)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2022-01-17  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Frequent GPU process jetsams due to RemoteRenderingBackendProxy not claiming ownership of SharedMemory buffers
+        https://bugs.webkit.org/show_bug.cgi?id=235226
+
+        Reviewed by Simon Fraser.
+
+        Claim memory from SharedBitmaps and SharedMemory that RemoteRenderingBackendProxy
+        asks and receives from RemoteRenderingBackend. This is not very good,
+        as GPUP allocates most of the memory and thus might jetsam
+        before WP claims them. However, that is a bigger change to be done
+        after this one.
+
+        No new tests, hard to test currently.
+
+        * Shared/ShareableBitmap.cpp:
+        (WebKit::ShareableBitmap::Handle::takeOwnershipOfMemory const):
+        * Shared/ShareableBitmap.h:
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp:
+        (WebKit::RemoteRenderingBackendProxy::getShareableBitmap):
+        (WebKit::RemoteRenderingBackendProxy::getFilteredImage):
+        * WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp:
+        (WebKit::RemoteResourceCacheProxy::recordNativeImageUse):
+
</ins><span class="cx"> 2022-01-17  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Transmit network load metrics when service worker is using one of its network load to respond to FetchEvents
</span></span></pre></div>
<a id="trunkSourceWebKitSharedShareableBitmapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ShareableBitmap.cpp (288089 => 288090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ShareableBitmap.cpp   2022-01-17 08:16:15 UTC (rev 288089)
+++ trunk/Source/WebKit/Shared/ShareableBitmap.cpp      2022-01-17 08:21:24 UTC (rev 288090)
</span><span class="lines">@@ -41,6 +41,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ShareableBitmap::Handle::takeOwnershipOfMemory(MemoryLedger ledger) const
+{
+    m_handle.takeOwnershipOfMemory(ledger);
+}
+
</ins><span class="cx"> void ShareableBitmap::Handle::encode(IPC::Encoder& encoder) const
</span><span class="cx"> {
</span><span class="cx">     SharedMemory::IPCHandle ipcHandle(WTFMove(m_handle), numBytesForSize(m_size, m_configuration));
</span></span></pre></div>
<a id="trunkSourceWebKitSharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/ShareableBitmap.h (288089 => 288090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/ShareableBitmap.h     2022-01-17 08:16:15 UTC (rev 288089)
+++ trunk/Source/WebKit/Shared/ShareableBitmap.h        2022-01-17 08:21:24 UTC (rev 288090)
</span><span class="lines">@@ -58,6 +58,9 @@
</span><span class="cx"> 
</span><span class="cx">         bool isNull() const { return m_handle.isNull(); }
</span><span class="cx"> 
</span><ins>+        // Take ownership of the memory for process memory accounting purposes.
+        void takeOwnershipOfMemory(MemoryLedger) const;
+
</ins><span class="cx">         void clear();
</span><span class="cx"> 
</span><span class="cx">         void encode(IPC::Encoder&) const;
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteRenderingBackendProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (288089 => 288090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp      2022-01-17 08:16:15 UTC (rev 288089)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp 2022-01-17 08:21:24 UTC (rev 288090)
</span><span class="lines">@@ -175,6 +175,7 @@
</span><span class="cx">         sendSyncToStream(Messages::RemoteRenderingBackend::SemaphoreForGetPixelBuffer(), Messages::RemoteRenderingBackend::SemaphoreForGetPixelBuffer::Reply(semaphore));
</span><span class="cx"> 
</span><span class="cx">     if (!handle.handle.isNull()) {
</span><ins>+        handle.handle.takeOwnershipOfMemory(MemoryLedger::Graphics);
</ins><span class="cx">         m_getPixelBufferSharedMemory = SharedMemory::map(handle.handle, SharedMemory::Protection::ReadOnly);
</span><span class="cx">         m_getPixelBufferSharedMemoryLength = handle.dataSize;
</span><span class="cx">     }
</span><span class="lines">@@ -220,6 +221,7 @@
</span><span class="cx">     auto sendResult = sendSyncToStream(Messages::RemoteRenderingBackend::GetShareableBitmapForImageBuffer(imageBuffer, preserveResolution), Messages::RemoteRenderingBackend::GetShareableBitmapForImageBuffer::Reply(handle));
</span><span class="cx">     if (handle.isNull())
</span><span class="cx">         return { };
</span><ins>+    handle.takeOwnershipOfMemory(MemoryLedger::Graphics);
</ins><span class="cx">     ASSERT_UNUSED(sendResult, sendResult);
</span><span class="cx">     return ShareableBitmap::create(handle);
</span><span class="cx"> }
</span><span class="lines">@@ -233,6 +235,7 @@
</span><span class="cx">     if (handle.isNull())
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><ins>+    handle.takeOwnershipOfMemory(MemoryLedger::Graphics);
</ins><span class="cx">     auto bitmap = ShareableBitmap::create(handle);
</span><span class="cx">     if (!bitmap)
</span><span class="cx">         return { };
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUgraphicsRemoteResourceCacheProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp (288089 => 288090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp 2022-01-17 08:16:15 UTC (rev 288089)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteResourceCacheProxy.cpp    2022-01-17 08:21:24 UTC (rev 288090)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx">     if (handle.isNull())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    handle.takeOwnershipOfMemory(MemoryLedger::Graphics);
</ins><span class="cx">     m_nativeImages.add(image.renderingResourceIdentifier(), NativeImageState { image, 1 });
</span><span class="cx"> 
</span><span class="cx">     // Set itself as an observer to NativeImage, so releaseNativeImage()
</span></span></pre>
</div>
</div>

</body>
</html>