From: Ingo Molnar Locking init improvement: - introduce and use __SPIN_LOCK_UNLOCKED for array initializations, to pass in the name string of locks, used by debugging Signed-off-by: Ingo Molnar Signed-off-by: Arjan van de Ven Signed-off-by: Andrew Morton --- arch/x86_64/kernel/smpboot.c | 3 +++ block/ll_rw_blk.c | 1 + drivers/char/random.c | 6 +++--- drivers/ide/ide-io.c | 2 ++ drivers/scsi/libata-core.c | 2 ++ drivers/spi/spi.c | 1 + fs/dcache.c | 2 +- include/linux/idr.h | 2 +- include/linux/init_task.h | 10 +++++----- include/linux/notifier.h | 2 +- include/linux/seqlock.h | 12 ++++++++++-- include/linux/spinlock_types.h | 15 +++++++++------ include/linux/wait.h | 2 +- kernel/kmod.c | 2 ++ kernel/rcupdate.c | 4 ++-- kernel/timer.c | 2 +- mm/swap_state.c | 2 +- net/ipv4/tcp_ipv4.c | 2 +- net/ipv4/tcp_minisocks.c | 2 +- 19 files changed, 48 insertions(+), 26 deletions(-) diff -puN arch/x86_64/kernel/smpboot.c~lock-validator-locking-init-debugging-improvement arch/x86_64/kernel/smpboot.c --- devel/arch/x86_64/kernel/smpboot.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/smpboot.c 2006-06-09 15:23:02.000000000 -0700 @@ -769,8 +769,11 @@ static int __cpuinit do_boot_cpu(int cpu .cpu = cpu, .done = COMPLETION_INITIALIZER(c_idle.done), }; + DECLARE_WORK(work, do_fork_idle, &c_idle); + init_completion(&c_idle.done); + /* allocate memory for gdts of secondary cpus. Hotplug is considered */ if (!cpu_gdt_descr[cpu].address && !(cpu_gdt_descr[cpu].address = get_zeroed_page(GFP_KERNEL))) { diff -puN block/ll_rw_blk.c~lock-validator-locking-init-debugging-improvement block/ll_rw_blk.c --- devel/block/ll_rw_blk.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/block/ll_rw_blk.c 2006-06-09 15:23:02.000000000 -0700 @@ -2526,6 +2526,7 @@ int blk_execute_rq(request_queue_t *q, s char sense[SCSI_SENSE_BUFFERSIZE]; int err = 0; + init_completion(&wait); /* * we need an extra reference to the request, so we can look at * it after io completion diff -puN drivers/char/random.c~lock-validator-locking-init-debugging-improvement drivers/char/random.c --- devel/drivers/char/random.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/drivers/char/random.c 2006-06-09 15:23:02.000000000 -0700 @@ -417,7 +417,7 @@ static struct entropy_store input_pool = .poolinfo = &poolinfo_table[0], .name = "input", .limit = 1, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(&input_pool.lock), .pool = input_pool_data }; @@ -426,7 +426,7 @@ static struct entropy_store blocking_poo .name = "blocking", .limit = 1, .pull = &input_pool, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(&blocking_pool.lock), .pool = blocking_pool_data }; @@ -434,7 +434,7 @@ static struct entropy_store nonblocking_ .poolinfo = &poolinfo_table[1], .name = "nonblocking", .pull = &input_pool, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(&nonblocking_pool.lock), .pool = nonblocking_pool_data }; diff -puN drivers/ide/ide-io.c~lock-validator-locking-init-debugging-improvement drivers/ide/ide-io.c --- devel/drivers/ide/ide-io.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/drivers/ide/ide-io.c 2006-06-09 15:23:02.000000000 -0700 @@ -1700,6 +1700,8 @@ int ide_do_drive_cmd (ide_drive_t *drive int where = ELEVATOR_INSERT_BACK, err; int must_wait = (action == ide_wait || action == ide_head_wait); + init_completion(&wait); + rq->errors = 0; rq->rq_status = RQ_ACTIVE; diff -puN drivers/scsi/libata-core.c~lock-validator-locking-init-debugging-improvement drivers/scsi/libata-core.c --- devel/drivers/scsi/libata-core.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/drivers/scsi/libata-core.c 2006-06-09 15:23:02.000000000 -0700 @@ -994,6 +994,8 @@ unsigned ata_exec_internal(struct ata_de unsigned int err_mask; int rc; + init_completion(&wait); + spin_lock_irqsave(&ap->host_set->lock, flags); /* no internal command while frozen */ diff -puN drivers/spi/spi.c~lock-validator-locking-init-debugging-improvement drivers/spi/spi.c --- devel/drivers/spi/spi.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/drivers/spi/spi.c 2006-06-09 15:23:02.000000000 -0700 @@ -512,6 +512,7 @@ int spi_sync(struct spi_device *spi, str DECLARE_COMPLETION(done); int status; + init_completion(&done); message->complete = spi_complete; message->context = &done; status = spi_async(spi, message); diff -puN fs/dcache.c~lock-validator-locking-init-debugging-improvement fs/dcache.c --- devel/fs/dcache.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/fs/dcache.c 2006-06-09 15:23:02.000000000 -0700 @@ -39,7 +39,7 @@ int sysctl_vfs_cache_pressure __read_mos EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure); __cacheline_aligned_in_smp DEFINE_SPINLOCK(dcache_lock); -static seqlock_t rename_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED; +static __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock); EXPORT_SYMBOL(dcache_lock); diff -puN include/linux/idr.h~lock-validator-locking-init-debugging-improvement include/linux/idr.h --- devel/include/linux/idr.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/idr.h 2006-06-09 15:23:02.000000000 -0700 @@ -66,7 +66,7 @@ struct idr { .id_free = NULL, \ .layers = 0, \ .id_free_cnt = 0, \ - .lock = SPIN_LOCK_UNLOCKED, \ + .lock = __SPIN_LOCK_UNLOCKED(name.lock), \ } #define DEFINE_IDR(name) struct idr name = IDR_INIT(name) diff -puN include/linux/init_task.h~lock-validator-locking-init-debugging-improvement include/linux/init_task.h --- devel/include/linux/init_task.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/init_task.h 2006-06-09 15:23:02.000000000 -0700 @@ -22,7 +22,7 @@ .count = ATOMIC_INIT(1), \ .fdt = &init_files.fdtab, \ .fdtab = INIT_FDTABLE, \ - .file_lock = SPIN_LOCK_UNLOCKED, \ + .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), \ .next_fd = 0, \ .close_on_exec_init = { { 0, } }, \ .open_fds_init = { { 0, } }, \ @@ -37,7 +37,7 @@ .user_id = 0, \ .next = NULL, \ .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \ - .ctx_lock = SPIN_LOCK_UNLOCKED, \ + .ctx_lock = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \ .reqs_active = 0U, \ .max_reqs = ~0U, \ } @@ -49,7 +49,7 @@ .mm_users = ATOMIC_INIT(2), \ .mm_count = ATOMIC_INIT(1), \ .mmap_sem = __RWSEM_INITIALIZER(name.mmap_sem), \ - .page_table_lock = SPIN_LOCK_UNLOCKED, \ + .page_table_lock = __SPIN_LOCK_UNLOCKED(name.page_table_lock), \ .mmlist = LIST_HEAD_INIT(name.mmlist), \ .cpu_vm_mask = CPU_MASK_ALL, \ } @@ -79,7 +79,7 @@ extern struct nsproxy init_nsproxy; #define INIT_SIGHAND(sighand) { \ .count = ATOMIC_INIT(1), \ .action = { { { .sa_handler = NULL, } }, }, \ - .siglock = SPIN_LOCK_UNLOCKED, \ + .siglock = __SPIN_LOCK_UNLOCKED(sighand.siglock), \ } extern struct group_info init_groups; @@ -130,7 +130,7 @@ extern struct group_info init_groups; .list = LIST_HEAD_INIT(tsk.pending.list), \ .signal = {{0}}}, \ .blocked = {{0}}, \ - .alloc_lock = SPIN_LOCK_UNLOCKED, \ + .alloc_lock = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock), \ .journal_info = NULL, \ .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ .fs_excl = ATOMIC_INIT(0), \ diff -puN include/linux/notifier.h~lock-validator-locking-init-debugging-improvement include/linux/notifier.h --- devel/include/linux/notifier.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/notifier.h 2006-06-09 15:23:02.000000000 -0700 @@ -65,7 +65,7 @@ struct raw_notifier_head { } while (0) #define ATOMIC_NOTIFIER_INIT(name) { \ - .lock = SPIN_LOCK_UNLOCKED, \ + .lock = __SPIN_LOCK_UNLOCKED(name.lock), \ .head = NULL } #define BLOCKING_NOTIFIER_INIT(name) { \ .rwsem = __RWSEM_INITIALIZER((name).rwsem), \ diff -puN include/linux/seqlock.h~lock-validator-locking-init-debugging-improvement include/linux/seqlock.h --- devel/include/linux/seqlock.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/seqlock.h 2006-06-09 15:23:02.000000000 -0700 @@ -38,9 +38,17 @@ typedef struct { * These macros triggered gcc-3.x compile-time problems. We think these are * OK now. Be cautious. */ -#define SEQLOCK_UNLOCKED { 0, SPIN_LOCK_UNLOCKED } -#define seqlock_init(x) do { *(x) = (seqlock_t) SEQLOCK_UNLOCKED; } while (0) +#define __SEQLOCK_UNLOCKED(lockname) \ + { 0, __SPIN_LOCK_UNLOCKED(lockname) } +#define SEQLOCK_UNLOCKED \ + __SEQLOCK_UNLOCKED(old_style_seqlock_init) + +#define seqlock_init(x) \ + do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0) + +#define DEFINE_SEQLOCK(x) \ + seqlock_t x = __SEQLOCK_UNLOCKED(x) /* Lock out other writers and update the count. * Acts like a normal spin_lock/unlock. diff -puN include/linux/spinlock_types.h~lock-validator-locking-init-debugging-improvement include/linux/spinlock_types.h --- devel/include/linux/spinlock_types.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/spinlock_types.h 2006-06-09 15:23:02.000000000 -0700 @@ -44,24 +44,27 @@ typedef struct { #define SPINLOCK_OWNER_INIT ((void *)-1L) #ifdef CONFIG_DEBUG_SPINLOCK -# define SPIN_LOCK_UNLOCKED \ +# define __SPIN_LOCK_UNLOCKED(lockname) \ (spinlock_t) { .raw_lock = __RAW_SPIN_LOCK_UNLOCKED, \ .magic = SPINLOCK_MAGIC, \ .owner = SPINLOCK_OWNER_INIT, \ .owner_cpu = -1 } -#define RW_LOCK_UNLOCKED \ +#define __RW_LOCK_UNLOCKED(lockname) \ (rwlock_t) { .raw_lock = __RAW_RW_LOCK_UNLOCKED, \ .magic = RWLOCK_MAGIC, \ .owner = SPINLOCK_OWNER_INIT, \ .owner_cpu = -1 } #else -# define SPIN_LOCK_UNLOCKED \ +# define __SPIN_LOCK_UNLOCKED(lockname) \ (spinlock_t) { .raw_lock = __RAW_SPIN_LOCK_UNLOCKED } -#define RW_LOCK_UNLOCKED \ +#define __RW_LOCK_UNLOCKED(lockname) \ (rwlock_t) { .raw_lock = __RAW_RW_LOCK_UNLOCKED } #endif -#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED -#define DEFINE_RWLOCK(x) rwlock_t x = RW_LOCK_UNLOCKED +#define SPIN_LOCK_UNLOCKED __SPIN_LOCK_UNLOCKED(old_style_spin_init) +#define RW_LOCK_UNLOCKED __RW_LOCK_UNLOCKED(old_style_rw_init) + +#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x) +#define DEFINE_RWLOCK(x) rwlock_t x = __RW_LOCK_UNLOCKED(x) #endif /* __LINUX_SPINLOCK_TYPES_H */ diff -puN include/linux/wait.h~lock-validator-locking-init-debugging-improvement include/linux/wait.h --- devel/include/linux/wait.h~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/include/linux/wait.h 2006-06-09 15:23:02.000000000 -0700 @@ -68,7 +68,7 @@ struct task_struct; wait_queue_t name = __WAITQUEUE_INITIALIZER(name, tsk) #define __WAIT_QUEUE_HEAD_INITIALIZER(name) { \ - .lock = SPIN_LOCK_UNLOCKED, \ + .lock = __SPIN_LOCK_UNLOCKED(name.lock), \ .task_list = { &(name).task_list, &(name).task_list } } #define DECLARE_WAIT_QUEUE_HEAD(name) \ diff -puN kernel/kmod.c~lock-validator-locking-init-debugging-improvement kernel/kmod.c --- devel/kernel/kmod.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/kernel/kmod.c 2006-06-09 15:23:02.000000000 -0700 @@ -246,6 +246,8 @@ int call_usermodehelper_keys(char *path, }; DECLARE_WORK(work, __call_usermodehelper, &sub_info); + init_completion(&done); + if (!khelper_wq) return -EBUSY; diff -puN kernel/rcupdate.c~lock-validator-locking-init-debugging-improvement kernel/rcupdate.c --- devel/kernel/rcupdate.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/kernel/rcupdate.c 2006-06-09 15:23:02.000000000 -0700 @@ -53,13 +53,13 @@ static struct rcu_ctrlblk rcu_ctrlblk = { .cur = -300, .completed = -300, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(&rcu_ctrlblk.lock), .cpumask = CPU_MASK_NONE, }; static struct rcu_ctrlblk rcu_bh_ctrlblk = { .cur = -300, .completed = -300, - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(&rcu_bh_ctrlblk.lock), .cpumask = CPU_MASK_NONE, }; diff -puN kernel/timer.c~lock-validator-locking-init-debugging-improvement kernel/timer.c --- devel/kernel/timer.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/kernel/timer.c 2006-06-09 15:23:02.000000000 -0700 @@ -1141,7 +1141,7 @@ unsigned long wall_jiffies = INITIAL_JIF * playing with xtime and avenrun. */ #ifndef ARCH_HAVE_XTIME_LOCK -seqlock_t xtime_lock __cacheline_aligned_in_smp = SEQLOCK_UNLOCKED; +__cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock); EXPORT_SYMBOL(xtime_lock); #endif diff -puN mm/swap_state.c~lock-validator-locking-init-debugging-improvement mm/swap_state.c --- devel/mm/swap_state.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/mm/swap_state.c 2006-06-09 15:23:02.000000000 -0700 @@ -39,7 +39,7 @@ static struct backing_dev_info swap_back struct address_space swapper_space = { .page_tree = RADIX_TREE_INIT(GFP_ATOMIC|__GFP_NOWARN), - .tree_lock = RW_LOCK_UNLOCKED, + .tree_lock = __RW_LOCK_UNLOCKED(swapper_space.tree_lock), .a_ops = &swap_aops, .i_mmap_nonlinear = LIST_HEAD_INIT(swapper_space.i_mmap_nonlinear), .backing_dev_info = &swap_backing_dev_info, diff -puN net/ipv4/tcp_ipv4.c~lock-validator-locking-init-debugging-improvement net/ipv4/tcp_ipv4.c --- devel/net/ipv4/tcp_ipv4.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/net/ipv4/tcp_ipv4.c 2006-06-09 15:23:02.000000000 -0700 @@ -91,7 +91,7 @@ static struct socket *tcp_socket; void tcp_v4_send_check(struct sock *sk, int len, struct sk_buff *skb); struct inet_hashinfo __cacheline_aligned tcp_hashinfo = { - .lhash_lock = RW_LOCK_UNLOCKED, + .lhash_lock = __RW_LOCK_UNLOCKED(tcp_hashinfo.lhash_lock), .lhash_users = ATOMIC_INIT(0), .lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(tcp_hashinfo.lhash_wait), }; diff -puN net/ipv4/tcp_minisocks.c~lock-validator-locking-init-debugging-improvement net/ipv4/tcp_minisocks.c --- devel/net/ipv4/tcp_minisocks.c~lock-validator-locking-init-debugging-improvement 2006-06-09 15:23:02.000000000 -0700 +++ devel-akpm/net/ipv4/tcp_minisocks.c 2006-06-09 15:23:02.000000000 -0700 @@ -41,7 +41,7 @@ int sysctl_tcp_abort_on_overflow; struct inet_timewait_death_row tcp_death_row = { .sysctl_max_tw_buckets = NR_FILE * 2, .period = TCP_TIMEWAIT_LEN / INET_TWDR_TWKILL_SLOTS, - .death_lock = SPIN_LOCK_UNLOCKED, + .death_lock = __SPIN_LOCK_UNLOCKED(tcp_death_row.death_lock), .hashinfo = &tcp_hashinfo, .tw_timer = TIMER_INITIALIZER(inet_twdr_hangman, 0, (unsigned long)&tcp_death_row), _