diff --git a/Cargo.toml b/Cargo.toml index b78d81eaa..71f5668c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,7 +53,7 @@ tracing-subscriber = { version = "0.3.0", default-features = false, features = [ url = "2" wasm-bindgen-test = { version = "0.3.45" } web-time = "1" -windows-sys = { version = ">=0.52, <=0.59", features = ["Win32_Foundation", "Win32_System_IO", "Win32_Networking_WinSock"] } +windows-sys = { version = ">=0.52, <=0.59", features = ["Win32_Foundation", "Win32_System_IO", "Win32_Networking_WinSock", "Win32_System_SystemInformation", "Win32_System_Threading"] } [profile.bench] debug = true diff --git a/quinn-udp/src/windows.rs b/quinn-udp/src/windows.rs index 223ab0fdf..28fe2b51c 100644 --- a/quinn-udp/src/windows.rs +++ b/quinn-udp/src/windows.rs @@ -10,7 +10,13 @@ use std::{ use libc::{c_int, c_uint}; use once_cell::sync::Lazy; -use windows_sys::Win32::Networking::WinSock; +use windows_sys::Win32::{ + Networking::WinSock, + System::{ + SystemInformation::IMAGE_FILE_MACHINE_ARM64, + Threading::{GetCurrentProcess, IsWow64Process2}, + }, +}; use crate::{ cmsg::{self, CMsgHdr}, @@ -107,16 +113,33 @@ impl UdpSocketState { )?; } - // Opportunistically try to enable GRO - _ = set_socket_option( - &*socket.0, - WinSock::IPPROTO_UDP, - WinSock::UDP_RECV_MAX_COALESCED_SIZE, - // u32 per - // https://learn.microsoft.com/en-us/windows/win32/winsock/ipproto-udp-socket-options. - // Choice of 2^16 - 1 inspired by msquic. - u16::MAX as u32, - ); + match &*IS_WINDOWS_ON_ARM { + Ok(true) => { + // Bug on Windows on ARM, not receiving `UDP_COALESCED_INFO` `CMSG` + // when _Virtual Machine Platform_ feature enabled. See + // for details. + debug!("detected Windows on ARM host thus not enabling URO") + } + Ok(false) => { + // Opportunistically try to enable URO + let result = set_socket_option( + &*socket.0, + WinSock::IPPROTO_UDP, + WinSock::UDP_RECV_MAX_COALESCED_SIZE, + // u32 per + // https://learn.microsoft.com/en-us/windows/win32/winsock/ipproto-udp-socket-options. + // Choice of 2^16 - 1 inspired by msquic. + u16::MAX as u32, + ); + + if let Err(e) = result { + debug!("failed to enable URO: {}", e); + } + } + Err(e) => { + debug!("failed to detect host system thus not enabling URO: {}", e); + } + } let now = Instant::now(); Ok(Self { @@ -470,3 +493,29 @@ static MAX_GSO_SEGMENTS: Lazy = Lazy::new(|| { Err(_) => 1, } }); + +/// Evaluates to [`Ok(true)`] if executed either directly on Windows on ARM, or +/// on an emulator which itself executes on Windows on ARM. +/// +/// See +/// +/// for details. +static IS_WINDOWS_ON_ARM: Lazy> = Lazy::new(|| { + let mut process_machine: u16 = 0; + let mut native_machine: u16 = 0; + + let result = unsafe { + IsWow64Process2( + GetCurrentProcess(), + &mut process_machine as *mut u16, + &mut native_machine as *mut u16, + ) + }; + + match result { + // See + // . + 0 => Err(io::Error::last_os_error()), + _ => Ok(native_machine == IMAGE_FILE_MACHINE_ARM64), + } +});