Skip to content

Commit b8e3dfa

Browse files
ubizjakingomolnar
authored andcommitted
x86/percpu: Use raw_cpu_try_cmpxchg() in preempt_count_set()
Use raw_cpu_try_cmpxchg() instead of raw_cpu_cmpxchg(*ptr, old, new) == old. x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after CMPXCHG (and related MOV instruction in front of CMPXCHG). Also, raw_cpu_try_cmpxchg() implicitly assigns old *ptr value to "old" when cmpxchg fails. There is no need to re-read the value in the loop. No functional change intended. Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20230830151623.3900-2-ubizjak@gmail.com
1 parent 5f86389 commit b8e3dfa

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/x86/include/asm/preempt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ static __always_inline void preempt_count_set(int pc)
3131
{
3232
int old, new;
3333

34+
old = raw_cpu_read_4(pcpu_hot.preempt_count);
3435
do {
35-
old = raw_cpu_read_4(pcpu_hot.preempt_count);
3636
new = (old & PREEMPT_NEED_RESCHED) |
3737
(pc & ~PREEMPT_NEED_RESCHED);
38-
} while (raw_cpu_cmpxchg_4(pcpu_hot.preempt_count, old, new) != old);
38+
} while (!raw_cpu_try_cmpxchg_4(pcpu_hot.preempt_count, &old, new));
3939
}
4040

4141
/*

0 commit comments

Comments
 (0)