mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched_clock: Fix atomicity/continuity bug by using cmpxchg64() x86: Provide an alternative() based cmpxchg64()
This commit is contained in:
commit
84d88d5d4e
5 changed files with 85 additions and 16 deletions
|
@ -312,19 +312,23 @@ static inline unsigned long cmpxchg_386(volatile void *ptr, unsigned long old,
|
||||||
|
|
||||||
extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
|
extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
|
||||||
|
|
||||||
#define cmpxchg64(ptr, o, n) \
|
#define cmpxchg64(ptr, o, n) \
|
||||||
({ \
|
({ \
|
||||||
__typeof__(*(ptr)) __ret; \
|
__typeof__(*(ptr)) __ret; \
|
||||||
if (likely(boot_cpu_data.x86 > 4)) \
|
__typeof__(*(ptr)) __old = (o); \
|
||||||
__ret = (__typeof__(*(ptr)))__cmpxchg64((ptr), \
|
__typeof__(*(ptr)) __new = (n); \
|
||||||
(unsigned long long)(o), \
|
alternative_io("call cmpxchg8b_emu", \
|
||||||
(unsigned long long)(n)); \
|
"lock; cmpxchg8b (%%esi)" , \
|
||||||
else \
|
X86_FEATURE_CX8, \
|
||||||
__ret = (__typeof__(*(ptr)))cmpxchg_486_u64((ptr), \
|
"=A" (__ret), \
|
||||||
(unsigned long long)(o), \
|
"S" ((ptr)), "0" (__old), \
|
||||||
(unsigned long long)(n)); \
|
"b" ((unsigned int)__new), \
|
||||||
__ret; \
|
"c" ((unsigned int)(__new>>32)) \
|
||||||
})
|
: "memory"); \
|
||||||
|
__ret; })
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define cmpxchg64_local(ptr, o, n) \
|
#define cmpxchg64_local(ptr, o, n) \
|
||||||
({ \
|
({ \
|
||||||
__typeof__(*(ptr)) __ret; \
|
__typeof__(*(ptr)) __ret; \
|
||||||
|
|
|
@ -10,6 +10,14 @@
|
||||||
EXPORT_SYMBOL(mcount);
|
EXPORT_SYMBOL(mcount);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note, this is a prototype to get at the symbol for
|
||||||
|
* the export, but dont use it from C code, it is used
|
||||||
|
* by assembly code and is not using C calling convention!
|
||||||
|
*/
|
||||||
|
extern void cmpxchg8b_emu(void);
|
||||||
|
EXPORT_SYMBOL(cmpxchg8b_emu);
|
||||||
|
|
||||||
/* Networking helper routines. */
|
/* Networking helper routines. */
|
||||||
EXPORT_SYMBOL(csum_partial_copy_generic);
|
EXPORT_SYMBOL(csum_partial_copy_generic);
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ ifeq ($(CONFIG_X86_32),y)
|
||||||
obj-y += atomic64_32.o
|
obj-y += atomic64_32.o
|
||||||
lib-y += checksum_32.o
|
lib-y += checksum_32.o
|
||||||
lib-y += strstr_32.o
|
lib-y += strstr_32.o
|
||||||
lib-y += semaphore_32.o string_32.o
|
lib-y += semaphore_32.o string_32.o cmpxchg8b_emu.o
|
||||||
|
|
||||||
lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
|
lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
|
||||||
else
|
else
|
||||||
|
|
57
arch/x86/lib/cmpxchg8b_emu.S
Normal file
57
arch/x86/lib/cmpxchg8b_emu.S
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; version 2
|
||||||
|
* of the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/linkage.h>
|
||||||
|
#include <asm/alternative-asm.h>
|
||||||
|
#include <asm/frame.h>
|
||||||
|
#include <asm/dwarf2.h>
|
||||||
|
|
||||||
|
|
||||||
|
.text
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Inputs:
|
||||||
|
* %esi : memory location to compare
|
||||||
|
* %eax : low 32 bits of old value
|
||||||
|
* %edx : high 32 bits of old value
|
||||||
|
* %ebx : low 32 bits of new value
|
||||||
|
* %ecx : high 32 bits of new value
|
||||||
|
*/
|
||||||
|
ENTRY(cmpxchg8b_emu)
|
||||||
|
CFI_STARTPROC
|
||||||
|
|
||||||
|
#
|
||||||
|
# Emulate 'cmpxchg8b (%esi)' on UP except we don't
|
||||||
|
# set the whole ZF thing (caller will just compare
|
||||||
|
# eax:edx with the expected value)
|
||||||
|
#
|
||||||
|
cmpxchg8b_emu:
|
||||||
|
pushfl
|
||||||
|
cli
|
||||||
|
|
||||||
|
cmpl (%esi), %eax
|
||||||
|
jne not_same
|
||||||
|
cmpl 4(%esi), %edx
|
||||||
|
jne half_same
|
||||||
|
|
||||||
|
movl %ebx, (%esi)
|
||||||
|
movl %ecx, 4(%esi)
|
||||||
|
|
||||||
|
popfl
|
||||||
|
ret
|
||||||
|
|
||||||
|
not_same:
|
||||||
|
movl (%esi), %eax
|
||||||
|
half_same:
|
||||||
|
movl 4(%esi), %edx
|
||||||
|
|
||||||
|
popfl
|
||||||
|
ret
|
||||||
|
|
||||||
|
CFI_ENDPROC
|
||||||
|
ENDPROC(cmpxchg8b_emu)
|
|
@ -127,7 +127,7 @@ static u64 sched_clock_local(struct sched_clock_data *scd)
|
||||||
clock = wrap_max(clock, min_clock);
|
clock = wrap_max(clock, min_clock);
|
||||||
clock = wrap_min(clock, max_clock);
|
clock = wrap_min(clock, max_clock);
|
||||||
|
|
||||||
if (cmpxchg(&scd->clock, old_clock, clock) != old_clock)
|
if (cmpxchg64(&scd->clock, old_clock, clock) != old_clock)
|
||||||
goto again;
|
goto again;
|
||||||
|
|
||||||
return clock;
|
return clock;
|
||||||
|
@ -163,7 +163,7 @@ static u64 sched_clock_remote(struct sched_clock_data *scd)
|
||||||
val = remote_clock;
|
val = remote_clock;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmpxchg(ptr, old_val, val) != old_val)
|
if (cmpxchg64(ptr, old_val, val) != old_val)
|
||||||
goto again;
|
goto again;
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
|
|
Loading…
Reference in a new issue