Backport ETW silo fix to v2.4 (#5058)

csujedihy · web-flow · commit 0c3596a214de · 2025-04-29T10:58:19.000Z
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.4.9-$(Build.BuildId)
+          ob_createvpack_version: 2.4.10-$(Build.BuildId)
         steps:
         - task: DownloadPipelineArtifact@2
           inputs:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,9 +118,6 @@ jobs:
         - plat: android
           systemcrypto: '-UseSystemOpenSSLCrypto'
         # TODO: android to support ubuntu-24.04
-        - plat: android
-          os: 'ubuntu-24.04'
-          systemcrypto: '-UseSystemOpenSSLCrypto'
         # No openssl system crypto on ubuntu-22.04
         - plat: linux
           os: 'ubuntu-22.04'
@@ -209,23 +206,21 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
     - name: Download Build Artifacts
-      uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: Release-${{ matrix.vec.plat }}-windows-2022-x86-${{ matrix.vec.tls }}
         path: artifacts
-        if_no_artifact_found: ignore
     - name: Download Build Artifacts
-      uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: Release-${{ matrix.vec.plat }}-windows-2022-x64-${{ matrix.vec.tls }}
         path: artifacts
-        if_no_artifact_found: ignore
     - name: Download Build Artifacts
-      uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11
+      if: matrix.vec.tls != 'openssl'
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
         path: artifacts
-        if_no_artifact_found: ignore
     - name: Build Package
       shell: pwsh
       run: scripts/package-nuget.ps1 -Tls ${{ matrix.vec.tls }} ${{ matrix.vec.arg }} -GHA
@@ -234,3 +229,4 @@ jobs:
       with:
         name: Nuget-Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
         path: artifacts/dist/*.nupkg
+
diff --git a/.github/workflows/test-down-level.yml b/.github/workflows/test-down-level.yml
@@ -25,7 +25,6 @@ jobs:
       matrix:
         vec: [
           # v2.1
-          { release: "2.1.11", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
           { release: "2.1.11", os: "windows-2022", arch: "x64", tls: "schannel" },
           { release: "2.1.11", os: "windows-2022", arch: "x64", tls: "openssl" },
           # v2.2
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.4.9)
+set(QUIC_FULL_VERSION 2.4.10)
 
 if (WIN32)
     set(CX_PLATFORM "windows")
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "msquic"
-version = "2.4.9-beta"
+version = "2.4.10-beta"
 edition = "2018"
 authors = ["Microsoft"]
 description = "Microsoft implementation of the IETF QUIC protocol"
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -505,16 +505,21 @@ function CMake-Generate {
         $Arguments += " -DQUIC_HIGH_RES_TIMERS=on"
     }
     if ($Platform -eq "android") {
-        $NDK = $env:ANDROID_NDK_LATEST_HOME -replace '26\.\d+\.\d+', '25.2.9519653' # Temporary work around. Use RegEx to replace newer version.
+        $NDK = $env:ANDROID_NDK_LATEST_HOME
         $env:PATH = "$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin:$env:PATH"
+        $env:ANDROID_NDK_HOME = $NDK
+        $env:ANDROID_NDK_ROOT = $NDK  # Set ANDROID_NDK_ROOT to ensure consistency
+        Write-Host "Set ANDROID_NDK_HOME: $env:ANDROID_NDK_HOME"
+        Write-Host "Set ANDROID_NDK_ROOT: $env:ANDROID_NDK_ROOT"
+        Write-Host "Set ANDROID_NDK_LATEST_HOME: $env:ANDROID_NDK_LATEST_HOME"
+
         switch ($Arch) {
             "x86"   { $Arguments += " -DANDROID_ABI=x86"}
             "x64"   { $Arguments += " -DANDROID_ABI=x86_64" }
             "arm"   { $Arguments += " -DANDROID_ABI=armeabi-v7a" }
             "arm64" { $Arguments += " -DANDROID_ABI=arm64-v8a" }
         }
         $Arguments += " -DANDROID_PLATFORM=android-29"
-        $env:ANDROID_NDK_HOME = $NDK
         $NdkToolchainFile = "$NDK/build/cmake/android.toolchain.cmake"
         $Arguments += " -DANDROID_NDK=""$NDK"""
         $Arguments += " -DCMAKE_TOOLCHAIN_FILE=""$NdkToolchainFile"""
diff --git a/scripts/package-distribution.ps1 b/scripts/package-distribution.ps1
@@ -24,7 +24,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin"
 # All direct subfolders are OS's
 $Platforms = Get-ChildItem -Path $ArtifactsBinDir
 
-$Version = "2.4.9"
+$Version = "2.4.10"
 
 $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.4.9"
+$Version = "2.4.10"
 
 $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.4.9";
+$VersionNumber = "2.4.10";
 
 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.4.9</string>
+    <string>2.4.10</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 9
+#define VER_PATCH 10
 #endif
 
 #ifndef VER_BUILD_ID
diff --git a/src/inc/quic_platform_winkernel.h b/src/inc/quic_platform_winkernel.h
@@ -932,7 +932,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/src/tools/forwarder/forwarder.cpp b/src/tools/forwarder/forwarder.cpp
@@ -234,6 +234,6 @@ int QUIC_MAIN_EXPORT main(int argc, char **argv) {
     CXPLAT_FRE_ASSERT(QUIC_SUCCEEDED(Listener.Start(Alpn, QuicAddr(QUIC_ADDRESS_FAMILY_UNSPEC, FrontEndPort))));
 
     printf("Press Enter to exit.\n\n");
-    getchar();
+    (void)getchar();
     return 0;
 }
diff --git a/src/tools/interopserver/InteropServer.cpp b/src/tools/interopserver/InteropServer.cpp
@@ -134,7 +134,7 @@ main(
         HttpServer Server(Registration, SupportedALPNs, ARRAYSIZE(SupportedALPNs), &ListenAddr, SslKeyLogFileParam);
         if (!GetFlag(argc, argv, "noexit")) {
             printf("Press Enter to exit.\n\n");
-            getchar();
+            (void)getchar();
         } else {
             CXPLAT_EVENT Event;
             CxPlatEventInitialize(&Event, TRUE, FALSE);
diff --git a/src/tools/ip/server/quicipserver.cpp b/src/tools/ip/server/quicipserver.cpp
@@ -182,7 +182,7 @@ RunServer(
     }
 
     printf("Press Enter to exit.\n\n");
-    getchar();
+    (void)getchar();
 
 Error:
 
diff --git a/src/tools/lb/loadbalancer.cpp b/src/tools/lb/loadbalancer.cpp
@@ -218,7 +218,7 @@ main(int argc, char **argv)
     PublicInterface = new LbPublicInterface(&PublicAddr);
 
     printf("Press Enter to exit.\n\n");
-    getchar();
+    (void)getchar();
 
     delete PublicInterface;
     CxPlatDataPathUninitialize(Datapath);
diff --git a/src/tools/sample/sample.c b/src/tools/sample/sample.c
@@ -662,7 +662,7 @@ RunServer(
     // Continue listening for connections until the Enter key is pressed.
     //
     printf("Press Enter to exit.\n\n");
-    getchar();
+    (void)getchar();
 
 Error:
 
diff --git a/version.json b/version.json
@@ -1 +1 @@
-{ "major": 2, "minor": 4, "patch": 9 }
+{ "major": 2, "minor": 4, "patch": 10 }

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`	`}`