|
@@ -6,7 +6,7 @@
|
|
#include <asm/page.h>
|
|
#include <asm/page.h>
|
|
#include <asm/processor.h>
|
|
#include <asm/processor.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/compiler.h>
|
|
-
|
|
|
|
|
|
+#include <asm/paravirt.h>
|
|
/*
|
|
/*
|
|
* Your basic SMP spinlocks, allowing only a single CPU anywhere
|
|
* Your basic SMP spinlocks, allowing only a single CPU anywhere
|
|
*
|
|
*
|
|
@@ -54,21 +54,21 @@
|
|
* much between them in performance though, especially as locks are out of line.
|
|
* much between them in performance though, especially as locks are out of line.
|
|
*/
|
|
*/
|
|
#if (NR_CPUS < 256)
|
|
#if (NR_CPUS < 256)
|
|
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
|
|
|
|
|
|
+static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
|
|
|
|
return (((tmp >> 8) & 0xff) != (tmp & 0xff));
|
|
return (((tmp >> 8) & 0xff) != (tmp & 0xff));
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
|
|
|
|
|
|
+static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
|
|
|
|
return (((tmp >> 8) & 0xff) - (tmp & 0xff)) > 1;
|
|
return (((tmp >> 8) & 0xff) - (tmp & 0xff)) > 1;
|
|
}
|
|
}
|
|
|
|
|
|
-static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
short inc = 0x0100;
|
|
short inc = 0x0100;
|
|
|
|
|
|
@@ -87,9 +87,7 @@ static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
|
|
: "memory", "cc");
|
|
: "memory", "cc");
|
|
}
|
|
}
|
|
|
|
|
|
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
|
|
|
|
-
|
|
|
|
-static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp;
|
|
int tmp;
|
|
short new;
|
|
short new;
|
|
@@ -110,7 +108,7 @@ static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
|
|
return tmp;
|
|
return tmp;
|
|
}
|
|
}
|
|
|
|
|
|
-static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
asm volatile(UNLOCK_LOCK_PREFIX "incb %0"
|
|
asm volatile(UNLOCK_LOCK_PREFIX "incb %0"
|
|
: "+m" (lock->slock)
|
|
: "+m" (lock->slock)
|
|
@@ -118,21 +116,21 @@ static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
|
|
: "memory", "cc");
|
|
: "memory", "cc");
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
-static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
|
|
|
|
|
|
+static inline int __ticket_spin_is_locked(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
|
|
|
|
return (((tmp >> 16) & 0xffff) != (tmp & 0xffff));
|
|
return (((tmp >> 16) & 0xffff) != (tmp & 0xffff));
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
|
|
|
|
|
|
+static inline int __ticket_spin_is_contended(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
int tmp = ACCESS_ONCE(lock->slock);
|
|
|
|
|
|
return (((tmp >> 16) & 0xffff) - (tmp & 0xffff)) > 1;
|
|
return (((tmp >> 16) & 0xffff) - (tmp & 0xffff)) > 1;
|
|
}
|
|
}
|
|
|
|
|
|
-static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline void __ticket_spin_lock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int inc = 0x00010000;
|
|
int inc = 0x00010000;
|
|
int tmp;
|
|
int tmp;
|
|
@@ -153,9 +151,7 @@ static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
|
|
: "memory", "cc");
|
|
: "memory", "cc");
|
|
}
|
|
}
|
|
|
|
|
|
-#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
|
|
|
|
-
|
|
|
|
-static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline int __ticket_spin_trylock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
int tmp;
|
|
int tmp;
|
|
int new;
|
|
int new;
|
|
@@ -177,7 +173,7 @@ static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
|
|
return tmp;
|
|
return tmp;
|
|
}
|
|
}
|
|
|
|
|
|
-static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
|
|
|
|
|
|
+static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
asm volatile(UNLOCK_LOCK_PREFIX "incw %0"
|
|
asm volatile(UNLOCK_LOCK_PREFIX "incw %0"
|
|
: "+m" (lock->slock)
|
|
: "+m" (lock->slock)
|
|
@@ -186,6 +182,35 @@ static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
|
|
|
|
+
|
|
|
|
+#ifndef CONFIG_PARAVIRT
|
|
|
|
+static inline int __raw_spin_is_locked(raw_spinlock_t *lock)
|
|
|
|
+{
|
|
|
|
+ return __ticket_spin_is_locked(lock);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
|
|
|
|
+{
|
|
|
|
+ return __ticket_spin_is_contended(lock);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
|
|
|
|
+{
|
|
|
|
+ __ticket_spin_lock(lock);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static __always_inline int __raw_spin_trylock(raw_spinlock_t *lock)
|
|
|
|
+{
|
|
|
|
+ return __ticket_spin_trylock(lock);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static __always_inline void __raw_spin_unlock(raw_spinlock_t *lock)
|
|
|
|
+{
|
|
|
|
+ __ticket_spin_unlock(lock);
|
|
|
|
+}
|
|
|
|
+#endif /* CONFIG_PARAVIRT */
|
|
|
|
+
|
|
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
|
|
static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock)
|
|
{
|
|
{
|
|
while (__raw_spin_is_locked(lock))
|
|
while (__raw_spin_is_locked(lock))
|