]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/asm: Use asm_inline() instead of asm() in clwb()
authorUros Bizjak <ubizjak@gmail.com>
Thu, 13 Mar 2025 10:26:56 +0000 (11:26 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 19 Mar 2025 10:26:58 +0000 (11:26 +0100)
Use asm_inline() to instruct the compiler that the size of asm()
is the minimum size of one instruction, ignoring how many instructions
the compiler thinks it is. ALTERNATIVE macro that expands to several
pseudo directives causes instruction length estimate to count
more than 20 instructions.

bloat-o-meter reports slight increase of the code size
for x86_64 defconfig object file, compiled with gcc-14.2:

  add/remove: 0/2 grow/shrink: 3/0 up/down: 190/-59 (131)

  Function                                     old     new   delta
  __copy_user_flushcache                       166     247     +81
  __memcpy_flushcache                          369     437     +68
  arch_wb_cache_pmem                             6      47     +41
  __pfx_clean_cache_range                       16       -     -16
  clean_cache_range                             43       -     -43

  Total: Before=22807167, After=22807298, chg +0.00%

The compiler now inlines and removes the clean_cache_range() function.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/r/20250313102715.333142-2-ubizjak@gmail.com
arch/x86/include/asm/special_insns.h

index 9b10bd102d3d8aa333e98ecea77f112d2c61fd33..6266d6b9e0b8c0ba9a218828e0cf72c1ffda3c26 100644 (file)
@@ -185,7 +185,7 @@ static inline void clwb(volatile void *__p)
 {
        volatile struct { char x[64]; } *p = __p;
 
-       asm volatile(ALTERNATIVE_2(
+       asm_inline volatile(ALTERNATIVE_2(
                "ds clflush %0",
                "clflushopt %0", X86_FEATURE_CLFLUSHOPT,
                "clwb %0", X86_FEATURE_CLWB)