Skip to contentSkip to conversation

x86/fpu: make WARN_ON_FPU get fully optimized out

PATCH In review Eric Biggers 1 participant 2 messages Jan 27, 2025 – Feb 10, 2025 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/fpu: make WARN_ON_FPU get fully optimized out

From: Eric Biggers <[email protected]>

Currently WARN_ON_FPU evaluates its argument even if CONFIG_X86_DEBUG_FPU is disabled, which adds unnecessary instructions to several functions, for example kernel_fpu_begin(). Fix this by using BUILD_BUG_ON_INVALID(x) in the no-debug case rather than (void)(x).

Fixes 83242c515881 ("x86/fpu: Make WARN_ON_FPU() more robust in the !CONFIG_X86_DEBUG_FPU case")

---

v2: use BUILD_BUG_ON_INVALID() as suggested by Sean Christopherson.

 arch/x86/kernel/fpu/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/fpu/internal.h +1 -1
index dbdb31f55fc7f..975de070c9c98 100644
@@ -16,11 +16,11 @@ static __always_inline __pure bool use_fxsr(void)
 }
 
 #ifdef CONFIG_X86_DEBUG_FPU
 # define WARN_ON_FPU(x) WARN_ON_ONCE(x)
 #else
-# define WARN_ON_FPU(x) ({ (void)(x); 0; })
+# define WARN_ON_FPU(x) ({ BUILD_BUG_ON_INVALID(x); 0; })
 #endif
 
 /* Used in init.c */
 extern void fpstate_init_user(struct fpstate *fpstate);
 extern void fpstate_reset(struct fpu *fpu);

base-commit: 805ba04cb7ccfc7d72e834ebd796e043142156ba

Signature · 1 line
2.48.1
#1 lore raw
Quoted 10 lines · Eric Biggers

From: Eric Biggers <[email protected]>

Currently WARN_ON_FPU evaluates its argument even if CONFIG_X86_DEBUG_FPU is disabled, which adds unnecessary instructions to several functions, for example kernel_fpu_begin(). Fix this by using BUILD_BUG_ON_INVALID(x) in the no-debug case rather than (void)(x).

Fixes 83242c515881 ("x86/fpu: Make WARN_ON_FPU() more robust in the !CONFIG_X86_DEBUG_FPU case")
Quoted 6 lines

---

v2: use BUILD_BUG_ON_INVALID() as suggested by Sean Christopherson.

 arch/x86/kernel/fpu/internal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Ping. Any interest in taking this through the x86 tree?

- Eric