R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: locking/lockdep: Avoid constant checks in __bfs by using offset reference

Browse Source 
In search of a dependency in the lock graph, there is contant checks for
forward or backward search. Directly reference the field offset of the
struct that differentiates the type of search to avoid those checks.

No functional change.

Signed-off-by: Yuyang Du <duyuyang@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bvanassche@acm.org
Cc: frederic@kernel.org
Cc: ming.lei@redhat.com
Cc: will.deacon@arm.com
Link: https://lkml.kernel.org/r/20190506081939.74287-15-duyuyang@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Change-Id: I31dbc61e2af019b2fa633826b327c8bbe2c7e38b
Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
This commit is contained in:
Yuyang Du 2019-05-06 16:19:30 +08:00 committed by spakkkk
parent f0ed7fde4f
commit c890d79a0c
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kernel/locking/lockdep.c
View File

@ -1394,11 +1394,25 @@ static inline int get_lock_depth(struct lock_list *child)
return depth;
}
/*
* Return the forward or backward dependency list.
*
* @lock: the lock_list to get its class's dependency list
* @offset: the offset to struct lock_class to determine whether it is
* locks_after or locks_before
*/
static inline struct list_head *get_dep_list(struct lock_list *lock, int offset)
{
void *lock_class = lock->class;
return lock_class + offset;
}
static int __bfs(struct lock_list *source_entry,
void *data,
int (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry,
int forward)
int offset)
{
struct lock_list *entry;
struct lock_list *lock;
@ -1412,11 +1426,7 @@ static int __bfs(struct lock_list *source_entry,
goto exit;
}
if (forward)
head = &source_entry->class->locks_after;
else
head = &source_entry->class->locks_before;
head = get_dep_list(source_entry, offset);
if (list_empty(head))
goto exit;
@ -1430,10 +1440,7 @@ static int __bfs(struct lock_list *source_entry,
goto exit;
}
if (forward)
head = &lock->class->locks_after;
else
head = &lock->class->locks_before;
head = get_dep_list(lock, offset);
DEBUG_LOCKS_WARN_ON(!irqs_disabled());
@ -1466,7 +1473,8 @@ static inline int __bfs_forwards(struct lock_list *src_entry,
int (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry)
{
return __bfs(src_entry, data, match, target_entry, 1);
return __bfs(src_entry, data, match, target_entry,
offsetof(struct lock_class, locks_after));
}
@ -1475,7 +1483,8 @@ static inline int __bfs_backwards(struct lock_list *src_entry,
int (*match)(struct lock_list *entry, void *data),
struct lock_list **target_entry)
{
return __bfs(src_entry, data, match, target_entry, 0);
return __bfs(src_entry, data, match, target_entry,
offsetof(struct lock_class, locks_before));
}