Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cc1814 authored by Mark Rutland's avatar Mark Rutland Committed by Ingo Molnar
Browse files

atomics/treewide: Make test ops optional 



Some of the atomics return the result of a test applied after the atomic
operation, and almost all architectures implement these as trivial
wrappers around the underlying atomic. Specifically:

 * <atomic>_inc_and_test(v)    is (<atomic>_inc_return(v)    == 0)
 * <atomic>_dec_and_test(v)    is (<atomic>_dec_return(v)    == 0)
 * <atomic>_sub_and_test(i, v) is (<atomic>_sub_return(i, v) == 0)
 * <atomic>_add_negative(i, v) is (<atomic>_add_return(i, v)  < 0)

Rather than have these definitions duplicated in all architectures, with
minor inconsistencies in formatting and documentation, let's make these
operations optional, with default fallbacks as above. Implementations
must now provide a preprocessor symbol.

The instrumented atomics are updated accordingly.

Both x86 and m68k have custom implementations, which are left as-is,
given preprocessor symbols to avoid being overridden.

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 avatarGeert Uytterhoeven <geert@linux-m68k.org>
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-16-mark.rutland@arm.com


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

arch/alpha/include/asm/atomic.h

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

}



#define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)

#define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)



#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_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0)

#define atomic64_sub_and_test(i,v) (atomic64_sub_return((i), (v)) == 0)



#define atomic_inc_and_test(v) (atomic_add_return(1, (v)) == 0)

#define atomic64_inc_and_test(v) (atomic64_add_return(1, (v)) == 0)



#define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0)

#define atomic64_dec_and_test(v) (atomic64_sub_return(1, (v)) == 0)



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

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

arch/arc/include/asm/atomic.h

+0 −10
Original line number Diff line number Diff line
@@ -311,14 +311,8 @@ ATOMIC_OPS(xor, ^=, CTOP_INST_AXOR_DI_R2_R2_R3) 
#define atomic_inc(v)			atomic_add(1, v)

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



#define atomic_inc_and_test(v)		(atomic_add_return(1, v) == 0)

#define atomic_dec_and_test(v)		(atomic_sub_return(1, v) == 0)

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

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

#define atomic_sub_and_test(i, v)	(atomic_sub_return(i, v) == 0)



#define atomic_add_negative(i, v)	(atomic_add_return(i, v) < 0)





#ifdef CONFIG_GENERIC_ATOMIC64
@@ -566,14 +560,10 @@ 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_add_negative(a, v)	(atomic64_add_return((a), (v)) < 0)

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

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

#define atomic64_inc_and_test(v)	(atomic64_inc_return(v) == 0)

#define atomic64_sub_and_test(a, v)	(atomic64_sub_return((a), (v)) == 0)

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

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

#define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)



#endif	/* !CONFIG_GENERIC_ATOMIC64 */

arch/arm/include/asm/atomic.h

+0 −9
Original line number Diff line number Diff line
@@ -248,13 +248,8 @@ ATOMIC_OPS(xor, ^=, eor) 
#define atomic_inc(v)		atomic_add(1, v)

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



#define atomic_inc_and_test(v)	(atomic_add_return(1, v) == 0)

#define atomic_dec_and_test(v)	(atomic_sub_return(1, v) == 0)

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

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

#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)



#define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0)



#ifndef CONFIG_GENERIC_ATOMIC64

typedef struct {
@@ -517,14 +512,10 @@ 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_add_negative(a, v)	(atomic64_add_return((a), (v)) < 0)

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

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

#define atomic64_inc_and_test(v)	(atomic64_inc_return(v) == 0)

#define atomic64_sub_and_test(a, v)	(atomic64_sub_return((a), (v)) == 0)

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

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

#define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)



#endif /* !CONFIG_GENERIC_ATOMIC64 */

#endif

arch/arm64/include/asm/atomic.h

+0 −8
Original line number Diff line number Diff line
@@ -110,10 +110,6 @@ 


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

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

#define atomic_inc_and_test(v)		(atomic_inc_return(v) == 0)

#define atomic_dec_and_test(v)		(atomic_dec_return(v) == 0)

#define atomic_sub_and_test(i, v)	(atomic_sub_return((i), (v)) == 0)

#define atomic_add_negative(i, v)	(atomic_add_return((i), (v)) < 0)

#define atomic_andnot			atomic_andnot



/*
@@ -185,10 +181,6 @@ 


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

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

#define atomic64_inc_and_test(v)	(atomic64_inc_return(v) == 0)

#define atomic64_dec_and_test(v)	(atomic64_dec_return(v) == 0)

#define atomic64_sub_and_test(i, v)	(atomic64_sub_return((i), (v)) == 0)

#define atomic64_add_negative(i, v)	(atomic64_add_return((i), (v)) < 0)

#define atomic64_andnot			atomic64_andnot



#endif

arch/h8300/include/asm/atomic.h

+0 −5
Original line number Diff line number Diff line
@@ -69,17 +69,12 @@ ATOMIC_OPS(sub, -=) 
#undef ATOMIC_OP_RETURN

#undef ATOMIC_OP



#define atomic_add_negative(a, v)	(atomic_add_return((a), (v)) < 0)

#define atomic_sub_and_test(i, v)	(atomic_sub_return(i, v) == 0)



#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_inc_and_test(v)		(atomic_inc_return(v) == 0)



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

#define atomic_dec_and_test(v)		(atomic_dec_return(v) == 0)



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

{