x86: Get rid of __HAVE_ARCH_CMPXCHG
Subsystems (3)
Borislav Petkov
maintainerPATCH 1/1 x86: Get rid of __HAVE_ARCH_CMPXCHG
From: Borislav Petkov <[email protected]>
Both the 32-bit and 64-bit cmpxchg.h header define __HAVE_ARCH_CMPXCHG and there's ifdeffery which checks it. But since both bitness define it, we can just as well drop it and simpify a bit of code in doing that.
--- arch/x86/include/asm/cmpxchg.h | 2 -- arch/x86/include/asm/cmpxchg_32.h | 2 -- arch/x86/include/asm/cmpxchg_64.h | 2 -- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/include/asm/mutex_32.h | 16 ++-------------- arch/x86/kernel/acpi/boot.c | 4 ---- kernel/locking/rtmutex.c | 2 +- 7 files changed, 4 insertions(+), 26 deletions(-)
arch/x86/include/asm/cmpxchg.h +0 -2
@@ -143,7 +143,6 @@ extern void __add_wrong_size(void)# include <asm/cmpxchg_64.h> #endif -#ifdef __HAVE_ARCH_CMPXCHG#define cmpxchg (ptr, old, new) \ __cmpxchg(ptr, old, new, sizeof(*(ptr)))
@@ -152,7 +151,6 @@ extern void __add_wrong_size(void)#define cmpxchg_local (ptr, old, new) \ __cmpxchg_local(ptr, old, new, sizeof(*(ptr))) -#endif /* * xadd() adds "inc" to "*ptr" and atomically returns the previous
arch/x86/include/asm/cmpxchg_32.h +0 -2
@@ -34,8 +34,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 value) : "memory"); } -#define __HAVE_ARCH_CMPXCHG 1 -#ifdef CONFIG_X86_CMPXCHG64 #define cmpxchg64 (ptr, o, n) \ ((__typeof__(*(ptr)))__cmpxchg64((ptr), (unsigned long long)(o), \
arch/x86/include/asm/cmpxchg_64.h +0 -2
@@ -6,8 +6,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 val) *ptr = val; } -#define __HAVE_ARCH_CMPXCHG 1 -#define cmpxchg64 (ptr, o, n) \ ({ \ BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
arch/x86/include/asm/mc146818rtc.h +1 -1
@@ -13,7 +13,7 @@#define RTC_ALWAYS_BCD 1/* RTC operates in binary mode */ #endif -#if defined(CONFIG_X86_32 ) && defined(__HAVE_ARCH_CMPXCHG) +#if defined(CONFIG_X86_32 )/* * This lock provides nmi access to the CMOS/RTC registers. It has some * special properties. It is owned by a CPU and stores the index register
arch/x86/include/asm/mutex_32.h +2 -14
@@ -100,23 +100,11 @@ do { \static inline int __mutex_fastpath_trylock (atomic_t *count,int (*fail_fn)(atomic_t *)) { -/* -* We have two variants here. The cmpxchg based one is the best one -* because it never induce a false contention state. It is included -* here because architectures using the inc/dec algorithms over the -* xchg ones are much more likely to support cmpxchg natively. -* -* If not we fall back to the spinlock based variant - that is -* just as efficient (and simpler) as a 'destructive' probing of -* the mutex state would be. -*/ -#ifdef __HAVE_ARCH_CMPXCHG +/* cmpxchg because it never induces a false contention state. */ if (likely (atomic_cmpxchg (count,1 ,0 ) ==1 ))return 1 ; +return 0 ; -#else -return fail_fn (count); -#endif }#endif /* _ASM_X86_MUTEX_32_H */
arch/x86/kernel/acpi/boot.c +0 -4
@@ -74,10 +74,6 @@ int acpi_fix_pin2_polarity __initdata;static u64 acpi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ;#endif -#ifndef __HAVE_ARCH_CMPXCHG -#warning ACPI uses CMPXCHG, i486 and later hardware -#endif -/* -------------------------------------------------------------------------- Boot-time Configuration -------------------------------------------------------------------------- */
kernel/locking/rtmutex.c +1 -1
@@ -73,7 +73,7 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)* We can speed up the acquire/release, if the architecture * supports cmpxchg and if there's no debugging state to be set up */ -#if defined(__HAVE_ARCH_CMPXCHG) && !defined(CONFIG_DEBUG_RT_MUTEXES ) +#ifndef CONFIG_DEBUG_RT_MUTEXES # define rt_mutex_cmpxchg (l,c,n) (cmpxchg(&l->owner, c, n) == c)static inline void mark_rt_mutex_waiters (struct rt_mutex *lock) {
Signature · 1 line
2.0.0
Quoted 20 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
Both the 32-bit and 64-bit
cmpxchg.hheader define__HAVE_ARCH_CMPXCHGand there's ifdeffery which checks it. But since both bitness define it, we can just as well drop it and simpify a bit of code in doing that.Signed-off-by Borislav Petkov <[email protected]>--- arch/x86/include/asm/cmpxchg.h | 2 -- arch/x86/include/asm/cmpxchg_32.h | 2 -- arch/x86/include/asm/cmpxchg_64.h | 2 -- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/include/asm/mutex_32.h | 16 ++-------------- arch/x86/kernel/acpi/boot.c | 4 ---- kernel/locking/rtmutex.c | 2 +- 7 files changed, 4 insertions(+), 26 deletions(-)
kernel/locking/rtmutex.c static void fixup_rt_mutex_waiters(struct rt_mutex *lock) · line 79
Quoted 8 lines
kernel/locking/rtmutex.c +1
-1@@ -73,7 +73,7 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)* We can speed up the acquire/release, if the architecture * supports cmpxchg and if there's no debugging state to be set up */ -#if defined(__HAVE_ARCH_CMPXCHG) && !defined(CONFIG_DEBUG_RT_MUTEXES ) +#ifndef CONFIG_DEBUG_RT_MUTEXES # define rt_mutex_cmpxchg (l,c,n) (cmpxchg(&l->owner, c, n) == c)static inline void mark_rt_mutex_waiters (struct rt_mutex *lock) {
What about non-x86? __HAVE_ARCH_CMPXCHG isn't always defined.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Borislav Petkov
maintainerQuoted 1 line · Geert Uytterhoeven
What about non-x86?
__HAVE_ARCH_CMPXCHGisn't always defined.
Bah, this hunk was definitely not supposed to be there. Thanks for the catch!
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--Quoted 5 lines · Borislav Petkov
Quoted 1 line · Geert Uytterhoeven
What about non-x86?
__HAVE_ARCH_CMPXCHGisn't always defined.Bah, this hunk was definitely not supposed to be there. Thanks for the catch!
IC.
In that case you also want to add a (new) "#define __HAVE_ARCH_CMPXCHG 1" to one of the shared x86 header files, right?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Borislav Petkov
maintainerQuoted 2 lines · Geert Uytterhoeven
In that case you also want to add a (new) "#define
__HAVE_ARCH_CMPXCHG1" to one of the shared x86 header files, right?
Yeah, I can't remove it after all. :-)
Diffstat is arch/x86/-only now, as it was supposed to be.
--
From: Borislav Petkov <[email protected]>
Subject: [PATCH] x86: Simplify __HAVE_ARCH_CMPXCHG tests
Both the 32-bit and 64-bit cmpxchg.h header define __HAVE_ARCH_CMPXCHG and there's ifdeffery which checks it. But since both bitness define it, we can just as well move it up to the main cmpxchg header and simpify a bit of code in doing that.
--- arch/x86/include/asm/cmpxchg.h | 4 ++-- arch/x86/include/asm/cmpxchg_32.h | 2 -- arch/x86/include/asm/cmpxchg_64.h | 2 -- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/include/asm/mutex_32.h | 16 ++-------------- arch/x86/kernel/acpi/boot.c | 4 ---- 6 files changed, 5 insertions(+), 25 deletions(-)
arch/x86/include/asm/cmpxchg.h +2 -2
@@ -4,6 +4,8 @@#include <linux/compiler.h> #include <asm/alternative.h> /* Provides LOCK_PREFIX */ +#define __HAVE_ARCH_CMPXCHG 1 +/* * Non-existant functions to indicate usage errors at link time * (or compile-time if the compiler implements __compiletime_error().
@@ -143,7 +145,6 @@ extern void __add_wrong_size(void)# include <asm/cmpxchg_64.h> #endif -#ifdef __HAVE_ARCH_CMPXCHG#define cmpxchg (ptr, old, new) \ __cmpxchg(ptr, old, new, sizeof(*(ptr)))
@@ -152,7 +153,6 @@ extern void __add_wrong_size(void)#define cmpxchg_local (ptr, old, new) \ __cmpxchg_local(ptr, old, new, sizeof(*(ptr))) -#endif /* * xadd() adds "inc" to "*ptr" and atomically returns the previous
arch/x86/include/asm/cmpxchg_32.h +0 -2
@@ -34,8 +34,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 value) : "memory"); } -#define __HAVE_ARCH_CMPXCHG 1 -#ifdef CONFIG_X86_CMPXCHG64 #define cmpxchg64 (ptr, o, n) \ ((__typeof__(*(ptr)))__cmpxchg64((ptr), (unsigned long long)(o), \
arch/x86/include/asm/cmpxchg_64.h +0 -2
@@ -6,8 +6,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 val) *ptr = val; } -#define __HAVE_ARCH_CMPXCHG 1 -#define cmpxchg64 (ptr, o, n) \ ({ \ BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
arch/x86/include/asm/mc146818rtc.h +1 -1
@@ -13,7 +13,7 @@#define RTC_ALWAYS_BCD 1/* RTC operates in binary mode */ #endif -#if defined(CONFIG_X86_32 ) && defined(__HAVE_ARCH_CMPXCHG) +#if defined(CONFIG_X86_32 )/* * This lock provides nmi access to the CMOS/RTC registers. It has some * special properties. It is owned by a CPU and stores the index register
arch/x86/include/asm/mutex_32.h +2 -14
@@ -100,23 +100,11 @@ do { \static inline int __mutex_fastpath_trylock (atomic_t *count,int (*fail_fn)(atomic_t *)) { -/* -* We have two variants here. The cmpxchg based one is the best one -* because it never induce a false contention state. It is included -* here because architectures using the inc/dec algorithms over the -* xchg ones are much more likely to support cmpxchg natively. -* -* If not we fall back to the spinlock based variant - that is -* just as efficient (and simpler) as a 'destructive' probing of -* the mutex state would be. -*/ -#ifdef __HAVE_ARCH_CMPXCHG +/* cmpxchg because it never induces a false contention state. */ if (likely (atomic_cmpxchg (count,1 ,0 ) ==1 ))return 1 ; +return 0 ; -#else -return fail_fn (count); -#endif }#endif /* _ASM_X86_MUTEX_32_H */
arch/x86/kernel/acpi/boot.c +0 -4
@@ -74,10 +74,6 @@ int acpi_fix_pin2_polarity __initdata;static u64 acpi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ;#endif -#ifndef __HAVE_ARCH_CMPXCHG -#warning ACPI uses CMPXCHG, i486 and later hardware -#endif -/* -------------------------------------------------------------------------- Boot-time Configuration -------------------------------------------------------------------------- */
Signature · 8 lines
2.0.0
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--tip-bot for Borislav Petkov
merge bot[tip:x86/cleanups] x86: Simplify __HAVE_ARCH_CMPXCHG tests
x86: Simplify __HAVE_ARCH_CMPXCHG tests
Commit-ID: b08ee5f7e4135d64b8edd769367f8964a725122e Gitweb: http://git.kernel.org/tip/b08ee5f7e4135d64b8edd769367f8964a725122e Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 11 Jul 2014 12:43:38 +0200 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 11 Jul 2014 17:28:51 -0700
x86: Simplify __HAVE_ARCH_CMPXCHG tests
Both the 32-bit and 64-bit cmpxchg.h header define __HAVE_ARCH_CMPXCHG and there's ifdeffery which checks it. But since both bitness define it, we can just as well move it up to the main cmpxchg header and simpify a bit of code in doing that.
--- arch/x86/include/asm/cmpxchg.h | 4 ++-- arch/x86/include/asm/cmpxchg_32.h | 2 -- arch/x86/include/asm/cmpxchg_64.h | 2 -- arch/x86/include/asm/mc146818rtc.h | 2 +- arch/x86/include/asm/mutex_32.h | 16 ++-------------- arch/x86/kernel/acpi/boot.c | 4 ---- 6 files changed, 5 insertions(+), 25 deletions(-)
arch/x86/include/asm/cmpxchg.h +2 -2
@@ -4,6 +4,8 @@#include <linux/compiler.h> #include <asm/alternative.h> /* Provides LOCK_PREFIX */ +#define __HAVE_ARCH_CMPXCHG 1 +/* * Non-existant functions to indicate usage errors at link time * (or compile-time if the compiler implements __compiletime_error().
@@ -143,7 +145,6 @@ extern void __add_wrong_size(void)# include <asm/cmpxchg_64.h> #endif -#ifdef __HAVE_ARCH_CMPXCHG#define cmpxchg (ptr, old, new) \ __cmpxchg(ptr, old, new, sizeof(*(ptr)))
@@ -152,7 +153,6 @@ extern void __add_wrong_size(void)#define cmpxchg_local (ptr, old, new) \ __cmpxchg_local(ptr, old, new, sizeof(*(ptr))) -#endif /* * xadd() adds "inc" to "*ptr" and atomically returns the previous
arch/x86/include/asm/cmpxchg_32.h +0 -2
@@ -34,8 +34,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 value) : "memory"); } -#define __HAVE_ARCH_CMPXCHG 1 -#ifdef CONFIG_X86_CMPXCHG64 #define cmpxchg64 (ptr, o, n) \ ((__typeof__(*(ptr)))__cmpxchg64((ptr), (unsigned long long)(o), \
arch/x86/include/asm/cmpxchg_64.h +0 -2
@@ -6,8 +6,6 @@ static inline void set_64bit(volatile u64 *ptr, u64 val) *ptr = val; } -#define __HAVE_ARCH_CMPXCHG 1 -#define cmpxchg64 (ptr, o, n) \ ({ \ BUILD_BUG_ON(sizeof(*(ptr)) != 8); \
arch/x86/include/asm/mc146818rtc.h +1 -1
@@ -13,7 +13,7 @@#define RTC_ALWAYS_BCD 1/* RTC operates in binary mode */ #endif -#if defined(CONFIG_X86_32 ) && defined(__HAVE_ARCH_CMPXCHG) +#if defined(CONFIG_X86_32 )/* * This lock provides nmi access to the CMOS/RTC registers. It has some * special properties. It is owned by a CPU and stores the index register
arch/x86/include/asm/mutex_32.h +2 -14
@@ -100,23 +100,11 @@ do { \static inline int __mutex_fastpath_trylock (atomic_t *count,int (*fail_fn)(atomic_t *)) { -/* -* We have two variants here. The cmpxchg based one is the best one -* because it never induce a false contention state. It is included -* here because architectures using the inc/dec algorithms over the -* xchg ones are much more likely to support cmpxchg natively. -* -* If not we fall back to the spinlock based variant - that is -* just as efficient (and simpler) as a 'destructive' probing of -* the mutex state would be. -*/ -#ifdef __HAVE_ARCH_CMPXCHG +/* cmpxchg because it never induces a false contention state. */ if (likely (atomic_cmpxchg (count,1 ,0 ) ==1 ))return 1 ; +return 0 ; -#else -return fail_fn (count); -#endif }#endif /* _ASM_X86_MUTEX_32_H */
arch/x86/kernel/acpi/boot.c +0 -4
@@ -74,10 +74,6 @@ int acpi_fix_pin2_polarity __initdata;static u64 acpi_lapic_addr__initdata =APIC_DEFAULT_PHYS_BASE ;#endif -#ifndef __HAVE_ARCH_CMPXCHG -#warning ACPI uses CMPXCHG, i486 and later hardware -#endif -/* -------------------------------------------------------------------------- Boot-time Configuration -------------------------------------------------------------------------- */