Re: [patch 10/21] mutex subsystem, debugging code

[Matt Helsley <matthltc@us.ibm.com>]

On Thu, 2006-01-05 at 16:38 +0100, Ingo Molnar wrote:
> mutex implementation - add debugging code.
> 
> Signed-off-by: Ingo Molnar <mingo@elte.hu>
> Signed-off-by: Arjan van de Ven <arjan@infradead.org>
> 
> ----
> 
>  include/linux/mutex-debug.h |   21 +
>  include/linux/sched.h       |    5 
>  kernel/Makefile             |    1 
>  kernel/fork.c               |    4 
>  kernel/mutex-debug.c        |  464 ++++++++++++++++++++++++++++++++++++++++++++
>  kernel/mutex-debug.h        |  134 ++++++++++++
>  lib/Kconfig.debug           |    8 
>  7 files changed, 637 insertions(+)
> 
> Index: linux/include/linux/mutex-debug.h
> ===================================================================
> --- /dev/null
> +++ linux/include/linux/mutex-debug.h
> @@ -0,0 +1,21 @@
> +#ifndef __LINUX_MUTEX_DEBUG_H
> +#define __LINUX_MUTEX_DEBUG_H
> +
> +/*
> + * Mutexes - debugging helpers:
> + */
> +
> +#define __DEBUG_MUTEX_INITIALIZER(lockname) \
> +	, .held_list = LIST_HEAD_INIT(lockname.held_list), \
> +	  .name = #lockname , .magic = &lockname
> +
> +#define mutex_init(sem)		__mutex_init(sem, __FUNCTION__)
> +
> +extern void FASTCALL(mutex_destroy(struct mutex *lock));
> +
> +extern void mutex_debug_show_all_locks(void);
> +extern void mutex_debug_show_held_locks(struct task_struct *filter);
> +extern void mutex_debug_check_no_locks_held(struct task_struct *task);
> +extern void mutex_debug_check_no_locks_freed(const void *from, const void *to);
> +
> +#endif
> Index: linux/include/linux/sched.h
> ===================================================================
> --- linux.orig/include/linux/sched.h
> +++ linux/include/linux/sched.h
> @@ -820,6 +820,11 @@ struct task_struct {
>  /* Protection of proc_dentry: nesting proc_lock, dcache_lock, write_lock_irq(&tasklist_lock); */
>  	spinlock_t proc_lock;
>  
> +#ifdef CONFIG_DEBUG_MUTEXES
> +	/* mutex deadlock detection */
> +	struct mutex_waiter *blocked_on;
> +#endif
> +
>  /* journalling filesystem info */
>  	void *journal_info;
>  
> Index: linux/kernel/Makefile
> ===================================================================
> --- linux.orig/kernel/Makefile
> +++ linux/kernel/Makefile
> @@ -9,6 +9,7 @@ obj-y     = sched.o fork.o exec_domain.o
>  	    rcupdate.o intermodule.o extable.o params.o posix-timers.o \
>  	    kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o
>  
> +obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
>  obj-$(CONFIG_FUTEX) += futex.o
>  obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
>  obj-$(CONFIG_SMP) += cpu.o spinlock.o
> Index: linux/kernel/fork.c
> ===================================================================
> --- linux.orig/kernel/fork.c
> +++ linux/kernel/fork.c
> @@ -973,6 +973,10 @@ static task_t *copy_process(unsigned lon
>   	}
>  #endif
>  
> +#ifdef CONFIG_DEBUG_MUTEXES
> +	p->blocked_on = NULL; /* not blocked yet */
> +#endif
> +
>  	p->tgid = p->pid;
>  	if (clone_flags & CLONE_THREAD)
>  		p->tgid = current->tgid;

Should there be a corresponding initialization of init's blocked_on
field in include/linux/init_task.h?

<snip>

Cheers,
	-Matt Helsley