Commit 9837559d authored by Mark Rutland's avatar Mark Rutland Committed by Ingo Molnar
Browse files

atomics/treewide: Make unconditional inc/dec ops optional 



Many of the inc/dec ops are mandatory, but for most architectures inc/dec are
simply trivial wrappers around their corresponding add/sub ops.

Let's make all the inc/dec ops optional, so that we can get rid of these
boilerplate wrappers.

The instrumented atomics are updated accordingly.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20180621121321.4761-17-mark.rutland@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 18cc1814

arch/alpha/include/asm/atomic.h

+0 −12
Original line number Diff line number Diff line
@@ -297,16 +297,4 @@ static inline long atomic64_dec_if_positive(atomic64_t *v) 
	return old - 1;

}



#define atomic_dec_return(v) atomic_sub_return(1,(v))

#define atomic64_dec_return(v) atomic64_sub_return(1,(v))



#define atomic_inc_return(v) atomic_add_return(1,(v))

#define atomic64_inc_return(v) atomic64_add_return(1,(v))



#define atomic_inc(v) atomic_add(1,(v))

#define atomic64_inc(v) atomic64_add(1,(v))



#define atomic_dec(v) atomic_sub(1,(v))

#define atomic64_dec(v) atomic64_sub(1,(v))



#endif /* _ALPHA_ATOMIC_H */

arch/arc/include/asm/atomic.h

+0 −11
Original line number Diff line number Diff line
@@ -308,12 +308,6 @@ ATOMIC_OPS(xor, ^=, CTOP_INST_AXOR_DI_R2_R2_R3) 
#undef ATOMIC_OP_RETURN

#undef ATOMIC_OP



#define atomic_inc(v)			atomic_add(1, v)

#define atomic_dec(v)			atomic_sub(1, v)



#define atomic_inc_return(v)		atomic_add_return(1, (v))

#define atomic_dec_return(v)		atomic_sub_return(1, (v))



#ifdef CONFIG_GENERIC_ATOMIC64



#include <asm-generic/atomic64.h>
@@ -560,11 +554,6 @@ static inline long long atomic64_fetch_add_unless(atomic64_t *v, long long a, 
}

#define atomic64_fetch_add_unless atomic64_fetch_add_unless



#define atomic64_inc(v)			atomic64_add(1LL, (v))

#define atomic64_inc_return(v)		atomic64_add_return(1LL, (v))

#define atomic64_dec(v)			atomic64_sub(1LL, (v))

#define atomic64_dec_return(v)		atomic64_sub_return(1LL, (v))



#endif	/* !CONFIG_GENERIC_ATOMIC64 */



#endif	/* !__ASSEMBLY__ */

arch/arm/include/asm/atomic.h

+0 −11
Original line number Diff line number Diff line
@@ -245,12 +245,6 @@ ATOMIC_OPS(xor, ^=, eor) 


#define atomic_xchg(v, new) (xchg(&((v)->counter), new))



#define atomic_inc(v)		atomic_add(1, v)

#define atomic_dec(v)		atomic_sub(1, v)



#define atomic_inc_return_relaxed(v)    (atomic_add_return_relaxed(1, v))

#define atomic_dec_return_relaxed(v)    (atomic_sub_return_relaxed(1, v))



#ifndef CONFIG_GENERIC_ATOMIC64

