Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 139029
b: refs/heads/master
c: a652d70
h: refs/heads/master
i:
  139027: b5aec6c
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Feb 14, 2009
1 parent 0801f72 commit 870cb0b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fc95e867f1e75351b89db3c68212dfcce7ea563
refs/heads/master: a652d7081bc96b3094e85ca30e47f50185d2f717
8 changes: 4 additions & 4 deletions trunk/include/linux/lockdep.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ enum lock_usage_bit
LOCK_USED_IN_RECLAIM_FS,
LOCK_ENABLED_SOFTIRQ,
LOCK_ENABLED_HARDIRQ,
LOCK_HELD_OVER_RECLAIM_FS,
LOCK_ENABLED_RECLAIM_FS,
LOCK_USED_IN_HARDIRQ_READ,
LOCK_USED_IN_SOFTIRQ_READ,
LOCK_USED_IN_RECLAIM_FS_READ,
LOCK_ENABLED_SOFTIRQ_READ,
LOCK_ENABLED_HARDIRQ_READ,
LOCK_HELD_OVER_RECLAIM_FS_READ,
LOCK_ENABLED_RECLAIM_FS_READ,
LOCK_USAGE_STATES
};

Expand All @@ -49,7 +49,7 @@ enum lock_usage_bit
#define LOCKF_USED_IN_RECLAIM_FS (1 << LOCK_USED_IN_RECLAIM_FS)
#define LOCKF_ENABLED_HARDIRQ (1 << LOCK_ENABLED_HARDIRQ)
#define LOCKF_ENABLED_SOFTIRQ (1 << LOCK_ENABLED_SOFTIRQ)
#define LOCKF_HELD_OVER_RECLAIM_FS (1 << LOCK_HELD_OVER_RECLAIM_FS)
#define LOCKF_ENABLED_RECLAIM_FS (1 << LOCK_ENABLED_RECLAIM_FS)

#define LOCKF_ENABLED_IRQ (LOCKF_ENABLED_HARDIRQ | LOCKF_ENABLED_SOFTIRQ)
#define LOCKF_USED_IN_IRQ (LOCKF_USED_IN_HARDIRQ | LOCKF_USED_IN_SOFTIRQ)
Expand All @@ -59,7 +59,7 @@ enum lock_usage_bit
#define LOCKF_USED_IN_RECLAIM_FS_READ (1 << LOCK_USED_IN_RECLAIM_FS_READ)
#define LOCKF_ENABLED_HARDIRQ_READ (1 << LOCK_ENABLED_HARDIRQ_READ)
#define LOCKF_ENABLED_SOFTIRQ_READ (1 << LOCK_ENABLED_SOFTIRQ_READ)
#define LOCKF_HELD_OVER_RECLAIM_FS_READ (1 << LOCK_HELD_OVER_RECLAIM_FS_READ)
#define LOCKF_ENABLED_RECLAIM_FS_READ (1 << LOCK_ENABLED_RECLAIM_FS_READ)

#define LOCKF_ENABLED_IRQ_READ \
(LOCKF_ENABLED_HARDIRQ_READ | LOCKF_ENABLED_SOFTIRQ_READ)
Expand Down
38 changes: 19 additions & 19 deletions trunk/kernel/lockdep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,8 @@ static const char *usage_str[] =
[LOCK_ENABLED_HARDIRQ_READ] = "hardirq-on-R",
[LOCK_USED_IN_RECLAIM_FS] = "in-reclaim-W",
[LOCK_USED_IN_RECLAIM_FS_READ] = "in-reclaim-R",
[LOCK_HELD_OVER_RECLAIM_FS] = "ov-reclaim-W",
[LOCK_HELD_OVER_RECLAIM_FS_READ] = "ov-reclaim-R",
[LOCK_ENABLED_RECLAIM_FS] = "ov-reclaim-W",
[LOCK_ENABLED_RECLAIM_FS_READ] = "ov-reclaim-R",
};

const char * __get_key_name(struct lockdep_subclass_key *key, char *str)
Expand Down Expand Up @@ -504,14 +504,14 @@ get_usage_chars(struct lock_class *class, char *c1, char *c2, char *c3,
if (class->usage_mask & LOCKF_USED_IN_RECLAIM_FS)
*c5 = '+';
else
if (class->usage_mask & LOCKF_HELD_OVER_RECLAIM_FS)
if (class->usage_mask & LOCKF_ENABLED_RECLAIM_FS)
*c5 = '-';

if (class->usage_mask & LOCKF_HELD_OVER_RECLAIM_FS_READ)
if (class->usage_mask & LOCKF_ENABLED_RECLAIM_FS_READ)
*c6 = '-';
if (class->usage_mask & LOCKF_USED_IN_RECLAIM_FS_READ) {
*c6 = '+';
if (class->usage_mask & LOCKF_HELD_OVER_RECLAIM_FS_READ)
if (class->usage_mask & LOCKF_ENABLED_RECLAIM_FS_READ)
*c6 = '?';
}

Expand Down Expand Up @@ -1335,7 +1335,7 @@ check_prev_add_irq(struct task_struct *curr, struct held_lock *prev,
* forwards-subgraph starting at <next>:
*/
if (!check_usage(curr, prev, next, LOCK_USED_IN_RECLAIM_FS,
LOCK_HELD_OVER_RECLAIM_FS, "reclaim-fs"))
LOCK_ENABLED_RECLAIM_FS, "reclaim-fs"))
return 0;

