From: Byungchul Park <byungchul.park@lge.com>
To: torvalds@linux-foundation.org, mingo@redhat.com,
linux-kernel@vger.kernel.org
Cc: peterz@infradead.org, will@kernel.org, tglx@linutronix.de,
rostedt@goodmis.org, joel@joelfernandes.org, sashal@kernel.org,
daniel.vetter@ffwll.ch, chris@chris-wilson.co.uk,
duyuyang@gmail.com, johannes.berg@intel.com, tj@kernel.org,
tytso@mit.edu, willy@infradead.org, david@fromorbit.com,
amir73il@gmail.com, bfields@fieldses.org,
gregkh@linuxfoundation.org, kernel-team@lge.com
Subject: [RFC 09/14] dept: Apply Dept to rwsem
Date: Tue, 25 Jan 2022 11:36:39 +0900 [thread overview]
Message-ID: <1643078204-12663-10-git-send-email-byungchul.park@lge.com> (raw)
In-Reply-To: <1643078204-12663-1-git-send-email-byungchul.park@lge.com>
Makes Dept able to track dependencies by rwsem.
Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
include/linux/lockdep.h | 24 ++++++++++++++++++++----
include/linux/percpu-rwsem.h | 10 +++++++++-
include/linux/rwsem.h | 31 +++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 4653df7..80e665e 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -628,10 +628,26 @@ static inline void print_irqtrace_events(struct task_struct *curr)
dept_mutex_unlock(&(l)->dmap, i); \
} while (0)
-#define rwsem_acquire(l, s, t, i) lock_acquire_exclusive(l, s, t, NULL, i)
-#define rwsem_acquire_nest(l, s, t, n, i) lock_acquire_exclusive(l, s, t, n, i)
-#define rwsem_acquire_read(l, s, t, i) lock_acquire_shared(l, s, t, NULL, i)
-#define rwsem_release(l, i) lock_release(l, i)
+#define rwsem_acquire(l, s, t, i) \
+do { \
+ lock_acquire_exclusive(l, s, t, NULL, i); \
+ dept_rwsem_lock(&(l)->dmap, s, t, NULL, "up_write", i); \
+} while (0)
+#define rwsem_acquire_nest(l, s, t, n, i) \
+do { \
+ lock_acquire_exclusive(l, s, t, n, i); \
+ dept_rwsem_lock(&(l)->dmap, s, t, (n) ? &(n)->dmap : NULL, "up_write", i);\
+} while (0)
+#define rwsem_acquire_read(l, s, t, i) \
+do { \
+ lock_acquire_shared(l, s, t, NULL, i); \
+ dept_rwsem_lock(&(l)->dmap, s, t, NULL, "up_read", i); \
+} while (0)
+#define rwsem_release(l, i) \
+do { \
+ lock_release(l, i); \
+ dept_rwsem_unlock(&(l)->dmap, i); \
+} while (0)
#define lock_map_acquire(l) lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)
#define lock_map_acquire_read(l) lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_)
diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h
index 5fda40f..7ec5625 100644
--- a/include/linux/percpu-rwsem.h
+++ b/include/linux/percpu-rwsem.h
@@ -20,8 +20,16 @@ struct percpu_rw_semaphore {
#endif
};
+#ifdef CONFIG_DEPT
+#define __PERCPU_RWSEM_DMAP_INIT(lockname) .dmap = { .name = #lockname }
+#else
+#define __PERCPU_RWSEM_DMAP_INIT(lockname)
+#endif
+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
-#define __PERCPU_RWSEM_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname },
+#define __PERCPU_RWSEM_DEP_MAP_INIT(lockname) .dep_map = { \
+ .name = #lockname, \
+ __PERCPU_RWSEM_DMAP_INIT(lockname) },
#else
#define __PERCPU_RWSEM_DEP_MAP_INIT(lockname)
#endif
diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
index 25e3fde8..b4a266f 100644
--- a/include/linux/rwsem.h
+++ b/include/linux/rwsem.h
@@ -20,6 +20,30 @@
#include <linux/osq_lock.h>
#endif
+#ifdef CONFIG_DEPT
+#define dept_rwsem_lock(m, ne, t, n, e_fn, ip) \
+do { \
+ if (t) { \
+ dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \
+ dept_asked_event(m); \
+ } else if (n) { \
+ dept_warn_on(dept_top_map() != (n)); \
+ } else { \
+ dept_wait(m, 1UL, ip, __func__, ne); \
+ dept_ecxt_enter(m, 1UL, ip, __func__, e_fn, ne); \
+ dept_asked_event(m); \
+ } \
+} while (0)
+#define dept_rwsem_unlock(m, ip) \
+do { \
+ dept_event(m, 1UL, ip, __func__); \
+ dept_ecxt_exit(m, ip); \
+} while (0)
+#else
+#define dept_rwsem_lock(m, ne, t, n, e_fn, ip) do { } while (0)
+#define dept_rwsem_unlock(m, ip) do { } while (0)
+#endif
+
/*
* For an uncontended rwsem, count and owner are the only fields a task
* needs to touch when acquiring the rwsem. So they are put next to each
@@ -64,11 +88,18 @@ static inline int rwsem_is_locked(struct rw_semaphore *sem)
/* Common initializer macros and functions */
+#ifdef CONFIG_DEPT
+# define RWSEM_DMAP_INIT(lockname) .dmap = { .name = #lockname },
+#else
+# define RWSEM_DMAP_INIT(lockname)
+#endif
+
#ifdef CONFIG_DEBUG_LOCK_ALLOC
# define __RWSEM_DEP_MAP_INIT(lockname) \
.dep_map = { \
.name = #lockname, \
.wait_type_inner = LD_WAIT_SLEEP, \
+ RWSEM_DMAP_INIT(lockname) \
},
#else
# define __RWSEM_DEP_MAP_INIT(lockname)
--
1.9.1
next prev parent reply other threads:[~2022-01-25 3:17 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 2:36 [RFC 00/14] DEPT(DEPendency Tracker) Byungchul Park
2022-01-25 2:36 ` [RFC 01/14] llist: Move llist_{head,node} definition to types.h Byungchul Park
2022-01-25 2:36 ` [RFC 02/14] dept: Implement Dept(Dependency Tracker) Byungchul Park
2022-01-25 2:36 ` [RFC 03/14] dept: Embed Dept data in Lockdep Byungchul Park
2022-01-25 2:36 ` [RFC 04/14] dept: Apply Dept to spinlock Byungchul Park
2022-01-25 2:36 ` [RFC 05/14] dept: Apply Dept to mutex families Byungchul Park
2022-01-25 2:36 ` [RFC 06/14] dept: Apply Dept to rwlock Byungchul Park
2022-01-25 2:36 ` [RFC 07/14] dept: Apply Dept to wait_for_completion()/complete() Byungchul Park
2022-01-25 2:36 ` [RFC 08/14] dept: Apply Dept to seqlock Byungchul Park
2022-01-25 2:36 ` Byungchul Park [this message]
2022-01-25 2:36 ` [RFC 10/14] dept: Add proc knobs to show stats and dependency graph Byungchul Park
2022-01-25 2:36 ` [RFC 11/14] dept: Introduce split map concept and new APIs for them Byungchul Park
2022-01-25 2:36 ` [RFC 12/14] dept: Apply Dept to wait/event of PG_{locked,writeback} Byungchul Park
2022-01-25 2:36 ` [RFC 13/14] dept: Separate out SDT(Single-event Dependency Tracker) header Byungchul Park
2022-01-25 2:36 ` [RFC 14/14] dept: Apply SDT to swait Byungchul Park
2022-01-27 1:00 ` [RFC 00/14] DEPT(DEPendency Tracker) Byungchul Park
2022-01-27 1:08 ` Patches(Dept) for v5.17-rc1 Byungchul Park
2022-01-27 1:10 ` [PATCH on v5.17-rc1 01/14] llist: Move llist_{head,node} definition to types.h Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 02/14] dept: Implement Dept(Dependency Tracker) Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 03/14] dept: Embed Dept data in Lockdep Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 04/14] dept: Apply Dept to spinlock Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 05/14] dept: Apply Dept to mutex families Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 06/14] dept: Apply Dept to rwlock Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 07/14] dept: Apply Dept to wait_for_completion()/complete() Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 08/14] dept: Apply Dept to seqlock Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 09/14] dept: Apply Dept to rwsem Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 10/14] dept: Add proc knobs to show stats and dependency graph Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 11/14] dept: Introduce split map concept and new APIs for them Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 12/14] dept: Apply Dept to wait/event of PG_{locked,writeback} Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 13/14] dept: Separate out SDT(Single-event Dependency Tracker) header Byungchul Park
2022-01-27 1:11 ` [PATCH on v5.17-rc1 14/14] dept: Apply SDT to swait Byungchul Park
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=1643078204-12663-10-git-send-email-byungchul.park@lge.com \
--to=byungchul.park@lge.com \
--cc=amir73il@gmail.com \
--cc=bfields@fieldses.org \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=david@fromorbit.com \
--cc=duyuyang@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=joel@joelfernandes.org \
--cc=johannes.berg@intel.com \
--cc=kernel-team@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sashal@kernel.org \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=will@kernel.org \
--cc=willy@infradead.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).