hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lockdep: merge the _READ mark_lock_irq() helpers 

The _READ helpers show remarkable similarity, merge them.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-01-22 16:51:29 +01:00 committed by Ingo Molnar
parent cd95302d25
commit 780e820b2d
1 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
kernel/lockdep.c
View File

@ -2091,22 +2091,34 @@ mark_lock_irq_used_in(struct task_struct *curr, struct held_lock *this,
} }
static int static int
mark_lock_irq_used_in_read(struct task_struct *curr, struct held_lock *this, mark_lock_irq_read(struct task_struct *curr, struct held_lock *this,
int new_bit) int new_bit)
{ {
const char *name = state_name(new_bit); const char *name = state_name(new_bit);
const char *rname = state_rname(new_bit); const char *rname = state_rname(new_bit);
int excl_bit = exclusive_bit(new_bit); int excl_bit = exclusive_bit(new_bit);
int dir = new_bit & 2;
if (!valid_state(curr, this, new_bit, excl_bit)) if (!valid_state(curr, this, new_bit, excl_bit))
return 0; return 0;
/*
* just marked it hardirq-read-safe, check that this lock if (!dir) {
* took no hardirq-unsafe lock in the past: /*
*/ * just marked it hardirq-read-safe, check that this lock
if (!check_usage_forwards(curr, this, excl_bit, name)) * took no hardirq-unsafe lock in the past:
return 0; */
if (!check_usage_forwards(curr, this, excl_bit, name))
return 0;
} else if (STRICT_READ_CHECKS) {
/*
* just marked it hardirq-read-unsafe, check that no
* hardirq-safe lock in the system ever took it in the past:
*/
if (!check_usage_backwards(curr, this, excl_bit, name))
return 0;
}
if (state_verbose(new_bit, hlock_class(this))) if (state_verbose(new_bit, hlock_class(this)))
return 2; return 2;
@ -2147,31 +2159,6 @@ mark_lock_irq_enabled(struct task_struct *curr, struct held_lock *this,
return 1; return 1;
} }
static int
mark_lock_irq_enabled_read(struct task_struct *curr, struct held_lock *this,
int new_bit)
{
const char *name = state_name(new_bit);
const char *rname = state_rname(new_bit);
int excl_bit = exclusive_bit(new_bit);
if (!valid_state(curr, this, new_bit, excl_bit))
return 0;
#if STRICT_READ_CHECKS
/*
* just marked it hardirq-read-unsafe, check that no
* hardirq-safe lock in the system ever took it in the past:
*/
if (!check_usage_backwards(curr, this, excl_bit, name))
return 0;
#endif
if (verbose(hlock_class(this)))
return 2;
return 1;
}
static int mark_lock_irq(struct task_struct *curr, struct held_lock *this, static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
enum lock_usage_bit new_bit) enum lock_usage_bit new_bit)
{ {
@ -2186,18 +2173,16 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
case LOCK_USED_IN_HARDIRQ_READ: case LOCK_USED_IN_HARDIRQ_READ:
case LOCK_USED_IN_SOFTIRQ_READ: case LOCK_USED_IN_SOFTIRQ_READ:
case LOCK_USED_IN_RECLAIM_FS_READ: case LOCK_USED_IN_RECLAIM_FS_READ:
return mark_lock_irq_used_in_read(curr, this, new_bit); case LOCK_ENABLED_HARDIRQ_READ:
case LOCK_ENABLED_SOFTIRQ_READ:
case LOCK_ENABLED_RECLAIM_FS_READ:
return mark_lock_irq_read(curr, this, new_bit);
case LOCK_ENABLED_HARDIRQ: case LOCK_ENABLED_HARDIRQ:
case LOCK_ENABLED_SOFTIRQ: case LOCK_ENABLED_SOFTIRQ:
case LOCK_ENABLED_RECLAIM_FS: case LOCK_ENABLED_RECLAIM_FS:
return mark_lock_irq_enabled(curr, this, new_bit); return mark_lock_irq_enabled(curr, this, new_bit);
case LOCK_ENABLED_HARDIRQ_READ:
case LOCK_ENABLED_SOFTIRQ_READ:
case LOCK_ENABLED_RECLAIM_FS_READ:
return mark_lock_irq_enabled_read(curr, this, new_bit);
default: default:
WARN_ON(1); WARN_ON(1);
break; break;