Merge pull request #1328 from asurdej-comcast/pressure_handler_gpu

[MemoryPressureHandler] MemoryPressureHandler tweaks

Author: magomez

Source/WTF/wtf/MemoryPressureHandler.cpp

@@ -54,6 +54,7 @@ static const Seconds s_pollInterval = 30_s;
 // platform component. It's a text file containing an unsigned integer value.
 static String s_GPUMemoryFile;
 static ssize_t s_envBaseThresholdVideo = 0;
+static bool s_videoMemoryInFootprint = false;
 
 static bool isWebProcess()
 {
@@ -140,6 +141,9 @@ MemoryPressureHandler::MemoryPressureHandler()
             if (s_envBaseThresholdVideo)
                 m_configuration.baseThresholdVideo = s_envBaseThresholdVideo;
         }
+        String gpuInRSS = String::fromLatin1(getenv("WPE_POLL_GPU_IN_FOOTPRINT"));
+        if (gpuInRSS == String::fromLatin1("1") || gpuInRSS.convertToASCIILowercase() == String::fromLatin1("true"))
+            s_videoMemoryInFootprint = true;
     }
 }
 
@@ -167,6 +171,7 @@ static const char* toString(MemoryUsagePolicy policy)
     case MemoryUsagePolicy::Unrestricted: return "Unrestricted";
     case MemoryUsagePolicy::Conservative: return "Conservative";
     case MemoryUsagePolicy::Strict: return "Strict";
+    case MemoryUsagePolicy::StrictSynchronous: return "StrictSynchronous";
     }
     ASSERT_NOT_REACHED();
     return "";
@@ -228,6 +233,8 @@ size_t MemoryPressureHandler::thresholdForPolicy(MemoryUsagePolicy policy, Memor
         return m_configuration.conservativeThresholdFraction * (type == MemoryType::Normal ? m_configuration.baseThreshold : m_configuration.baseThresholdVideo);
     case MemoryUsagePolicy::Strict:
         return m_configuration.strictThresholdFraction * (type == MemoryType::Normal ? m_configuration.baseThreshold : m_configuration.baseThresholdVideo);
+    case MemoryUsagePolicy::StrictSynchronous:
+        return type == MemoryType::Normal ? m_configuration.baseThreshold : m_configuration.baseThresholdVideo;
     default:
         ASSERT_NOT_REACHED();
         return 0;
@@ -236,13 +243,26 @@ size_t MemoryPressureHandler::thresholdForPolicy(MemoryUsagePolicy policy, Memor
 
 MemoryUsagePolicy MemoryPressureHandler::policyForFootprints(size_t footprint, size_t footprintVideo)
 {
+    footprint = calculateFootprintForPolicyDecision(footprint, footprintVideo);
+    if (footprint >= thresholdForPolicy(MemoryUsagePolicy::StrictSynchronous, MemoryType::Normal) || footprintVideo >= thresholdForPolicy(MemoryUsagePolicy::StrictSynchronous, MemoryType::Video))
+        return MemoryUsagePolicy::StrictSynchronous;
     if (footprint >= thresholdForPolicy(MemoryUsagePolicy::Strict, MemoryType::Normal) || footprintVideo >= thresholdForPolicy(MemoryUsagePolicy::Strict, MemoryType::Video))
         return MemoryUsagePolicy::Strict;
     if (footprint >= thresholdForPolicy(MemoryUsagePolicy::Conservative, MemoryType::Normal) || footprintVideo >= thresholdForPolicy(MemoryUsagePolicy::Conservative, MemoryType::Video))
         return MemoryUsagePolicy::Conservative;
     return MemoryUsagePolicy::Unrestricted;
 }
 
+size_t MemoryPressureHandler::calculateFootprintForPolicyDecision(size_t footprint, size_t footprintVideo)
+{
+    // Some devices accounts video memory into the process memory footprint (as file mappings - RSSFile).
+    // In such cases, we need to subtract the video memory from the process memory footprint
+    // to make the memory pressure policy decision based on the process memory footprint only.
+    if (s_videoMemoryInFootprint)
+        footprint -= footprintVideo;
+    return footprint;
+}
+
 MemoryUsagePolicy MemoryPressureHandler::currentMemoryUsagePolicy()
 {
     return policyForFootprints(memoryFootprint(), memoryFootprintVideo());
@@ -305,15 +325,15 @@ void MemoryPressureHandler::measurementTimerFired()
         releaseMemory(Critical::No, Synchronous::No);
         break;
     case MemoryUsagePolicy::Strict:
-        if (footprint > m_configuration.baseThreshold || footprintVideo > m_configuration.baseThresholdVideo) {
-            WTFLogAlways("MemoryPressure: Critical memory usage (PID=%d) [MB]: %zu (of %zu), video: %zu (of %zu)\n",
-                          getpid(), footprint / MB, m_configuration.baseThreshold / MB,
-                          footprintVideo / MB, m_configuration.baseThresholdVideo / MB);
-            releaseMemory(Critical::Yes, Synchronous::Yes);
-            break;
-        }
         releaseMemory(Critical::Yes, Synchronous::No);
         break;
+    case MemoryUsagePolicy::StrictSynchronous:
+        WTFLogAlways("MemoryPressure: Critical memory usage (PID=%d) [MB]: %zu%s/%zu, video: %zu/%zu\n",
+                     getpid(),
+                     footprint / MB, s_videoMemoryInFootprint ? "(including video)" : "", m_configuration.baseThreshold / MB,
+                     footprintVideo / MB, m_configuration.baseThresholdVideo / MB);
+        releaseMemory(Critical::Yes, Synchronous::Yes);
+        break;
     }
 
     if (processState() == WebsamProcessState::Active && footprint > thresholdForMemoryKillOfInactiveProcess(m_pageCount))

Source/WTF/wtf/MemoryPressureHandler.h

@@ -59,6 +59,7 @@ enum class MemoryUsagePolicy : uint8_t {
     Unrestricted, // Allocate as much as you want
     Conservative, // Maybe you don't cache every single thing
     Strict, // Time to start pinching pennies for real
+    StrictSynchronous, // Time to start pinching pennies for real, and do it now
 };
 
 enum class MemoryType : uint8_t {
@@ -243,6 +244,7 @@ class MemoryPressureHandler {
     std::optional<size_t> thresholdForMemoryKill(MemoryType);
     size_t thresholdForPolicy(MemoryUsagePolicy, MemoryType);
     MemoryUsagePolicy policyForFootprints(size_t, size_t);
+    size_t calculateFootprintForPolicyDecision(size_t footprint, size_t footprintVideo);
 
     void memoryPressureStatusChanged();