Commit cede8841 authored Feb 25, 2015 by Sebastian Andrzej Siewior Committed by Thomas Gleixner May 13, 2015

locking/rtmutex: Drop usage of __HAVE_ARCH_CMPXCHG



The rtmutex code is the only user of __HAVE_ARCH_CMPXCHG and we have a few
other user of cmpxchg() which do not care about __HAVE_ARCH_CMPXCHG. This
define was first introduced in 23f78d4a ("[PATCH] pi-futex: rt mutex core")
which is v2.6.18. The generic cmpxchg was introduced later in 068fbad2
("Add cmpxchg_local to asm-generic for per cpu atomic operations") which is
v2.6.25.
Back then something was required to get rtmutex working with the fast
path on architectures without cmpxchg and this seems to be the result.

It popped up recently on rt-users because ARM (v6+) does not define
__HAVE_ARCH_CMPXCHG (even that it implements it) which results in slower
locking performance in the fast path.
To put some numbers on it: preempt -RT, am335x, 10 loops of
100000 invocations of rt_spin_lock() + rt_spin_unlock() (time "total" is
the average of the 10 loops for the 100000 invocations, "loop" is
"total / 100000 * 1000"):

     cmpxchg |    slowpath used  ||    cmpxchg used
             |   total   | loop  ||   total    | loop
     --------|-----------|-------||------------|-------
     ARMv6   | 9129.4 us | 91 ns ||  3311.9 us |  33 ns
     generic | 9360.2 us | 94 ns || 10834.6 us | 108 ns
     ----------------------------||--------------------

Forcing it to generic cmpxchg() made things worse for the slowpath and
even worse in cmpxchg() path. It boils down to 14ns more per lock+unlock
in a cache hot loop so it might not be that much in real world.
The last test was a substitute for pre ARMv6 machine but then I was able
to perform the comparison on imx28 which is ARMv5 and therefore is
always is using the generic cmpxchg implementation. And the numbers:

              |   total     | loop
     -------- |-----------  |--------
     slowpath | 263937.2 us | 2639 ns
     cmpxchg  |  16934.2 us |  169 ns
     --------------------------------

The numbers are larger since the machine is slower in general. However,
letting rtmutex use cmpxchg() instead the slowpath seem to improve things.

Since from the ARM (tested on am335x + imx28) point of view always
using cmpxchg() in rt_mutex_lock() + rt_mutex_unlock() makes sense I
would drop the define.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: will.deacon@arm.com
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20150225175613.GE6823@linutronix.de


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent c7114b4e

include/asm-generic/cmpxchg.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -86,9 +86,6 @@ unsigned long __xchg(unsigned long x, volatile void *ptr, int size)

		/*
		* Atomic compare and exchange.
		*
		* Do not define __HAVE_ARCH_CMPXCHG because we want to use it to check whether
		* a cmpxchg primitive faster than repeated local irq save/restore exists.
		*/
		#include <asm-generic/cmpxchg-local.h>

kernel/locking/rtmutex.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -70,10 +70,10 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
		}

		/*
		* We can speed up the acquire/release, if the architecture
		* supports cmpxchg and if there's no debugging state to be set up
		* We can speed up the acquire/release, if there's no debugging state to be
		* set up.
		*/
		#if defined(__HAVE_ARCH_CMPXCHG) && !defined(CONFIG_DEBUG_RT_MUTEXES)
		#ifndef CONFIG_DEBUG_RT_MUTEXES
		# define rt_mutex_cmpxchg(l,c,n) (cmpxchg(&l->owner, c, n) == c)
		static inline void mark_rt_mutex_waiters(struct rt_mutex *lock)
		{

Admin message