[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 10 Oct 2017 04:04:44 -0700
From: tip-bot for Kirill Tkhai <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: ktkhai@...tuozzo.com, torvalds@...ux-foundation.org,
peterz@...radead.org, linux-kernel@...r.kernel.org,
mingo@...nel.org, hpa@...or.com, tglx@...utronix.de
Subject: [tip:locking/core] locking/arch, s390: Add __down_read_killable()
Commit-ID: a61ba2c8a48f150f5e6b6d14328fc7f1aa32969d
Gitweb: https://git.kernel.org/tip/a61ba2c8a48f150f5e6b6d14328fc7f1aa32969d
Author: Kirill Tkhai <ktkhai@...tuozzo.com>
AuthorDate: Fri, 29 Sep 2017 19:06:18 +0300
Committer: Ingo Molnar <mingo@...nel.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 <ktkhai@...tuozzo.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: arnd@...db.de
Cc: avagin@...tuozzo.com
Cc: davem@...emloft.net
Cc: fenghua.yu@...el.com
Cc: gorcunov@...tuozzo.com
Cc: heiko.carstens@...ibm.com
Cc: hpa@...or.com
Cc: ink@...assic.park.msu.ru
Cc: mattst88@...il.com
Cc: rientjes@...gle.com
Cc: rth@...ddle.net
Cc: schwidefsky@...ibm.com
Cc: tony.luck@...el.com
Cc: viro@...iv.linux.org.uk
Link: http://lkml.kernel.org/r/150670117817.23930.13068785028558453848.stgit@localhost.localdomain
Signed-off-by: Ingo Molnar <mingo@...nel.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
*/
Powered by blists - more mailing lists