On Sat, Jun 17, 2017 at 11:15:29AM +0200, Dmitry Vyukov wrote: > The new header allows to wrap per-arch atomic operations > and add common functionality to all of them. > > Signed-off-by: Dmitry Vyukov <dvyu...@google.com> > Cc: Mark Rutland <mark.rutl...@arm.com> > Cc: Peter Zijlstra <pet...@infradead.org> > Cc: Will Deacon <will.dea...@arm.com> > Cc: Andrew Morton <a...@linux-foundation.org> > Cc: Andrey Ryabinin <aryabi...@virtuozzo.com> > Cc: Ingo Molnar <mi...@redhat.com> > Cc: kasan-...@googlegroups.com > Cc: linux...@kvack.org > Cc: linux-kernel@vger.kernel.org > Cc: x...@kernel.org
Looks sane to me, and I can see how this can be extended to cover all the ordering vairants arm64 will require. I've pushed my WIP [1]. FWIW: Acked-by: Mark Rutland <mark.rutl...@arm.com> Mark. [1] https://git.kernel.org/pub/scm/linux/kernel/git/mark/linux.git/log/?h=arm64/kasan-atomic > --- > include/asm-generic/atomic-instrumented.h | 316 > ++++++++++++++++++++++++++++++ > 1 file changed, 316 insertions(+) > > diff --git a/include/asm-generic/atomic-instrumented.h > b/include/asm-generic/atomic-instrumented.h > new file mode 100644 > index 000000000000..50401d925290 > --- /dev/null > +++ b/include/asm-generic/atomic-instrumented.h > @@ -0,0 +1,316 @@ > +#ifndef _LINUX_ATOMIC_INSTRUMENTED_H > +#define _LINUX_ATOMIC_INSTRUMENTED_H > + > +static __always_inline int atomic_read(const atomic_t *v) > +{ > + return arch_atomic_read(v); > +} > + > +static __always_inline s64 atomic64_read(const atomic64_t *v) > +{ > + return arch_atomic64_read(v); > +} > + > +static __always_inline void atomic_set(atomic_t *v, int i) > +{ > + arch_atomic_set(v, i); > +} > + > +static __always_inline void atomic64_set(atomic64_t *v, s64 i) > +{ > + arch_atomic64_set(v, i); > +} > + > +static __always_inline int atomic_xchg(atomic_t *v, int i) > +{ > + return arch_atomic_xchg(v, i); > +} > + > +static __always_inline s64 atomic64_xchg(atomic64_t *v, s64 i) > +{ > + return arch_atomic64_xchg(v, i); > +} > + > +static __always_inline int atomic_cmpxchg(atomic_t *v, int old, int new) > +{ > + return arch_atomic_cmpxchg(v, old, new); > +} > + > +static __always_inline s64 atomic64_cmpxchg(atomic64_t *v, s64 old, s64 new) > +{ > + return arch_atomic64_cmpxchg(v, old, new); > +} > + > +#ifdef arch_atomic_try_cmpxchg > +#define atomic_try_cmpxchg atomic_try_cmpxchg > +static __always_inline bool atomic_try_cmpxchg(atomic_t *v, int *old, int > new) > +{ > + return arch_atomic_try_cmpxchg(v, old, new); > +} > +#endif > + > +#ifdef arch_atomic64_try_cmpxchg > +#define atomic64_try_cmpxchg atomic64_try_cmpxchg > +static __always_inline bool atomic64_try_cmpxchg(atomic64_t *v, s64 *old, > s64 new) > +{ > + return arch_atomic64_try_cmpxchg(v, old, new); > +} > +#endif > + > +static __always_inline int __atomic_add_unless(atomic_t *v, int a, int u) > +{ > + return __arch_atomic_add_unless(v, a, u); > +} > + > + > +static __always_inline bool atomic64_add_unless(atomic64_t *v, s64 a, s64 u) > +{ > + return arch_atomic64_add_unless(v, a, u); > +} > + > +static __always_inline void atomic_inc(atomic_t *v) > +{ > + arch_atomic_inc(v); > +} > + > +static __always_inline void atomic64_inc(atomic64_t *v) > +{ > + arch_atomic64_inc(v); > +} > + > +static __always_inline void atomic_dec(atomic_t *v) > +{ > + arch_atomic_dec(v); > +} > + > +static __always_inline void atomic64_dec(atomic64_t *v) > +{ > + arch_atomic64_dec(v); > +} > + > +static __always_inline void atomic_add(int i, atomic_t *v) > +{ > + arch_atomic_add(i, v); > +} > + > +static __always_inline void atomic64_add(s64 i, atomic64_t *v) > +{ > + arch_atomic64_add(i, v); > +} > + > +static __always_inline void atomic_sub(int i, atomic_t *v) > +{ > + arch_atomic_sub(i, v); > +} > + > +static __always_inline void atomic64_sub(s64 i, atomic64_t *v) > +{ > + arch_atomic64_sub(i, v); > +} > + > +static __always_inline void atomic_and(int i, atomic_t *v) > +{ > + arch_atomic_and(i, v); > +} > + > +static __always_inline void atomic64_and(s64 i, atomic64_t *v) > +{ > + arch_atomic64_and(i, v); > +} > + > +static __always_inline void atomic_or(int i, atomic_t *v) > +{ > + arch_atomic_or(i, v); > +} > + > +static __always_inline void atomic64_or(s64 i, atomic64_t *v) > +{ > + arch_atomic64_or(i, v); > +} > + > +static __always_inline void atomic_xor(int i, atomic_t *v) > +{ > + arch_atomic_xor(i, v); > +} > + > +static __always_inline void atomic64_xor(s64 i, atomic64_t *v) > +{ > + arch_atomic64_xor(i, v); > +} > + > +static __always_inline int atomic_inc_return(atomic_t *v) > +{ > + return arch_atomic_inc_return(v); > +} > + > +static __always_inline s64 atomic64_inc_return(atomic64_t *v) > +{ > + return arch_atomic64_inc_return(v); > +} > + > +static __always_inline int atomic_dec_return(atomic_t *v) > +{ > + return arch_atomic_dec_return(v); > +} > + > +static __always_inline s64 atomic64_dec_return(atomic64_t *v) > +{ > + return arch_atomic64_dec_return(v); > +} > + > +static __always_inline s64 atomic64_inc_not_zero(atomic64_t *v) > +{ > + return arch_atomic64_inc_not_zero(v); > +} > + > +static __always_inline s64 atomic64_dec_if_positive(atomic64_t *v) > +{ > + return arch_atomic64_dec_if_positive(v); > +} > + > +static __always_inline bool atomic_dec_and_test(atomic_t *v) > +{ > + return arch_atomic_dec_and_test(v); > +} > + > +static __always_inline bool atomic64_dec_and_test(atomic64_t *v) > +{ > + return arch_atomic64_dec_and_test(v); > +} > + > +static __always_inline bool atomic_inc_and_test(atomic_t *v) > +{ > + return arch_atomic_inc_and_test(v); > +} > + > +static __always_inline bool atomic64_inc_and_test(atomic64_t *v) > +{ > + return arch_atomic64_inc_and_test(v); > +} > + > +static __always_inline int atomic_add_return(int i, atomic_t *v) > +{ > + return arch_atomic_add_return(i, v); > +} > + > +static __always_inline s64 atomic64_add_return(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_add_return(i, v); > +} > + > +static __always_inline int atomic_sub_return(int i, atomic_t *v) > +{ > + return arch_atomic_sub_return(i, v); > +} > + > +static __always_inline s64 atomic64_sub_return(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_sub_return(i, v); > +} > + > +static __always_inline int atomic_fetch_add(int i, atomic_t *v) > +{ > + return arch_atomic_fetch_add(i, v); > +} > + > +static __always_inline s64 atomic64_fetch_add(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_fetch_add(i, v); > +} > + > +static __always_inline int atomic_fetch_sub(int i, atomic_t *v) > +{ > + return arch_atomic_fetch_sub(i, v); > +} > + > +static __always_inline s64 atomic64_fetch_sub(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_fetch_sub(i, v); > +} > + > +static __always_inline int atomic_fetch_and(int i, atomic_t *v) > +{ > + return arch_atomic_fetch_and(i, v); > +} > + > +static __always_inline s64 atomic64_fetch_and(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_fetch_and(i, v); > +} > + > +static __always_inline int atomic_fetch_or(int i, atomic_t *v) > +{ > + return arch_atomic_fetch_or(i, v); > +} > + > +static __always_inline s64 atomic64_fetch_or(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_fetch_or(i, v); > +} > + > +static __always_inline int atomic_fetch_xor(int i, atomic_t *v) > +{ > + return arch_atomic_fetch_xor(i, v); > +} > + > +static __always_inline s64 atomic64_fetch_xor(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_fetch_xor(i, v); > +} > + > +static __always_inline bool atomic_sub_and_test(int i, atomic_t *v) > +{ > + return arch_atomic_sub_and_test(i, v); > +} > + > +static __always_inline bool atomic64_sub_and_test(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_sub_and_test(i, v); > +} > + > +static __always_inline bool atomic_add_negative(int i, atomic_t *v) > +{ > + return arch_atomic_add_negative(i, v); > +} > + > +static __always_inline bool atomic64_add_negative(s64 i, atomic64_t *v) > +{ > + return arch_atomic64_add_negative(i, v); > +} > + > +#define cmpxchg(ptr, old, new) \ > +({ \ > + arch_cmpxchg((ptr), (old), (new)); \ > +}) > + > +#define sync_cmpxchg(ptr, old, new) \ > +({ \ > + arch_sync_cmpxchg((ptr), (old), (new)); \ > +}) > + > +#define cmpxchg_local(ptr, old, new) \ > +({ \ > + arch_cmpxchg_local((ptr), (old), (new)); \ > +}) > + > +#define cmpxchg64(ptr, old, new) \ > +({ \ > + arch_cmpxchg64((ptr), (old), (new)); \ > +}) > + > +#define cmpxchg64_local(ptr, old, new) \ > +({ \ > + arch_cmpxchg64_local((ptr), (old), (new)); \ > +}) > + > +#define cmpxchg_double(p1, p2, o1, o2, n1, n2) > \ > +({ \ > + arch_cmpxchg_double((p1), (p2), (o1), (o2), (n1), (n2)); \ > +}) > + > +#define cmpxchg_double_local(p1, p2, o1, o2, n1, n2) \ > +({ \ > + arch_cmpxchg_double_local((p1), (p2), (o1), (o2), (n1), (n2)); \ > +}) > + > +#endif /* _LINUX_ATOMIC_INSTRUMENTED_H */ > -- > 2.13.1.518.g3df882009-goog >
