Commit ea2e64f2 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

workqueue: Provide destroy_delayed_work_on_stack() 



If a delayed or deferrable work is on stack we need to tell debug
objects that we are destroying the timer and the work. Otherwise we
leak the tracking object.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20140323141939.911487677@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 87291a92

include/linux/workqueue.h

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ struct execute_work { 
#ifdef CONFIG_DEBUG_OBJECTS_WORK

extern void __init_work(struct work_struct *work, int onstack);

extern void destroy_work_on_stack(struct work_struct *work);

extern void destroy_delayed_work_on_stack(struct delayed_work *work);

static inline unsigned int work_static(struct work_struct *work)

{

	return *work_data_bits(work) & WORK_STRUCT_STATIC;
@@ -198,6 +199,7 @@ static inline unsigned int work_static(struct work_struct *work) 
#else

static inline void __init_work(struct work_struct *work, int onstack) { }

static inline void destroy_work_on_stack(struct work_struct *work) { }

static inline void destroy_delayed_work_on_stack(struct delayed_work *work) { }

static inline unsigned int work_static(struct work_struct *work) { return 0; }

#endif

kernel/workqueue.c

+7 −0
Original line number Diff line number Diff line
@@ -516,6 +516,13 @@ void destroy_work_on_stack(struct work_struct *work) 
}

EXPORT_SYMBOL_GPL(destroy_work_on_stack);



void destroy_delayed_work_on_stack(struct delayed_work *work)

{

	destroy_timer_on_stack(&work->timer);

	debug_object_free(&work->work, &work_debug_descr);

}

EXPORT_SYMBOL_GPL(destroy_delayed_work_on_stack);



#else

static inline void debug_work_activate(struct work_struct *work) { }

static inline void debug_work_deactivate(struct work_struct *work) { }

CRA Git | Maintained and supported by SUSTech CRA and CCSE