x86/fpu: Reset MXCSR to default in kernel_fpu_begin()
Borislav Petkov
maintainerPATCH 1/1 x86/fpu: Reset MXCSR to default in kernel_fpu_begin()
Ok,
here's the fix first so that it goes in. I'll hammer on the test case later.
---
From: Petteri Aimonen <[email protected]>
Previously, kernel floating point code would run with the MXCSR control register value last set by userland code by the thread that was active on the CPU core just before kernel call. This could affect calculation results if rounding mode was changed, or a crash if a FPU/SIMD exception was unmasked.
Restore MXCSR to the kernel's default value.
[ bp: Carve out from a bigger patch by Petteri, add feature check. ]
--- arch/x86/include/asm/fpu/internal.h | 5 +++++ arch/x86/kernel/fpu/core.c | 3 +++ 2 files changed, 8 insertions(+)
arch/x86/include/asm/fpu/internal.h +5 -0
@@ -623,6 +623,11 @@ static inline void switch_fpu_finish(struct fpu *new_fpu)* MXCSR and XCR definitions: */ +static inline void ldmxcsr (u32 mxcsr) +{ + asmvolatile ("ldmxcsr %0" ::"m" (mxcsr)); +} +extern unsigned int mxcsr_feature_mask;#define XCR_XFEATURE_ENABLED_MASK 0x00000000
arch/x86/kernel/fpu/core.c +3 -0
@@ -101,6 +101,9 @@ void kernel_fpu_begin(void)copy_fpregs_to_fpstate (¤t->thread.fpu); }__cpu_invalidate_fpregs_state (); + +if (boot_cpu_has (X86_FEATURE_XMM )) +ldmxcsr (MXCSR_DEFAULT ); }EXPORT_SYMBOL_GPL (kernel_fpu_begin);
Signature · 8 lines
2.21.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 4 lines · Borislav Petkov
Ok,
here's the fix first so that it goes in. I'll hammer on the test case later.
Does the 32-bit case need FNINIT?
Quoted 61 lines
---
From: Petteri Aimonen <[email protected]>Previously, kernel floating point code would run with the MXCSR control register value last set by userland code by the thread that was active on the CPU core just before kernel call. This could affect calculation results if rounding mode was changed, or a crash if a FPU/SIMD exception was unmasked.
Restore MXCSR to the kernel's default value.
[ bp: Carve out from a bigger patch by Petteri, add feature check. ]
Signed-off-by Petteri Aimonen <[email protected]>Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/include/asm/fpu/internal.h | 5 +++++ arch/x86/kernel/fpu/core.c | 3 +++ 2 files changed, 8 insertions(+)arch/x86/include/asm/fpu/internal.h +5
-0@@ -623,6 +623,11 @@ static inline void switch_fpu_finish(struct fpu *new_fpu)* MXCSR and XCR definitions: */ +static inline void ldmxcsr (u32 mxcsr) +{ + asmvolatile ("ldmxcsr %0" ::"m" (mxcsr)); +} +extern unsigned int mxcsr_feature_mask;#define XCR_XFEATURE_ENABLED_MASK 0x00000000arch/x86/kernel/fpu/core.c +3
-1@@ -101,6 +101,9 @@ void kernel_fpu_begin(void)copy_fpregs_to_fpstate (¤t->thread.fpu); }__cpu_invalidate_fpregs_state (); + +if (boot_cpu_has (X86_FEATURE_XMM )) +ldmxcsr (MXCSR_DEFAULT ); }EXPORT_SYMBOL_GPL (kernel_fpu_begin); --2.21.0
--
Regards/Gruss,
Boris.
Signature · 2 lines
Andy Lutomirski AMA Capital Management, LLC
Borislav Petkov
maintainerQuoted 7 lines · Andy Lutomirski
Quoted 4 lines · Borislav Petkov
Ok,
here's the fix first so that it goes in. I'll hammer on the test case later.
Does the 32-bit case need FNINIT?
Pasting from IRC:
I'm thinking if you'd need to reinit the FPU, then you need to do it for both, not only 32-bit or do you mean something else? Also, if you end up doing FNSAVE (old CPU) that one reinits state.
Whatever we decide doing, this should be a separate patch anyway.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 11 lines · Borislav Petkov
Quoted 6 lines · Andy Lutomirski
Quoted 5 lines · Borislav Petkov
Ok,
here's the fix first so that it goes in. I'll hammer on the test case later.
Quoted 7 lines
Quoted 1 line
Does the 32-bit case need FNINIT?
Pasting from IRC:
I'm thinking if you'd need to reinit the FPU, then you need to do it for both, not only 32-bit or do you mean something else? Also, if you end up doing FNSAVE (old CPU) that one reinits state.
We definitely need to sanitize MXCSR for kernel fpu if kernel fpu means SSE2. If kernel fpu means x87, we need to fix the fpu control word.
On x86_64, I suspect the UEFI ABI technically requires a clean x87 control word too. If we’re willing to declare that the kernel proper won’t use x87, then we could shove that into the UEFI code.
Quoted 10 lines
Whatever we decide doing, this should be a separate patch anyway.
Thx.
Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
Borislav Petkov
maintainerQuoted 3 lines · Andy Lutomirski
We definitely need to sanitize MXCSR for kernel fpu if kernel fpu means SSE2. If kernel fpu means x87, we need to fix the fpu control word.
Bah, there's no need to beat around the bush - let's just do:
if (boot_cpu_has(X86_FEATURE_XMM))
ldmxcsr(MXCSR_DEFAULT);
if (boot_cpu_has(X86_FEATURE_FPU))
asm volatile ("fninit");and be sure that kernel users get a squeaky-clean FPU.
Quoted 3 lines
On
x86_64, I suspect the UEFI ABI technically requires a clean x87 control word too. If we’re willing to declare that the kernel proper won’t use x87, then we could shove that into the UEFI code.
Nah, we don't trust the firmware.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 14 lines · Borislav Petkov
Quoted 3 lines · Andy Lutomirski
We definitely need to sanitize MXCSR for kernel fpu if kernel fpu means SSE2. If kernel fpu means x87, we need to fix the fpu control word.
Bah, there's no need to beat around the bush - let's just do:
if (boot_cpu_has(X86_FEATURE_XMM)) ldmxcsr(MXCSR_DEFAULT); if (boot_cpu_has(X86_FEATURE_FPU)) asm volatile ("fninit");
Quoted 7 lines
and be sure that kernel users get a squeaky-clean FPU.
Quoted 3 lines
On
x86_64, I suspect the UEFI ABI technically requires a clean x87 control word too. If we’re willing to declare that the kernel proper won’t use x87, then we could shove that into the UEFI code.Nah, we don't trust the firmware.
What I mean is: if we trust ourselves to have no x87 instructions in the kernel, we could put the FNINIT in the UEFI stubs to save some cycles. I don't know how slow FNINIT is.
Quoted 6 lines
--
Regards/Gruss,
Boris.
Signature · 2 lines
Andy Lutomirski AMA Capital Management, LLC