Changeset 282228 in webkit

Timestamp:

Sep 9, 2021, 11:04:30 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r282174. rdar://problem/82931245

Remove responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection
​https://bugs.webkit.org/show_bug.cgi?id=230016
rdar://problem/80760179

Reviewed by Chris Dumez.

We've seen evidence that network process may be blocked in initializeNetworkProcess. Since we have a 3-second
responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection, blocked network process will be killed
and a new network process will be launched for getting connection. However, the new network process may get
stuck in initializeNetworkProcess too. In this case, web process will crash for not being able to get network
process connection.

• UIProcess/Network/NetworkProcessProxy.cpp: (WebKit::NetworkProcessProxy::getNetworkProcessConnection):
• UIProcess/WebsiteData/WebsiteDataStore.cpp: change RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE to RELEASE_LOG_ERROR as the message is not printed in non-debug build. (WebKit::WebsiteDataStore::getNetworkProcessConnection):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@282174 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Network/NetworkProcessProxy.cpp (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

branches/safari-612-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-09  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r282174. rdar://problem/82931245
+
+    Remove responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection
+    https://bugs.webkit.org/show_bug.cgi?id=230016
+    rdar://problem/80760179
+    
+    Reviewed by Chris Dumez.
+    
+    We've seen evidence that network process may be blocked in initializeNetworkProcess. Since we have a 3-second
+    responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection, blocked network process will be killed
+    and a new network process will be launched for getting connection. However, the new network process may get
+    stuck in initializeNetworkProcess too. In this case, web process will crash for not being able to get network
+    process connection.
+    
+    * UIProcess/Network/NetworkProcessProxy.cpp:
+    (WebKit::NetworkProcessProxy::getNetworkProcessConnection):
+    * UIProcess/WebsiteData/WebsiteDataStore.cpp: change RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE to
+    RELEASE_LOG_ERROR as the message is not printed in non-debug build.
+    (WebKit::WebsiteDataStore::getNetworkProcessConnection):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282174 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-08  Sihui Liu  <sihui_liu@apple.com>
+
+            Remove responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection
+            https://bugs.webkit.org/show_bug.cgi?id=230016
+            rdar://problem/80760179
+
+            Reviewed by Chris Dumez.
+
+            We've seen evidence that network process may be blocked in initializeNetworkProcess. Since we have a 3-second
+            responsiveness timer in NetworkProcessProxy::getNetworkProcessConnection, blocked network process will be killed
+            and a new network process will be launched for getting connection. However, the new network process may get
+            stuck in initializeNetworkProcess too. In this case, web process will crash for not being able to get network
+            process connection.
+
+            * UIProcess/Network/NetworkProcessProxy.cpp:
+            (WebKit::NetworkProcessProxy::getNetworkProcessConnection):
+            * UIProcess/WebsiteData/WebsiteDataStore.cpp: change RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE to
+            RELEASE_LOG_ERROR as the message is not printed in non-debug build.
+            (WebKit::WebsiteDataStore::getNetworkProcessConnection):
+
 2021-09-08  Alan Coon  <alancoon@apple.com>
 

branches/safari-612-branch/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp

@@ -251 +251 @@
 {
     RELEASE_LOG(ProcessSuspension, "%p - NetworkProcessProxy is taking a background assertion because a web process is requesting a connection", this);
-    startResponsivenessTimer(UseLazyStop::No);
+    if (!isLaunching())
+        startResponsivenessTimer(UseLazyStop::No);
     sendWithAsyncReply(Messages::NetworkProcess::CreateNetworkConnectionToWebProcess { webProcessProxy.coreProcessIdentifier(), webProcessProxy.sessionID() }, [this, weakThis = makeWeakPtr(*this), reply = WTFMove(reply)](auto&& identifier, auto cookieAcceptPolicy) mutable {
         if (!weakThis) {

branches/safari-612-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -1746 +1746 @@
                     networkProcessState = networkProcessProxy->stateString();
                 }
-                RELEASE_ASSERT_NOT_REACHED_WITH_MESSAGE("WebsiteDataStore::getNetworkProcessConnection: Failed to get connection - networkProcessProxy=%p, networkProcessIdentifier=%d, processState=%s, webProcessProxy=%p, webProcessIdentifier=%d", networkProcessProxy.get(), networkProcessIdentifier, networkProcessState.utf8().data(), webProcessProxy.get(), webProcessProxy->processIdentifier());
+                RELEASE_LOG_ERROR(Process, "WebsiteDataStore::getNetworkProcessConnection: Failed to get connection - networkProcessProxy=%p, networkProcessIdentifier=%d, processState=%s, webProcessProxy=%p, webProcessIdentifier=%d", networkProcessProxy.get(), networkProcessIdentifier, networkProcessState.utf8().data(), webProcessProxy.get(), webProcessProxy->processIdentifier());
+                RELEASE_ASSERT_NOT_REACHED();
 #endif
             };