Port Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory m… (

#5343) * Port Fix AwaitableSocketAsyncEventArgs reorderings on weaker memory models * Remove dotnet-blob-feed
dotnet · Nov 3, 2023 · fe8bfd5 · fe8bfd5
1 parent 66845f0
commit fe8bfd5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/azure-pipelines-arcade.yml b/azure-pipelines-arcade.yml
@@ -80,16 +80,12 @@ stages:
         # Internal/Official Build Variables
         - ${{ if eq(variables._RunAsInternal, True) }}:
             # Only enable publishing in non-public, non PR scenarios.
-            # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
             # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
             # DotNet-HelixApi-Access provides: HelixApiAccessToken
-            - group: DotNet-Blob-Feed
             - group: Publish-Build-Assets
             - group: DotNet-HelixApi-Access
             - _PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
             - _InternalBuildArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
-                /p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
-                /p:DotNetPublishBlobFeedUrl=$(_PublishBlobFeedUrl)
                 /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
                 /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
                 /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)

diff --git a/src/System.ServiceModel.NetTcp/src/System/ServiceModel/Channels/SocketAwaitableEventArgs.cs b/src/System.ServiceModel.NetTcp/src/System/ServiceModel/Channels/SocketAwaitableEventArgs.cs
@@ -20,7 +20,11 @@ internal class SocketAwaitableEventArgs : SocketAsyncEventArgs, IValueTaskSource
     {
         private static readonly Action<object> _continuationCompleted = _ => { };
 
-        private Action<object> _continuation;
+        // There are places where we read the _continuation field and then read some other state which we assume to be consistent
+        // with the value we read in _continuation. Without a fence, those secondary reads could be reordered with respect to the first.
+        // https://github.com/dotnet/runtime/pull/84432
+        // https://github.com/dotnet/aspnetcore/issues/50623
+        private volatile Action<object> _continuation;
 
         public SocketAwaitableEventArgs() : base(unsafeSuppressExecutionContextFlow: true) { }
 

diff --git a/...erviceModel.UnixDomainSocket/src/System/ServiceModel/Channels/SocketAwaitableEventArgs.cs b/...erviceModel.UnixDomainSocket/src/System/ServiceModel/Channels/SocketAwaitableEventArgs.cs
@@ -20,7 +20,11 @@ internal class SocketAwaitableEventArgs : SocketAsyncEventArgs, IValueTaskSource
     {
         private static readonly Action<object> _continuationCompleted = _ => { };
 
-        private Action<object> _continuation;
+        // There are places where we read the _continuation field and then read some other state which we assume to be consistent
+        // with the value we read in _continuation. Without a fence, those secondary reads could be reordered with respect to the first.
+        // https://github.com/dotnet/runtime/pull/84432
+        // https://github.com/dotnet/aspnetcore/issues/50623
+        private volatile Action<object> _continuation;
 
         public SocketAwaitableEventArgs() : base(unsafeSuppressExecutionContextFlow: true) { }