[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-a7967bc31584bd282682981295861e7bcba19e65@git.kernel.org>
Date: Wed, 25 Oct 2017 04:12:59 -0700
From: tip-bot for Byungchul Park <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: byungchul.park@....com, peterz@...radead.org,
linux-kernel@...r.kernel.org, tglx@...utronix.de,
torvalds@...ux-foundation.org, hpa@...or.com, mingo@...nel.org
Subject: [tip:locking/core] sched/completions: Add support for initializing
completions with lockdep_map
Commit-ID: a7967bc31584bd282682981295861e7bcba19e65
Gitweb: https://git.kernel.org/tip/a7967bc31584bd282682981295861e7bcba19e65
Author: Byungchul Park <byungchul.park@....com>
AuthorDate: Wed, 25 Oct 2017 17:56:03 +0900
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 25 Oct 2017 12:19:03 +0200
sched/completions: Add support for initializing completions with lockdep_map
Sometimes we want to initialize completions with sparate lockdep maps
to assign lock classes as desired. For example, the workqueue code
needs to directly manage lockdep maps, since only the code is aware of
how to classify lockdep maps properly.
Provide additional macros initializing completions in that way.
Signed-off-by: Byungchul Park <byungchul.park@....com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: amir73il@...il.com
Cc: axboe@...nel.dk
Cc: darrick.wong@...cle.com
Cc: david@...morbit.com
Cc: hch@...radead.org
Cc: idryomov@...il.com
Cc: johan@...nel.org
Cc: johannes.berg@...el.com
Cc: kernel-team@....com
Cc: linux-block@...r.kernel.org
Cc: linux-fsdevel@...r.kernel.org
Cc: linux-mm@...ck.org
Cc: linux-xfs@...r.kernel.org
Cc: oleg@...hat.com
Cc: tj@...nel.org
Link: http://lkml.kernel.org/r/1508921765-15396-8-git-send-email-byungchul.park@lge.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
include/linux/completion.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/include/linux/completion.h b/include/linux/completion.h
index 9121803..4da4991 100644
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
@@ -49,6 +49,13 @@ static inline void complete_release_commit(struct completion *x)
lock_commit_crosslock((struct lockdep_map *)&x->map);
}
+#define init_completion_map(x, m) \
+do { \
+ lockdep_init_map_crosslock((struct lockdep_map *)&(x)->map, \
+ (m)->name, (m)->key, 0); \
+ __init_completion(x); \
+} while (0)
+
#define init_completion(x) \
do { \
static struct lock_class_key __key; \
@@ -58,6 +65,7 @@ do { \
__init_completion(x); \
} while (0)
#else
+#define init_completion_map(x, m) __init_completion(x)
#define init_completion(x) __init_completion(x)
static inline void complete_acquire(struct completion *x) {}
static inline void complete_release(struct completion *x) {}
@@ -73,6 +81,9 @@ static inline void complete_release_commit(struct completion *x) {}
{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
#endif
+#define COMPLETION_INITIALIZER_ONSTACK_MAP(work, map) \
+ (*({ init_completion_map(&(work), &(map)); &(work); }))
+
#define COMPLETION_INITIALIZER_ONSTACK(work) \
(*({ init_completion(&work); &work; }))
@@ -102,8 +113,11 @@ static inline void complete_release_commit(struct completion *x) {}
#ifdef CONFIG_LOCKDEP
# define DECLARE_COMPLETION_ONSTACK(work) \
struct completion work = COMPLETION_INITIALIZER_ONSTACK(work)
+# define DECLARE_COMPLETION_ONSTACK_MAP(work, map) \
+ struct completion work = COMPLETION_INITIALIZER_ONSTACK_MAP(work, map)
#else
# define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work)
+# define DECLARE_COMPLETION_ONSTACK_MAP(work, map) DECLARE_COMPLETION(work)
#endif
/**
Powered by blists - more mailing lists