All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: linux-ia64@vger.kernel.org, avagin@virtuozzo.com,
	peterz@infradead.org, heiko.carstens@de.ibm.com, hpa@zytor.com,
	gorcunov@virtuozzo.com, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, x86@kernel.org, mingo@redhat.com,
	mattst88@gmail.com, fenghua.yu@intel.com, arnd@arndb.de,
	ktkhai@virtuozzo.com, ink@jurassic.park.msu.ru,
	tglx@linutronix.de, rth@twiddle.net, tony.luck@intel.com,
	linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
	schwidefsky@de.ibm.com, davem@davemloft.net, rientjes@google.com,
	viro@zeniv.linux.org.uk
Subject: [PATCH REBASED 3/6] s390: Add __down_read_killable()
Date: Fri, 29 Sep 2017 19:06:18 +0300	[thread overview]
Message-ID: <150670117817.23930.13068785028558453848.stgit@localhost.localdomain> (raw)
In-Reply-To: <150670038738.23930.7190484711222807884.stgit@localhost.localdomain>

Similar to __down_write_killable(), and read killable primitive.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 arch/s390/include/asm/rwsem.h |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h
index 597e7e96b59e..6bef7d5fbf1c 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,24 @@ 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
  */

WARNING: multiple messages have this Message-ID (diff)
From: Kirill Tkhai <ktkhai@virtuozzo.com>
To: linux-ia64@vger.kernel.org, avagin@virtuozzo.com,
	peterz@infradead.org, heiko.carstens@de.ibm.com, hpa@zytor.com,
	gorcunov@virtuozzo.com, linux-arch@vger.kernel.org,
	linux-s390@vger.kernel.org, x86@kernel.org, mingo@redhat.com,
	mattst88@gmail.com, fenghua.yu@intel.com, arnd@arndb.de,
	ktkhai@virtuozzo.com, ink@jurassic.park.msu.ru,
	tglx@linutronix.de, rth@twiddle.net, tony.luck@intel.com,
	linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
	schwidefsky@de.ibm.com, davem@davemloft.net, rientjes@google.com,
	viro@zeniv.linux.org.uk
Subject: [PATCH REBASED 3/6] s390: Add __down_read_killable()
Date: Fri, 29 Sep 2017 16:06:18 +0000	[thread overview]
Message-ID: <150670117817.23930.13068785028558453848.stgit@localhost.localdomain> (raw)
In-Reply-To: <150670038738.23930.7190484711222807884.stgit@localhost.localdomain>

Similar to __down_write_killable(), and read killable primitive.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 arch/s390/include/asm/rwsem.h |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/s390/include/asm/rwsem.h b/arch/s390/include/asm/rwsem.h
index 597e7e96b59e..6bef7d5fbf1c 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,24 @@ 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
  */


  parent reply	other threads:[~2017-09-29 16:06 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-29 16:05 [PATCH REBASED 0/6] rwsem: Implement down_read_killable() Kirill Tkhai
2017-09-29 16:05 ` Kirill Tkhai
2017-09-29 16:05 ` [PATCH REBASED 1/6] alpha: Add __down_read_killable() Kirill Tkhai
2017-09-29 16:05   ` Kirill Tkhai
2017-10-10 11:03   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 2/6] ia64: " Kirill Tkhai
2017-09-29 16:06   ` Kirill Tkhai
2017-10-10 11:04   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` Kirill Tkhai [this message]
2017-09-29 16:06   ` [PATCH REBASED 3/6] s390: " Kirill Tkhai
2017-09-30  9:20   ` Heiko Carstens
2017-09-30  9:20     ` Heiko Carstens
2017-09-30 10:36     ` Martin Schwidefsky
2017-09-30 10:36       ` Martin Schwidefsky
2017-09-30 10:38       ` Heiko Carstens
2017-09-30 10:38         ` Heiko Carstens
2017-09-30 10:39       ` Martin Schwidefsky
2017-09-30 10:39         ` Martin Schwidefsky
2017-10-10 11:04   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 4/6] x86: " Kirill Tkhai
2017-09-29 16:06   ` Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 5/6] rwsem: Add down_read_killable() Kirill Tkhai
2017-09-29 16:06   ` Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/rwsem: " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 6/6] fs: Use killable down_read() in iterate_dir() Kirill Tkhai
2017-09-29 16:06   ` Kirill Tkhai
2017-09-29 16:06   ` Kirill Tkhai
2017-10-10 11:05   ` [tip:locking/core] locking/rwsem, " tip-bot for Kirill Tkhai
2017-10-03  9:03 ` [PATCH REBASED 0/6] rwsem: Implement down_read_killable() Peter Zijlstra
2017-10-03  9:03   ` Peter Zijlstra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=150670117817.23930.13068785028558453848.stgit@localhost.localdomain \
    --to=ktkhai@virtuozzo.com \
    --cc=arnd@arndb.de \
    --cc=avagin@virtuozzo.com \
    --cc=davem@davemloft.net \
    --cc=fenghua.yu@intel.com \
    --cc=gorcunov@virtuozzo.com \
    --cc=heiko.carstens@de.ibm.com \
    --cc=hpa@zytor.com \
    --cc=ink@jurassic.park.msu.ru \
    --cc=linux-alpha@vger.kernel.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=mattst88@gmail.com \
    --cc=mingo@redhat.com \
    --cc=peterz@infradead.org \
    --cc=rientjes@google.com \
    --cc=rth@twiddle.net \
    --cc=schwidefsky@de.ibm.com \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    --cc=viro@zeniv.linux.org.uk \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.