Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Optimize ticket spinlocks in fsys_rt_sigprocmask
This commit is contained in:
Linus Torvalds 2010-09-16 12:58:44 -07:00
Родитель 1f0ce990f0 2d2b690164
Коммит 7bb419041b
1 изменённых файлов: 13 добавлений и 33 удалений

Просмотреть файл

@ -420,34 +420,31 @@ EX(.fail_efault, ld8 r14=[r33]) // r14 <- *set
;; ;;
RSM_PSR_I(p0, r18, r19) // mask interrupt delivery RSM_PSR_I(p0, r18, r19) // mask interrupt delivery
mov ar.ccv=0
andcm r14=r14,r17 // filter out SIGKILL & SIGSTOP andcm r14=r14,r17 // filter out SIGKILL & SIGSTOP
mov r8=EINVAL // default to EINVAL
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
// __ticket_spin_trylock(r31) // __ticket_spin_trylock(r31)
ld4 r17=[r31] ld4 r17=[r31]
mov r8=EINVAL // default to EINVAL
;; ;;
extr r9=r17,17,15
;;
xor r18=r17,r9
adds r19=1,r17
;;
extr.u r18=r18,0,15
;;
cmp.eq p0,p7=0,r18
(p7) br.cond.spnt.many .lock_contention
mov.m ar.ccv=r17 mov.m ar.ccv=r17
extr.u r9=r17,17,15
adds r19=1,r17
extr.u r18=r17,0,15
;; ;;
cmpxchg4.acq r9=[r31],r19,ar.ccv cmp.eq p6,p7=r9,r18
;;
(p6) cmpxchg4.acq r9=[r31],r19,ar.ccv
(p6) dep.z r20=r19,1,15 // next serving ticket for unlock
(p7) br.cond.spnt.many .lock_contention
;; ;;
cmp4.eq p0,p7=r9,r17 cmp4.eq p0,p7=r9,r17
adds r31=2,r31
(p7) br.cond.spnt.many .lock_contention (p7) br.cond.spnt.many .lock_contention
ld8 r3=[r2] // re-read current->blocked now that we hold the lock ld8 r3=[r2] // re-read current->blocked now that we hold the lock
;; ;;
#else #else
ld8 r3=[r2] // re-read current->blocked now that we hold the lock ld8 r3=[r2] // re-read current->blocked now that we hold the lock
mov r8=EINVAL // default to EINVAL
#endif #endif
add r18=IA64_TASK_PENDING_OFFSET+IA64_SIGPENDING_SIGNAL_OFFSET,r16 add r18=IA64_TASK_PENDING_OFFSET+IA64_SIGPENDING_SIGNAL_OFFSET,r16
add r19=IA64_TASK_SIGNAL_OFFSET,r16 add r19=IA64_TASK_SIGNAL_OFFSET,r16
@ -503,16 +500,8 @@ EX(.fail_efault, ld8 r14=[r33]) // r14 <- *set
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
// __ticket_spin_unlock(r31) // __ticket_spin_unlock(r31)
adds r31=2,r31 st2.rel [r31]=r20
;; mov r20=0 // i must not leak kernel bits...
ld2.bias r2=[r31]
mov r3=65534
;;
adds r2=2,r2
;;
and r3=r3,r2
;;
st2.rel [r31]=r3
#endif #endif
SSM_PSR_I(p0, p9, r31) SSM_PSR_I(p0, p9, r31)
;; ;;
@ -535,16 +524,7 @@ EX(.fail_efault, (p15) st8 [r34]=r3)
.sig_pending: .sig_pending:
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
// __ticket_spin_unlock(r31) // __ticket_spin_unlock(r31)
adds r31=2,r31 st2.rel [r31]=r20 // release the lock
;;
ld2.bias r2=[r31]
mov r3=65534
;;
adds r2=2,r2
;;
and r3=r3,r2
;;
st2.rel [r31]=r3
#endif #endif
SSM_PSR_I(p0, p9, r17) SSM_PSR_I(p0, p9, r17)
;; ;;