Who owns those locks ? (2)
I have forgotten the function "_raw_spin_trylock()" :-(
Zoltán
include/asm-ia64/spinlock.h +16 -9
@@ -45,7 +45,8 @@ asmvolatile ("{\n\t" " mov ar.ccv = r0\n\t" " mov r28 = ip\n\t" -" mov r30 = 1;;\n\t" +/* " mov r30 = 1;;\n\t" */ +" shr.u r30 = r13, 12;;\n\t" /* Current task pointer */ "}\n\t" "cmpxchg4.acq r30 = [%1], r30, ar.ccv\n\t" "movl r29 = ia64_spinlock_contention_pre3_4;;\n\t"
@@ -57,7 +58,8 @@ asmvolatile ("{\n\t" " mov ar.ccv = r0\n\t" " mov r28 = ip\n\t" -" mov r30 = 1;;\n\t" +/* " mov r30 = 1;;\n\t" */ +" shr.u r30 = r13, 12;;\n\t" /* Current task pointer */ "}\n\t" "cmpxchg4.acq r30 = [%1], r30, ar.ccv;;\n\t" "cmp4.ne p14, p0 = r30, r0\n"
@@ -68,7 +70,8 @@# ifdef CONFIG_ITANIUM /* don't use brl on Itanium... */ /* mis-declare, so we get the entry-point, not it's function descriptor: */ - asmvolatile ("mov r30 = 1\n\t" + asmvolatile (/* " mov r30 = 1;;\n\t" */ +" shr.u r30 = r13, 12;;\n\t" /* Current task pointer */ "mov ar.ccv = r0;;\n\t" "cmpxchg4.acq r30 = [%0], r30, ar.ccv\n\t" "movl r29 = ia64_spinlock_contention;;\n\t"
@@ -77,7 +80,8 @@ "(p14) br.call.spnt.many b6 = b6" : "=r"(ptr) : "r"(ptr) : IA64_SPINLOCK_CLOBBERS); # else - asmvolatile ("mov r30 = 1\n\t" + asmvolatile (/* " mov r30 = 1;;\n\t" */ +" shr.u r30 = r13, 12;;\n\t" /* Current task pointer */ "mov ar.ccv = r0;;\n\t" "cmpxchg4.acq r30 = [%0], r30, ar.ccv;;\n\t" "cmp4.ne p14, p0 = r30, r0\n\t"
@@ -89,14 +93,17 @@#else /* !ASM_SUPPORTED */ # define _raw_spin_lock (x) \ do { \ - __u32 *ia64_spinlock_ptr = (__u32 *) (x); \ - __u64 ia64_spinlock_val; \ - ia64_spinlock_val = ia64_cmpxchg4_acq(ia64_spinlock_ptr, 1, 0); \ + __u32 *ia64_spinlock_ptr = (__u32 *) (x); \ + __u64 ia64_spinlock_val; \ + __u32 new_spinlock_val = (__u32)((__u64) current >> 12); \ + \ + ia64_spinlock_val = ia64_cmpxchg4_acq(ia64_spinlock_ptr, new_spinlock_val, 0); \ if (unlikely(ia64_spinlock_val)) { \ do { \ while (*ia64_spinlock_ptr) \ ia64_barrier(); \ - ia64_spinlock_val = ia64_cmpxchg4_acq(ia64_spinlock_ptr, 1, 0); \ + ia64_spinlock_val = ia64_cmpxchg4_acq(ia64_spinlock_ptr, \ + new_spinlock_val, 0); \ } while (ia64_spinlock_val); \ } \ } while (0)
@@ -104,7 +111,7 @@#define spin_is_locked (x) ((x)->lock != 0)#define _raw_spin_unlock (x) do { barrier(); ((spinlock_t *) x)->lock = 0; } while (0) -#define _raw_spin_trylock (x) (cmpxchg_acq(&(x)->lock, 0, 1) == 0) +#define _raw_spin_trylock (x) (cmpxchg_acq(&(x)->lock, 0, (__u32)((__u64) current >> 12)) == 0)#define spin_unlock_wait (x) do { barrier(); } while ((x)->lock) typedef struct {