Skip to content

Update Microsoft.WSL.Kernel to 6.18.20.1 #40161

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

Open
chessturo wants to merge 4 commits into
base: master
Choose a base branch
from
+4 −11
Open

Update Microsoft.WSL.Kernel to 6.18.20.1 #40161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01e1b22
Update Microsoft.WSL.Kernel to 6.18.20.1
chessturo Apr 10, 2026
09c5e02
Merge branch 'master' into user/chessturo/6.18.20.1-update
OneBlue Apr 11, 2026
f217a58
update mount options to match 6.18 expected format
Apr 13, 2026
2a21f7b
more test adjustments to account for 6.18 behavior
Apr 13, 2026
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
2 changes: 1 addition & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<package id="Microsoft.WSL.Dependencies.amd64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
<package id="Microsoft.WSL.Dependencies.arm64fre" version="10.0.27820.1000-250318-1700.rs-base2-hyp" targetFramework="native" />
<package id="Microsoft.WSL.DeviceHost" version="1.2.10-0" />
<package id="Microsoft.WSL.Kernel" version="6.6.114.1-1" targetFramework="native" />
<package id="Microsoft.WSL.Kernel" version="6.18.20.1-1" targetFramework="native" />
<package id="Microsoft.WSL.LinuxSdk" version="1.20.0" targetFramework="native" />
<package id="Microsoft.WSL.TestDistro" version="2.7.1-1" />
<package id="Microsoft.WSLg" version="1.0.73" />
Expand Down
11 changes: 2 additions & 9 deletions test/linux/unit_tests/lxtfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ Return Value:
snprintf(
Plan9Options,
sizeof(Plan9Options),
"aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=5,access=client,msize=262144,trans=virtio",
"aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=0x5,access=client,msize=262144,trans=virtio",
Plan9Source,
Temp);
Comment on lines 285 to 290
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cache=0x5 literal is duplicated across multiple option strings, and hard-codes a particular textual representation that may vary by kernel/userspace. To reduce future churn, consider centralizing the cache option formatting (e.g., a shared constant or helper that can emit either decimal/hex or accept a parameter), or making the test/consumer tolerant of either representation.

Copilot uses AI. Check for mistakes.
}
Expand All @@ -294,7 +294,7 @@ Return Value:
snprintf(
Plan9Options,
sizeof(Plan9Options),
"aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=5,access=client,msize=65536,trans=fd,rfd=*,wfd=*",
"aname=drvfs;path=%s%s;symlinkroot=/mnt/,cache=0x5,access=client,msize=65536,trans=fd,rfd=*,wfd=*",
Plan9Source,
Temp);
Comment on lines 294 to 299
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cache=0x5 literal is duplicated across multiple option strings, and hard-codes a particular textual representation that may vary by kernel/userspace. To reduce future churn, consider centralizing the cache option formatting (e.g., a shared constant or helper that can emit either decimal/hex or accept a parameter), or making the test/consumer tolerant of either representation.

Copilot uses AI. Check for mistakes.
}
Expand Down Expand Up @@ -3652,8 +3652,6 @@ Return Value:
// Test an invalid buffer after a valid buffer. The writev call should return the
// number of bytes written until the invalid buffer.
//
// N.B. The plan 9 client does not follow this behavior, and will write nothing.
//

LxtCheckErrno(FileDescriptor = open(TestFile, O_RDWR | O_CREAT | O_TRUNC, S_IRWXU));
memset(Iov, 0, sizeof(Iov));
Expand All @@ -3664,11 +3662,6 @@ Return Value:
Iov[2].iov_base = ContentB;
Iov[2].iov_len = sizeof(ContentB);
LxtLogInfo("%d", g_LxtFsInfo.FsType);
if (g_LxtFsInfo.FsType == LxtFsTypePlan9)
{
LxtCheckErrnoFailure(Bytes = writev(FileDescriptor, Iov, 3), EFAULT);
}
else
{
LxtCheckErrno(Bytes = writev(FileDescriptor, Iov, 3));
LxtCheckEqual(Bytes, sizeof(ContentA), "%d");
Expand Down
2 changes: 1 addition & 1 deletion test/windows/UnitTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ Error code: Wsl/InstallDistro/WSL_E_DISTRO_NOT_FOUND
VERIFY_ARE_EQUAL(
LxsstuLaunchWsl(
L"mount | grep -iF '" TEXT(
LXSS_GPU_DRIVERS_SHARE) L" on /usr/lib/wsl/drivers type 9p (ro,nosuid,nodev,noatime,aname=" TEXT(LXSS_GPU_DRIVERS_SHARE) L";fmask=222;dmask=222,cache=5,access=client,msize=65536,trans=fd,rfd=8,wfd=8)'",
LXSS_GPU_DRIVERS_SHARE) L" on /usr/lib/wsl/drivers type 9p (ro,nosuid,nodev,noatime,aname=" TEXT(LXSS_GPU_DRIVERS_SHARE) L";fmask=222;dmask=222,cache=0x5,access=client,msize=65536,trans=fd,rfd=8,wfd=8)'",
nullptr,
nullptr,
nullptr,
Comment on lines 1774 to 1780
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assertion is now brittle to formatting differences in mount output (e.g., some environments may print cache=5 instead of cache=0x5, or reorder mount options). Consider loosening the check to accept both forms (e.g., cache=(5|0x5)) and/or validating only the specific invariants you care about (mount point + aname + key options) rather than an exact full option string.

Copilot uses AI. Check for mistakes.
Expand Down
Loading