From: Byungchul Park <byungchul.park@lge.com>
To: peterz@infradead.org, mingo@kernel.org
Cc: tglx@linutronix.de, walken@google.com, boqun.feng@gmail.com,
kirill@shutemov.name, linux-kernel@vger.kernel.org,
linux-mm@kvack.org, iamjoonsoo.kim@lge.com,
akpm@linux-foundation.org, npiggin@gmail.com
Subject: [PATCH v4 05/15] lockdep: Make check_prev_add can use a separate stack_trace
Date: Fri, 9 Dec 2016 14:12:01 +0900 [thread overview]
Message-ID: <1481260331-360-6-git-send-email-byungchul.park@lge.com> (raw)
In-Reply-To: <1481260331-360-1-git-send-email-byungchul.park@lge.com>
check_prev_add() saves a stack trace of the current. But crossrelease
feature needs to use a separate stack trace of another context in
check_prev_add(). So make it use a separate stack trace instead of one
of the current.
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 111839f..3eaa11c 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -1793,7 +1793,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;
@@ -1854,7 +1855,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;
@@ -1866,14 +1867,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;
@@ -1882,7 +1883,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));
@@ -1931,8 +1933,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-12-09 5:16 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 5:11 [PATCH v4 00/15] lockdep: Implement crossrelease feature Byungchul Park
2016-12-09 5:11 ` [PATCH v4 01/15] x86/dumpstack: Optimize save_stack_trace Byungchul Park
2016-12-09 5:11 ` [PATCH v4 02/15] x86/dumpstack: Add save_stack_trace()_fast() Byungchul Park
2016-12-09 5:11 ` [PATCH v4 03/15] lockdep: Refactor lookup_chain_cache() Byungchul Park
2016-12-09 5:12 ` [PATCH v4 04/15] lockdep: Add a function building a chain between two classes Byungchul Park
2017-01-10 21:00 ` Peter Zijlstra
2017-01-12 1:41 ` Byungchul Park
2016-12-09 5:12 ` Byungchul Park [this message]
2017-01-12 16:16 ` [PATCH v4 05/15] lockdep: Make check_prev_add can use a separate stack_trace Peter Zijlstra
2017-01-13 2:45 ` Byungchul Park
2017-01-13 4:09 ` [PATCH] lockdep: Make a stack_trace instance passed to check_prev_add as an arg Byungchul Park
2017-01-13 4:38 ` Byungchul Park
2017-01-13 10:11 ` [PATCH v4 05/15] lockdep: Make check_prev_add can use a separate stack_trace Byungchul Park
2017-01-13 10:17 ` [PATCH 1/2] lockdep: Refactor save_trace() Byungchul Park
2017-01-13 10:17 ` [PATCH 2/2] lockdep: Pass a callback arg to check_prev_add() to handle stack_trace Byungchul Park
2017-01-17 15:54 ` [PATCH v4 05/15] lockdep: Make check_prev_add can use a separate stack_trace Peter Zijlstra
2017-01-18 2:04 ` Byungchul Park
2017-01-18 15:10 ` Peter Zijlstra
2017-01-19 2:47 ` Byungchul Park
2016-12-09 5:12 ` [PATCH v4 06/15] lockdep: Make save_trace can skip stack tracing of the current Byungchul Park
2017-01-12 16:37 ` Peter Zijlstra
2017-01-13 0:18 ` Byungchul Park
2016-12-09 5:12 ` [PATCH v4 07/15] lockdep: Implement crossrelease feature Byungchul Park
2017-01-13 4:39 ` Lai Jiangshan
2017-01-13 5:02 ` Byungchul Park
2017-01-16 15:10 ` Peter Zijlstra
2017-01-17 2:05 ` Byungchul Park
2017-01-17 7:12 ` Peter Zijlstra
2017-01-17 7:49 ` Byungchul Park
2017-01-17 7:14 ` Peter Zijlstra
2017-01-17 7:45 ` Byungchul Park
2017-01-16 15:13 ` Peter Zijlstra
2017-01-17 2:33 ` Byungchul Park
2017-01-17 6:24 ` Boqun Feng
2017-01-17 7:43 ` Byungchul Park
2016-12-09 5:12 ` [PATCH v4 08/15] lockdep: Make crossrelease use save_stack_trace_fast() Byungchul Park
2016-12-09 5:12 ` [PATCH v4 09/15] lockdep: Make print_circular_bug() crosslock-aware Byungchul Park
2016-12-09 5:12 ` [PATCH v4 10/15] lockdep: Apply crossrelease to completion operation Byungchul Park
2016-12-09 5:12 ` [PATCH v4 11/15] pagemap.h: Remove trailing white space Byungchul Park
2016-12-09 5:12 ` [PATCH v4 12/15] lockdep: Apply crossrelease to PG_locked lock Byungchul Park
2016-12-09 5:12 ` [PATCH v4 13/15] lockdep: Apply lock_acquire(release) on __Set(__Clear)PageLocked Byungchul Park
2016-12-09 5:12 ` [PATCH v4 14/15] lockdep: Move data used in CONFIG_LOCKDEP_PAGELOCK from page to page_ext Byungchul Park
2016-12-09 5:12 ` [PATCH v4 15/15] lockdep: Crossrelease feature documentation Byungchul Park
2017-01-10 20:08 ` Peter Zijlstra
2017-01-11 1:29 ` Byungchul Park
2017-01-18 6:42 ` Boqun Feng
2017-01-18 10:53 ` Byungchul Park
2017-01-18 11:03 ` Peter Zijlstra
2017-01-18 11:54 ` Byungchul Park
2017-01-18 12:07 ` Peter Zijlstra
2017-01-18 12:14 ` byungchul.park
2017-01-18 14:12 ` Peter Zijlstra
2017-01-19 1:54 ` Byungchul Park
2017-01-18 12:49 ` byungchul.park
2016-12-09 5:21 ` [FYI] Output of 'cat /proc/lockdep' after applying crossrelease 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=1481260331-360-6-git-send-email-byungchul.park@lge.com \
--to=byungchul.park@lge.com \
--cc=akpm@linux-foundation.org \
--cc=boqun.feng@gmail.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=tglx@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;
as well as URLs for NNTP newsgroup(s).