Conversation
Updated Microsoft.WSL.Kernel package version from 6.6.114.1-1 to 6.18.20.1-1. - Release rolling-lts/wsl/6.18.20.1 - Update to stable kernel version v6.18.20 - New x86 and ARM64 configs including: - CONFIG_ANON_VMA_NAME - Various options for CAN support - CONFIG_INPUT_JOYDEV - CONFIG_USB_MON - F2FS support - ExFAT support - Configs added to ARM64 already present on x86 - FAT support - Fewer out of tree patches. Sets of patches now included from upstream: - Virtio PMEM support for PCI BAR addresses (feature/hvlite_virtio_pmem/6.6) - ICTIMESYNCFLAG_SYNC support (fix/hv_utils_clock/6.6)
There was a problem hiding this comment.
Pull request overview
Updates the WSL kernel NuGet dependency to ship a newer rolling-lts kernel release, aligning the repo’s build inputs with kernel v6.18.20 and the associated configuration/patch set described in the PR metadata.
Changes:
- Bump
Microsoft.WSL.Kernelpackage version from6.6.114.1-1to6.18.20.1-1.
|
Updated this branch since the build break in |
|
Strange, a bunch of errors around importing distributions. I'll try to get a local repro. |
| 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, |
There was a problem hiding this comment.
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.
| 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); |
There was a problem hiding this comment.
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.
| 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); |
There was a problem hiding this comment.
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.
Updated Microsoft.WSL.Kernel package version from 6.6.114.1-1 to 6.18.20.1-1.
Closes: #7747, #11994, #11503, #8231, #11801, #11285