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

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

atomics/treewide: Make atomic64_fetch_add_unless() optional 



Architectures with atomic64_fetch_add_unless() provide a preprocessor
symbol if they do so, and all other architectures have trivial C
implementations of atomic64_add_unless() which are near-identical.

Let's unify the trivial definitions of atomic64_fetch_add_unless() in
<linux/atomic.h>, so that we always have both
atomic64_fetch_add_unless() and atomic64_add_unless() with less
boilerplate code.

This means that atomic64_add_unless() is always implemented in core
code, and 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>
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-15-mark.rutland@arm.com


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

arch/arm64/include/asm/atomic.h

+0 −12
Original line number Diff line number Diff line
@@ -40,17 +40,6 @@ 


#include <asm/cmpxchg.h>



#define ___atomic_add_unless(v, a, u, sfx)				\

({									\

	typeof((v)->counter) c, old;					\

									\

	c = atomic##sfx##_read(v);					\

	while (c != (u) &&						\

	      (old = atomic##sfx##_cmpxchg((v), c, c + (a))) != c)	\

		c = old;						\

	c;								\

 })



#define ATOMIC_INIT(i)	{ (i) }



#define atomic_read(v)			READ_ONCE((v)->counter)
@@ -200,7 +189,6 @@ 
#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_add_unless(v, a, u)	(___atomic_add_unless(v, a, u, 64) != u)

#define atomic64_andnot			atomic64_andnot



#endif

arch/ia64/include/asm/atomic.h

+0 −15
Original line number Diff line number Diff line
@@ -215,21 +215,6 @@ ATOMIC64_FETCH_OP(xor, ^) 
	(cmpxchg(&((v)->counter), old, new))

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



static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)

{

	long c, old;

	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic64_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



static __inline__ long atomic64_dec_if_positive(atomic64_t *v)

{

	long c, old, dec;

arch/mips/include/asm/atomic.h

+0 −24
Original line number Diff line number Diff line
@@ -596,30 +596,6 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
	((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))

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



/**

 * atomic64_add_unless - add unless the number is a given value

 * @v: pointer of type atomic64_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as it was not @u.

 * Returns true iff @v was not @u.

 */

static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)

{

	long c, old;

	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic64_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



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

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

arch/parisc/include/asm/atomic.h

+0 −24
Original line number Diff line number Diff line
@@ -257,30 +257,6 @@ atomic64_read(const atomic64_t *v) 
	((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))

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



/**

 * atomic64_add_unless - add unless the number is a given value

 * @v: pointer of type atomic64_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as it was not @u.

 * Returns the old value of @v.

 */

static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)

{

	long c, old;

	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == (u)))

			break;

		old = atomic64_cmpxchg((v), c, c + (a));

		if (likely(old == c))

			break;

		c = old;

	}

	return c != (u);

}



/*

 * atomic64_dec_if_positive - decrement by 1 if old value positive

 * @v: pointer of type atomic_t

arch/s390/include/asm/atomic.h

+0 −16
Original line number Diff line number Diff line
@@ -153,22 +153,6 @@ ATOMIC64_OPS(xor) 


#undef ATOMIC64_OPS



static inline int atomic64_add_unless(atomic64_t *v, long i, long u)

{

	long c, old;



	c = atomic64_read(v);

	for (;;) {

		if (unlikely(c == u))

			break;

		old = atomic64_cmpxchg(v, c, c + i);

		if (likely(old == c))

			break;

		c = old;

	}

	return c != u;

}



static inline long atomic64_dec_if_positive(atomic64_t *v)

{

	long c, old, dec;