All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Kirill Tkhai <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, peterz@infradead.org,
	torvalds@linux-foundation.org, tglx@linutronix.de,
	linux-kernel@vger.kernel.org, mingo@kernel.org,
	ktkhai@virtuozzo.com
Subject: [tip:locking/core] locking/rwsem: Add down_read_killable()
Date: Tue, 10 Oct 2017 04:05:31 -0700	[thread overview]
Message-ID: <tip-76f8507f7a6442215df19de74f07eabca2462f1e@git.kernel.org> (raw)
In-Reply-To: <150670119884.23930.2585570605960763239.stgit@localhost.localdomain>

Commit-ID:  76f8507f7a6442215df19de74f07eabca2462f1e
Gitweb:     https://git.kernel.org/tip/76f8507f7a6442215df19de74f07eabca2462f1e
Author:     Kirill Tkhai <ktkhai@virtuozzo.com>
AuthorDate: Fri, 29 Sep 2017 19:06:38 +0300
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 10 Oct 2017 11:50:16 +0200

locking/rwsem: Add down_read_killable()

Similar to down_read() and down_write_killable(),
add killable version of down_read(), based on
__down_read_killable() function, added in previous
patches.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
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: mattst88@gmail.com
Cc: rientjes@google.com
Cc: rth@twiddle.net
Cc: schwidefsky@de.ibm.com
Cc: tony.luck@intel.com
Cc: viro@zeniv.linux.org.uk
Link: http://lkml.kernel.org/r/150670119884.23930.2585570605960763239.stgit@localhost.localdomain
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 include/asm-generic/rwsem.h | 10 ++++++++++
 include/linux/rwsem.h       |  1 +
 kernel/locking/rwsem.c      | 16 ++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/include/asm-generic/rwsem.h b/include/asm-generic/rwsem.h
index 6c6a214..b2d68d2 100644
--- a/include/asm-generic/rwsem.h
+++ b/include/asm-generic/rwsem.h
@@ -37,6 +37,16 @@ static inline void __down_read(struct rw_semaphore *sem)
 		rwsem_down_read_failed(sem);
 }
 
+static inline int __down_read_killable(struct rw_semaphore *sem)
+{
+	if (unlikely(atomic_long_inc_return_acquire(&sem->count) <= 0)) {
+		if (IS_ERR(rwsem_down_read_failed_killable(sem)))
+			return -EINTR;
+	}
+
+	return 0;
+}
+
 static inline int __down_read_trylock(struct rw_semaphore *sem)
 {
 	long tmp;
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 0ad7318..6ac8ee5 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -111,6 +111,7 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem)
  * lock for reading
  */
 extern void down_read(struct rw_semaphore *sem);
+extern int __must_check down_read_killable(struct rw_semaphore *sem);
 
 /*
  * trylock for reading -- returns 1 if successful, 0 if contention
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 4d48b1c..e53f7746 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -28,6 +28,22 @@ void __sched down_read(struct rw_semaphore *sem)
 
 EXPORT_SYMBOL(down_read);
 
+int __sched down_read_killable(struct rw_semaphore *sem)
+{
+	might_sleep();
+	rwsem_acquire_read(&sem->dep_map, 0, 0, _RET_IP_);
+
+	if (LOCK_CONTENDED_RETURN(sem, __down_read_trylock, __down_read_killable)) {
+		rwsem_release(&sem->dep_map, 1, _RET_IP_);
+		return -EINTR;
+	}
+
+	rwsem_set_reader_owned(sem);
+	return 0;
+}
+
+EXPORT_SYMBOL(down_read_killable);
+
 /*
  * trylock for reading -- returns 1 if successful, 0 if contention
  */

  reply	other threads:[~2017-10-10 11:09 UTC|newest]

Thread overview: 19+ 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 ` [PATCH REBASED 1/6] alpha: Add __down_read_killable() 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-10-10 11:04   ` [tip:locking/core] locking/arch, " tip-bot for Kirill Tkhai
2017-09-29 16:06 ` [PATCH REBASED 3/6] s390: " Kirill Tkhai
2017-09-30  9:20   ` Heiko Carstens
2017-09-30 10:36     ` Martin Schwidefsky
2017-09-30 10:38       ` Heiko Carstens
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-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-10-10 11:05   ` tip-bot for Kirill Tkhai [this message]
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-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

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=tip-76f8507f7a6442215df19de74f07eabca2462f1e@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=hpa@zytor.com \
    --cc=ktkhai@virtuozzo.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [tip:locking/core] locking/rwsem: Add down_read_killable()' \
    /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

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.