Backport ETW silo fix to v2.3 (#5057)

Yi Huang · web-flow · commit e9d854e7a977 · 2025-04-29T06:52:30.000-04:00
diff --git a/.azure/OneBranch.Package.yml b/.azure/OneBranch.Package.yml
@@ -95,7 +95,7 @@ extends:
           ob_createvpack_owneralias: quicdev
           ob_createvpack_description: msquic.$(Build.SourceBranchName)
           ob_createvpack_versionAs: string
-          ob_createvpack_version: 2.3.10-$(Build.BuildId)
+          ob_createvpack_version: 2.3.11-$(Build.BuildId)
         steps:
         - task: DownloadPipelineArtifact@2
           inputs:
diff --git a/.github/workflows/build-reuse-unix.yml b/.github/workflows/build-reuse-unix.yml
@@ -80,7 +80,7 @@ jobs:
     name: Build
     runs-on: ${{ inputs.os }}
     container:
-      image: ${{ inputs.plat == 'linux' && format('ghcr.io/microsoft/msquic/linux-build-xcomp:{0}', inputs.os) || '' }}
+      image: ${{ inputs.plat == 'linux' && format('ghcr.io/microsoft/msquic/linux-build-xcomp:{0}-cross', inputs.os) || '' }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
diff --git a/.github/workflows/test-down-level.yml b/.github/workflows/test-down-level.yml
@@ -40,24 +40,32 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
     - name: Prepare Machine
-      run: scripts/prepare-machine.ps1 -Tls ${{ matrix.tls }} -DisableTest
+      run: scripts/prepare-machine.ps1 -Tls ${{ matrix.vec.tls }} -DisableTest
       shell: pwsh
+    - name: Install Perl
+      if: runner.os == 'Windows'
+      uses: shogo82148/actions-setup-perl@22423f01bde48fb88785c007e3166fbbbd8e892a
+      with:
+        perl-version: '5.34'
+    - name: Install NASM
+      if: runner.os == 'Windows'
+      uses: ilammy/setup-nasm@72793074d3c8cdda771dba85f6deafe00623038b
     - name: Build Release
       shell: pwsh
-      run: scripts/build.ps1 -Config Release -Arch ${{ matrix.arch }} -Tls ${{ matrix.tls }} -UseSystemOpenSSLCrypto -DisableTest -DisableTools -DisablePerf
+      run: scripts/build.ps1 -Config Release -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -UseSystemOpenSSLCrypto -DisableTest -DisableTools -DisablePerf
     - name: Download Tests
       shell: pwsh
       run: |
         $osName = "${{runner.os}}".ToLower()
-        Invoke-WebRequest -Uri "https://github.com/microsoft/msquic/releases/download/v${{matrix.release}}/msquic_${{runner.os}}_${{matrix.arch}}_Release_${{matrix.tls}}_test.zip" -OutFile "artifacts/test.zip"
-        Expand-Archive -Path artifacts/test.zip -DestinationPath artifacts/bin/$osName/${{matrix.arch}}_Release_${{matrix.tls}}
+        Invoke-WebRequest -Uri "https://github.com/microsoft/msquic/releases/download/v${{matrix.vec.release}}/msquic_${{runner.os}}_${{matrix.vec.arch}}_Release_${{matrix.vec.tls}}_test.zip" -OutFile "artifacts/test.zip"
+        Expand-Archive -Path artifacts/test.zip -DestinationPath artifacts/bin/$osName/${{matrix.vec.arch}}_Release_${{matrix.vec.tls}}
     - name: Run Tests (Linux)
       if: runner.os == 'Linux'
       shell: pwsh
       run: |
-        chmod +x artifacts/bin/linux/${{matrix.arch}}_Release_${{matrix.tls}}/msquictest
-        $env:LD_LIBRARY_PATH = Join-Path (Get-Location).Path "artifacts/bin/linux/${{matrix.arch}}_Release_${{matrix.tls}}"
-        scripts/test.ps1 -AZP -Config Release -Arch ${{ matrix.arch }} -Tls ${{ matrix.tls }} -SkipUnitTests -Filter -*CredValidation*:*ConnectClientCertificate*:Basic.StartTwoListenersSameALPN:ParameterValidation.ValidateGlobalParam
+        chmod +x artifacts/bin/linux/${{matrix.vec.arch}}_Release_${{matrix.vec.tls}}/msquictest
+        $env:LD_LIBRARY_PATH = Join-Path (Get-Location).Path "artifacts/bin/linux/${{matrix.vec.arch}}_Release_${{matrix.vec.tls}}"
+        scripts/test.ps1 -AZP -Config Release -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -SkipUnitTests -Filter -*CredValidation*:*ConnectClientCertificate*:Basic.StartTwoListenersSameALPN:ParameterValidation.ValidateGlobalParam
     - name: Run Tests (Windows)
       if: runner.os == 'Windows'
-      run: scripts/test.ps1 -AZP -Config Release -Arch ${{ matrix.arch }} -Tls ${{ matrix.tls }} -SkipUnitTests -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*:Basic.StartTwoListenersSameALPN:ParameterValidation.ValidateGlobalParam
+      run: scripts/test.ps1 -AZP -Config Release -Arch ${{ matrix.vec.arch }} -Tls ${{ matrix.vec.tls }} -SkipUnitTests -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*:Basic.StartTwoListenersSameALPN:ParameterValidation.ValidateGlobalParam
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,7 @@ message(STATUS "Platform version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
 set(QUIC_MAJOR_VERSION 2)
-set(QUIC_FULL_VERSION 2.3.10)
+set(QUIC_FULL_VERSION 2.3.11)
 
 if (WIN32)
     set(CX_PLATFORM "windows")
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "msquic"
-version = "2.3.10-beta"
+version = "2.3.11-beta"
 edition = "2018"
 authors = ["Microsoft"]
 description = "Microsoft implementation of the IETF QUIC protocol"
diff --git a/scripts/package-distribution.ps1 b/scripts/package-distribution.ps1
@@ -19,7 +19,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin"
 # All direct subfolders are OS's
 $Platforms = Get-ChildItem -Path $ArtifactsBinDir
 
-$Version = "2.3.10"
+$Version = "2.3.11"
 
 $WindowsBuilds = @()
 $AllBuilds = @()
diff --git a/scripts/package-nuget.ps1 b/scripts/package-nuget.ps1
@@ -153,7 +153,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist"
 $CurrentCommitHash = Get-GitHash -RepoDir $RootDir
 $RepoRemote = Get-GitRemote -RepoDir $RootDir
 
-$Version = "2.3.10"
+$Version = "2.3.11"
 
 $BuildId = $env:BUILD_BUILDID
 if ($null -ne $BuildId) {
diff --git a/scripts/write-versions.ps1 b/scripts/write-versions.ps1
@@ -26,7 +26,7 @@ $ArtifactsDir = $BuildConfig.ArtifactsDir
 $SourceVersion = $env:BUILD_SOURCEVERSION;
 $SourceBranch = $env:BUILD_SOURCEBRANCH;
 $BuildId = $env:BUILD_BUILDID;
-$VersionNumber = "2.3.10";
+$VersionNumber = "2.3.11";
 
 class BuildData {
     [string]$SourceVersion;
diff --git a/src/bin/winkernel/driver.c b/src/bin/winkernel/driver.c
@@ -95,6 +95,8 @@ Return Value:
     NTSTATUS Status;
     WDF_DRIVER_CONFIG Config;
     WDFDRIVER Driver;
+    QUIC_SILO PrevSilo = QuicSiloAttach(QuicSiloGetHostSilo());
+    CXPLAT_DBG_ASSERT(!QuicSiloIsServerSilo());
 
     //
     // We explicitly load the MsQuic library upfront (instead of letting it
@@ -143,6 +145,7 @@ Return Value:
         MsQuicLibraryUnload();
     }
 
+    QuicSiloDetatch(PrevSilo);
     return Status;
 }
 
@@ -168,10 +171,13 @@ Routine Description:
 --*/
 {
     UNREFERENCED_PARAMETER(Driver);
+    QUIC_SILO PrevSilo = QuicSiloAttach(QuicSiloGetHostSilo());
+    CXPLAT_DBG_ASSERT(!QuicSiloIsServerSilo());
 
     PAGED_CODE();
 
     MsQuicDeregisterNmrProvider();
     MsQuicPcwCleanup();
     MsQuicLibraryUnload();
+    QuicSiloDetatch(PrevSilo);
 }
diff --git a/src/core/configuration.c b/src/core/configuration.c
@@ -116,7 +116,7 @@ MsQuicConfigurationOpen(
     //
 
 #ifdef QUIC_SILO
-    Configuration->Silo = QuicSiloGetCurrentServer();
+    Configuration->Silo = QuicSiloGetCurrentServerSilo();
     QuicSiloAddRef(Configuration->Silo);
     if (Configuration->Silo != NULL) {
         //
diff --git a/src/core/listener.c b/src/core/listener.c
@@ -71,7 +71,7 @@ MsQuicListenerOpen(
     CxPlatEventInitialize(&Listener->StopEvent, TRUE, TRUE);
 
 #ifdef QUIC_SILO
-    Listener->Silo = QuicSiloGetCurrentServer();
+    Listener->Silo = QuicSiloGetCurrentServerSilo();
     QuicSiloAddRef(Listener->Silo);
 #endif
 
diff --git a/src/distribution/Info.plist b/src/distribution/Info.plist
@@ -19,7 +19,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleVersion</key>
-    <string>2.3.10</string>
+    <string>2.3.11</string>
     <key>NSHumanReadableCopyright</key>
     <string>MIT</string>
     <key>CFBundleGetInfoString</key>
diff --git a/src/inc/msquic.ver b/src/inc/msquic.ver
@@ -12,7 +12,7 @@
 #endif
 
 #ifndef VER_PATCH
-#define VER_PATCH 10
+#define VER_PATCH 11
 #endif
 
 #ifndef VER_BUILD_ID
diff --git a/src/inc/quic_platform_winkernel.h b/src/inc/quic_platform_winkernel.h
@@ -931,7 +931,9 @@ CxPlatRandom(
 #define QUIC_SILO PESILO
 #define QUIC_SILO_INVALID ((PESILO)(void*)(LONG_PTR)-1)
 
-#define QuicSiloGetCurrentServer() PsGetCurrentServerSilo()
+#define QuicSiloGetHostSilo() PsGetHostSilo()
+#define QuicSiloIsServerSilo() PsIsCurrentThreadInServerSilo()
+#define QuicSiloGetCurrentServerSilo() PsGetCurrentServerSilo()
 #define QuicSiloAddRef(Silo) if (Silo != NULL) { ObReferenceObjectWithTag(Silo, QUIC_POOL_SILO); }
 #define QuicSiloRelease(Silo) if (Silo != NULL) { ObDereferenceObjectWithTag(Silo, QUIC_POOL_SILO); }
 #define QuicSiloAttach(Silo) PsAttachSiloToCurrentThread(Silo)
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{ "major": 2, "minor": 3, "patch": 10 }
+{ "major": 2, "minor": 3, "patch": 11 }

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,8 @@ Return Value:`
`95`	`95`	`NTSTATUS Status;`
`96`	`96`	`WDF_DRIVER_CONFIG Config;`
`97`	`97`	`WDFDRIVER Driver;`
	`98`	`+ QUIC_SILO PrevSilo = QuicSiloAttach(QuicSiloGetHostSilo());`
	`99`	`+ CXPLAT_DBG_ASSERT(!QuicSiloIsServerSilo());`
`98`	`100`
`99`	`101`	`//`
`100`	`102`	`// We explicitly load the MsQuic library upfront (instead of letting it`
`@@ -143,6 +145,7 @@ Return Value:`
`143`	`145`	`MsQuicLibraryUnload();`
`144`	`146`	`}`
`145`	`147`
	`148`	`+ QuicSiloDetatch(PrevSilo);`
`146`	`149`	`return Status;`
`147`	`150`	`}`
`148`	`151`
`@@ -168,10 +171,13 @@ Routine Description:`
`168`	`171`	`--*/`
`169`	`172`	`{`
`170`	`173`	`UNREFERENCED_PARAMETER(Driver);`
	`174`	`+ QUIC_SILO PrevSilo = QuicSiloAttach(QuicSiloGetHostSilo());`
	`175`	`+ CXPLAT_DBG_ASSERT(!QuicSiloIsServerSilo());`
`171`	`176`
`172`	`177`	`PAGED_CODE();`
`173`	`178`
`174`	`179`	`MsQuicDeregisterNmrProvider();`
`175`	`180`	`MsQuicPcwCleanup();`
`176`	`181`	`MsQuicLibraryUnload();`
	`182`	`+ QuicSiloDetatch(PrevSilo);`
`177`	`183`	`}`