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

Commit 08f5fcbe authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: ticket spin locks: factor out more common code 



Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ef1f3413

include/asm-x86/spinlock.h

+16 −26
Original line number Diff line number Diff line
@@ -54,19 +54,7 @@ 
 * much between them in performance though, especially as locks are out of line.

 */

#if (NR_CPUS < 256)

static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return (((tmp >> 8) & 0xff) != (tmp & 0xff));

}



static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return (((tmp >> 8) - tmp) & 0xff) > 1;

}

#define TICKET_SHIFT 8



static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)

{
@@ -116,19 +104,7 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock) 
		     : "memory", "cc");

}

#else

static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return (((tmp >> 16) & 0xffff) != (tmp & 0xffff));

}



static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return (((tmp >> 16) - tmp) & 0xffff) > 1;

}

#define TICKET_SHIFT 16



static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)

{
@@ -182,6 +158,20 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock) 
}

#endif



static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return !!(((tmp >> TICKET_SHIFT) ^ tmp) & ((1 << TICKET_SHIFT) - 1));

}



static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)

{

	int tmp = ACCESS_ONCE(lock->slock);



	return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1;

}



#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)



#ifdef CONFIG_PARAVIRT