[PATCH] kthread_worker: Initialize dynamically allocated spinlockproperly for lockdep

[Andy Walls]

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);
+	INIT_LIST_HEAD(&worker->work_list);
+	worker->task = NULL;
 }
 
 static inline void init_kthread_work(struct kthread_work *work,


--
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/