microsoft/WSL
1
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2026-02-04 02:06:49 -06:00
Code Issues Packages Projects Releases 94 Wiki Activity

WSLA: Change default networking mode for WSLA to VirtioProxy (#14131)

Browse Source 
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
This commit is contained in:
Ben Hillis 2026-01-30 13:29:20 -08:00 committed by GitHub
parent 14e03734dd
commit fc3dfa7c52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/windows/common/WslClient.cpp
View File

@ -1526,7 +1526,7 @@ int WslaShell(_In_ std::wstring_view commandLine)
sessionSettings.DisplayName = L"WSLAShell";
sessionSettings.CpuCount = 4;
sessionSettings.MemoryMb = 4096;
sessionSettings.NetworkingMode = WSLANetworkingModeNAT;
sessionSettings.NetworkingMode = WSLANetworkingModeVirtioProxy;
sessionSettings.BootTimeoutMs = 30 * 1000;
sessionSettings.MaximumStorageSizeMb = 4096;

2
src/windows/wsladiag/wsladiag.cpp
View File

@ -284,7 +284,7 @@ static wil::com_ptr<IWSLASession> OpenCLISession()
settings.BootTimeoutMs = 30 * 1000;
settings.StoragePath = dataFolder.c_str();
settings.MaximumStorageSizeMb = 10000; // 10GB.
settings.NetworkingMode = WSLANetworkingModeNAT;
settings.NetworkingMode = WSLANetworkingModeVirtioProxy;
wil::com_ptr<IWSLASession> session;
THROW_IF_FAILED(manager->CreateSession(&settings, WSLASessionFlagsPersistent | WSLASessionFlagsOpenExisting, &session));

4
src/windows/wslaservice/exe/WSLAVirtualMachine.cpp
View File

@ -509,9 +509,7 @@ void WSLAVirtualMachine::ConfigureNetworking()
if (FeatureEnabled(WslaFeatureFlagsDnsTunneling))
{
THROW_HR_IF_MSG(
E_NOTIMPL,
m_settings.NetworkingMode == WSLANetworkingModeVirtioProxy,
"DNS tunneling not currently supported for VirtioProxy");
E_NOTIMPL, m_settings.NetworkingMode == WSLANetworkingModeVirtioProxy, "DNS tunneling not supported for VirtioProxy");
fds.emplace_back(WSLAProcessFd{.Fd = -1, .Type = WSLAFdType::WSLAFdTypeDefault});
THROW_IF_FAILED(wsl::core::networking::DnsResolver::LoadDnsResolverMethods());

66
test/windows/WSLATests.cpp
View File

@ -49,7 +49,7 @@ class WSLATests
THROW_IF_WIN32_ERROR(WSAStartup(MAKEWORD(2, 2), &m_wsadata));
m_storagePath = std::filesystem::current_path() / "test-storage";
m_defaultSessionSettings = GetDefaultSessionSettings(c_testSessionName, true, WSLANetworkingModeNAT);
m_defaultSessionSettings = GetDefaultSessionSettings(c_testSessionName, true, WSLANetworkingModeVirtioProxy);
m_defaultSession = CreateSession(m_defaultSessionSettings);
wil::unique_cotaskmem_array_ptr<WSLA_IMAGE_INFORMATION> images;
@ -1935,23 +1935,14 @@ class WSLATests
}
}
void RunPortMappingsTest(WSLANetworkingMode networkingMode, WSLA_CONTAINER_NETWORK_TYPE containerNetworkType)
void RunPortMappingsTest(IWSLASession& session, WSLA_CONTAINER_NETWORK_TYPE containerNetworkType)
{
WSL2_TEST_ONLY();
auto settings = GetDefaultSessionSettings(L"port-mapping-test", true);
settings.NetworkingMode = networkingMode;
// Reuse the default session if the networking mode matches, otherwise reset and create a new one.
auto createNewSession = networkingMode != m_defaultSessionSettings.NetworkingMode;
auto restore = createNewSession ? std::optional{ResetTestSession()} : std::nullopt;
auto session = createNewSession ? CreateSession(settings) : m_defaultSession;
LogInfo("Container network type: %d", static_cast<int>(containerNetworkType));
auto expectBoundPorts = [&](RunningWSLAContainer& Container, const std::vector<std::string>& expectedBoundPorts) {
auto ports = Container.Inspect().HostConfig.PortBindings;
std::vector<std::string> boundPorts;
for (const auto& e : ports)
{
boundPorts.emplace_back(e.first);
@ -1976,7 +1967,7 @@ class WSLATests
launcher.AddPort(1234, 8000, AF_INET);
launcher.AddPort(1234, 8000, AF_INET6);
auto container = launcher.Launch(*session);
auto container = launcher.Launch(session);
auto initProcess = container.GetInitProcess();
auto stdoutHandle = initProcess.GetStdHandle(1);
@ -1993,7 +1984,7 @@ class WSLATests
"python:3.12-alpine", "test-ports-2", {"python3", "-m", "http.server"}, {"PYTHONUNBUFFERED=1"}, containerNetworkType);
subLauncher.AddPort(1234, 8000, AF_INET);
auto [hresult, newContainer] = subLauncher.LaunchNoThrow(*session);
auto [hresult, newContainer] = subLauncher.LaunchNoThrow(session);
VERIFY_ARE_EQUAL(hresult, HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS));
VERIFY_SUCCEEDED(container.Get().Stop(WSLASignalSIGKILL, 0));
@ -2008,7 +1999,7 @@ class WSLATests
launcher.AddPort(1234, 8000, AF_INET);
auto container = launcher.Launch(*session);
auto container = launcher.Launch(session);
auto initProcess = container.GetInitProcess();
auto stdoutHandle = initProcess.GetStdHandle(1);
@ -2032,7 +2023,7 @@ class WSLATests
launcher.AddPort(1234, 8000, AF_INET);
launcher.AddPort(1234, 8000, AF_INET);
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(*session).first, HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS));
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(session).first, HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS));
}
auto bindSocket = [](auto port) {
@ -2052,7 +2043,7 @@ class WSLATests
"python:3.12-alpine", "test-ports-fail", {"python3", "-m", "http.server"}, {"PYTHONUNBUFFERED=1"}, containerNetworkType);
launcher.AddPort(1235, 8000, AF_INET);
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(*session).first, HRESULT_FROM_WIN32(WSAEACCES));
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(session).first, HRESULT_FROM_WIN32(WSAEACCES));
// Validate that Create() correctly cleans up bound ports after a port fails to map
{
@ -2061,7 +2052,7 @@ class WSLATests
launcher.AddPort(1236, 8000, AF_INET); // Should succeed
launcher.AddPort(1235, 8000, AF_INET); // Should fail.
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(*session).first, HRESULT_FROM_WIN32(WSAEACCES));
VERIFY_ARE_EQUAL(launcher.LaunchNoThrow(session).first, HRESULT_FROM_WIN32(WSAEACCES));
// Validate that port 1234 is still available.
VERIFY_IS_TRUE(!!bindSocket(1236));
@ -2083,7 +2074,7 @@ class WSLATests
launcher.AddPort(1234, 8000, AF_INET);
launcher.AddPort(1234, 8000, AF_INET6);
auto container = launcher.Launch(*session);
auto container = launcher.Launch(session);
auto initProcess = container.GetInitProcess();
auto stdoutHandle = initProcess.GetStdHandle(1);
@ -2096,24 +2087,35 @@ class WSLATests
}*/
}
TEST_METHOD(PortMappingsNatBridged)
auto SetupPortMappingsTest(WSLANetworkingMode networkingMode)
{
RunPortMappingsTest(WSLANetworkingModeNAT, WSLA_CONTAINER_NETWORK_BRIDGE);
auto settings = GetDefaultSessionSettings(L"networking-session", true, networkingMode);
auto createNewSession = settings.NetworkingMode != m_defaultSessionSettings.NetworkingMode;
auto restore = createNewSession ? std::optional{ResetTestSession()} : std::nullopt;
auto session = createNewSession ? CreateSession(settings) : m_defaultSession;
return std::make_pair(std::move(restore), session);
}
TEST_METHOD(PortMappingsNatHost)
TEST_METHOD(PortMappingsNat)
{
RunPortMappingsTest(WSLANetworkingModeNAT, WSLA_CONTAINER_NETWORK_HOST);
WSL2_TEST_ONLY();
auto [restore, session] = SetupPortMappingsTest(WSLANetworkingModeNAT);
RunPortMappingsTest(*session, WSLA_CONTAINER_NETWORK_BRIDGE);
RunPortMappingsTest(*session, WSLA_CONTAINER_NETWORK_HOST);
}
TEST_METHOD(PortMappingsVirtioProxyBridged)
TEST_METHOD(PortMappingsVirtioProxy)
{
RunPortMappingsTest(WSLANetworkingModeVirtioProxy, WSLA_CONTAINER_NETWORK_BRIDGE);
}
WSL2_TEST_ONLY();
TEST_METHOD(PortMappingsVirtioProxyHost)
{
RunPortMappingsTest(WSLANetworkingModeVirtioProxy, WSLA_CONTAINER_NETWORK_HOST);
auto [restore, session] = SetupPortMappingsTest(WSLANetworkingModeVirtioProxy);
RunPortMappingsTest(*session, WSLA_CONTAINER_NETWORK_BRIDGE);
RunPortMappingsTest(*session, WSLA_CONTAINER_NETWORK_HOST);
}
TEST_METHOD(PortMappingsNone)
@ -2543,11 +2545,7 @@ class WSLATests
};
auto create = [this](LPCWSTR Name, WSLASessionFlags Flags) {
auto settings = GetDefaultSessionSettings(Name);
settings.NetworkingMode = WSLANetworkingModeNone;
settings.StoragePath = nullptr;
return CreateSession(settings, Flags);
return CreateSession(GetDefaultSessionSettings(Name), Flags);
};
// Validate that non-persistent sessions are dropped when released