Changeset 295192 in webkit

Timestamp:

Jun 2, 2022, 11:45:51 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick f822d46cdb31. rdar://problem/93265374

Enforce foreground WebContent memory limit on macOS
​https://bugs.webkit.org/show_bug.cgi?id=240397

Reviewed by Chris Dumez.

We removed the foreground memory limit for WebContent on macOS in r272046. But based on some
bug reports that we've seen, it seems like we need to restore some limit to prevent bad user
outcomes when a misbehaving process has runaway memory usage.

This patch adds a foreground memory limit of 8GB or 16GB depending on RAM size. This matches
the limits set by other browsers for their content process.

• wtf/MemoryPressureHandler.cpp: (WTF::thresholdForMemoryKillOfActiveProcess): (WTF::MemoryPressureHandler::thresholdForMemoryKill):

Canonical link: ​https://commits.webkit.org/250548@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/MemoryPressureHandler.cpp (modified) (2 diffs)

branches/safari-613-branch/Source/WTF/ChangeLog

@@ -50 +50 @@
         (WTF::WorkQueue::assertIsCurrent const):
         (WTF::currentSequenceID):
+2022-05-13  Ben Nham  <nham@apple.com>
+
+        Enforce foreground WebContent memory limit on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=240397
+
+        Reviewed by Chris Dumez.
+
+        We removed the foreground memory limit for WebContent on macOS in r272046. But based on some
+        bug reports that we've seen, it seems like we need to restore some limit to prevent bad user
+        outcomes when a misbehaving process has runaway memory usage.
+
+        This patch adds a foreground memory limit of 8GB or 16GB depending on RAM size. This matches
+        the limits set by other browsers for their content process.
+
+        * wtf/MemoryPressureHandler.cpp:
+        (WTF::thresholdForMemoryKillOfActiveProcess):
+        (WTF::MemoryPressureHandler::thresholdForMemoryKill):
+
         * wtf/generic/WorkQueueGeneric.cpp:
         (WTF::WorkQueueBase::platformInitialize):

branches/safari-613-branch/Source/WTF/wtf/MemoryPressureHandler.cpp

@@ -96 +96 @@
 #endif
 
+static size_t thresholdForMemoryKillOfActiveProcess(unsigned tabCount)
+{
+    size_t baseThreshold = ramSize() > 16 * GB ? 15 * GB : 7 * GB;
+    return baseThreshold + tabCount * GB;
+}
+
 static size_t thresholdForMemoryKillOfInactiveProcess(unsigned tabCount)
 {
@@ -122 +128 @@
         return thresholdForMemoryKillOfInactiveProcess(m_pageCount);
     case WebsamProcessState::Active:
-        break;
+        return thresholdForMemoryKillOfActiveProcess(m_pageCount);
     }
     return std::nullopt;