x86/asm: use memory clobber in bitops that touch arbitrary memory
Subsystems (2)
PATCH 1/1 x86/asm: use memory clobber in bitops that touch arbitrary memory
Certain bit operations that read/write bits take a base pointer and an arbitrarily large offset to address the bit relative to that base. Inline assembly constraints aren't expressive enough to tell the compiler that the assembly directive is going to touch a specific memory location of unknown size, therefore we have to use the "memory" clobber to indicate that the assembly is going to access memory locations other than those listed in the inputs/outputs.
This particular patch leads to size increase of 124 kernel functions in a defconfig build. For some of them the diff is in NOP operations, other end up re-reading values from memory and may potentially slow down the execution. But without these clobbers the compiler is free to cache the contents of the bitmaps and use them as if they weren't changed by the inline assembly.
--- arch/x86/include/asm/bitops.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/bitops.h +7 -7
@@ -111,7 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }
@@ -131,7 +131,7 @@ static __always_inline void clear_bit_unlock(long nr, volatile unsigned long *ad static __always_inline void __clear_bit(long nr, volatile unsigned long *addr) { - asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr)); + asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr) : "memory"); } static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)
@@ -176,7 +176,7 @@ static __always_inline void __clear_bit_unlock(long nr, volatile unsigned long **/ static __always_inline void __change_bit(long nr, volatile unsigned long *addr) { - asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr)); + asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr) : "memory"); }/**
@@ -197,7 +197,7 @@ static __always_inline void change_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btc) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }
@@ -243,7 +243,7 @@ static __always_inline bool __test_and_set_bit(long nr, volatile unsigned long * asm(__ASM_SIZE(bts) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit), ADDR - : "Ir" (nr)); + : "Ir" (nr) : "memory");return oldbit; }
@@ -283,7 +283,7 @@ static __always_inline bool __test_and_clear_bit(long nr, volatile unsigned long asm volatile(__ASM_SIZE(btr) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit), ADDR - : "Ir" (nr)); + : "Ir" (nr) : "memory");return oldbit; }
@@ -326,7 +326,7 @@ static __always_inline bool variable_test_bit(long nr, volatile const unsigned l asm volatile(__ASM_SIZE(bt) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit) - : "m" (*(unsigned long *)addr), "Ir" (nr)); + : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");return oldbit; }
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
Quoted 15 lines · Alexander Potapenko
Certain bit operations that read/write bits take a base pointer and an arbitrarily large offset to address the bit relative to that base. Inline assembly constraints aren't expressive enough to tell the compiler that the assembly directive is going to touch a specific memory location of unknown size, therefore we have to use the "memory" clobber to indicate that the assembly is going to access memory locations other than those listed in the inputs/outputs.
This particular patch leads to size increase of 124 kernel functions in a defconfig build. For some of them the diff is in NOP operations, other end up re-reading values from memory and may potentially slow down the execution. But without these clobbers the compiler is free to cache the contents of the bitmaps and use them as if they weren't changed by the inline assembly.
Quoted 6 lines
Signed-off-by Alexander Potapenko <[email protected]>Cc Dmitry Vyukov <[email protected]>Cc Paul E. McKenney <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Peter Zijlstra <[email protected]>Cc James Y Knight <[email protected]>
Quoted 74 lines
--- arch/x86/include/asm/bitops.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)arch/x86/include/asm/bitops.h +7
-7@@ -111,7 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }@@ -131,7 +131,7 @@ static __always_inline void clear_bit_unlock(long nr, volatile unsigned long *ad static __always_inline void __clear_bit(long nr, volatile unsigned long *addr) { - asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr)); + asm volatile(__ASM_SIZE(btr) " %1,%0" : ADDR : "Ir" (nr) : "memory"); } static __always_inline bool clear_bit_unlock_is_negative_byte(long nr, volatile unsigned long *addr)@@ -176,7 +176,7 @@ static __always_inline void __clear_bit_unlock(long nr, volatile unsigned long **/ static __always_inline void __change_bit(long nr, volatile unsigned long *addr) { - asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr)); + asm volatile(__ASM_SIZE(btc) " %1,%0" : ADDR : "Ir" (nr) : "memory"); }/** @@ -197,7 +197,7 @@ static __always_inline void change_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btc) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }@@ -243,7 +243,7 @@ static __always_inline bool __test_and_set_bit(long nr, volatile unsigned long * asm(__ASM_SIZE(bts) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit), ADDR - : "Ir" (nr)); + : "Ir" (nr) : "memory");return oldbit; }@@ -283,7 +283,7 @@ static __always_inline bool __test_and_clear_bit(long nr, volatile unsigned long asm volatile(__ASM_SIZE(btr) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit), ADDR - : "Ir" (nr)); + : "Ir" (nr) : "memory");return oldbit; }@@ -326,7 +326,7 @@ static __always_inline bool variable_test_bit(long nr, volatile const unsigned l asm volatile(__ASM_SIZE(bt) " %2,%1" CC_SET(c) : CC_OUT(c) (oldbit) - : "m" (*(unsigned long *)addr), "Ir" (nr)); + : "m" (*(unsigned long *)addr), "Ir" (nr) : "memory");return oldbit; }Signature · 1 line
2.21.0.392.gf8f6787159e-goog
arch/x86/include/asm/bitops.h clear_bit(long nr, volatile unsigned long *addr) · line 116
Quoted 12 lines · Alexander Potapenko
arch/x86/include/asm/bitops.h +1
-1@@ -111,7 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }
clear_bit() doesn't have a return value, so why are we now still using "+m" output ?
AFAICT the only reason we did that was to clobber the variable, which you've (afaiu correctly) argued to be incorrect.
So whould we not write this as:
asm volatile (LOCK_PREFIX __ASM_SIZE(btr) " %[nr], %[addr]" : : [addr] "m" (*addr), [nr] "Ir" (nr) : "memory");
?
And the very same for _all_ other sites touched in this patch.
Quoted 4 lines · Peter Zijlstra
On Mon, Apr 01, 2019 at 06:24:08PM +0200, Alexander Potapenko wrote:
Quoted 15 lines
arch/x86/include/asm/bitops.h clear_bit(long nr, volatile unsigned long *addr) · line 116
Quoted 12 lines
arch/x86/include/asm/bitops.h +1
-1@@ -111,7 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }
clear_bit()doesn't have a return value, so why are we now still using "+m" output ?
You're right, "m" should suffice. I'll update the patch. By the way, now that we've added the memory barriers we can probably remove the barrier() call from __clear_bit_unlock() and update the comment accordingly.
For clear_bit() the memory barrier is missing on the IS_IMMEDIATE(nr) path, so this one should be kept as is.
Quoted 12 lines
AFAICT the only reason we did that was to clobber the variable, which you've (afaiu correctly) argued to be incorrect.
So whould we not write this as:
asm volatile (LOCK_PREFIX __ASM_SIZE(btr) " %[nr], %[addr]" : : [addr] "m" (*addr), [nr] "Ir" (nr) : "memory");?
And the very same for _all_ other sites touched in this patch.
Signature · 10 lines
Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
Quoted 21 lines · Alexander Potapenko
Quoted 4 lines · Peter Zijlstra
On Mon, Apr 01, 2019 at 06:24:08PM +0200, Alexander Potapenko wrote:
Quoted 15 lines
arch/x86/include/asm/bitops.h clear_bit(long nr, volatile unsigned long *addr) · line 116
Quoted 12 lines
arch/x86/include/asm/bitops.h +1
-1@@ -111,7 +111,7 @@ clear_bit(long nr, volatile unsigned long *addr) } else { asm volatile(LOCK_PREFIX __ASM_SIZE(btr) " %1,%0" : BITOP_ADDR(addr) - : "Ir" (nr)); + : "Ir" (nr) : "memory"); } }
clear_bit()doesn't have a return value, so why are we now still using "+m" output ?
Quoted 15 lines
You're right, "m" should suffice. I'll update the patch. By the way, now that we've added the memory barriers we can probably remove the
barrier()call from__clear_bit_unlock()and update the comment accordingly.
Forclear_bit()the memory barrier is missing on theIS_IMMEDIATE(nr)path, so this one should be kept as is.Quoted 8 lines
AFAICT the only reason we did that was to clobber the variable, which you've (afaiu correctly) argued to be incorrect.
So whould we not write this as:
asm volatile (LOCK_PREFIX __ASM_SIZE(btr) " %[nr], %[addr]" : : [addr] "m" (*addr), [nr] "Ir" (nr) : "memory");
Updated the patch.
I took the liberty of not adding the symbolic names to reduce the diff. If you think that's necessary I can do that in a separate patch.
Quoted 17 lines
Quoted 3 lines
?
And the very same for _all_ other sites touched in this patch.
--
Alexander Potapenko
Software EngineerGoogle Germany GmbH
Erika-Mann-Straße, 33
80636 MünchenGeschäftsführer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
Signature · 10 lines
Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Straße, 33 80636 München Geschäftsführer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg