debugobjects: stop accessing objects after releasing spinlock
Subsystems (3)
PATCH 1/1 debugobjects: stop accessing objects after releasing spinlock
After spinlock release object can be modified/freed by concurrent thread. Using it in such case is error prone, even for printing object state. To avoid such situation local copy of the object is created if necessary.
--- lib/debugobjects.c | 208 +++++++++++++++++++++------------------------ 1 file changed, 97 insertions(+), 111 deletions(-)
lib/debugobjects.c +97 -111
@@ -620,9 +620,8 @@ static void debug_objects_fill_pool(void)static void __debug_object_init (void *addr,const struct debug_obj_descr *descr,int onstack) { -enum debug_obj_state state;struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags;debug_objects_fill_pool ();
@@ -644,23 +643,19 @@ __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstackcase ODEBUG_STATE_INACTIVE : obj->state =ODEBUG_STATE_INIT ;break ; - -case ODEBUG_STATE_ACTIVE : - state = obj->state; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"init" ); -debug_object_fixup (descr->fixup_init, addr, state); -return ; - -case ODEBUG_STATE_DESTROYED : -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"init" ); -return ;default : -break ; + o = *obj; + obj =NULL ; }raw_spin_unlock_irqrestore (&db->lock, flags); + +if (obj) +return ; + +debug_print_object (&o,"init" ); +if (o.state ==ODEBUG_STATE_ACTIVE ) +debug_object_fixup (descr->fixup_init, addr, o.state); }/**
@@ -700,12 +695,9 @@ EXPORT_SYMBOL_GPL(debug_object_init_on_stack);*/ int debug_object_activate (void *addr,const struct debug_obj_descr *descr) { -struct debug_obj o = { .object = addr, .state =ODEBUG_STATE_NOTAVAILABLE , .descr = descr }; -enum debug_obj_state state;struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags; -int ret;if (!debug_objects_enabled)return 0 ;
@@ -717,49 +709,46 @@ int debug_object_activate(void *addr, const struct debug_obj_descr *descr)raw_spin_lock_irqsave (&db->lock, flags); obj =lookup_object_or_alloc (addr, db, descr, false, true); -if (likely (!IS_ERR_OR_NULL (obj))) { -bool print_object = false; - +if (unlikely (!obj)) { +raw_spin_unlock_irqrestore (&db->lock, flags); +debug_objects_oom (); +return 0 ; + }else if (likely (!IS_ERR (obj))) {switch (obj->state) {case ODEBUG_STATE_INIT :case ODEBUG_STATE_INACTIVE : obj->state =ODEBUG_STATE_ACTIVE ; - ret =0 ;break ; -case ODEBUG_STATE_ACTIVE : - state = obj->state; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"activate" ); - ret =debug_object_fixup (descr->fixup_activate, addr, state); -return ret ?0 : -EINVAL ; -case ODEBUG_STATE_DESTROYED : - print_object = true; - ret = -EINVAL ; + o = *obj; + obj =NULL ;break ;default : - ret =0 ; -break ; } -raw_spin_unlock_irqrestore (&db->lock, flags); -if (print_object) -debug_print_object (obj,"activate" ); -return ret; + }else { + o.object = addr; + o.state =ODEBUG_STATE_NOTAVAILABLE ; + o.descr = descr; + obj =NULL ; }raw_spin_unlock_irqrestore (&db->lock, flags); -/* If NULL the allocation has hit OOM */ -if (!obj) { -debug_objects_oom (); +if (obj)return 0 ; - } -/* Object is neither static nor tracked. It's not initialized */ debug_print_object (&o,"activate" ); - ret =debug_object_fixup (descr->fixup_activate, addr,ODEBUG_STATE_NOTAVAILABLE ); -return ret ?0 : -EINVAL ; + +switch (o.state) { +case ODEBUG_STATE_ACTIVE : +case ODEBUG_STATE_NOTAVAILABLE : +if (debug_object_fixup (descr->fixup_activate, addr, o.state)) +return 0 ; +default : + } + +return -EINVAL ; }EXPORT_SYMBOL_GPL (debug_object_activate);
@@ -771,9 +760,8 @@ EXPORT_SYMBOL_GPL(debug_object_activate);void debug_object_deactivate (void *addr,const struct debug_obj_descr *descr) {struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags; -bool print_object = false;if (!debug_objects_enabled)return ;
@@ -788,30 +776,29 @@ void debug_object_deactivate(void *addr, const struct debug_obj_descr *descr)case ODEBUG_STATE_INIT :case ODEBUG_STATE_INACTIVE :case ODEBUG_STATE_ACTIVE : -if (!obj->astate) +if (!obj->astate) { obj->state =ODEBUG_STATE_INACTIVE ; -else - print_object = true; -break ; - +break ; + } + fallthrough;case ODEBUG_STATE_DESTROYED : - print_object = true; + o = *obj; + obj =NULL ;break ;default :break ; } + }else { + o.object = addr; + o.state =ODEBUG_STATE_NOTAVAILABLE ; + o.descr = descr; + obj =NULL ; }raw_spin_unlock_irqrestore (&db->lock, flags); -if (!obj) { -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr }; +if (!obj)debug_print_object (&o,"deactivate" ); - }else if (print_object) { -debug_print_object (obj,"deactivate" ); - } }EXPORT_SYMBOL_GPL (debug_object_deactivate);
@@ -822,11 +809,9 @@ EXPORT_SYMBOL_GPL(debug_object_deactivate);*/ void debug_object_destroy (void *addr,const struct debug_obj_descr *descr) { -enum debug_obj_state state;struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags; -bool print_object = false;if (!debug_objects_enabled)return ;
@@ -836,8 +821,10 @@ void debug_object_destroy(void *addr, const struct debug_obj_descr *descr)raw_spin_lock_irqsave (&db->lock, flags); obj =lookup_object (addr, db); -if (!obj) - goto out_unlock; +if (!obj) { +raw_spin_unlock_irqrestore (&db->lock, flags); +return ; + }switch (obj->state) {case ODEBUG_STATE_NONE :
@@ -846,22 +833,22 @@ void debug_object_destroy(void *addr, const struct debug_obj_descr *descr) obj->state =ODEBUG_STATE_DESTROYED ;break ;case ODEBUG_STATE_ACTIVE : - state = obj->state; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"destroy" ); -debug_object_fixup (descr->fixup_destroy, addr, state); -return ; -case ODEBUG_STATE_DESTROYED : - print_object = true; + o = *obj; + obj =NULL ;break ;default : -break ; } -out_unlock: +raw_spin_unlock_irqrestore (&db->lock, flags); -if (print_object) -debug_print_object (obj,"destroy" ); + +if (obj) +return ; + +debug_print_object (&o,"destroy" ); + +if (o.state ==ODEBUG_STATE_ACTIVE ) +debug_object_fixup (descr->fixup_destroy, addr, o.state); }EXPORT_SYMBOL_GPL (debug_object_destroy);
@@ -872,9 +859,8 @@ EXPORT_SYMBOL_GPL(debug_object_destroy);*/ void debug_object_free (void *addr,const struct debug_obj_descr *descr) { -enum debug_obj_state state;struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags;if (!debug_objects_enabled)
@@ -885,24 +871,29 @@ void debug_object_free(void *addr, const struct debug_obj_descr *descr)raw_spin_lock_irqsave (&db->lock, flags); obj =lookup_object (addr, db); -if (!obj) - goto out_unlock; +if (!obj) { +raw_spin_unlock_irqrestore (&db->lock, flags); +return ; + }switch (obj->state) {case ODEBUG_STATE_ACTIVE : - state = obj->state; -raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"free" ); -debug_object_fixup (descr->fixup_free, addr, state); -return ; + o = *obj; + obj =NULL ; +break ;default :hlist_del (&obj->node); -raw_spin_unlock_irqrestore (&db->lock, flags); + } + +raw_spin_unlock_irqrestore (&db->lock, flags); + +if (obj) {free_object (obj);return ; } -out_unlock: -raw_spin_unlock_irqrestore (&db->lock, flags); + +debug_print_object (&o,"free" ); +debug_object_fixup (descr->fixup_free, addr, o.state); }EXPORT_SYMBOL_GPL (debug_object_free);
@@ -955,9 +946,8 @@ debug_object_active_state(void *addr, const struct debug_obj_descr *descr, unsigned int expect, unsigned int next) {struct debug_bucket *db; -struct debug_obj *obj; +struct debug_obj *obj, o;unsigned long flags; -bool print_object = false;if (!debug_objects_enabled)return ;
@@ -970,28 +960,27 @@ debug_object_active_state(void *addr, const struct debug_obj_descr *descr,if (obj) {switch (obj->state) {case ODEBUG_STATE_ACTIVE : -if (obj->astate == expect) +if (obj->astate == expect) { obj->astate = next; -else - print_object = true; -break ; - +break ; + } + fallthrough;default : - print_object = true; + o = *obj; + obj =NULL ;break ; } + }else { + o.object = addr; + o.state =ODEBUG_STATE_NOTAVAILABLE ; + o.descr = descr; + obj =NULL ; }raw_spin_unlock_irqrestore (&db->lock, flags); -if (!obj) { -struct debug_obj o = { .object = addr, - .state =ODEBUG_STATE_NOTAVAILABLE , - .descr = descr }; +if (!obj)debug_print_object (&o,"active_state" ); - }else if (print_object) { -debug_print_object (obj,"active_state" ); - } }EXPORT_SYMBOL_GPL (debug_object_active_state);
@@ -999,11 +988,9 @@ EXPORT_SYMBOL_GPL(debug_object_active_state);static void __debug_check_no_obj_freed (const void *address,unsigned long size) {unsigned long flags, oaddr, saddr, eaddr, paddr, chunks; -const struct debug_obj_descr *descr; -enum debug_obj_state state;struct debug_bucket *db;struct hlist_node *tmp; -struct debug_obj *obj; +struct debug_obj *obj, o;int cnt, objs_checked =0 ; saddr = (unsigned long ) address;
@@ -1026,12 +1013,11 @@ static void __debug_check_no_obj_freed(const void *address, unsigned long size)switch (obj->state) {case ODEBUG_STATE_ACTIVE : - descr = obj->descr; - state = obj->state; + o = *obj;raw_spin_unlock_irqrestore (&db->lock, flags); -debug_print_object (obj,"free" ); -debug_object_fixup (descr->fixup_free, - (void *) oaddr, state); +debug_print_object (&o,"free" ); +debug_object_fixup (o.descr->fixup_free, + (void *) oaddr, o.state); goto repeat;default :hlist_del (&obj->node);
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for debugobjects: stop accessing objects after releasing spinlock
== Series Details ==
== Series Details ==
Series: debugobjects: stop accessing objects after releasing spinlock
URL : https://patchwork.freedesktop.org/series/124185/
State : failure
== Summary ==
Error: make failed
CALL scripts/checksyscalls.sh
DESCEND objtool
INSTALL libsubcmd_headers
AR lib/lib.a
CC lib/debugobjects.olib/debugobjects.c: In function ‘debug_object_activate’:lib/debugobjects.c:727:3: error: label at end of compound statement
727 | default:
| ^~~~~~~
lib/debugobjects.c:748:2: error: label at end of compound statement
748 | default:
| ^~~~~~~
lib/debugobjects.c: In function ‘debug_object_destroy’:
lib/debugobjects.c:840:2: error: label at end of compound statement
840 | default:
| ^~~~~~~make[3]: *** [scripts/Makefile.build:243: lib/debugobjects.o] Error 1 make[2]: *** [scripts/Makefile.build:480: lib] Error 2 make[1]: *** [/home/kbuild/kernel/Makefile:1913: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
Build failed, no error log produced
Re: [Intel-gfx] ✗ Fi.CI.BUILD: failure for debugobjects: stop accessing objects after releasing spinlock
Quoted 25 lines · Patchwork
== Series Details ==
Series: debugobjects: stop accessing objects after releasing spinlock
URL : https://patchwork.freedesktop.org/series/124185/
State : failure== Summary ==
Error: make failed
CALLscripts/checksyscalls.sh
DESCEND objtool
INSTALLlibsubcmd_headers
ARlib/lib.a
CClib/debugobjects.olib/debugobjects.c: In function ‘debug_object_activate’:lib/debugobjects.c:727:3: error: label at end of compound statement727 | default: | ^~~~~~~ lib/debugobjects.c:748:2: error: label at end of compound statement 748 | default: | ^~~~~~~ lib/debugobjects.c: In function ‘debug_object_destroy’: lib/debugobjects.c:840:2: error: label at end of compound statement 840 | default: | ^~~~~~~
Quoted 7 lines
make[3]: *** [
scripts/Makefile.build:243:lib/debugobjects.o] Error 1 make[2]: *** [scripts/Makefile.build:480: lib] Error 2 make[1]: *** [/home/kbuild/kernel/Makefile:1913: .] Error 2
make: *** [Makefile:234: __sub-make] Error 2
Build failed, no error log produced
Apparently this compiler is more pedantic, v2 posted.
Regards
Andrzej