Skip to content

Commit

Permalink
debugobjects: Convert to raw_spinlocks
Browse files Browse the repository at this point in the history 
Convert locks which cannot be sleeping locks in preempt-rt to
raw_spinlocks.

Signed-off-by: Thomas Gleixner <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Acked-by: Ingo Molnar <[email protected]>
  • Loading branch information
@KAGA-KOKO
KAGA-KOKO committed Dec 14, 2009
1 parent e625cce commit aef9cb0
Showing 1 changed file with 37 additions and 37 deletions.
74 changes: 37 additions & 37 deletions lib/debugobjects.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@

struct debug_bucket {
struct hlist_head list;
spinlock_t lock;
raw_spinlock_t lock;
};

static struct debug_bucket obj_hash[ODEBUG_HASH_SIZE];

static struct debug_obj obj_static_pool[ODEBUG_POOL_SIZE] __initdata;

static DEFINE_SPINLOCK(pool_lock);
static DEFINE_RAW_SPINLOCK(pool_lock);

static HLIST_HEAD(obj_pool);

Expand Down Expand Up @@ -96,10 +96,10 @@ static int fill_pool(void)
if (!new)
return obj_pool_free;

spin_lock_irqsave(&pool_lock, flags);
raw_spin_lock_irqsave(&pool_lock, flags);
hlist_add_head(&new->node, &obj_pool);
obj_pool_free++;
spin_unlock_irqrestore(&pool_lock, flags);
raw_spin_unlock_irqrestore(&pool_lock, flags);
}
return obj_pool_free;
}
Expand Down Expand Up @@ -133,7 +133,7 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)
{
struct debug_obj *obj = NULL;

spin_lock(&pool_lock);
raw_spin_lock(&pool_lock);
if (obj_pool.first) {
obj = hlist_entry(obj_pool.first, typeof(*obj), node);

Expand All @@ -152,7 +152,7 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)
if (obj_pool_free < obj_pool_min_free)
obj_pool_min_free = obj_pool_free;
}
spin_unlock(&pool_lock);
raw_spin_unlock(&pool_lock);

return obj;
}
Expand All @@ -165,7 +165,7 @@ static void free_obj_work(struct work_struct *work)
struct debug_obj *obj;
unsigned long flags;

spin_lock_irqsave(&pool_lock, flags);
raw_spin_lock_irqsave(&pool_lock, flags);
while (obj_pool_free > ODEBUG_POOL_SIZE) {
obj = hlist_entry(obj_pool.first, typeof(*obj), node);
hlist_del(&obj->node);
Expand All @@ -174,11 +174,11 @@ static void free_obj_work(struct work_struct *work)
* We release pool_lock across kmem_cache_free() to
* avoid contention on pool_lock.
*/
spin_unlock_irqrestore(&pool_lock, flags);
raw_spin_unlock_irqrestore(&pool_lock, flags);
kmem_cache_free(obj_cache, obj);
spin_lock_irqsave(&pool_lock, flags);
raw_spin_lock_irqsave(&pool_lock, flags);
}
spin_unlock_irqrestore(&pool_lock, flags);
raw_spin_unlock_irqrestore(&pool_lock, flags);
}

/*
Expand All @@ -190,7 +190,7 @@ static void free_object(struct debug_obj *obj)
unsigned long flags;
int sched = 0;

spin_lock_irqsave(&pool_lock, flags);
raw_spin_lock_irqsave(&pool_lock, flags);
/*
* schedule work when the pool is filled and the cache is
* initialized:
Expand All @@ -200,7 +200,7 @@ static void free_object(struct debug_obj *obj)
hlist_add_head(&obj->node, &obj_pool);
obj_pool_free++;
obj_pool_used--;
spin_unlock_irqrestore(&pool_lock, flags);
raw_spin_unlock_irqrestore(&pool_lock, flags);
if (sched)
schedule_work(&debug_obj_work);
}
Expand All @@ -221,9 +221,9 @@ static void debug_objects_oom(void)
printk(KERN_WARNING "ODEBUG: Out of memory. ODEBUG disabled\n");

for (i = 0; i < ODEBUG_HASH_SIZE; i++, db++) {
spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);
hlist_move_list(&db->list, &freelist);
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);

/* Now free them */
hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
Expand Down Expand Up @@ -303,14 +303,14 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (!obj) {
obj = alloc_object(addr, db, descr);
if (!obj) {
debug_objects_enabled = 0;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_objects_oom();
return;
}
Expand All @@ -327,7 +327,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
case ODEBUG_STATE_ACTIVE:
debug_print_object(obj, "init");
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_init, addr, state);
return;

Expand All @@ -338,7 +338,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
break;
}

spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
}

/**
Expand Down Expand Up @@ -385,7 +385,7 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (obj) {
Expand All @@ -398,7 +398,7 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
case ODEBUG_STATE_ACTIVE:
debug_print_object(obj, "activate");
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_activate, addr, state);
return;

Expand All @@ -408,11 +408,11 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
default:
break;
}
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
return;
}

spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
/*
* This happens when a static object is activated. We
* let the type specific code decide whether this is
Expand All @@ -438,7 +438,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (obj) {
Expand All @@ -463,7 +463,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
debug_print_object(&o, "deactivate");
}

spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
}

/**
Expand All @@ -483,7 +483,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (!obj)
Expand All @@ -498,7 +498,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
case ODEBUG_STATE_ACTIVE:
debug_print_object(obj, "destroy");
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_destroy, addr, state);
return;

Expand All @@ -509,7 +509,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
break;
}
out_unlock:
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
}

/**
Expand All @@ -529,7 +529,7 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (!obj)
Expand All @@ -539,17 +539,17 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)
case ODEBUG_STATE_ACTIVE:
debug_print_object(obj, "free");
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_free, addr, state);
return;
default:
hlist_del(&obj->node);
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
free_object(obj);
return;
}
out_unlock:
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
}

#ifdef CONFIG_DEBUG_OBJECTS_FREE
Expand All @@ -575,7 +575,7 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)

repeat:
cnt = 0;
spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);
hlist_for_each_entry_safe(obj, node, tmp, &db->list, node) {
cnt++;
oaddr = (unsigned long) obj->object;
Expand All @@ -587,7 +587,7 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)
debug_print_object(obj, "free");
descr = obj->descr;
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_free,
(void *) oaddr, state);
goto repeat;
Expand All @@ -597,7 +597,7 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)
break;
}
}
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);

/* Now free them */
hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
Expand Down Expand Up @@ -783,7 +783,7 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)

db = get_bucket((unsigned long) addr);

spin_lock_irqsave(&db->lock, flags);
raw_spin_lock_irqsave(&db->lock, flags);

obj = lookup_object(addr, db);
if (!obj && state != ODEBUG_STATE_NONE) {
Expand All @@ -807,7 +807,7 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
}
res = 0;
out:
spin_unlock_irqrestore(&db->lock, flags);
raw_spin_unlock_irqrestore(&db->lock, flags);
if (res)
debug_objects_enabled = 0;
return res;
Expand Down Expand Up @@ -907,7 +907,7 @@ void __init debug_objects_early_init(void)
int i;

for (i = 0; i < ODEBUG_HASH_SIZE; i++)
spin_lock_init(&obj_hash[i].lock);
raw_spin_lock_init(&obj_hash[i].lock);

for (i = 0; i < ODEBUG_POOL_SIZE; i++)
hlist_add_head(&obj_static_pool[i].node, &obj_pool);
Expand Down

0 comments on commit aef9cb0

Please sign in to comment.