AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

locking/lockdep: Consolidate lock usage bit initialization

Browse Source 
Lock usage bit initialization is consolidated into one function
mark_usage(). Trivial readability improvement. 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-22-duyuyang@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Yuyang Du 2019-05-06 16:19:37 +08:00 committed by Ingo Molnar
parent 68e9dc29f8
commit 0918065151
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/locking/lockdep.c
View File

@ -3460,8 +3460,12 @@ void trace_softirqs_off(unsigned long ip)
debug_atomic_inc(redundant_softirqs_off); debug_atomic_inc(redundant_softirqs_off);
} }
static int mark_irqflags(struct task_struct *curr, struct held_lock *hlock) static int
mark_usage(struct task_struct *curr, struct held_lock *hlock, int check)
{ {
if (!check)
goto lock_used;
/* /*
* If non-trylock use in a hardirq or softirq context, then * If non-trylock use in a hardirq or softirq context, then
* mark the lock as used in these contexts: * mark the lock as used in these contexts:
@ -3505,6 +3509,11 @@ static int mark_irqflags(struct task_struct *curr, struct held_lock *hlock)
} }
} }
lock_used:
/* mark it as used: */
if (!mark_lock(curr, hlock, LOCK_USED))
return 0;
return 1; return 1;
} }
@ -3546,8 +3555,8 @@ int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
return 1; return 1;
} }
static inline int mark_irqflags(struct task_struct *curr, static inline int
struct held_lock *hlock) mark_usage(struct task_struct *curr, struct held_lock *hlock, int check)
{ {
return 1; return 1;
} }
@ -3833,11 +3842,8 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
#endif #endif
hlock->pin_count = pin_count; hlock->pin_count = pin_count;
if (check && !mark_irqflags(curr, hlock)) /* Initialize the lock usage bit */
return 0; if (!mark_usage(curr, hlock, check))
/* mark it as used: */
if (!mark_lock(curr, hlock, LOCK_USED))
return 0; return 0;
/* /*