From: Byungchul Park <byungchul.park@lge.com>
To: peterz@infradead.org, mingo@kernel.org
Cc: linux-kernel@vger.kernel.org, npiggin@suse.de, walken@google.com,
ak@suse.de, tglx@inhelltoy.tec.linutronix.de
Subject: [RFC 03/12] lockdep: Make check_prev_add can use a stack_trace of other context
Date: Mon, 20 Jun 2016 13:55:18 +0900 [thread overview]
Message-ID: <1466398527-1122-4-git-send-email-byungchul.park@lge.com> (raw)
In-Reply-To: <1466398527-1122-1-git-send-email-byungchul.park@lge.com>
Currently, check_prev_add() can only save its current context's stack
trace. But it would be useful if a seperated stack_trace can be taken
and used in check_prev_add(). Crossrelease feature can use
check_prev_add() with another context's stack_trace.
Signed-off-by: Byungchul Park <byungchul.park@lge.com>
---
kernel/locking/lockdep.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 4d51208..c596bef 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -1822,7 +1822,8 @@ check_deadlock(struct task_struct *curr, struct held_lock *next,
*/
static int
check_prev_add(struct task_struct *curr, struct held_lock *prev,
- struct held_lock *next, int distance, int *stack_saved)
+ struct held_lock *next, int distance, int *stack_saved,
+ struct stack_trace *own_trace)
{
struct lock_list *entry;
int ret;
@@ -1883,7 +1884,7 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
}
}
- if (!*stack_saved) {
+ if (!own_trace && stack_saved && !*stack_saved) {
if (!save_trace(&trace))
return 0;
*stack_saved = 1;
@@ -1895,14 +1896,14 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
*/
ret = add_lock_to_list(hlock_class(prev), hlock_class(next),
&hlock_class(prev)->locks_after,
- next->acquire_ip, distance, &trace);
+ next->acquire_ip, distance, own_trace ?: &trace);
if (!ret)
return 0;
ret = add_lock_to_list(hlock_class(next), hlock_class(prev),
&hlock_class(next)->locks_before,
- next->acquire_ip, distance, &trace);
+ next->acquire_ip, distance, own_trace ?: &trace);
if (!ret)
return 0;
@@ -1911,7 +1912,8 @@ check_prev_add(struct task_struct *curr, struct held_lock *prev,
*/
if (verbose(hlock_class(prev)) || verbose(hlock_class(next))) {
/* We drop graph lock, so another thread can overwrite trace. */
- *stack_saved = 0;
+ if (stack_saved)
+ *stack_saved = 0;
graph_unlock();
printk("\n new dependency: ");
print_lock_name(hlock_class(prev));
@@ -1960,8 +1962,8 @@ check_prevs_add(struct task_struct *curr, struct held_lock *next)
* added:
*/
if (hlock->read != 2 && hlock->check) {
- if (!check_prev_add(curr, hlock, next,
- distance, &stack_saved))
+ if (!check_prev_add(curr, hlock, next, distance,
+ &stack_saved, NULL))
return 0;
/*
* Stop after the first non-trylock entry,
--
1.9.1
next prev parent reply other threads:[~2016-06-20 5:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 4:55 [RFC 00/12] lockdep: Implement crossrelease feature Byungchul Park
2016-06-20 4:55 ` [RFC 01/12] lockdep: Refactor lookup_chain_cache() Byungchul Park
2016-06-20 4:55 ` [RFC 02/12] lockdep: Add a function building a chain between two hlocks Byungchul Park
2016-06-20 4:55 ` Byungchul Park [this message]
2016-06-20 4:55 ` [RFC 04/12] lockdep: Make save_trace can copy from other stack_trace Byungchul Park
2016-06-20 4:55 ` [RFC 05/12] lockdep: Implement crossrelease feature Byungchul Park
2016-06-30 13:03 ` Peter Zijlstra
2016-06-30 23:28 ` Byungchul Park
2016-06-20 4:55 ` [RFC 06/12] lockdep: Apply crossrelease to completion Byungchul Park
2016-06-20 4:55 ` [RFC 07/12] pagemap.h: Remove trailing white space Byungchul Park
2016-06-20 4:55 ` [RFC 08/12] lockdep: Apply crossrelease to PG_locked lock Byungchul Park
2016-06-30 13:04 ` Peter Zijlstra
2016-06-30 23:21 ` Byungchul Park
2016-07-01 8:10 ` Peter Zijlstra
2016-07-01 11:18 ` Kirill A. Shutemov
2016-07-04 4:30 ` Byungchul Park
2016-06-20 4:55 ` [RFC 09/12] cifs/file.c: Remove trailing white space Byungchul Park
2016-06-20 4:55 ` [RFC 10/12] mm/swap_state.c: " Byungchul Park
2016-06-20 4:55 ` [RFC 11/12] lockdep: Call lock_acquire(release) when accessing PG_locked manually Byungchul Park
2016-06-20 4:55 ` [RFC 12/12] x86/dumpstack: Optimize save_stack_trace Byungchul Park
2016-06-20 7:29 ` xinhui
2016-06-20 7:50 ` byungchul.park
2016-06-29 12:43 ` Byungchul Park
2016-06-30 10:38 ` xinhui
2016-06-30 23:06 ` Byungchul Park
2016-06-23 23:37 ` [RFC 00/12] lockdep: Implement crossrelease feature Byungchul Park
2016-06-24 7:08 ` Peter Zijlstra
2016-06-24 11:13 ` Byungchul Park
2016-06-24 11:26 ` Nikolay Borisov
2016-06-27 1:34 ` Byungchul Park
2016-07-01 4:15 ` [PATCH] lockdep: Add a document describing " Byungchul Park
2016-07-01 10:45 ` Peter Zijlstra
2016-07-04 6:42 ` Byungchul Park
2016-07-06 0:49 ` Boqun Feng
2016-07-06 2:17 ` Byungchul Park
2016-07-06 5:33 ` Byungchul Park
2016-07-06 7:56 ` Peter Zijlstra
2016-07-06 8:12 ` 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=1466398527-1122-4-git-send-email-byungchul.park@lge.com \
--to=byungchul.park@lge.com \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=npiggin@suse.de \
--cc=peterz@infradead.org \
--cc=tglx@inhelltoy.tec.linutronix.de \
--cc=walken@google.com \
/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
all inboxes | Powered by JetHome®