interruptible rwsem operations (i386, core)
Subsystems (2)
RFC PATCH 2/4 interruptible rwsem operations (i386, core)
From: Nick Piggin <[email protected]>
Add functions down_read_interruptible, and down_write_interruptible to rw semaphores. Implement these for i386.
Other architectures should be fairly straight forward - the functions are basically identical to down_read / down_write, but must just catch and return the value from the out-of-line function in the case that the semaphore is contended.
---
linux-2.6-npiggin/include/asm-i386/rwsem.h | 75 ++++++++++++- linux-2.6-npiggin/include/linux/rwsem-spinlock.h | 2 linux-2.6-npiggin/include/linux/rwsem.h | 28 ++++ linux-2.6-npiggin/lib/rwsem-spinlock.c | 132 +++++++++++++++++++++++ linux-2.6-npiggin/lib/rwsem.c | 114 ++++++++++++++++++- 5 files changed, 337 insertions(+), 14 deletions(-)
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +105 -9
@@ -142,8 +142,7 @@ __rwsem_do_wake(struct rw_semaphore *sem/* * wait for a lock to be granted */ -static inline struct rw_semaphore * -rwsem_down_failed_common (struct rw_semaphore *sem, +static inline void rwsem_down_failed_common (struct rw_semaphore *sem,struct rwsem_waiter *waiter,signed long adjustment) {struct task_struct *tsk = current;
@@ -180,15 +179,70 @@ rwsem_down_failed_common(struct rw_semap } tsk->state =TASK_RUNNING ; +} -return sem; +/* +* interruptible wait for a lock to be granted +*/ +static inline int +rwsem_down_interruptible_failed_common (struct rw_semaphore *sem, +struct rwsem_waiter *waiter,signed long adjustment) +{ +struct task_struct *tsk = current; +signed long count; +int ret =0 ; + +if (signal_pending (current)) +return -EINTR ; + +set_task_state (tsk,TASK_INTERRUPTIBLE ); + +/* set up my own style of waitqueue */ +spin_lock (&sem->wait_lock); + waiter->task = tsk; +get_task_struct (tsk); + +list_add_tail (&waiter->list, &sem->wait_list); + +/* we're now waiting on the lock, but no longer actively read-locking */ + count =rwsem_atomic_update (adjustment, sem); + +/* if there are no active locks, wake the front queued process(es) up */ +if (!(count &RWSEM_ACTIVE_MASK )) + sem =__rwsem_do_wake (sem,0 ); + +spin_unlock (&sem->wait_lock); + +/* wait to be given the lock */ +for (;;) { +if (!waiter->task) +break ; +if (signal_pending (current)) { +spin_lock (&sem->wait_lock); +if (!waiter->task) { +spin_unlock (&sem->wait_lock); +break ; + } +list_del (&waiter->list); +rwsem_atomic_add (-adjustment, sem); +spin_unlock (&sem->wait_lock); + ret = -EINTR ; +break ; + } + +schedule (); +set_task_state (tsk,TASK_INTERRUPTIBLE ); + } + + tsk->state =TASK_RUNNING ; + +return ret; }/* * wait for the read lock to be granted */ -struct rw_semaphore fastcall __sched * -rwsem_down_read_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_read_failed(struct rw_semaphore *sem) {struct rwsem_waiter waiter;
@@ -199,14 +253,33 @@ rwsem_down_read_failed(struct rw_semapho RWSEM_WAITING_BIAS - RWSEM_ACTIVE_BIAS);rwsemtrace (sem,"Leaving rwsem_down_read_failed" ); -return sem; +} + +/* +* interruptible wait for the read lock to be granted +*/ +int fastcall __sched +rwsem_down_read_interruptible_failed (struct rw_semaphore *sem) +{ +struct rwsem_waiter waiter; +int ret; + +rwsemtrace (sem,"Entering rwsem_down_read_interruptible_failed" ); + + waiter.flags =RWSEM_WAITING_FOR_READ ; + ret =rwsem_down_interruptible_failed_common (sem, &waiter, +RWSEM_WAITING_BIAS -RWSEM_ACTIVE_BIAS ); +if (ret == -EINTR ) +up_read (sem); + +rwsemtrace (sem,"Leaving rwsem_down_read_interruptible_failed" ); +return ret; }/* * wait for the write lock to be granted */ -struct rw_semaphore fastcall __sched * -rwsem_down_write_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_write_failed(struct rw_semaphore *sem) {struct rwsem_waiter waiter;
@@ -216,10 +289,31 @@ rwsem_down_write_failed(struct rw_semaphrwsem_down_failed_common (sem, &waiter, -RWSEM_ACTIVE_BIAS );rwsemtrace (sem,"Leaving rwsem_down_write_failed" ); -return sem; }/* +* interruptible wait for the write lock to be granted +*/ +int fastcall __sched +rwsem_down_write_interruptible_failed (struct rw_semaphore *sem) +{ +struct rwsem_waiter waiter; +int ret; + +rwsemtrace (sem,"Entering rwsem_down_write_interruptible_failed" ); + + waiter.flags =RWSEM_WAITING_FOR_WRITE ; + ret =rwsem_down_interruptible_failed_common (sem, &waiter, + -RWSEM_ACTIVE_BIAS ); +if (ret == -EINTR ) +up_write (sem); + +rwsemtrace (sem,"Leaving rwsem_down_write_interruptible_failed" ); +return ret; +} + + +/* * handle waking up a waiter on the semaphore * - up_read/up_write has decremented the active part of count if we come here */
@@ -262,7 +356,9 @@ struct rw_semaphore fastcall *rwsem_down }EXPORT_SYMBOL (rwsem_down_read_failed); +EXPORT_SYMBOL (rwsem_down_read_interruptible_failed);EXPORT_SYMBOL (rwsem_down_write_failed); +EXPORT_SYMBOL (rwsem_down_write_interruptible_failed);EXPORT_SYMBOL (rwsem_wake);EXPORT_SYMBOL (rwsem_downgrade_wake);#if RWSEM_DEBUG
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +70 -5
113 lines not on this page · raw message
lib/rwsem-spinlock.c renamed from lib/rwsem-spinlock.c~rwsem-interruptible +132 -0
144 lines not on this page · raw message
include/linux/rwsem.h renamed from include/linux/rwsem.h~rwsem-interruptible +28 -0
@@ -47,6 +47,20 @@ static inline void down_read(struct rw_s }/* +* interrupbile lock for reading +* returns 0 on success, -EINTR if interrupted +*/ +static inline int down_read_interruptible (struct rw_semaphore *sem) +{ +int ret; +might_sleep (); +rwsemtrace (sem,"Entering down_read_interruptible" ); + ret =__down_read_interruptible (sem); +rwsemtrace (sem,"Leaving down_read_interruptible" ); +return ret; +} + +/* * trylock for reading -- returns 1 if successful, 0 if contention */ static inline int down_read_trylock (struct rw_semaphore *sem)
@@ -70,6 +84,20 @@ static inline void down_write(struct rw_ }/* +* interrupbile lock for writing +* returns 0 on success, -EINTR if interrupted +*/ +static inline int down_write_interruptible (struct rw_semaphore *sem) +{ +int ret; +might_sleep (); +rwsemtrace (sem,"Entering down_write_interruptible" ); + ret =__down_write_interruptible (sem); +rwsemtrace (sem,"Leaving down_write_interruptible" ); +return ret; +} + +/* * trylock for writing -- returns 1 if successful, 0 if contention */ static inline int down_write_trylock (struct rw_semaphore *sem)
include/linux/rwsem-spinlock.h renamed from include/linux/rwsem-spinlock.h~rwsem-interruptible +2 -0
@@ -54,8 +54,10 @@ struct rw_semaphore {extern void FASTCALL (init_rwsem (struct rw_semaphore *sem));extern void FASTCALL (__down_read (struct rw_semaphore *sem)); +extern int FASTCALL (__down_read_interruptible (struct rw_semaphore *sem));extern int FASTCALL (__down_read_trylock (struct rw_semaphore *sem));extern void FASTCALL (__down_write (struct rw_semaphore *sem)); +extern int FASTCALL (__down_write_interruptible (struct rw_semaphore *sem));extern int FASTCALL (__down_write_trylock (struct rw_semaphore *sem));extern void FASTCALL (__up_read (struct rw_semaphore *sem));extern void FASTCALL (__up_write (struct rw_semaphore *sem));
_
lib/rwsem.c rwsem_down_failed_common(struct rw_semap · line 190
Quoted 9 lines · Dominik Brodowski
Add functions
down_read_interruptible, anddown_write_interruptibleto rw semaphores. Implement these for i386.
...lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +4
-0+static inline int +rwsem_down_interruptible_failed_common (struct rw_semaphore *sem, +struct rwsem_waiter *waiter,signed long adjustment) +{
I wonder if you should check to see if there are any readers that can be woken up if a sleeping writer is interrupted, but I can't think of a simple way to do it.
lib/rwsem.c rwsem_down_failed_common(struct rw_semap · line 245
Quoted 3 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +1
-2-struct rw_semaphore fastcall __sched * -rwsem_down_read_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_read_failed(struct rw_semaphore *sem)
Please don't.
lib/rwsem.c rwsem_down_read_failed(struct rw_semapho · line 202
Quoted 5 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +0
-1@@ -199,14 +253,33 @@ rwsem_down_read_failed(struct rw_semapho RWSEM_WAITING_BIAS - RWSEM_ACTIVE_BIAS);rwsemtrace (sem,"Leaving rwsem_down_read_failed" ); -return sem;
Ditto.
lib/rwsem.c rwsem_down_read_failed(struct rw_semapho · line 282
Quoted 3 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +1
-2-struct rw_semaphore fastcall __sched * -rwsem_down_write_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_write_failed(struct rw_semaphore *sem)
Ditto.
lib/rwsem.c rwsem_down_write_failed(struct rw_semaph · line 219
Quoted 5 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +0
-1@@ -216,10 +289,31 @@ rwsem_down_write_failed(struct rw_semaphrwsem_down_failed_common (sem, &waiter, -RWSEM_ACTIVE_BIAS );rwsemtrace (sem,"Leaving rwsem_down_write_failed" ); -return sem;
Ditto.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 106
Quoted 6 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1@@ -99,11 +103,12 @@ static inline void __down_read(struct rw { __asm__ __volatile__("# beginning down_read\n\t" -LOCK_PREFIX " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ +LOCK_PREFIX " incl %0\n\t" /* adds 0x00000001, returns the old value */
Ditto.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 111
Quoted 5 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-0" js 2f\n\t" /* jump if we weren't granted the lock */ "1:\n\t" LOCK_SECTION_START("")"2:\n\t" +" movl %2,%%eax\n\t"
Splat.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 114
Quoted 3 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +0
-0" pushl %%ecx\n\t" " pushl %%edx\n\t" " call rwsem_down_read_failed\n\t"
Splat.
include/asm-i386/rwsem.h LOCK_PREFIX " incl (%%eax)\n\t" /* · line 123
Quoted 8 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1@@ -113,11 +118,41 @@ LOCK_PREFIX " incl (%%eax)\n\t" /* LOCK_SECTION_END "# ending down_read\n\t" : "=m"(sem->count) - : "a"(sem), "m"(sem->count) + : "m"(sem->count), "m"(sem) : "memory", "cc"); }
You appear to be corrupting EAX.
include/asm-i386/rwsem.h LOCK_PREFIX " incl (%%eax)\n\t" /* · line 128
Quoted 1 line
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-0+static inline int __down_read_interruptible (struct rw_semaphore *sem)
Will corrupt EAX.
include/asm-i386/rwsem.h static inline void __down_write(struct r · line 188
Quoted 3 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1"# beginning down_write\n\t" -LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ +LOCK_PREFIX " xadd %%edx,%0\n\t" /* subtract 0x0000ffff, returns the old value */
Again, please don't. It's a lot more readable when it mentions EAX directly, plus it's also independent of constraint reordering.
include/asm-i386/rwsem.h LOCK_PREFIX " xadd %%edx,(%%eax)\n · line 208
Quoted 1 line
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-0+static inline int __down_write_interruptible (struct rw_semaphore *sem)
Will corrupt EAX and EDX.
David
Quoted 8 lines · David Howells
Quoted 3 lines · Dominik Brodowski
Add functions
down_read_interruptible, anddown_write_interruptibleto rw semaphores. Implement these for i386.
...
Quoted 12 lines
lib/rwsem.c rwsem_down_failed_common(struct rw_semap · line 190
Quoted 5 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +4
-0+static inline int +rwsem_down_interruptible_failed_common (struct rw_semaphore *sem, +struct rwsem_waiter *waiter,signed long adjustment) +{I wonder if you should check to see if there are any readers that can be woken up if a sleeping writer is interrupted, but I can't think of a simple way to do it.
I think it will, won't it?
Quoted 78 lines
lib/rwsem.c rwsem_down_failed_common(struct rw_semap · line 245
Quoted 3 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +1
-2-struct rw_semaphore fastcall __sched * -rwsem_down_read_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_read_failed(struct rw_semaphore *sem)Please don't.
lib/rwsem.c rwsem_down_read_failed(struct rw_semapho · line 202
Quoted 5 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +0
-1@@ -199,14 +253,33 @@ rwsem_down_read_failed(struct rw_semapho RWSEM_WAITING_BIAS - RWSEM_ACTIVE_BIAS);rwsemtrace (sem,"Leaving rwsem_down_read_failed" ); -return sem;Ditto.
lib/rwsem.c rwsem_down_read_failed(struct rw_semapho · line 282
Quoted 3 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +1
-2-struct rw_semaphore fastcall __sched * -rwsem_down_write_failed (struct rw_semaphore *sem) +void fastcall __sched rwsem_down_write_failed(struct rw_semaphore *sem)Ditto.
lib/rwsem.c rwsem_down_write_failed(struct rw_semaph · line 219
Quoted 5 lines
lib/rwsem.c renamed from lib/rwsem.c~rwsem-interruptible +0
-1@@ -216,10 +289,31 @@ rwsem_down_write_failed(struct rw_semaphrwsem_down_failed_common (sem, &waiter, -RWSEM_ACTIVE_BIAS );rwsemtrace (sem,"Leaving rwsem_down_write_failed" ); -return sem;Ditto.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 106
Quoted 6 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1@@ -99,11 +103,12 @@ static inline void __down_read(struct rw { __asm__ __volatile__("# beginning down_read\n\t" -LOCK_PREFIX " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ +LOCK_PREFIX " incl %0\n\t" /* adds 0x00000001, returns the old value */Ditto.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 111
Quoted 5 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-0" js 2f\n\t" /* jump if we weren't granted the lock */ "1:\n\t" LOCK_SECTION_START("")"2:\n\t" +" movl %2,%%eax\n\t" Splat.
include/asm-i386/rwsem.h static inline void __down_read(struct rw · line 114
Quoted 3 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +0
-0" pushl %%ecx\n\t" " pushl %%edx\n\t" " call rwsem_down_read_failed\n\t" Splat.
include/asm-i386/rwsem.h LOCK_PREFIX " incl (%%eax)\n\t" /* · line 123
Quoted 8 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1@@ -113,11 +118,41 @@ LOCK_PREFIX " incl (%%eax)\n\t" /* LOCK_SECTION_END "# ending down_read\n\t" : "=m"(sem->count) - : "a"(sem), "m"(sem->count) + : "m"(sem->count), "m"(sem) : "memory", "cc"); }You appear to be corrupting EAX.
Quoted 5 lines
include/asm-i386/rwsem.h LOCK_PREFIX " incl (%%eax)\n\t" /* · line 128
Quoted 1 line
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-0+static inline int __down_read_interruptible (struct rw_semaphore *sem)Will corrupt EAX.
I'll fix these up. You're right by the looks.
Quoted 9 lines
include/asm-i386/rwsem.h static inline void __down_write(struct r · line 188
Quoted 4 lines
include/asm-i386/rwsem.h renamed from include/asm-i386/rwsem.h~rwsem-interruptible +1
-1"# beginning down_write\n\t" -LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ +LOCK_PREFIX " xadd %%edx,%0\n\t" /* subtract 0x0000ffff, returns the old value */ Again, please don't. It's a lot more readable when it mentions EAX directly, plus it's also independent of constraint reordering.
OK I suppose so...