Skip to content

L
linux-davinci
Commit 938ba5eb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files
Options

debugobjects: Convert to atomic_spinlock 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 34ca9f9b
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
lib/debugobjects.c
View file @ 938ba5eb
......@@ -25,14 +25,14 @@
struct debug_bucket {
struct hlist_head list;
spinlock_t lock;
atomic_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_ATOMIC_SPINLOCK(pool_lock);
static HLIST_HEAD(obj_pool);
......@@ -95,10 +95,10 @@ static int fill_pool(void)
if (!new)
return obj_pool_free;
spin_lock_irqsave(&pool_lock, flags);
atomic_spin_lock_irqsave(&pool_lock, flags);
hlist_add_head(&new->node, &obj_pool);
obj_pool_free++;
spin_unlock_irqrestore(&pool_lock, flags);
atomic_spin_unlock_irqrestore(&pool_lock, flags);
}
return obj_pool_free;
}
......@@ -132,7 +132,7 @@ alloc_object(void *addr, struct debug_bucket *b, struct debug_obj_descr *descr)
{
struct debug_obj *obj = NULL;
spin_lock(&pool_lock);
atomic_spin_lock(&pool_lock);
if (obj_pool.first) {
obj = hlist_entry(obj_pool.first, typeof(*obj), node);
......@@ -151,7 +151,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);
atomic_spin_unlock(&pool_lock);
return obj;
}
......@@ -164,7 +164,7 @@ static void free_obj_work(struct work_struct *work)
struct debug_obj *obj;
unsigned long flags;
spin_lock_irqsave(&pool_lock, flags);
atomic_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);
......@@ -173,11 +173,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);
atomic_spin_unlock_irqrestore(&pool_lock, flags);
kmem_cache_free(obj_cache, obj);
spin_lock_irqsave(&pool_lock, flags);
atomic_spin_lock_irqsave(&pool_lock, flags);
}
spin_unlock_irqrestore(&pool_lock, flags);
atomic_spin_unlock_irqrestore(&pool_lock, flags);
}
/*
......@@ -189,7 +189,7 @@ static void free_object(struct debug_obj *obj)
unsigned long flags;
int sched = 0;
spin_lock_irqsave(&pool_lock, flags);
atomic_spin_lock_irqsave(&pool_lock, flags);
/*
* schedule work when the pool is filled and the cache is
* initialized:
......@@ -199,7 +199,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);
atomic_spin_unlock_irqrestore(&pool_lock, flags);
if (sched)
schedule_work(&debug_obj_work);
}
......@@ -220,9 +220,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);
atomic_spin_lock_irqsave(&db->lock, flags);
hlist_move_list(&db->list, &freelist);
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
/* Now free them */
hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
......@@ -302,14 +302,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);
atomic_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);
atomic_spin_unlock_irqrestore(&db->lock, flags);
debug_objects_oom();
return;
}
......@@ -326,7 +326,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);
atomic_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_init, addr, state);
return;
......@@ -337,7 +337,7 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
break;
}
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
}
/**
......@@ -384,7 +384,7 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
db = get_bucket((unsigned long) addr);
spin_lock_irqsave(&db->lock, flags);
atomic_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object(addr, db);
if (obj) {
......@@ -397,7 +397,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);
atomic_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_activate, addr, state);
return;
......@@ -407,11 +407,11 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
default:
break;
}
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
return;
}
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
/*
* This happens when a static object is activated. We
* let the type specific code decide whether this is
......@@ -437,7 +437,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
db = get_bucket((unsigned long) addr);
spin_lock_irqsave(&db->lock, flags);
atomic_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object(addr, db);
if (obj) {
......@@ -462,7 +462,7 @@ void debug_object_deactivate(void *addr, struct debug_obj_descr *descr)
debug_print_object(&o, "deactivate");
}
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
}
/**
......@@ -482,7 +482,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
db = get_bucket((unsigned long) addr);
spin_lock_irqsave(&db->lock, flags);
atomic_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object(addr, db);
if (!obj)
......@@ -497,7 +497,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);
atomic_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_destroy, addr, state);
return;
......@@ -508,7 +508,7 @@ void debug_object_destroy(void *addr, struct debug_obj_descr *descr)
break;
}
out_unlock:
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
}
/**
......@@ -528,7 +528,7 @@ void debug_object_free(void *addr, struct debug_obj_descr *descr)
db = get_bucket((unsigned long) addr);
spin_lock_irqsave(&db->lock, flags);
atomic_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object(addr, db);
if (!obj)
......@@ -538,17 +538,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);
atomic_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);
atomic_spin_unlock_irqrestore(&db->lock, flags);
free_object(obj);
return;
}
out_unlock:
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
}
#ifdef CONFIG_DEBUG_OBJECTS_FREE
......@@ -574,7 +574,7 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)
repeat:
cnt = 0;
spin_lock_irqsave(&db->lock, flags);
atomic_spin_lock_irqsave(&db->lock, flags);
hlist_for_each_entry_safe(obj, node, tmp, &db->list, node) {
cnt++;
oaddr = (unsigned long) obj->object;
......@@ -586,7 +586,7 @@ repeat:
debug_print_object(obj, "free");
descr = obj->descr;
state = obj->state;
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
debug_object_fixup(descr->fixup_free,
(void *) oaddr, state);
goto repeat;
......@@ -596,7 +596,7 @@ repeat:
break;
}
}
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
/* Now free them */
hlist_for_each_entry_safe(obj, node, tmp, &freelist, node) {
......@@ -782,7 +782,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);
atomic_spin_lock_irqsave(&db->lock, flags);
obj = lookup_object(addr, db);
if (!obj && state != ODEBUG_STATE_NONE) {
......@@ -806,7 +806,7 @@ check_results(void *addr, enum debug_obj_state state, int fixups, int warnings)
}
res = 0;
out:
spin_unlock_irqrestore(&db->lock, flags);
atomic_spin_unlock_irqrestore(&db->lock, flags);
if (res)
debug_objects_enabled = 0;
return res;
......@@ -906,7 +906,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);
atomic_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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment