Commit-ID: a61ba2c8a48f150f5e6b6d14328fc7f1aa32969d Gitweb: https://git.kernel.org/tip/a61ba2c8a48f150f5e6b6d14328fc7f1aa32969d Author: Kirill Tkhai <ktk...@virtuozzo.com> AuthorDate: Fri, 29 Sep 2017 19:06:18 +0300 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 10 Oct 2017 11:50:15 +0200
locking/arch, s390: 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/150670117817.23930.13068785028558453848.stgit@localhost.localdomain Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/s390/include/asm/rwsem.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h index 597e7e9..fda9481 100644 --- a/arch/s390/include/asm/rwsem.h +++ b/arch/s390/include/asm/rwsem.h @@ -49,7 +49,7 @@ /* * lock for reading */ -static inline void __down_read(struct rw_semaphore *sem) +static inline int ___down_read(struct rw_semaphore *sem) { signed long old, new; @@ -62,10 +62,25 @@ static inline void __down_read(struct rw_semaphore *sem) : "=&d" (old), "=&d" (new), "=Q" (sem->count) : "Q" (sem->count), "i" (RWSEM_ACTIVE_READ_BIAS) : "cc", "memory"); - if (old < 0) + return (old < 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; +} + /* * trylock for reading -- returns 1 if successful, 0 if contention */
