Skip to content

plan9: re-enable virtio9p now that the known virtio queue corruption issue has been root caused #40600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
benhillis wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −13
Draft

plan9: re-enable virtio9p now that the known virtio queue corruption issue has been root caused #40600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions localization/strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,9 +1123,6 @@ Attempting web download...</value>
<data name="MessageNoInstallDefault" xml:space="preserve">
<value>No default distribution has been configured. Please provide a distribution to install.</value>
</data>
<data name="MessageConfigVirtio9pDisabled" xml:space="preserve">
<value>wsl2.virtio9p is disabled, falling back to 9p with vsock transport.</value>
</data>
<data name="MessageInstallationCorrupted" xml:space="preserve">
<value>WSL installation appears to be corrupted (Error code: {}).
Press any key to repair WSL, or CTRL-C to cancel.
Expand Down
6 changes: 0 additions & 6 deletions src/windows/common/WslCoreConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,6 @@ void wsl::core::Config::Initialize(_In_opt_ HANDLE UserToken)
VALIDATE_CONFIG_OPTION(!EnableVirtio, EnableVirtioFs, false);
}

if (EnableVirtio9p)
{
EMIT_USER_WARNING(wsl::shared::Localization::MessageConfigVirtio9pDisabled());
EnableVirtio9p = false;
}

if (NetworkingMode != NetworkingMode::Nat && NetworkingMode != NetworkingMode::Mirrored && NetworkingMode != NetworkingMode::VirtioProxy)
{
VALIDATE_CONFIG_OPTION(
Expand Down
2 changes: 1 addition & 1 deletion src/windows/common/WslCoreConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ struct Config
ConfigKeyPresence LoadKernelModulesPresence = ConfigKeyPresence::Absent;
bool LoadDefaultKernelModules = true;
bool EnableNestedVirtualization = !shared::Arm64 && windows::common::helpers::IsWindows11OrAbove();
bool EnableVirtio9p = false;
bool EnableVirtio9p = true;
bool EnableVirtio = !shared::Arm64 || windows::common::helpers::IsWindows11OrAbove();
bool EnableVirtioFs = false;
int KernelDebugPort = 0;
Expand Down
4 changes: 1 addition & 3 deletions test/windows/DrvFsTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,6 @@ WSL2_DRVFS_TEST_CLASS(Plan9);

WSL2_DRVFS_TEST_CLASS(VirtioFs);

// Disabled while an issue with the 6.1 Linux kernel causing disk corruption is investigated.
// TODO: Enable again once the issue is resolved
// WSL2_DRVFS_TEST_CLASS(Virtio9p);
WSL2_DRVFS_TEST_CLASS(Virtio9p);

} // namespace DrvFsTests