typedef struct {

	long long counter;
@@ -512,11 +506,6 @@ static inline long long atomic64_fetch_add_unless(atomic64_t *v, long long a, 
}

#define atomic64_fetch_add_unless atomic64_fetch_add_unless



#define atomic64_inc(v)			atomic64_add(1LL, (v))

#define atomic64_inc_return_relaxed(v)	atomic64_add_return_relaxed(1LL, (v))

#define atomic64_dec(v)			atomic64_sub(1LL, (v))

#define atomic64_dec_return_relaxed(v)	atomic64_sub_return_relaxed(1LL, (v))



#endif /* !CONFIG_GENERIC_ATOMIC64 */

#endif

#endif

arch/arm64/include/asm/atomic.h

+0 −24
Original line number Diff line number Diff line
@@ -50,21 +50,11 @@ 
#define atomic_add_return_release	atomic_add_return_release

#define atomic_add_return		atomic_add_return



#define atomic_inc_return_relaxed(v)	atomic_add_return_relaxed(1, (v))

#define atomic_inc_return_acquire(v)	atomic_add_return_acquire(1, (v))

#define atomic_inc_return_release(v)	atomic_add_return_release(1, (v))

#define atomic_inc_return(v)		atomic_add_return(1, (v))



#define atomic_sub_return_relaxed	atomic_sub_return_relaxed

#define atomic_sub_return_acquire	atomic_sub_return_acquire

#define atomic_sub_return_release	atomic_sub_return_release

#define atomic_sub_return		atomic_sub_return



#define atomic_dec_return_relaxed(v)	atomic_sub_return_relaxed(1, (v))

#define atomic_dec_return_acquire(v)	atomic_sub_return_acquire(1, (v))

#define atomic_dec_return_release(v)	atomic_sub_return_release(1, (v))

#define atomic_dec_return(v)		atomic_sub_return(1, (v))



#define atomic_fetch_add_relaxed	atomic_fetch_add_relaxed

#define atomic_fetch_add_acquire	atomic_fetch_add_acquire

#define atomic_fetch_add_release	atomic_fetch_add_release
@@ -108,8 +98,6 @@ 
	cmpxchg_release(&((v)->counter), (old), (new))

#define atomic_cmpxchg(v, old, new)	cmpxchg(&((v)->counter), (old), (new))



#define atomic_inc(v)			atomic_add(1, (v))

#define atomic_dec(v)			atomic_sub(1, (v))

#define atomic_andnot			atomic_andnot



/*
@@ -124,21 +112,11 @@ 
#define atomic64_add_return_release	atomic64_add_return_release

#define atomic64_add_return		atomic64_add_return



#define atomic64_inc_return_relaxed(v)	atomic64_add_return_relaxed(1, (v))

#define atomic64_inc_return_acquire(v)	atomic64_add_return_acquire(1, (v))

#define atomic64_inc_return_release(v)	atomic64_add_return_release(1, (v))

#define atomic64_inc_return(v)		atomic64_add_return(1, (v))



#define atomic64_sub_return_relaxed	atomic64_sub_return_relaxed

#define atomic64_sub_return_acquire	atomic64_sub_return_acquire

#define atomic64_sub_return_release	atomic64_sub_return_release

#define atomic64_sub_return		atomic64_sub_return



#define atomic64_dec_return_relaxed(v)	atomic64_sub_return_relaxed(1, (v))

#define atomic64_dec_return_acquire(v)	atomic64_sub_return_acquire(1, (v))

#define atomic64_dec_return_release(v)	atomic64_sub_return_release(1, (v))

#define atomic64_dec_return(v)		atomic64_sub_return(1, (v))



#define atomic64_fetch_add_relaxed	atomic64_fetch_add_relaxed

#define atomic64_fetch_add_acquire	atomic64_fetch_add_acquire

#define atomic64_fetch_add_release	atomic64_fetch_add_release
@@ -179,8 +157,6 @@ 
#define atomic64_cmpxchg_release	atomic_cmpxchg_release

#define atomic64_cmpxchg		atomic_cmpxchg



#define atomic64_inc(v)			atomic64_add(1, (v))

#define atomic64_dec(v)			atomic64_sub(1, (v))

#define atomic64_andnot			atomic64_andnot



#endif

arch/h8300/include/asm/atomic.h

+0 −7
Original line number Diff line number Diff line
@@ -69,13 +69,6 @@ ATOMIC_OPS(sub, -=) 
#undef ATOMIC_OP_RETURN

#undef ATOMIC_OP



#define atomic_inc_return(v)		atomic_add_return(1, v)

#define atomic_dec_return(v)		atomic_sub_return(1, v)



#define atomic_inc(v)			(void)atomic_inc_return(v)



#define atomic_dec(v)			(void)atomic_dec_return(v)



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

{

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE