1 files changed, 50 insertions, 4 deletions

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index a78b7c6e042c..77cb245f8e7b 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -268,12 +268,16 @@ static void debug_print_object(struct debug_obj *obj, char *msg)
  * Try to repair the damage, so we have a better chance to get useful
  * debug output.
  */
-static void
+static int
 debug_object_fixup(int (*fixup)(void *addr, enum debug_obj_state state),
                    void * addr, enum debug_obj_state state)
 {
+        int fixed = 0;
+
         if (fixup)
-                debug_objects_fixups += fixup(addr, state);
+                fixed = fixup(addr, state);
+        debug_objects_fixups += fixed;
+        return fixed;
 }
 
 static void debug_object_is_on_stack(void *addr, int onstack)
@@ -386,6 +390,9 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
         struct debug_bucket *db;
         struct debug_obj *obj;
         unsigned long flags;
+        struct debug_obj o = { .object = addr,
+                               .state = ODEBUG_STATE_NOTAVAILABLE,
+                               .descr = descr };
 
         if (!debug_objects_enabled)
                 return;
@@ -425,8 +432,9 @@ void debug_object_activate(void *addr, struct debug_obj_descr *descr)
          * let the type specific code decide whether this is
          * true or not.
          */
-        debug_object_fixup(descr->fixup_activate, addr,
-                           ODEBUG_STATE_NOTAVAILABLE);
+        if (debug_object_fixup(descr->fixup_activate, addr,
+                           ODEBUG_STATE_NOTAVAILABLE))
+                debug_print_object(&o, "activate");
 }
 
 /**
@@ -563,6 +571,44 @@ out_unlock:
 }
 
 /**
+ * debug_object_assert_init - debug checks when object should be init-ed
+ * @addr:       address of the object
+ * @descr:      pointer to an object specific debug description structure
+ */
+void debug_object_assert_init(void *addr, struct debug_obj_descr *descr)
+{
+        struct debug_bucket *db;
+        struct debug_obj *obj;
+        unsigned long flags;
+
+        if (!debug_objects_enabled)
+                return;
+
+        db = get_bucket((unsigned long) addr);
+
+        raw_spin_lock_irqsave(&db->lock, flags);
+
+        obj = lookup_object(addr, db);
+        if (!obj) {
+                struct debug_obj o = { .object = addr,
+                                       .state = ODEBUG_STATE_NOTAVAILABLE,
+                                       .descr = descr };
+
+                raw_spin_unlock_irqrestore(&db->lock, flags);
+                /*
+                 * Maybe the object is static.  Let the type specific
+                 * code decide what to do.
+                 */
+                if (debug_object_fixup(descr->fixup_assert_init, addr,
+                                       ODEBUG_STATE_NOTAVAILABLE))
+                        debug_print_object(&o, "assert_init");
+                return;
+        }
+
+        raw_spin_unlock_irqrestore(&db->lock, flags);
+}
+
+/**
  * debug_object_active_state - debug checks object usage state machine
  * @addr:       address of the object
  * @descr:      pointer to an object specific debug description structure