rwsem: fix rwsem_is_locked() bugs
Subsystems (2)
PATCH v5 1/1 rwsem: fix rwsem_is_locked() bugs
v4 -> v5:
- Uninline rwsem_is_locked().
- Use spin_trylock_irqsave instead of spin_trylock_irq().
Thanks to Andrew and David.
rwsem_is_locked() tests ->activity without locks, so we should always keep ->activity consistent. However, the code in __rwsem_do_wake() breaks this rule, it updates ->activity after _all_ readers waken up, this may give some reader a wrong ->activity value, thus cause rwsem_is_locked() behaves wrong.
Quote from Andrew:
"
- we have one or more processes sleeping in down_read(), waiting for access.
- we wake one or more processes up without altering ->activity
- they start to run and they do rwsem_is_locked(). This incorrectly returns "false", because the waker process is still crunching away in __rwsem_do_wake().
- the waker now alters ->activity, but it was too late. "
So we need get a spinlock to protect this. And rwsem_is_locked() should not block, thus we use spin_trylock_irqsave().
(David, if you think it's fine, can you Ack on this version? Thanks!)
---
include/linux/rwsem-spinlock.h +2 -4
@@ -68,11 +68,9 @@ extern int __down_write_trylock(struct rw_semaphore *sem);extern void __up_read (struct rw_semaphore *sem);extern void __up_write (struct rw_semaphore *sem);extern void __downgrade_write (struct rw_semaphore *sem); +extern int __rwsem_is_locked (struct rw_semaphore *sem); -static inline int rwsem_is_locked (struct rw_semaphore *sem) -{ -return (sem->activity !=0 ); -} +#define rwsem_is_locked (sem) __rwsem_is_locked(sem)#endif /* __KERNEL__ */ #endif /* _LINUX_RWSEM_SPINLOCK_H */
lib/rwsem-spinlock.c +13 -0
@@ -17,6 +17,19 @@ struct rwsem_waiter {#define RWSEM_WAITING_FOR_WRITE 0x00000002 }; +int __rwsem_is_locked (struct rw_semaphore *sem) +{ +int ret =1 ; +unsigned long flags; + +if (spin_trylock_irqsave (&sem->wait_lock, flags)) { + ret = (sem->activity !=0 ); +spin_unlock_irqrestore (&sem->wait_lock, flags); + } +return ret; +} +EXPORT_SYMBOL (__rwsem_is_locked); +/* * initialise the semaphore */
Andrew Morton
maintainerQuoted 26 lines · On Wed, 14 Oct 2009 05:52:22 -0400 Amerigo Wang <[email protected]> wrote:
include/linux/rwsem-spinlock.h +2
-4@@ -68,11 +68,9 @@ extern int __down_write_trylock(struct rw_semaphore *sem);extern void __up_read (struct rw_semaphore *sem);extern void __up_write (struct rw_semaphore *sem);extern void __downgrade_write (struct rw_semaphore *sem); +extern int __rwsem_is_locked (struct rw_semaphore *sem); -static inline int rwsem_is_locked (struct rw_semaphore *sem) -{ -return (sem->activity !=0 ); -} +#define rwsem_is_locked (sem) __rwsem_is_locked(sem)#endif /* __KERNEL__ */ #endif /* _LINUX_RWSEM_SPINLOCK_H */ lib/rwsem-spinlock.c +2
-0@@ -17,6 +17,19 @@ struct rwsem_waiter {#define RWSEM_WAITING_FOR_WRITE 0x00000002 }; +int __rwsem_is_locked (struct rw_semaphore *sem) +{
lib/rwsem-spinlock.c struct rwsem_waiter { · line 31
Quoted 10 lines
lib/rwsem-spinlock.c +10
-0+int ret =1 ; +unsigned long flags; + +if (spin_trylock_irqsave (&sem->wait_lock, flags)) { + ret = (sem->activity !=0 ); +spin_unlock_irqrestore (&sem->wait_lock, flags); + } +return ret; +} +EXPORT_SYMBOL (__rwsem_is_locked);
Why the macro tricks? Can we do
include/linux/rwsem-spinlock.h renamed from include/linux/rwsem-spinlock.h~rwsem-fix-rwsem_is_locked-bugs-fix +1 -3
@@ -68,9 +68,7 @@ extern int __down_write_trylock(struct rextern void __up_read (struct rw_semaphore *sem);extern void __up_write (struct rw_semaphore *sem);extern void __downgrade_write (struct rw_semaphore *sem); -extern int __rwsem_is_locked (struct rw_semaphore *sem); - -#define rwsem_is_locked (sem) __rwsem_is_locked(sem) +extern int rwsem_is_locked (struct rw_semaphore *sem);#endif /* __KERNEL__ */ #endif /* _LINUX_RWSEM_SPINLOCK_H */
lib/rwsem-spinlock.c renamed from lib/rwsem-spinlock.c~rwsem-fix-rwsem_is_locked-bugs-fix +2 -2
@@ -17,7 +17,7 @@ struct rwsem_waiter {#define RWSEM_WAITING_FOR_WRITE 0x00000002 }; -int __rwsem_is_locked (struct rw_semaphore *sem) +int rwsem_is_locked (struct rw_semaphore *sem) {int ret =1 ;unsigned long flags;
@@ -28,7 +28,7 @@ int __rwsem_is_locked(struct rw_semaphor }return ret; } -EXPORT_SYMBOL (__rwsem_is_locked); +EXPORT_SYMBOL (rwsem_is_locked);/* * initialise the semaphore
_
Quoted 27 lines · Andrew Morton
Quoted 24 lines · On Wed, 14 Oct 2009 05:52:22 -0400 Amerigo Wang <[email protected]> wrote:
include/linux/rwsem-spinlock.h +2
-4@@ -68,11 +68,9 @@ extern int __down_write_trylock(struct rw_semaphore *sem);extern void __up_read (struct rw_semaphore *sem);extern void __up_write (struct rw_semaphore *sem);extern void __downgrade_write (struct rw_semaphore *sem); +extern int __rwsem_is_locked (struct rw_semaphore *sem); -static inline int rwsem_is_locked (struct rw_semaphore *sem) -{ -return (sem->activity !=0 ); -} +#define rwsem_is_locked (sem) __rwsem_is_locked(sem)#endif /* __KERNEL__ */ #endif /* _LINUX_RWSEM_SPINLOCK_H */ lib/rwsem-spinlock.c +0
-0@@ -17,6 +17,19 @@ struct rwsem_waiter {#define RWSEM_WAITING_FOR_WRITE 0x00000002 };
Quoted 14 lines
lib/rwsem-spinlock.c struct rwsem_waiter { · line 31
Quoted 12 lines
lib/rwsem-spinlock.c +12
-0+int __rwsem_is_locked (struct rw_semaphore *sem) +{ +int ret =1 ; +unsigned long flags; + +if (spin_trylock_irqsave (&sem->wait_lock, flags)) { + ret = (sem->activity !=0 ); +spin_unlock_irqrestore (&sem->wait_lock, flags); + } +return ret; +} +EXPORT_SYMBOL (__rwsem_is_locked);Why the macro tricks? Can we do
Yes, better.
Thanks for your patch!
Quoted 36 lines
include/linux/rwsem-spinlock.h renamed from include/linux/rwsem-spinlock.h~rwsem-fix-rwsem_is_locked-bugs-fix +1
-3@@ -68,9 +68,7 @@ extern int __down_write_trylock(struct rextern void __up_read (struct rw_semaphore *sem);extern void __up_write (struct rw_semaphore *sem);extern void __downgrade_write (struct rw_semaphore *sem); -extern int __rwsem_is_locked (struct rw_semaphore *sem); - -#define rwsem_is_locked (sem) __rwsem_is_locked(sem) +extern int rwsem_is_locked (struct rw_semaphore *sem);#endif /* __KERNEL__ */ #endif /* _LINUX_RWSEM_SPINLOCK_H */ lib/rwsem-spinlock.c renamed from lib/rwsem-spinlock.c~rwsem-fix-rwsem_is_locked-bugs-fix +2
-2@@ -17,7 +17,7 @@ struct rwsem_waiter {#define RWSEM_WAITING_FOR_WRITE 0x00000002 }; -int __rwsem_is_locked (struct rw_semaphore *sem) +int rwsem_is_locked (struct rw_semaphore *sem) {int ret =1 ;unsigned long flags;@@ -28,7 +28,7 @@ int __rwsem_is_locked(struct rw_semaphor }return ret; } -EXPORT_SYMBOL (__rwsem_is_locked); +EXPORT_SYMBOL (rwsem_is_locked);/* * initialise the semaphore _