Changeset 295176 in webkit

Timestamp:

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

Author:

Alan Coon

Message:

Apply patch. rdar://problem/88904160

Location:

branches/safari-613-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• GPUProcess/graphics/RemoteGraphicsContextGL.cpp (modified) (1 diff)
• GPUProcess/webrtc/LibWebRTCCodecsProxy.h (modified) (2 diffs)
• GPUProcess/webrtc/LibWebRTCCodecsProxy.mm (modified) (1 diff)

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

@@ +1 @@
+2022-04-22  Kimmo Kinnunen  <kkinnunen@apple.com>
+
+        Multiple concurrency violations in LibWebRTCCodecsProxy
+        https://bugs.webkit.org/show_bug.cgi?id=236767
+        <rdar://88904160>
+
+        Reviewed by Antti Koivisto.
+
+        - ThreadMessageReceivers should not add IPC listeners in constructors,
+        as the delivery starts right away and uses the unconstructed virtual pointer.
+        - The work queue functions should not use GPUConnectionToWebProcess, as that is
+        main thread object.
+        - Locked m_encoders, m_decoders are sometimes accessed without lock.
+
+        Instead:
+        - Add the IPC listeners in initialize function.
+        - Remove the IPC listeners when GPUConnectionToWebProcess disconnects.
+        - Store the thread-safe conection, video frame object heap, process identity
+        objects as member variables.
+        - Do not lock m_encoders, m_decoders. If they are work queue instances,
+        just access them in the work queue functions. Add thread requirements
+        to the variables so that the compiler checks the access.
+        - Use IPC testing assertions when skipping incorrect messages.
+        - Use separate atomic counter (bool) to check if allowsExitUnderMemoryPressure.
+
+        No new tests, tested with existing tests and ASAN.
+
+        * GPUProcess/GPUConnectionToWebProcess.cpp:
+        (WebKit::GPUConnectionToWebProcess::~GPUConnectionToWebProcess):
+        (WebKit::GPUConnectionToWebProcess::didClose):
+        * GPUProcess/GPUConnectionToWebProcess.h:
+        * GPUProcess/webrtc/LibWebRTCCodecsProxy.h:
+        * GPUProcess/webrtc/LibWebRTCCodecsProxy.mm:
+        (WebKit::LibWebRTCCodecsProxy::create):
+        (WebKit::LibWebRTCCodecsProxy::LibWebRTCCodecsProxy):
+        (WebKit::LibWebRTCCodecsProxy::stopListeningForIPC):
+        (WebKit::LibWebRTCCodecsProxy::initialize):
+        (WebKit::LibWebRTCCodecsProxy::dispatchToThread):
+        (WebKit::LibWebRTCCodecsProxy::createDecoderCallback):
+        (WebKit::LibWebRTCCodecsProxy::createH264Decoder):
+        (WebKit::LibWebRTCCodecsProxy::createH265Decoder):
+        (WebKit::LibWebRTCCodecsProxy::createVP9Decoder):
+        (WebKit::LibWebRTCCodecsProxy::releaseDecoder):
+        (WebKit::LibWebRTCCodecsProxy::createEncoder):
+        (WebKit::LibWebRTCCodecsProxy::releaseEncoder):
+        (WebKit::LibWebRTCCodecsProxy::initializeEncoder):
+        (WebKit::LibWebRTCCodecsProxy::findEncoder):
+        (WebKit::LibWebRTCCodecsProxy::encodeFrame):
+        (WebKit::LibWebRTCCodecsProxy::setEncodeRates):
+        (WebKit::LibWebRTCCodecsProxy::setSharedVideoFrameSemaphore):
+        (WebKit::LibWebRTCCodecsProxy::setSharedVideoFrameMemory):
+        (WebKit::LibWebRTCCodecsProxy::allowsExitUnderMemoryPressure const):
+
 2022-04-22  Kimmo Kinnunen  <kkinnunen@apple.com>
 

branches/safari-613-branch/Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp

@@ -253 +253 @@
 void RemoteGraphicsContextGL::copyTextureFromMedia(WebCore::MediaPlayerIdentifier mediaPlayerIdentifier, uint32_t texture, uint32_t target, int32_t level, uint32_t internalFormat, uint32_t format, uint32_t type, bool premultiplyAlpha, bool flipY, CompletionHandler<void(bool)>&& completionHandler)
 {
-    assertIsCurrent(m_workQueue());
+    assertIsCurrent(workQueue());
 #if USE(AVFOUNDATION)
     UNUSED_VARIABLE(premultiplyAlpha);

branches/safari-613-branch/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.h

@@ -32 +32 @@
 #include "RTCDecoderIdentifier.h"
 #include "RTCEncoderIdentifier.h"
+#include <WebCore/ProcessIdentity.h>
 #include <atomic>
 #include <wtf/ThreadAssertions.h>
@@ -88 +89 @@
     CFDictionaryRef ioSurfacePixelBufferCreationOptions(IOSurfaceRef);
 
+    Ref<IPC::Connection> m_connection;
+    Ref<WorkQueue> m_queue;
+    const WebCore::ProcessIdentity m_resourceOwner;
 
-    Ref<WorkQueue> m_queue;
     HashMap<RTCDecoderIdentifier, webrtc::LocalDecoder> m_decoders WTF_GUARDED_BY_LOCK(workQueue());
     HashMap<RTCEncoderIdentifier, webrtc::LocalEncoder> m_encoders WTF_GUARDED_BY_LOCK(workQueue());

branches/safari-613-branch/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm

@@ -38 +38 @@
 #import <WebCore/LibWebRTCProvider.h>
 #import <WebCore/RemoteVideoSample.h>
+#import <WebCore/MediaSampleAVFObjC.h>
 #import <webrtc/sdk/WebKit/WebKitDecoder.h>
 #import <webrtc/sdk/WebKit/WebKitEncoder.h>