Fix the x86 specializations of atomic_[set|clear]_mask
Subsystems (2)
PATCH 1/1 Fix the x86 specializations of atomic_[set|clear]_mask
This patch fixes a number of issues with these specializations:
1. The memory operand inside the asm specification is erroneously declared read-only instead of read-write.
2. There is no reason to require the 1st operand of andl/orl to be inside a register; the 1st operand could also be an immediate operand. So change its specification from "r" to "ir".
3. Since addr is supposed to be an atomic_t *, the memory operand should be addr->counter and not *addr.
4. These specializations should be inline functions instead of macros.
5. Finally, the "memory" clobbers are unnecessary, so they should be removed. (This is in line with the other atomic functions such as atomic_add and atomic_sub, the likes of which do not have a "memory" clobber.)
--- arch/x86/include/asm/atomic.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/x86/include/asm/atomic.h +12 -8
@@ -219,15 +219,19 @@ static inline short int atomic_inc_short(short int *v)return *v; } -/* These are x86-specific, used by some header files */ -#define atomic_clear_mask (mask, addr) \ - asm volatile(LOCK_PREFIX "andl %0,%1" \ - : : "r" (~(mask)), "m" (*(addr)) : "memory") +static inline void atomic_clear_mask (int mask,atomic_t *v) +{ + asmvolatile (LOCK_PREFIX "andl %1, %0" + :"+m" (v->counter) + :"ir" (~mask)); +} -#define atomic_set_mask (mask, addr) \ - asm volatile(LOCK_PREFIX "orl %0,%1" \ - : : "r" ((unsigned)(mask)), "m" (*(addr)) \ - : "memory") +static inline void atomic_set_mask (int mask,atomic_t *v) +{ + asmvolatile (LOCK_PREFIX "orl %1, %0" + :"+m" (v->counter) + :"ir" (mask)); +}#ifdef CONFIG_X86_32 # include <asm/atomic64_32.h>
Signature · 1 line
2.1.2.443.g670a3c1
Peter Zijlstra
maintainerQuoted 12 lines · Patrick Palka
This patch fixes a number of issues with these specializations:
1. The memory operand inside the asm specification is erroneously declared read-only instead of read-write.
2. There is no reason to require the 1st operand of andl/orl to be inside a register; the 1st operand could also be an immediate operand. So change its specification from "r" to "ir".
3. Since addr is supposed to be an
atomic_t*, the memory operand should beaddr->counterand not *addr.
Quoted 6 lines
4. These specializations should be inline functions instead of macros.
5. Finally, the "memory" clobbers are unnecessary, so they should be removed. (This is in line with the other atomic functions such as
atomic_addandatomic_sub, the likes of which do not have a "memory" clobber.)
No real problem with this, but I'm going to kill off these functions when I get a little time :)
A message that is not in the archive (sent off-list or not yet received): CA+C-WL-EKxA-oZ815vG9jau76BwQvAuL5WiuE-YvddgWPzt-Ew@mail.gmail.com
Peter Zijlstra
maintainerQuoted 22 lines · Patrick Palka
Quoted 21 lines · Peter Zijlstra
Quoted 18 lines · Patrick Palka
This patch fixes a number of issues with these specializations:
1. The memory operand inside the asm specification is erroneously declared read-only instead of read-write.
2. There is no reason to require the 1st operand of andl/orl to be inside a register; the 1st operand could also be an immediate operand. So change its specification from "r" to "ir".
3. Since addr is supposed to be an
atomic_t*, the memory operand should beaddr->counterand not *addr.4. These specializations should be inline functions instead of macros.
5. Finally, the "memory" clobbers are unnecessary, so they should be removed. (This is in line with the other atomic functions such as
atomic_addandatomic_sub, the likes of which do not have a "memory" clobber.)
Quoted 4 lines
Quoted 2 lines
No real problem with this, but I'm going to kill off these functions when I get a little time :)
Hmm why's that?
because they're odd (inconsistent with the rest of the atomic interfaces) and not implemented by all archs.
See: https://lkml.org/lkml/2014/2/6/196
3.18 will include up to 4/5 of that series and when I get a spare moment I need cleanup/post the next arch sweep that will get us that 5/5 thing.
Quoted 28 lines · Peter Zijlstra
Quoted 22 lines · Patrick Palka
Quoted 21 lines · Peter Zijlstra
Quoted 18 lines · Patrick Palka
This patch fixes a number of issues with these specializations:
1. The memory operand inside the asm specification is erroneously declared read-only instead of read-write.
2. There is no reason to require the 1st operand of andl/orl to be inside a register; the 1st operand could also be an immediate operand. So change its specification from "r" to "ir".
3. Since addr is supposed to be an
atomic_t*, the memory operand should beaddr->counterand not *addr.4. These specializations should be inline functions instead of macros.
5. Finally, the "memory" clobbers are unnecessary, so they should be removed. (This is in line with the other atomic functions such as
atomic_addandatomic_sub, the likes of which do not have a "memory" clobber.)Quoted 4 lines
Quoted 2 lines
No real problem with this, but I'm going to kill off these functions when I get a little time :)
Hmm why's that?
Quoted 9 lines
because they're odd (inconsistent with the rest of the atomic interfaces) and not implemented by all archs.
See: https://lkml.org/lkml/2014/2/6/196
3.18 will include up to 4/5 of that series and when I get a spare moment I need cleanup/post the next arch sweep that will get us that 5/5 thing.
Cool! Perhaps atomic_inc_short() should be killed off too. It currently has no callers and, despite what its name suggests, it is not even atomic..