Skip to contentSkip to conversation

x86/fpu: set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4

PATCH Superseded Feng Tang 3 participants 5 messages Aug 23, 2023 – Aug 24, 2023 x86

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Feng Tang

author
#0 lore raw

PATCH 1/1 x86/fpu: set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4

0Day found a 34.6% regression in stress-ng's 'af-alg' test case [1], and bisected it to commit b81fac906a8f ("x86/fpu: Move FPU initialization into arch_cpu_finalize_init()"), which optimizes the FPU init order, and moves the CR4_OSXSAVE enabling into a later place:

arch_cpu_finalize_init

       identify_boot_cpu
	   identify_cpu
	       generic_identify
                   get_cpu_cap --> setup cpu capability
       ...
       fpu__init_cpu
           fpu__init_cpu_xstate
               cr4_set_bits(X86_CR4_OSXSAVE);

And it makes 'X86_FEATURE_OSXSAVE' feature bit missed in cpu capability setup. Many security module like 'camellia_aesni_avx_x86_64' depends on this feature, and will fail to be loaded after the commit, causing the regression.

So set X86_FEATURE_OSXSAVE feature right after OSXSAVE enabling to fix it.

[1]. https://lore.kernel.org/lkml/[email protected]/

Fixes b81fac906a8f ("x86/fpu: Move FPU initialization into arch_cpu_finalize_init()")
---
 arch/x86/kernel/fpu/xstate.c | 3 +++
 1 file changed, 3 insertions(+)
arch/x86/kernel/fpu/xstate.c +3 -0
index 0bab497c9436..8ebea0d522d2 100644
@@ -173,6 +173,9 @@ void fpu__init_cpu_xstate(void)
 
 	cr4_set_bits(X86_CR4_OSXSAVE);
 
+	if (!boot_cpu_has(X86_FEATURE_OSXSAVE))
+		setup_force_cpu_cap(X86_FEATURE_OSXSAVE);
+
 	/*
 	 * Must happen after CR4 setup and before xsetbv() to allow KVM
 	 * lazy passthrough.  Write independent of the dynamic state static
Signature · 1 line
2.27.0
#1 lore raw
Quoted 24 lines · Feng Tang

0Day found a 34.6% regression in stress-ng's 'af-alg' test case [1], and
bisected it to commit b81fac906a8f ("x86/fpu: Move FPU initialization into arch_cpu_finalize_init()"), which optimizes the FPU init order, and moves the CR4_OSXSAVE enabling into a later place:

   arch_cpu_finalize_init
       identify_boot_cpu
           identify_cpu
               generic_identify
                   get_cpu_cap --> setup cpu capability
       ...
       fpu__init_cpu
           fpu__init_cpu_xstate cr4_set_bits(X86_CR4_OSXSAVE);

And it makes 'X86_FEATURE_OSXSAVE' feature bit missed in cpu capability
setup. Many security module like 'camellia_aesni_avx_x86_64' depends on
this feature, and will fail to be loaded after the commit, causing the
regression.

Quoted 2 lines

So set X86_FEATURE_OSXSAVE feature right after OSXSAVE enabling to fix it.

Oh, that's unfortunate.

It might help to include a bit more about the problem in the log. The piece that confused me at first was that X86_FEATURE_OSXSAVE maps to a CPUID bit that will change once CR4.OSXSAVE is set. So since the CPUID bits are read before CR4.OSXSAVE is set, it stores the original unset value of the bit.

Quoted 18 lines

[1].
https://lore.kernel.org/lkml/[email protected]/

Fixes b81fac906a8f ("x86/fpu: Move FPU initialization into

arch_cpu_finalize_init()")

---
 arch/x86/kernel/fpu/xstate.c | 3 +++

 1 file changed, 3 insertions(+)
arch/x86/kernel/fpu/xstate.c +0 -0
index 0bab497c9436..8ebea0d522d2 100644
@@ -173,6 +173,9 @@ void fpu__init_cpu_xstate(void)
Quoted 6 lines


        cr4_set_bits(X86_CR4_OSXSAVE);

+       if (!boot_cpu_has(X86_FEATURE_OSXSAVE)) +               setup_force_cpu_cap(X86_FEATURE_OSXSAVE); +

I'd also put a comment here to explain why this is done manually. I'll toss something out in case it's useful:

	/*
	 * CPUID bit for X86_FEATURE_OSXSAVE value will change once 
	 * CR4.OSXSAVE is set, so update it manually.
	 */
author
#2 lore raw

Hi Rick,

Thanks for the review!

Quoted 28 lines · Rick P
Quoted 24 lines · Feng Tang

