Skip to content

L
linux
Commit eb47418d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix write lock scalability 64-bit issue
  x86: Unify rwsem assembly implementation
  x86: Unify rwlock assembly implementation
  x86, asm: Fix binutils 2.16 issue with __USER32_CS
  x86, asm: Cleanup thunk_64.S
  x86, asm: Flip RESTORE_ARGS arguments logic
  x86, asm: Flip SAVE_ARGS arguments logic
  x86, asm: Thin down SAVE/RESTORE_* asm macros
parents 2c9e88a1 a750036f
Show whitespace changes
Inline Side-by-side
Showing with 263 additions and 286 deletions
arch/um/sys-i386/Makefile
View file @ eb47418d
...@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ ...@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
obj-$(CONFIG_BINFMT_ELF) += elfcore.o obj-$(CONFIG_BINFMT_ELF) += elfcore.o
subarch-obj-y = lib/semaphore_32.o lib/string_32.o subarch-obj-y = lib/rwsem.o lib/string_32.o
subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
subarch-obj-$(CONFIG_MODULES) += kernel/module.o subarch-obj-$(CONFIG_MODULES) += kernel/module.o
......
arch/um/sys-x86_64/Makefile
View file @ eb47418d
...@@ -9,7 +9,7 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \ ...@@ -9,7 +9,7 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
sysrq.o ksyms.o tls.o sysrq.o ksyms.o tls.o
subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o \ subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o \
lib/rwsem_64.o lib/rwsem.o
subarch-obj-$(CONFIG_MODULES) += kernel/module.o subarch-obj-$(CONFIG_MODULES) += kernel/module.o
ldt-y = ../sys-i386/ldt.o ldt-y = ../sys-i386/ldt.o
......
arch/x86/ia32/ia32entry.S
View file @ eb47418d
...@@ -143,7 +143,7 @@ ENTRY(ia32_sysenter_target) ...@@ -143,7 +143,7 @@ ENTRY(ia32_sysenter_target)
CFI_REL_OFFSET rip,0 CFI_REL_OFFSET rip,0
pushq_cfi %rax pushq_cfi %rax
cld cld
SAVE_ARGS 0,0,1 SAVE_ARGS 0,1,0
/* no need to do an access_ok check here because rbp has been /* no need to do an access_ok check here because rbp has been
32bit zero extended */ 32bit zero extended */
1: movl (%rbp),%ebp 1: movl (%rbp),%ebp
...@@ -173,7 +173,7 @@ sysexit_from_sys_call: ...@@ -173,7 +173,7 @@ sysexit_from_sys_call:
andl $~0x200,EFLAGS-R11(%rsp) andl $~0x200,EFLAGS-R11(%rsp)
movl RIP-R11(%rsp),%edx /* User %eip */ movl RIP-R11(%rsp),%edx /* User %eip */
CFI_REGISTER rip,rdx CFI_REGISTER rip,rdx
RESTORE_ARGS 1,24,1,1,1,1 RESTORE_ARGS 0,24,0,0,0,0
xorq %r8,%r8 xorq %r8,%r8
xorq %r9,%r9 xorq %r9,%r9
xorq %r10,%r10 xorq %r10,%r10
...@@ -289,7 +289,7 @@ ENTRY(ia32_cstar_target) ...@@ -289,7 +289,7 @@ ENTRY(ia32_cstar_target)
* disabled irqs and here we enable it straight after entry: * disabled irqs and here we enable it straight after entry:
*/ */
ENABLE_INTERRUPTS(CLBR_NONE) ENABLE_INTERRUPTS(CLBR_NONE)
SAVE_ARGS 8,1,1 SAVE_ARGS 8,0,0
movl %eax,%eax /* zero extension */ movl %eax,%eax /* zero extension */
movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp)
...@@ -328,7 +328,7 @@ cstar_dispatch: ...@@ -328,7 +328,7 @@ cstar_dispatch:
jnz sysretl_audit jnz sysretl_audit
sysretl_from_sys_call: sysretl_from_sys_call:
andl $~TS_COMPAT,TI_status(%r10) andl $~TS_COMPAT,TI_status(%r10)
RESTORE_ARGS 1,-ARG_SKIP,1,1,1 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
movl RIP-ARGOFFSET(%rsp),%ecx movl RIP-ARGOFFSET(%rsp),%ecx
CFI_REGISTER rip,rcx CFI_REGISTER rip,rcx
movl EFLAGS-ARGOFFSET(%rsp),%r11d movl EFLAGS-ARGOFFSET(%rsp),%r11d
...@@ -419,7 +419,7 @@ ENTRY(ia32_syscall) ...@@ -419,7 +419,7 @@ ENTRY(ia32_syscall)
cld cld
/* note the registers are not zero extended to the sf. /* note the registers are not zero extended to the sf.
this could be a problem. */ this could be a problem. */
SAVE_ARGS 0,0,1 SAVE_ARGS 0,1,0
GET_THREAD_INFO(%r10) GET_THREAD_INFO(%r10)
orl $TS_COMPAT,TI_status(%r10) orl $TS_COMPAT,TI_status(%r10)
testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10) testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
......
arch/x86/include/asm/asm.h
View file @ eb47418d
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
# define __ASM_FORM(x) x # define __ASM_FORM(x) x
# define __ASM_FORM_COMMA(x) x,
# define __ASM_EX_SEC .section __ex_table, "a" # define __ASM_EX_SEC .section __ex_table, "a"
#else #else
# define __ASM_FORM(x) " " #x " " # define __ASM_FORM(x) " " #x " "
# define __ASM_FORM_COMMA(x) " " #x ","
# define __ASM_EX_SEC " .section __ex_table,\"a\"\n" # define __ASM_EX_SEC " .section __ex_table,\"a\"\n"
#endif #endif
...@@ -15,7 +17,8 @@ ...@@ -15,7 +17,8 @@
# define __ASM_SEL(a,b) __ASM_FORM(b) # define __ASM_SEL(a,b) __ASM_FORM(b)
#endif #endif
#define __ASM_SIZE(inst) __ASM_SEL(inst##l, inst##q) #define __ASM_SIZE(inst, ...) __ASM_SEL(inst##l##__VA_ARGS__, \
inst##q##__VA_ARGS__)
#define __ASM_REG(reg) __ASM_SEL(e##reg, r##reg) #define __ASM_REG(reg) __ASM_SEL(e##reg, r##reg)
#define _ASM_PTR __ASM_SEL(.long, .quad) #define _ASM_PTR __ASM_SEL(.long, .quad)
......
arch/x86/include/asm/calling.h
View file @ eb47418d
...@@ -46,6 +46,7 @@ For 32-bit we have the following conventions - kernel is built with ...@@ -46,6 +46,7 @@ For 32-bit we have the following conventions - kernel is built with
*/ */
#include "dwarf2.h"
/* /*
* 64-bit system call stack frame layout defines and helpers, for * 64-bit system call stack frame layout defines and helpers, for
...@@ -84,72 +85,57 @@ For 32-bit we have the following conventions - kernel is built with ...@@ -84,72 +85,57 @@ For 32-bit we have the following conventions - kernel is built with
#define ARGOFFSET R11 #define ARGOFFSET R11
#define SWFRAME ORIG_RAX #define SWFRAME ORIG_RAX
.macro SAVE_ARGS addskip=0, norcx=0, nor891011=0 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
subq $9*8+\addskip, %rsp subq $9*8+\addskip, %rsp
CFI_ADJUST_CFA_OFFSET 9*8+\addskip CFI_ADJUST_CFA_OFFSET 9*8+\addskip
movq %rdi, 8*8(%rsp) movq_cfi rdi, 8*8
CFI_REL_OFFSET rdi, 8*8 movq_cfi rsi, 7*8
movq %rsi, 7*8(%rsp) movq_cfi rdx, 6*8
CFI_REL_OFFSET rsi, 7*8
movq %rdx, 6*8(%rsp) .if \save_rcx
CFI_REL_OFFSET rdx, 6*8 movq_cfi rcx, 5*8
.if \norcx
.else
movq %rcx, 5*8(%rsp)
CFI_REL_OFFSET rcx, 5*8
.endif .endif
movq %rax, 4*8(%rsp)
CFI_REL_OFFSET rax, 4*8 movq_cfi rax, 4*8
.if \nor891011
.else .if \save_r891011
movq %r8, 3*8(%rsp) movq_cfi r8, 3*8
CFI_REL_OFFSET r8, 3*8 movq_cfi r9, 2*8
movq %r9, 2*8(%rsp) movq_cfi r10, 1*8
CFI_REL_OFFSET r9, 2*8 movq_cfi r11, 0*8
movq %r10, 1*8(%rsp)
CFI_REL_OFFSET r10, 1*8
movq %r11, (%rsp)
CFI_REL_OFFSET r11, 0*8
.endif .endif
.endm .endm
#define ARG_SKIP (9*8) #define ARG_SKIP (9*8)
.macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \ .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
skipr8910=0, skiprdx=0 rstor_r8910=1, rstor_rdx=1
.if \skipr11 .if \rstor_r11
.else movq_cfi_restore 0*8, r11
movq (%rsp), %r11
CFI_RESTORE r11
.endif .endif
.if \skipr8910
.else .if \rstor_r8910
movq 1*8(%rsp), %r10 movq_cfi_restore 1*8, r10
CFI_RESTORE r10 movq_cfi_restore 2*8, r9
movq 2*8(%rsp), %r9 movq_cfi_restore 3*8, r8
CFI_RESTORE r9
movq 3*8(%rsp), %r8
CFI_RESTORE r8
.endif .endif
.if \skiprax
.else .if \rstor_rax
movq 4*8(%rsp), %rax movq_cfi_restore 4*8, rax
CFI_RESTORE rax
.endif .endif
.if \skiprcx
.else .if \rstor_rcx
movq 5*8(%rsp), %rcx movq_cfi_restore 5*8, rcx
CFI_RESTORE rcx
.endif .endif
.if \skiprdx
.else .if \rstor_rdx
movq 6*8(%rsp), %rdx movq_cfi_restore 6*8, rdx
CFI_RESTORE rdx
.endif .endif
movq 7*8(%rsp), %rsi
CFI_RESTORE rsi movq_cfi_restore 7*8, rsi
movq 8*8(%rsp), %rdi movq_cfi_restore 8*8, rdi
CFI_RESTORE rdi
.if ARG_SKIP+\addskip > 0 .if ARG_SKIP+\addskip > 0
addq $ARG_SKIP+\addskip, %rsp addq $ARG_SKIP+\addskip, %rsp
CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip) CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
...@@ -176,33 +162,21 @@ For 32-bit we have the following conventions - kernel is built with ...@@ -176,33 +162,21 @@ For 32-bit we have the following conventions - kernel is built with
.macro SAVE_REST .macro SAVE_REST
subq $REST_SKIP, %rsp subq $REST_SKIP, %rsp
CFI_ADJUST_CFA_OFFSET REST_SKIP CFI_ADJUST_CFA_OFFSET REST_SKIP
movq %rbx, 5*8(%rsp) movq_cfi rbx, 5*8
CFI_REL_OFFSET rbx, 5*8 movq_cfi rbp, 4*8
movq %rbp, 4*8(%rsp) movq_cfi r12, 3*8
CFI_REL_OFFSET rbp, 4*8 movq_cfi r13, 2*8
movq %r12, 3*8(%rsp) movq_cfi r14, 1*8
CFI_REL_OFFSET r12, 3*8 movq_cfi r15, 0*8
movq %r13, 2*8(%rsp)
CFI_REL_OFFSET r13, 2*8
movq %r14, 1*8(%rsp)
CFI_REL_OFFSET r14, 1*8
movq %r15, (%rsp)
CFI_REL_OFFSET r15, 0*8
.endm .endm
.macro RESTORE_REST .macro RESTORE_REST
movq (%rsp), %r15 movq_cfi_restore 0*8, r15
CFI_RESTORE r15 movq_cfi_restore 1*8, r14
movq 1*8(%rsp), %r14 movq_cfi_restore 2*8, r13
CFI_RESTORE r14 movq_cfi_restore 3*8, r12
movq 2*8(%rsp), %r13 movq_cfi_restore 4*8, rbp
CFI_RESTORE r13 movq_cfi_restore 5*8, rbx
movq 3*8(%rsp), %r12
CFI_RESTORE r12
movq 4*8(%rsp), %rbp
CFI_RESTORE rbp
movq 5*8(%rsp), %rbx
CFI_RESTORE rbx
addq $REST_SKIP, %rsp addq $REST_SKIP, %rsp
CFI_ADJUST_CFA_OFFSET -(REST_SKIP) CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
.endm .endm
...@@ -214,7 +188,7 @@ For 32-bit we have the following conventions - kernel is built with ...@@ -214,7 +188,7 @@ For 32-bit we have the following conventions - kernel is built with
.macro RESTORE_ALL addskip=0 .macro RESTORE_ALL addskip=0
RESTORE_REST RESTORE_REST
RESTORE_ARGS 0, \addskip RESTORE_ARGS 1, \addskip
.endm .endm
.macro icebp .macro icebp
......
arch/x86/include/asm/frame.h
View file @ eb47418d
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#include <asm/asm.h>
#include <asm/dwarf2.h> #include <asm/dwarf2.h>
/* The annotation hides the frame from the unwinder and makes it look /* The annotation hides the frame from the unwinder and makes it look
...@@ -7,13 +8,13 @@ ...@@ -7,13 +8,13 @@
frame pointer later */ frame pointer later */
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
.macro FRAME .macro FRAME
pushl_cfi %ebp __ASM_SIZE(push,_cfi) %__ASM_REG(bp)
CFI_REL_OFFSET ebp,0 CFI_REL_OFFSET __ASM_REG(bp), 0
movl %esp,%ebp __ASM_SIZE(mov) %__ASM_REG(sp), %__ASM_REG(bp)
.endm .endm
.macro ENDFRAME .macro ENDFRAME
popl_cfi %ebp __ASM_SIZE(pop,_cfi) %__ASM_REG(bp)
CFI_RESTORE ebp CFI_RESTORE __ASM_REG(bp)
.endm .endm
#else #else
.macro FRAME .macro FRAME
......
arch/x86/include/asm/rwlock.h
View file @ eb47418d
#ifndef _ASM_X86_RWLOCK_H #ifndef _ASM_X86_RWLOCK_H
#define _ASM_X86_RWLOCK_H #define _ASM_X86_RWLOCK_H
#define RW_LOCK_BIAS 0x01000000 #include <asm/asm.h>
#if CONFIG_NR_CPUS <= 2048
#ifndef __ASSEMBLY__
typedef union {
s32 lock;
s32 write;
} arch_rwlock_t;
#endif
#define RW_LOCK_BIAS 0x00100000
#define READ_LOCK_SIZE(insn) __ASM_FORM(insn##l)
#define READ_LOCK_ATOMIC(n) atomic_##n
#define WRITE_LOCK_ADD(n) __ASM_FORM_COMMA(addl n)
#define WRITE_LOCK_SUB(n) __ASM_FORM_COMMA(subl n)
#define WRITE_LOCK_CMP RW_LOCK_BIAS
#else /* CONFIG_NR_CPUS > 2048 */
#include <linux/const.h>
#ifndef __ASSEMBLY__
typedef union {
s64 lock;
struct {
u32 read;
s32 write;
};
} arch_rwlock_t;
#endif
#define RW_LOCK_BIAS (_AC(1,L) << 32)
#define READ_LOCK_SIZE(insn) __ASM_FORM(insn##q)
#define READ_LOCK_ATOMIC(n) atomic64_##n
#define WRITE_LOCK_ADD(n) __ASM_FORM(incl)
#define WRITE_LOCK_SUB(n) __ASM_FORM(decl)
#define WRITE_LOCK_CMP 1
#endif /* CONFIG_NR_CPUS */
#define __ARCH_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
/* Actual code is in asm/spinlock.h or in arch/x86/lib/rwlock.S */ /* Actual code is in asm/spinlock.h or in arch/x86/lib/rwlock.S */
......
arch/x86/include/asm/segment.h
View file @ eb47418d
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
#define GDT_ENTRY_DEFAULT_USER32_CS 4 #define GDT_ENTRY_DEFAULT_USER32_CS 4
#define GDT_ENTRY_DEFAULT_USER_DS 5 #define GDT_ENTRY_DEFAULT_USER_DS 5
#define GDT_ENTRY_DEFAULT_USER_CS 6 #define GDT_ENTRY_DEFAULT_USER_CS 6
#define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3) #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
#define __USER32_DS __USER_DS #define __USER32_DS __USER_DS
#define GDT_ENTRY_TSS 8 /* needs two entries */ #define GDT_ENTRY_TSS 8 /* needs two entries */
......
arch/x86/include/asm/spinlock.h
View file @ eb47418d
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _ASM_X86_SPINLOCK_H #define _ASM_X86_SPINLOCK_H
#include <asm/atomic.h> #include <asm/atomic.h>
#include <asm/rwlock.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <linux/compiler.h> #include <linux/compiler.h>
...@@ -234,7 +233,7 @@ static inline void arch_spin_unlock_wait(arch_spinlock_t *lock) ...@@ -234,7 +233,7 @@ static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
*/ */
static inline int arch_read_can_lock(arch_rwlock_t *lock) static inline int arch_read_can_lock(arch_rwlock_t *lock)
{ {
return (int)(lock)->lock > 0; return lock->lock > 0;
} }
/** /**
...@@ -243,12 +242,12 @@ static inline int arch_read_can_lock(arch_rwlock_t *lock) ...@@ -243,12 +242,12 @@ static inline int arch_read_can_lock(arch_rwlock_t *lock)
*/ */
static inline int arch_write_can_lock(arch_rwlock_t *lock) static inline int arch_write_can_lock(arch_rwlock_t *lock)
{ {
return (lock)->lock == RW_LOCK_BIAS; return lock->write == WRITE_LOCK_CMP;
} }
static inline void arch_read_lock(arch_rwlock_t *rw) static inline void arch_read_lock(arch_rwlock_t *rw)
{ {
asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
"jns 1f\n" "jns 1f\n"
"call __read_lock_failed\n\t" "call __read_lock_failed\n\t"
"1:\n" "1:\n"
...@@ -257,47 +256,55 @@ static inline void arch_read_lock(arch_rwlock_t *rw) ...@@ -257,47 +256,55 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
static inline void arch_write_lock(arch_rwlock_t *rw) static inline void arch_write_lock(arch_rwlock_t *rw)
{ {
asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t" asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
"jz 1f\n" "jz 1f\n"
"call __write_lock_failed\n\t" "call __write_lock_failed\n\t"
"1:\n" "1:\n"
::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory"); ::LOCK_PTR_REG (&rw->write), "i" (RW_LOCK_BIAS)
: "memory");
} }
static inline int arch_read_trylock(arch_rwlock_t *lock) static inline int arch_read_trylock(arch_rwlock_t *lock)
{ {
atomic_t *count = (atomic_t *)lock; READ_LOCK_ATOMIC(t) *count = (READ_LOCK_ATOMIC(t) *)lock;
if (atomic_dec_return(count) >= 0) if (READ_LOCK_ATOMIC(dec_return)(count) >= 0)
return 1; return 1;
atomic_inc(count); READ_LOCK_ATOMIC(inc)(count);
return 0; return 0;
} }
static inline int arch_write_trylock(arch_rwlock_t *lock) static inline int arch_write_trylock(arch_rwlock_t *lock)
{ {
atomic_t *count = (atomic_t *)lock; atomic_t *count = (atomic_t *)&lock->write;
if (atomic_sub_and_test(RW_LOCK_BIAS, count)) if (atomic_sub_and_test(WRITE_LOCK_CMP, count))
return 1; return 1;
atomic_add(RW_LOCK_BIAS, count); atomic_add(WRITE_LOCK_CMP, count);
return 0; return 0;
} }
static inline void arch_read_unlock(arch_rwlock_t *rw) static inline void arch_read_unlock(arch_rwlock_t *rw)
{ {
asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory"); asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
:"+m" (rw->lock) : : "memory");
} }
static inline void arch_write_unlock(arch_rwlock_t *rw) static inline void arch_write_unlock(arch_rwlock_t *rw)
{ {
asm volatile(LOCK_PREFIX "addl %1, %0" asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
} }
#define arch_read_lock_flags(lock, flags) arch_read_lock(lock) #define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
#define arch_write_lock_flags(lock, flags) arch_write_lock(lock) #define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
#undef READ_LOCK_SIZE
#undef READ_LOCK_ATOMIC
#undef WRITE_LOCK_ADD
#undef WRITE_LOCK_SUB
#undef WRITE_LOCK_CMP
#define arch_spin_relax(lock) cpu_relax() #define arch_spin_relax(lock) cpu_relax()
#define arch_read_relax(lock) cpu_relax() #define arch_read_relax(lock) cpu_relax()
#define arch_write_relax(lock) cpu_relax() #define arch_write_relax(lock) cpu_relax()
......
arch/x86/include/asm/spinlock_types.h
View file @ eb47418d
...@@ -11,10 +11,6 @@ typedef struct arch_spinlock { ...@@ -11,10 +11,6 @@ typedef struct arch_spinlock {
#define __ARCH_SPIN_LOCK_UNLOCKED { 0 } #define __ARCH_SPIN_LOCK_UNLOCKED { 0 }
typedef struct { #include <asm/rwlock.h>
unsigned int lock;
} arch_rwlock_t;
#define __ARCH_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
#endif /* _ASM_X86_SPINLOCK_TYPES_H */ #endif /* _ASM_X86_SPINLOCK_TYPES_H */
arch/x86/kernel/entry_64.S
View file @ eb47418d
...@@ -467,7 +467,7 @@ ENTRY(system_call_after_swapgs) ...@@ -467,7 +467,7 @@ ENTRY(system_call_after_swapgs)
* and short: * and short:
*/ */
ENABLE_INTERRUPTS(CLBR_NONE) ENABLE_INTERRUPTS(CLBR_NONE)
SAVE_ARGS 8,1 SAVE_ARGS 8,0
movq %rax,ORIG_RAX-ARGOFFSET(%rsp) movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
movq %rcx,RIP-ARGOFFSET(%rsp) movq %rcx,RIP-ARGOFFSET(%rsp)
CFI_REL_OFFSET rip,RIP-ARGOFFSET CFI_REL_OFFSET rip,RIP-ARGOFFSET
...@@ -502,7 +502,7 @@ sysret_check: ...@@ -502,7 +502,7 @@ sysret_check:
TRACE_IRQS_ON TRACE_IRQS_ON
movq RIP-ARGOFFSET(%rsp),%rcx movq RIP-ARGOFFSET(%rsp),%rcx
CFI_REGISTER rip,rcx CFI_REGISTER rip,rcx
RESTORE_ARGS 0,-ARG_SKIP,1 RESTORE_ARGS 1,-ARG_SKIP,0
/*CFI_REGISTER rflags,r11*/ /*CFI_REGISTER rflags,r11*/
movq PER_CPU_VAR(old_rsp), %rsp movq PER_CPU_VAR(old_rsp), %rsp
USERGS_SYSRET64 USERGS_SYSRET64
...@@ -851,7 +851,7 @@ retint_restore_args: /* return to kernel space */ ...@@ -851,7 +851,7 @@ retint_restore_args: /* return to kernel space */
*/ */
TRACE_IRQS_IRETQ TRACE_IRQS_IRETQ
restore_args: restore_args:
RESTORE_ARGS 0,8,0 RESTORE_ARGS 1,8,1
irq_return: irq_return:
INTERRUPT_RETURN INTERRUPT_RETURN
......
arch/x86/lib/Makefile
View file @ eb47418d
...@@ -20,6 +20,8 @@ lib-y := delay.o ...@@ -20,6 +20,8 @@ lib-y := delay.o
lib-y += thunk_$(BITS).o lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
lib-y += memcpy_$(BITS).o lib-y += memcpy_$(BITS).o
lib-$(CONFIG_SMP) += rwlock.o
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o
obj-y += msr.o msr-reg.o msr-reg-export.o obj-y += msr.o msr-reg.o msr-reg-export.o
...@@ -29,7 +31,7 @@ ifeq ($(CONFIG_X86_32),y) ...@@ -29,7 +31,7 @@ ifeq ($(CONFIG_X86_32),y)
lib-y += atomic64_cx8_32.o lib-y += atomic64_cx8_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 += string_32.o
lib-y += cmpxchg.o lib-y += cmpxchg.o
ifneq ($(CONFIG_X86_CMPXCHG64),y) ifneq ($(CONFIG_X86_CMPXCHG64),y)
lib-y += cmpxchg8b_emu.o atomic64_386_32.o lib-y += cmpxchg8b_emu.o atomic64_386_32.o
...@@ -40,7 +42,6 @@ else ...@@ -40,7 +42,6 @@ else
lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o lib-y += csum-partial_64.o csum-copy_64.o csum-wrappers_64.o
lib-y += thunk_64.o clear_page_64.o copy_page_64.o lib-y += thunk_64.o clear_page_64.o copy_page_64.o
lib-y += memmove_64.o memset_64.o lib-y += memmove_64.o memset_64.o
lib-y += copy_user_64.o rwlock_64.o copy_user_nocache_64.o lib-y += copy_user_64.o copy_user_nocache_64.o
lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem_64.o
lib-y += cmpxchg16b_emu.o lib-y += cmpxchg16b_emu.o
endif endif
arch/x86/lib/rwlock_64.S → arch/x86/lib/rwlock.S
View file @ eb47418d
/* Slow paths of read/write spinlocks. */ /* Slow paths of read/write spinlocks. */
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/rwlock.h>
#include <asm/alternative-asm.h> #include <asm/alternative-asm.h>
#include <asm/dwarf2.h> #include <asm/frame.h>
#include <asm/rwlock.h>
#ifdef CONFIG_X86_32
# define __lock_ptr eax
#else
# define __lock_ptr rdi
#endif
/* rdi: pointer to rwlock_t */
ENTRY(__write_lock_failed) ENTRY(__write_lock_failed)
CFI_STARTPROC CFI_STARTPROC
LOCK_PREFIX FRAME
addl $RW_LOCK_BIAS,(%rdi) 0: LOCK_PREFIX
1: rep WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
nop 1: rep; nop
cmpl $RW_LOCK_BIAS,(%rdi) cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
jne 1b jne 1b
LOCK_PREFIX LOCK_PREFIX
subl $RW_LOCK_BIAS,(%rdi) WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
jnz __write_lock_failed jnz 0b
ENDFRAME
ret ret
CFI_ENDPROC CFI_ENDPROC
END(__write_lock_failed) END(__write_lock_failed)
/* rdi: pointer to rwlock_t */
ENTRY(__read_lock_failed) ENTRY(__read_lock_failed)
CFI_STARTPROC CFI_STARTPROC
LOCK_PREFIX FRAME
incl (%rdi) 0: LOCK_PREFIX
1: rep READ_LOCK_SIZE(inc) (%__lock_ptr)
nop 1: rep; nop
cmpl $1,(%rdi) READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
js 1b js 1b
LOCK_PREFIX LOCK_PREFIX
decl (%rdi) READ_LOCK_SIZE(dec) (%__lock_ptr)
js __read_lock_failed js 0b
ENDFRAME
ret ret
CFI_ENDPROC CFI_ENDPROC
END(__read_lock_failed) END(__read_lock_failed)
arch/x86/lib/rwsem_64.S → arch/x86/lib/rwsem.S
View file @ eb47418d
/*
* x86 semaphore implementation.
*
* (C) Copyright 1999 Linus Torvalds
*
* Portions Copyright 1999 Red Hat, Inc.
*
* 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; either version
* 2 of the License, or (at your option) any later version.
*
* rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org>
*/
#include <linux/linkage.h>
#include <asm/alternative-asm.h>
#include <asm/dwarf2.h>
#define __ASM_HALF_REG(reg) __ASM_SEL(reg, e##reg)
#define __ASM_HALF_SIZE(inst) __ASM_SEL(inst##w, inst##l)
#ifdef CONFIG_X86_32
/*
* The semaphore operations have a special calling sequence that
* allow us to do a simpler in-line version of them. These routines
* need to convert that sequence back into the C sequence when
* there is contention on the semaphore.
*
* %eax contains the semaphore pointer on entry. Save the C-clobbered
* registers (%eax, %edx and %ecx) except %eax whish is either a return
* value or just clobbered..
*/
#define save_common_regs \
pushl_cfi %ecx; CFI_REL_OFFSET ecx, 0
#define restore_common_regs \
popl_cfi %ecx; CFI_RESTORE ecx
/* Avoid uglifying the argument copying x86-64 needs to do. */
.macro movq src, dst
.endm
#else
/* /*
* x86-64 rwsem wrappers * x86-64 rwsem wrappers
* *
...@@ -16,12 +63,6 @@ ...@@ -16,12 +63,6 @@
* but %rdi, %rsi, %rcx, %r8-r11 always need saving. * but %rdi, %rsi, %rcx, %r8-r11 always need saving.
*/ */
#include <linux/linkage.h>
#include <asm/rwlock.h>
#include <asm/alternative-asm.h>
#include <asm/frame.h>
#include <asm/dwarf2.h>
#define save_common_regs \ #define save_common_regs \
pushq_cfi %rdi; CFI_REL_OFFSET rdi, 0; \ pushq_cfi %rdi; CFI_REL_OFFSET rdi, 0; \
pushq_cfi %rsi; CFI_REL_OFFSET rsi, 0; \ pushq_cfi %rsi; CFI_REL_OFFSET rsi, 0; \
...@@ -40,16 +81,18 @@ ...@@ -40,16 +81,18 @@
popq_cfi %rsi; CFI_RESTORE rsi; \ popq_cfi %rsi; CFI_RESTORE rsi; \
popq_cfi %rdi; CFI_RESTORE rdi popq_cfi %rdi; CFI_RESTORE rdi
#endif
/* Fix up special calling conventions */ /* Fix up special calling conventions */
ENTRY(call_rwsem_down_read_failed) ENTRY(call_rwsem_down_read_failed)
CFI_STARTPROC CFI_STARTPROC
save_common_regs save_common_regs
pushq_cfi %rdx __ASM_SIZE(push,_cfi) %__ASM_REG(dx)
CFI_REL_OFFSET rdx, 0 CFI_REL_OFFSET __ASM_REG(dx), 0
movq %rax,%rdi movq %rax,%rdi
call rwsem_down_read_failed call rwsem_down_read_failed
popq_cfi %rdx __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
CFI_RESTORE rdx CFI_RESTORE __ASM_REG(dx)
restore_common_regs restore_common_regs
ret ret
CFI_ENDPROC CFI_ENDPROC
...@@ -67,7 +110,8 @@ ENDPROC(call_rwsem_down_write_failed) ...@@ -67,7 +110,8 @@ ENDPROC(call_rwsem_down_write_failed)
ENTRY(call_rwsem_wake) ENTRY(call_rwsem_wake)
CFI_STARTPROC CFI_STARTPROC
decl %edx /* do nothing if still outstanding active readers */ /* do nothing if still outstanding active readers */
__ASM_HALF_SIZE(dec) %__ASM_HALF_REG(dx)
jnz 1f jnz 1f
save_common_regs save_common_regs
movq %rax,%rdi movq %rax,%rdi
...@@ -77,16 +121,15 @@ ENTRY(call_rwsem_wake) ...@@ -77,16 +121,15 @@ ENTRY(call_rwsem_wake)
CFI_ENDPROC CFI_ENDPROC
ENDPROC(call_rwsem_wake) ENDPROC(call_rwsem_wake)
/* Fix up special calling conventions */
ENTRY(call_rwsem_downgrade_wake) ENTRY(call_rwsem_downgrade_wake)
CFI_STARTPROC CFI_STARTPROC
save_common_regs save_common_regs
pushq_cfi %rdx __ASM_SIZE(push,_cfi) %__ASM_REG(dx)
CFI_REL_OFFSET rdx, 0 CFI_REL_OFFSET __ASM_REG(dx), 0
movq %rax,%rdi movq %rax,%rdi
call rwsem_downgrade_wake call rwsem_downgrade_wake
popq_cfi %rdx __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
CFI_RESTORE rdx CFI_RESTORE __ASM_REG(dx)
restore_common_regs restore_common_regs
ret ret
CFI_ENDPROC CFI_ENDPROC
......
arch/x86/lib/semaphore_32.S deleted 100644 → 0
View file @ 2c9e88a1
/*
* i386 semaphore implementation.
*
* (C) Copyright 1999 Linus Torvalds
*
* Portions Copyright 1999 Red Hat, Inc.
*
* 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; either version
* 2 of the License, or (at your option) any later version.
*
* rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org>
*/
#include <linux/linkage.h>
#include <asm/rwlock.h>
#include <asm/alternative-asm.h>
#include <asm/frame.h>
#include <asm/dwarf2.h>
/*
* The semaphore operations have a special calling sequence that
* allow us to do a simpler in-line version of them. These routines
* need to convert that sequence back into the C sequence when
* there is contention on the semaphore.
*
* %eax contains the semaphore pointer on entry. Save the C-clobbered
* registers (%eax, %edx and %ecx) except %eax whish is either a return
* value or just clobbered..
*/
.section .sched.text, "ax"
/*
* rw spinlock fallbacks
*/
#ifdef CONFIG_SMP
ENTRY(__write_lock_failed)
CFI_STARTPROC
FRAME
2: LOCK_PREFIX
addl $ RW_LOCK_BIAS,(%eax)
1: rep; nop
cmpl $ RW_LOCK_BIAS,(%eax)
jne 1b
LOCK_PREFIX
subl $ RW_LOCK_BIAS,(%eax)
jnz 2b
ENDFRAME
ret
CFI_ENDPROC
ENDPROC(__write_lock_failed)
ENTRY(__read_lock_failed)
CFI_STARTPROC
FRAME
2: LOCK_PREFIX
incl (%eax)
1: rep; nop
cmpl $1,(%eax)
js 1b
LOCK_PREFIX
decl (%eax)
js 2b
ENDFRAME
ret
CFI_ENDPROC
ENDPROC(__read_lock_failed)
#endif
#ifdef CONFIG_RWSEM_XCHGADD_ALGORITHM
/* Fix up special calling conventions */
ENTRY(call_rwsem_down_read_failed)
CFI_STARTPROC
pushl_cfi %ecx
CFI_REL_OFFSET ecx,0
pushl_cfi %edx
CFI_REL_OFFSET edx,0
call rwsem_down_read_failed
popl_cfi %edx
popl_cfi %ecx
ret
CFI_ENDPROC
ENDPROC(call_rwsem_down_read_failed)
ENTRY(call_rwsem_down_write_failed)
CFI_STARTPROC
pushl_cfi %ecx
CFI_REL_OFFSET ecx,0
calll rwsem_down_write_failed
popl_cfi %ecx
ret
CFI_ENDPROC
ENDPROC(call_rwsem_down_write_failed)
ENTRY(call_rwsem_wake)
CFI_STARTPROC
decw %dx /* do nothing if still outstanding active readers */
jnz 1f
pushl_cfi %ecx
CFI_REL_OFFSET ecx,0
call rwsem_wake
popl_cfi %ecx
1: ret
CFI_ENDPROC
ENDPROC(call_rwsem_wake)
/* Fix up special calling conventions */
ENTRY(call_rwsem_downgrade_wake)
CFI_STARTPROC
pushl_cfi %ecx
CFI_REL_OFFSET ecx,0
pushl_cfi %edx
CFI_REL_OFFSET edx,0
call rwsem_downgrade_wake
popl_cfi %edx
popl_cfi %ecx
ret
CFI_ENDPROC
ENDPROC(call_rwsem_downgrade_wake)
#endif
arch/x86/lib/thunk_64.S
View file @ eb47418d
...@@ -5,44 +5,35 @@ ...@@ -5,44 +5,35 @@
* Added trace_hardirqs callers - Copyright 2007 Steven Rostedt, Red Hat, Inc. * Added trace_hardirqs callers - Copyright 2007 Steven Rostedt, Red Hat, Inc.
* Subject to the GNU public license, v.2. No warranty of any kind. * Subject to the GNU public license, v.2. No warranty of any kind.
*/ */
#include <linux/linkage.h>
#include <linux/linkage.h> #include <asm/dwarf2.h>
#include <asm/dwarf2.h> #include <asm/calling.h>
#include <asm/calling.h>
#include <asm/rwlock.h>
/* rdi: arg1 ... normal C conventions. rax is saved/restored. */ /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
.macro thunk name,func .macro THUNK name, func, put_ret_addr_in_rdi=0
.globl \name .globl \name
\name: \name:
CFI_STARTPROC CFI_STARTPROC
SAVE_ARGS
call \func
jmp restore
CFI_ENDPROC
.endm
#ifdef CONFIG_TRACE_IRQFLAGS /* this one pushes 9 elems, the next one would be %rIP */
/* put return address in rdi (arg1) */
.macro thunk_ra name,func
.globl \name
\name:
CFI_STARTPROC
SAVE_ARGS SAVE_ARGS
/* SAVE_ARGS pushs 9 elements */
/* the next element would be the rip */ .if \put_ret_addr_in_rdi
movq 9*8(%rsp), %rdi movq_cfi_restore 9*8, rdi
.endif
call \func call \func
jmp restore jmp restore
CFI_ENDPROC CFI_ENDPROC
.endm .endm
thunk_ra trace_hardirqs_on_thunk,trace_hardirqs_on_caller #ifdef CONFIG_TRACE_IRQFLAGS
thunk_ra trace_hardirqs_off_thunk,trace_hardirqs_off_caller THUNK trace_hardirqs_on_thunk,trace_hardirqs_on_caller,1
THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
#endif #endif
#ifdef CONFIG_DEBUG_LOCK_ALLOC #ifdef CONFIG_DEBUG_LOCK_ALLOC
thunk lockdep_sys_exit_thunk,lockdep_sys_exit THUNK lockdep_sys_exit_thunk,lockdep_sys_exit
#endif #endif
/* SAVE_ARGS below is used only for the .cfi directives it contains. */ /* SAVE_ARGS below is used only for the .cfi directives it contains. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7