Merge tag 'rolling-lts/wsl/6.6.36.6' into linux-msft-wsl-6.6.y

Linux rolling-lts/wsl/6.6.36.6 Signed-off-by: Mitchell Levy <[email protected]>
microsoft · Sep 3, 2024 · e458890 · e458890
2 parents 149cbd1 + 6cb123f
commit e458890
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/MSFT-Merge/log b/MSFT-Merge/log
@@ -6,5 +6,6 @@ feature/arm64-hyperv-synthetic-clocks-timers/6.6   b63263237d73f1e1d76e2c2049e31
 feature/dxgkrnl/6.6                                423e5044c57566f8267bbb20cf7cf57d1aefb040
 feature/hvlite_virtio_pmem/6.6                     7d955beb0207d880fa1862b1ace8487057b5aa6c
 fix/hv_utils_clock/6.6                             a34090e9209d3d3db3d97aa567bb323ebc7620a4
-product/wsl/readme/6.6                             e8bb7797885b28a31b42891d1002ddc17ec926ef
+fix/xsaves-lbr/v6.6                                ea0740024a0f0c7c6b8844492e3fa9eeb1289a83
+product/wsl/readme/6.6                             9e964c9ff297f4c6eca78a5bb67fccc56384e100
 product/wsl/security/6.6                           c9cb753bbd093f0599408e24292aba20eed103f2
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 6
 SUBLEVEL = 36
-EXTRAVERSION = .3
+EXTRAVERSION = .6
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Instructions for building an x86_64 WSL2 kernel with an Ubuntu distribution are
 as follows:
 
 1. Install the build dependencies:  
-   `$ sudo apt install build-essential flex bison dwarves libssl-dev libelf-dev`
+   `$ sudo apt install build-essential flex bison dwarves libssl-dev libelf-dev cpio`
 
 2. Modify WSL2 kernel configs (optional):  
    `$ make menuconfig KCONFIG_CONFIG=Microsoft/config-wsl`

diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/types.h
@@ -589,6 +589,13 @@ struct fpu_state_config {
 	 * even without XSAVE support, i.e. legacy features FP + SSE
 	 */
 	u64 legacy_features;
+	/*
+	 * @independent_features:
+	 *
+	 * Features that are supported by XSAVES, but not managed as part of
+	 * the FPU core, such as LBR
+	 */
+	u64 independent_features;
 };
 
 /* FPU state configuration information */

diff --git a/arch/x86/kernel/fpu/xstate.c b/arch/x86/kernel/fpu/xstate.c
@@ -788,6 +788,9 @@ void __init fpu__init_system_xstate(unsigned int legacy_size)
 		goto out_disable;
 	}
 
+	fpu_kernel_cfg.independent_features = fpu_kernel_cfg.max_features &
+					      XFEATURE_MASK_INDEPENDENT;
+
 	/*
 	 * Clear XSAVE features that are disabled in the normal CPUID.
 	 */

diff --git a/arch/x86/kernel/fpu/xstate.h b/arch/x86/kernel/fpu/xstate.h
@@ -64,9 +64,9 @@ static inline u64 xfeatures_mask_supervisor(void)
 static inline u64 xfeatures_mask_independent(void)
 {
 	if (!cpu_feature_enabled(X86_FEATURE_ARCH_LBR))
-		return XFEATURE_MASK_INDEPENDENT & ~XFEATURE_MASK_LBR;
+		return fpu_kernel_cfg.independent_features & ~XFEATURE_MASK_LBR;
 
-	return XFEATURE_MASK_INDEPENDENT;
+	return fpu_kernel_cfg.independent_features;
 }
 
 /* XSAVE/XRSTOR wrapper functions */