0Day found a 34.6% regression in stress-ng's 'af-alg' test case [1], and
bisected it to commit b81fac906a8f ("x86/fpu: Move FPU initialization into arch_cpu_finalize_init()"), which optimizes the FPU init order, and moves the CR4_OSXSAVE enabling into a later place:

   arch_cpu_finalize_init
       identify_boot_cpu
           identify_cpu
               generic_identify
                   get_cpu_cap --> setup cpu capability
       ...
       fpu__init_cpu
           fpu__init_cpu_xstate cr4_set_bits(X86_CR4_OSXSAVE);

And it makes 'X86_FEATURE_OSXSAVE' feature bit missed in cpu capability
setup. Many security module like 'camellia_aesni_avx_x86_64' depends on
this feature, and will fail to be loaded after the commit, causing the
regression.

Quoted 2 lines

So set X86_FEATURE_OSXSAVE feature right after OSXSAVE enabling to fix it.

Quoted 7 lines

Oh, that's unfortunate.

It might help to include a bit more about the problem in the log. The piece that confused me at first was that X86_FEATURE_OSXSAVE maps to a CPUID bit that will change once CR4.OSXSAVE is set. So since the CPUID bits are read before CR4.OSXSAVE is set, it stores the original unset value of the bit.

Good point. It's also my first time to know that this cpuid bit could change with CR4 runtime setting.

Quoted 27 lines
Quoted 18 lines

[1].
https://lore.kernel.org/lkml/[email protected]/

Fixes b81fac906a8f ("x86/fpu: Move FPU initialization into

arch_cpu_finalize_init()")

---
 arch/x86/kernel/fpu/xstate.c | 3 +++

 1 file changed, 3 insertions(+)
arch/x86/kernel/fpu/xstate.c +0 -0
index 0bab497c9436..8ebea0d522d2 100644
@@ -173,6 +173,9 @@ void fpu__init_cpu_xstate(void)
Quoted 6 lines


        cr4_set_bits(X86_CR4_OSXSAVE);

+       if (!boot_cpu_has(X86_FEATURE_OSXSAVE)) +               setup_force_cpu_cap(X86_FEATURE_OSXSAVE); +

I'd also put a comment here to explain why this is done manually. I'll toss something out in case it's useful:

Quoted 4 lines
	/*
	 * CPUID bit for X86_FEATURE_OSXSAVE value will change once 
	 * CR4.OSXSAVE is set, so update it manually.
	 */

Will add. thanks!

- Feng

#3 lore raw
In reply to Feng Tang

arch/x86/kernel/fpu/xstate.c void fpu__init_cpu_xstate(void) · line 177

Quoted 10 lines · Feng Tang
arch/x86/kernel/fpu/xstate.c +2 -0
index 0bab497c9436..8ebea0d522d2 100644
@@ -173,6 +173,9 @@ void fpu__init_cpu_xstate(void)
 
 	cr4_set_bits(X86_CR4_OSXSAVE);
 
+	if (!boot_cpu_has(X86_FEATURE_OSXSAVE))
+		setup_force_cpu_cap(X86_FEATURE_OSXSAVE);

This is wrong in several aspects:

1) You force the feature bit _before_ XSAVE is completely initialized. fpu__init_system_xstate() has error paths which disable XSAVE.

2) This conditional should have been a red flag for you simply because fpu__init_cpu_xstate() is invoked on all CPUs not only on the BSP.

I fixed it up and added a proper comment explaining it.

author
#4 lore raw

Hi Thomas,

Quoted 9 lines · Thomas Gleixner
Quoted 8 lines · Feng Tang
arch/x86/kernel/fpu/xstate.c +0 -0
index 0bab497c9436..8ebea0d522d2 100644
@@ -173,6 +173,9 @@ void fpu__init_cpu_xstate(void)
 
 	cr4_set_bits(X86_CR4_OSXSAVE);
 
Quoted 8 lines

arch/x86/kernel/fpu/xstate.c void fpu__init_cpu_xstate(void) · line 177

Quoted 2 lines
arch/x86/kernel/fpu/xstate.c +2 -0
+	if (!boot_cpu_has(X86_FEATURE_OSXSAVE))
+		setup_force_cpu_cap(X86_FEATURE_OSXSAVE);

This is wrong in several aspects:

1) You force the feature bit _before_ XSAVE is completely initialized. fpu__init_system_xstate() has error paths which disable XSAVE.

Yes, I missed the error path in BSP fpu initialization code.

Quoted 3 lines

2) This conditional should have been a red flag for you simply because fpu__init_cpu_xstate() is invoked on all CPUs not only on the BSP.

Indeed. when I worked on the patch, I even thought about ugly thing like:

    if (raw_smp_processor_id() == 0)
	setup_force_cpu_cap(X86_FEATURE_OSXSAVE);
Quoted 1 line

I fixed it up and added a proper comment explaining it.

Thanks for fixing it up and improving the comments!

- Feng