workqueue changes for 2.6.33-rc1
Subsystems (3)
Tejun Heo
maintainerHello, Linus.
Please full from the following git tree. This is a tree I set up for concurrency managed workqueue changes but currently only contains Thomas's debug object patch which makes work_struct lifetime related bugs easy to track.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-linus
It merges into the current master without conflict.
Thanks.
----
Thomas Gleixner (1):
workqueue: Add debugobjects support
arch/x86/kernel/smpboot.c | 4 +- include/linux/workqueue.h | 38 +++++++++---- kernel/workqueue.c | 131 +++++++++++++++++++++++++++++++++++++++++++- lib/Kconfig.debug | 8 +++ 4 files changed, 166 insertions(+), 15 deletions(-)
arch/x86/kernel/smpboot.c +3 -1
@@ -687,7 +687,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), }; -INIT_WORK (&c_idle.work, do_fork_idle); +INIT_WORK_ON_STACK (&c_idle.work, do_fork_idle);alternatives_smp_switch (1 );
@@ -713,6 +713,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)if (IS_ERR (c_idle.idle)) {printk ("failed fork for CPU %d\n" , cpu); +destroy_work_on_stack (&c_idle.work);return PTR_ERR (c_idle.idle); }
@@ -831,6 +832,7 @@ do_rest:smpboot_restore_warm_reset_vector (); } +destroy_work_on_stack (&c_idle.work);return boot_error; }
include/linux/workqueue.h +27 -11
@@ -25,6 +25,7 @@ typedef void (*work_func_t)(struct work_struct *work);struct work_struct {atomic_long_t data;#define WORK_STRUCT_PENDING 0/* T if work item pending execution */ +#define WORK_STRUCT_STATIC 1/* static initializer (debugobjects) */ #define WORK_STRUCT_FLAG_MASK (3UL)#define WORK_STRUCT_WQ_DATA_MASK (~WORK_STRUCT_FLAG_MASK)struct list_head entry;
@@ -35,6 +36,7 @@ struct work_struct { };#define WORK_DATA_INIT () ATOMIC_LONG_INIT(0) +#define WORK_DATA_STATIC_INIT () ATOMIC_LONG_INIT(2)struct delayed_work {struct work_struct work;
@@ -63,7 +65,7 @@ struct execute_work {#endif #define __WORK_INITIALIZER (n, f) { \ - .data = WORK_DATA_INIT(), \ + .data = WORK_DATA_STATIC_INIT(), \ .entry = { &(n).entry, &(n).entry }, \ .func = (f), \ __WORK_INIT_LOCKDEP_MAP(#n, &(n)) \
@@ -91,6 +93,14 @@ struct execute_work {#define PREPARE_DELAYED_WORK (_work, _func) \ PREPARE_WORK(&(_work)->work, (_func)) +#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); +#else +static inline void __init_work (struct work_struct *work,int onstack) { } +static inline void destroy_work_on_stack (struct work_struct *work) { } +#endif +/* * initialize all of a work item in one go *
@@ -99,24 +109,36 @@ struct execute_work {* to generate better code. */ #ifdef CONFIG_LOCKDEP -#define INIT_WORK (_work, _func) \ +#define __INIT_WORK (_work, _func, _onstack) \ do { \ static struct lock_class_key __key; \ \ + __init_work((_work), _onstack); \ (_work)->data = (atomic_long_t) WORK_DATA_INIT(); \ lockdep_init_map(&(_work)->lockdep_map, #_work, &__key, 0);\ INIT_LIST_HEAD(&(_work)->entry); \ PREPARE_WORK((_work), (_func)); \ } while (0)#else -#define INIT_WORK (_work, _func) \ +#define __INIT_WORK (_work, _func, _onstack) \ do { \ + __init_work((_work), _onstack); \ (_work)->data = (atomic_long_t) WORK_DATA_INIT(); \ INIT_LIST_HEAD(&(_work)->entry); \ PREPARE_WORK((_work), (_func)); \ } while (0)#endif +#define INIT_WORK (_work, _func) \ + do { \ + __INIT_WORK((_work), (_func), 0); \ + } while (0) + +#define INIT_WORK_ON_STACK (_work, _func) \ + do { \ + __INIT_WORK((_work), (_func), 1); \ + } while (0) +#define INIT_DELAYED_WORK (_work, _func) \ do { \ INIT_WORK(&(_work)->work, (_func)); \
@@ -125,22 +147,16 @@ struct execute_work {#define INIT_DELAYED_WORK_ON_STACK (_work, _func) \ do { \ - INIT_WORK(&(_work)->work, (_func)); \ + INIT_WORK_ON_STACK(&(_work)->work, (_func)); \ init_timer_on_stack(&(_work)->timer); \ } while (0) -#define INIT_DELAYED_WORK_DEFERRABLE (_work, _func) \ +#define INIT_DELAYED_WORK_DEFERRABLE (_work, _func) \ do { \ INIT_WORK(&(_work)->work, (_func)); \ init_timer_deferrable(&(_work)->timer); \ } while (0) -#define INIT_DELAYED_WORK_ON_STACK (_work, _func) \ - do { \ - INIT_WORK(&(_work)->work, (_func)); \ - init_timer_on_stack(&(_work)->timer); \ - } while (0) -/** * work_pending - Find out whether a work item is currently pending * @work: The work item in question
kernel/workqueue.c +128 -3
185 lines not on this page · raw message
lib/Kconfig.debug +8 -0
@@ -298,6 +298,14 @@ config DEBUG_OBJECTS_TIMERS timer routines to track the life time of timer objects and validate the timer operations. +config DEBUG_OBJECTS_WORK + bool "Debug work objects" + depends on DEBUG_OBJECTS + help + If you say Y here, additional code will be inserted into the + work queue routines to track the life time of work objects and + validate the work operations. + config DEBUG_OBJECTS_ENABLE_DEFAULT int "debug_objects bootup default value (0-1)" range 0 1