From: "tip-bot2 for Eric W. Biederman" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] rwsem: Implement down_read_interruptible
Date: Wed, 09 Dec 2020 18:38:48 -0000 [thread overview]
Message-ID: <160753912899.3364.3947297068679861678.tip-bot2@tip-bot2> (raw)
In-Reply-To: <87k0tybqfy.fsf@x220.int.ebiederm.org>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: 31784cff7ee073b34d6eddabb95e3be2880a425c
Gitweb: https://git.kernel.org/tip/31784cff7ee073b34d6eddabb95e3be2880a425c
Author: Eric W. Biederman <ebiederm@xmission.com>
AuthorDate: Thu, 03 Dec 2020 14:11:13 -06:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 09 Dec 2020 17:08:42 +01:00
rwsem: Implement down_read_interruptible
In preparation for converting exec_update_mutex to a rwsem so that
multiple readers can execute in parallel and not deadlock, add
down_read_interruptible. This is needed for perf_event_open to be
converted (with no semantic changes) from working on a mutex to
wroking on a rwsem.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/87k0tybqfy.fsf@x220.int.ebiederm.org
---
include/linux/rwsem.h | 1 +
kernel/locking/rwsem.c | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 13021b0..4c715be 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -123,6 +123,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_interruptible(struct rw_semaphore *sem);
extern int __must_check down_read_killable(struct rw_semaphore *sem);
/*
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c
index 54d11cb..a163542 100644
--- a/kernel/locking/rwsem.c
+++ b/kernel/locking/rwsem.c
@@ -1345,6 +1345,18 @@ static inline void __down_read(struct rw_semaphore *sem)
}
}
+static inline int __down_read_interruptible(struct rw_semaphore *sem)
+{
+ if (!rwsem_read_trylock(sem)) {
+ if (IS_ERR(rwsem_down_read_slowpath(sem, TASK_INTERRUPTIBLE)))
+ return -EINTR;
+ DEBUG_RWSEMS_WARN_ON(!is_rwsem_reader_owned(sem), sem);
+ } else {
+ rwsem_set_reader_owned(sem);
+ }
+ return 0;
+}
+
static inline int __down_read_killable(struct rw_semaphore *sem)
{
if (!rwsem_read_trylock(sem)) {
@@ -1495,6 +1507,20 @@ void __sched down_read(struct rw_semaphore *sem)
}
EXPORT_SYMBOL(down_read);
+int __sched down_read_interruptible(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_interruptible)) {
+ rwsem_release(&sem->dep_map, _RET_IP_);
+ return -EINTR;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL(down_read_interruptible);
+
int __sched down_read_killable(struct rw_semaphore *sem)
{
might_sleep();
next prev parent reply other threads:[~2020-12-09 18:40 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 20:09 [PATCH 0/3] exec: Transform exec_update_mutex into a rw_semaphore Eric W. Biederman
2020-12-03 20:10 ` [PATCH 1/3] rwsem: Implement down_read_killable_nested Eric W. Biederman
2020-12-04 1:58 ` Waiman Long
2020-12-09 18:38 ` [tip: locking/core] " tip-bot2 for Eric W. Biederman
2020-12-03 20:11 ` [PATCH 2/3] rwsem: Implement down_read_interruptible Eric W. Biederman
2020-12-04 1:59 ` Waiman Long
2020-12-07 9:02 ` Peter Zijlstra
2020-12-07 15:33 ` Waiman Long
2020-12-07 16:58 ` David Laight
2020-12-07 19:02 ` Waiman Long
2020-12-08 9:12 ` David Laight
2020-12-08 12:32 ` Peter Zijlstra
2020-12-08 13:13 ` David Laight
2020-12-08 15:34 ` Waiman Long
2020-12-08 16:23 ` David Laight
2020-12-07 15:56 ` Eric W. Biederman
2020-12-08 14:52 ` Peter Zijlstra
2020-12-08 18:27 ` Eric W. Biederman
2020-12-09 18:36 ` Peter Zijlstra
2020-12-10 19:33 ` Eric W. Biederman
2020-12-11 8:16 ` Peter Zijlstra
2020-12-09 18:38 ` [tip: locking/core] locking/rwsem: Introduce rwsem_write_trylock() tip-bot2 for Peter Zijlstra
2020-12-09 18:38 ` [tip: locking/core] locking/rwsem: Fold __down_{read,write}*() tip-bot2 for Peter Zijlstra
2020-12-09 18:38 ` [tip: locking/core] locking/rwsem: Better collate rwsem_read_trylock() tip-bot2 for Peter Zijlstra
2020-12-09 18:38 ` tip-bot2 for Eric W. Biederman [this message]
2020-12-03 20:12 ` [PATCH 3/3] exec: Transform exec_update_mutex into a rw_semaphore Eric W. Biederman
2020-12-04 16:08 ` Bernd Edlinger
2020-12-04 17:21 ` Linus Torvalds
2020-12-04 19:34 ` Eric W. Biederman
2020-12-04 20:10 ` Linus Torvalds
2020-12-04 20:30 ` Bernd Edlinger
2020-12-04 20:48 ` Linus Torvalds
2020-12-04 21:48 ` Davidlohr Bueso
2020-12-05 18:05 ` Eric W. Biederman
2020-12-07 9:15 ` Peter Zijlstra
2020-12-07 9:09 ` Peter Zijlstra
2020-12-07 18:40 ` Linus Torvalds
2020-12-08 8:34 ` [PATCH] perf: Break deadlock involving exec_update_mutex Peter Zijlstra
2020-12-08 18:37 ` Linus Torvalds
2020-12-10 18:38 ` Davidlohr Bueso
2020-12-10 19:40 ` Eric W. Biederman
2020-12-05 17:43 ` [PATCH 3/3] exec: Transform exec_update_mutex into a rw_semaphore Eric W. Biederman
2020-12-04 17:39 ` Eric W. Biederman
2020-12-03 22:42 ` [PATCH 0/3] " Linus Torvalds
2020-12-04 1:56 ` Waiman Long
2020-12-04 4:54 ` Davidlohr Bueso
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=160753912899.3364.3947297068679861678.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).