Commit-ID: c0905115a55c8a3011d7b7e6ee5d63653c1e99f1 Gitweb: https://git.kernel.org/tip/c0905115a55c8a3011d7b7e6ee5d63653c1e99f1 Author: Kirill Tkhai <ktk...@virtuozzo.com> AuthorDate: Fri, 29 Sep 2017 19:06:07 +0300 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 10 Oct 2017 11:50:14 +0200
locking/arch, ia64: Add __down_read_killable() Similar to __down_write_killable(), and read killable primitive. Signed-off-by: Kirill Tkhai <ktk...@virtuozzo.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: a...@arndb.de Cc: ava...@virtuozzo.com Cc: da...@davemloft.net Cc: fenghua...@intel.com Cc: gorcu...@virtuozzo.com Cc: heiko.carst...@de.ibm.com Cc: h...@zytor.com Cc: i...@jurassic.park.msu.ru Cc: matts...@gmail.com Cc: rient...@google.com Cc: r...@twiddle.net Cc: schwidef...@de.ibm.com Cc: tony.l...@intel.com Cc: v...@zeniv.linux.org.uk Link: http://lkml.kernel.org/r/150670116749.23930.14976888440968191759.stgit@localhost.localdomain Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/ia64/include/asm/rwsem.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h index 8fa98dd..49f7db0 100644 --- a/arch/ia64/include/asm/rwsem.h +++ b/arch/ia64/include/asm/rwsem.h @@ -37,15 +37,31 @@ /* * lock for reading */ -static inline void -__down_read (struct rw_semaphore *sem) +static inline int +___down_read (struct rw_semaphore *sem) { long result = ia64_fetchadd8_acq((unsigned long *)&sem->count.counter, 1); - if (result < 0) + return (result < 0); +} + +static inline void +__down_read (struct rw_semaphore *sem) +{ + if (___down_read(sem)) rwsem_down_read_failed(sem); } +static inline int +__down_read_killable (struct rw_semaphore *sem) +{ + if (___down_read(sem)) + if (IS_ERR(rwsem_down_read_failed_killable(sem))) + return -EINTR; + + return 0; +} + /* * lock for writing */ @@ -72,9 +88,10 @@ __down_write (struct rw_semaphore *sem) static inline int __down_write_killable (struct rw_semaphore *sem) { - if (___down_write(sem)) + if (___down_write(sem)) { if (IS_ERR(rwsem_down_write_failed_killable(sem))) return -EINTR; + } return 0; }
