Re: [PATCH] kthread_worker: Initialize dynamically allocated spinlockproperly for lockdep

From: Yong Zhang
Date: Mon Dec 20 2010 - 02:07:32 EST


On Sun, Dec 19, 2010 at 8:49 PM, Andy Walls <awalls@xxxxxxxxxxxxxxxx> wrote:
> init_kthread_worker(), via KTHREAD_WORKER_INIT(), used an
> initializer for static spin_lock objects, SPIN_LOCK_UNLOCKED, on
> a dynamically allocated kthread_worker object's internal spinlock_t.
> This causes lockdep to gripe:
>
> Â Â Â ÂINFO: trying to register non-static key.
> Â Â Â Âthe code is fine but needs lockdep annotation.
> Â Â Â Âturning off the locking correctness validator.
>
> To keep lockdep happy, use spin_lock_init() for dynamically
> allocated kthread_worker objects' internal spinlock_t.
>
> Reported-by: Nicolas <nicolas.mailhot@xxxxxxxxxxx>
> Signed-off-by: Andy Walls <awalls@xxxxxxxxxxxxxxxx>
>
> Cc: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Jarod Wilson <jarod@xxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
>
> diff --git a/include/linux/kthread.h b/include/linux/kthread.h
> index 685ea65..e65d0b1 100644
> --- a/include/linux/kthread.h
> +++ b/include/linux/kthread.h
> @@ -83,7 +83,13 @@ struct kthread_work {
>
> Âstatic inline void init_kthread_worker(struct kthread_worker *worker)
> Â{
> - Â Â Â *worker = (struct kthread_worker)KTHREAD_WORKER_INIT(*worker);
> + Â Â Â /*
> + Â Â Â Â* Lockdep complains if a dynamically allocated worker's spinlock_t
> + Â Â Â Â* is initialzed using SPIN_LOCK_UNLOCKED.
> + Â Â Â Â*/
> + Â Â Â spin_lock_init(&worker->lock);

This will make different kthead_worker->lock initialized with one same
key. You know spin_lock_init() will be like below:
# define raw_spin_lock_init(lock) \
do { \
static struct lock_class_key __key; \
\
__raw_spin_lock_init((lock), #lock, &__key); \
} while (0)

So we should put the real initializer to kernel/kthread.c
and make init_kthread_worker() to be a MACRO.

BTW, init_kthread_work() should also be changed like above
because member done is a wait_queue_head.

Thanks,
Yong

--
Only stand for myself.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/