浏览代码

arm64: spinlock: retry trylock operation if strex fails on free lock

An exclusive store instruction may fail for reasons other than lock
contention (e.g. a cache eviction during the critical section) so, in
line with other architectures using similar exclusive instructions
(alpha, mips, powerpc), retry the trylock operation if the lock appears
to be free but the strex reported failure.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Tony Thompson <anthony.thompson@arm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Catalin Marinas 12 年之前
父节点
当前提交
4ecf7ccb19
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      arch/arm64/include/asm/spinlock.h

+ 2 - 1
arch/arm64/include/asm/spinlock.h

@@ -59,9 +59,10 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
 	unsigned int tmp;
 	unsigned int tmp;
 
 
 	asm volatile(
 	asm volatile(
-	"	ldaxr	%w0, %1\n"
+	"2:	ldaxr	%w0, %1\n"
 	"	cbnz	%w0, 1f\n"
 	"	cbnz	%w0, 1f\n"
 	"	stxr	%w0, %w2, %1\n"
 	"	stxr	%w0, %w2, %1\n"
+	"	cbnz	%w0, 2b\n"
 	"1:\n"
 	"1:\n"
 	: "=&r" (tmp), "+Q" (lock->lock)
 	: "=&r" (tmp), "+Q" (lock->lock)
 	: "r" (1)
 	: "r" (1)