Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

locking/atomics/x86: Reduce arch_cmpxchg64*() instrumentation

Currently x86's arch_cmpxchg64() and arch_cmpxchg64_local() are
instrumented twice, as they call into instrumented atomics rather than
their arch_ equivalents.

A call to cmpxchg64() results in:

cmpxchg64()
kasan_check_write()
arch_cmpxchg64()
cmpxchg()
kasan_check_write()
arch_cmpxchg()

Let's fix this up and call the arch_ equivalents, resulting in:

cmpxchg64()
kasan_check_write()
arch_cmpxchg64()
arch_cmpxchg()

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: andy.shevchenko@gmail.com
Cc: arnd@arndb.de
Cc: aryabinin@virtuozzo.com
Cc: catalin.marinas@arm.com
Cc: glider@google.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: parri.andrea@gmail.com
Cc: peter@hurleysoftware.com
Link: http://lkml.kernel.org/r/20180716113017.3909-3-mark.rutland@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Mark Rutland and committed by
Ingo Molnar
00d5551c 71b7ff5e

+2 -2
+2 -2
arch/x86/include/asm/cmpxchg_64.h
··· 10 10 #define arch_cmpxchg64(ptr, o, n) \ 11 11 ({ \ 12 12 BUILD_BUG_ON(sizeof(*(ptr)) != 8); \ 13 - cmpxchg((ptr), (o), (n)); \ 13 + arch_cmpxchg((ptr), (o), (n)); \ 14 14 }) 15 15 16 16 #define arch_cmpxchg64_local(ptr, o, n) \ 17 17 ({ \ 18 18 BUILD_BUG_ON(sizeof(*(ptr)) != 8); \ 19 - cmpxchg_local((ptr), (o), (n)); \ 19 + arch_cmpxchg_local((ptr), (o), (n)); \ 20 20 }) 21 21 22 22 #define system_has_cmpxchg_double() boot_cpu_has(X86_FEATURE_CX16)