/*
Expand All @@ -1345,7 +1345,7 @@ check_prev_add_irq(struct task_struct *curr, struct held_lock *prev,
* forwards-subgraph starting at <next>:
*/
if (!check_usage(curr, prev, next, LOCK_USED_IN_RECLAIM_FS_READ,
LOCK_HELD_OVER_RECLAIM_FS, "reclaim-fs-read"))
LOCK_ENABLED_RECLAIM_FS, "reclaim-fs-read"))
return 0;

return 1;
Expand Down Expand Up @@ -2058,25 +2058,25 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
ret = 2;
break;
case LOCK_USED_IN_RECLAIM_FS:
if (!valid_state(curr, this, new_bit, LOCK_HELD_OVER_RECLAIM_FS))
if (!valid_state(curr, this, new_bit, LOCK_ENABLED_RECLAIM_FS))
return 0;
if (!valid_state(curr, this, new_bit,
LOCK_HELD_OVER_RECLAIM_FS_READ))
LOCK_ENABLED_RECLAIM_FS_READ))
return 0;
/*
* just marked it reclaim-fs-safe, check that this lock
* took no reclaim-fs-unsafe lock in the past:
*/
if (!check_usage_forwards(curr, this,
LOCK_HELD_OVER_RECLAIM_FS, "reclaim-fs"))
LOCK_ENABLED_RECLAIM_FS, "reclaim-fs"))
return 0;
#if STRICT_READ_CHECKS
/*
* just marked it reclaim-fs-safe, check that this lock
* took no reclaim-fs-unsafe-read lock in the past:
*/
if (!check_usage_forwards(curr, this,
LOCK_HELD_OVER_RECLAIM_FS_READ, "reclaim-fs-read"))
LOCK_ENABLED_RECLAIM_FS_READ, "reclaim-fs-read"))
return 0;
#endif
if (reclaim_verbose(hlock_class(this)))
Expand Down Expand Up @@ -2109,14 +2109,14 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
ret = 2;
break;
case LOCK_USED_IN_RECLAIM_FS_READ:
if (!valid_state(curr, this, new_bit, LOCK_HELD_OVER_RECLAIM_FS))
if (!valid_state(curr, this, new_bit, LOCK_ENABLED_RECLAIM_FS))
return 0;
/*
* just marked it reclaim-fs-read-safe, check that this lock
* took no reclaim-fs-unsafe lock in the past:
*/
if (!check_usage_forwards(curr, this,
LOCK_HELD_OVER_RECLAIM_FS, "reclaim-fs"))
LOCK_ENABLED_RECLAIM_FS, "reclaim-fs"))
return 0;
if (reclaim_verbose(hlock_class(this)))
ret = 2;
Expand Down Expand Up @@ -2173,7 +2173,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
if (softirq_verbose(hlock_class(this)))
ret = 2;
break;
case LOCK_HELD_OVER_RECLAIM_FS:
case LOCK_ENABLED_RECLAIM_FS:
if (!valid_state(curr, this, new_bit, LOCK_USED_IN_RECLAIM_FS))
return 0;
if (!valid_state(curr, this, new_bit,
Expand Down Expand Up @@ -2229,7 +2229,7 @@ static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
if (softirq_verbose(hlock_class(this)))
ret = 2;
break;
case LOCK_HELD_OVER_RECLAIM_FS_READ:
case LOCK_ENABLED_RECLAIM_FS_READ:
if (!valid_state(curr, this, new_bit, LOCK_USED_IN_RECLAIM_FS))
return 0;
#if STRICT_READ_CHECKS
Expand Down Expand Up @@ -2288,9 +2288,9 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark)

case RECLAIM_FS:
if (hlock->read)
usage_bit = LOCK_HELD_OVER_RECLAIM_FS_READ;
usage_bit = LOCK_ENABLED_RECLAIM_FS_READ;
else
usage_bit = LOCK_HELD_OVER_RECLAIM_FS;
usage_bit = LOCK_ENABLED_RECLAIM_FS;
break;

default:
Expand Down Expand Up @@ -2646,8 +2646,8 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,
case LOCK_ENABLED_SOFTIRQ_READ:
case LOCK_USED_IN_RECLAIM_FS:
case LOCK_USED_IN_RECLAIM_FS_READ:
case LOCK_HELD_OVER_RECLAIM_FS:
case LOCK_HELD_OVER_RECLAIM_FS_READ:
case LOCK_ENABLED_RECLAIM_FS:
case LOCK_ENABLED_RECLAIM_FS_READ:
ret = mark_lock_irq(curr, this, new_bit);
if (!ret)
return 0;
Expand Down

0 comments on commit 870cb0b

Please sign in to comment.