Commit b9fdac7f authored by Du, Changbin's avatar Du, Changbin Committed by Linus Torvalds
Browse files

debugobjects: insulate non-fixup logic related to static obj from fixup callbacks 

When activating a static object we need make sure that the object is
tracked in the object tracker.  If it is a non-static object then the
activation is illegal.

In previous implementation, each subsystem need take care of this in
their fixup callbacks.  Actually we can put it into debugobjects core.
Thus we can save duplicated code, and have *pure* fixup callbacks.

To achieve this, a new callback "is_static_object" is introduced to let
the type specific code decide whether a object is static or not.  If
yes, we take it into object tracker, otherwise give warning and invoke
fixup callback.

This change has paassed debugobjects selftest, and I also do some test
with all debugobjects supports enabled.

At last, I have a concern about the fixups that can it change the object
which is in incorrect state on fixup? Because the 'addr' may not point
to any valid object if a non-static object is not tracked.  Then Change
such object can overwrite someone's memory and cause unexpected
behaviour.  For example, the timer_fixup_activate bind timer to function
stub_timer.

Link: http://lkml.kernel.org/r/1462576157-14539-1-git-send-email-changbin.du@intel.com
[changbin.du@intel.com: improve code comments where invoke the new is_static_object callback]
  Link: http://lkml.kernel.org/r/1462777431-8171-1-git-send-email-changbin.du@intel.com


Signed-off-by: default avatarDu, Changbin <changbin.du@intel.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Josh Triplett <josh@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8bad1cd0

include/linux/debugobjects.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ struct debug_obj { 
 * @name:		name of the object typee

 * @debug_hint:		function returning address, which have associated

 *			kernel symbol, to allow identify the object

 * @is_static_object	return true if the obj is static, otherwise return false

 * @fixup_init:		fixup function, which is called when the init check

 *			fails. All fixup functions must return true if fixup

 *			was successful, otherwise return false
@@ -53,6 +54,7 @@ struct debug_obj { 
struct debug_obj_descr {

	const char		*name;

	void *(*debug_hint)(void *addr);

	bool (*is_static_object)(void *addr);

	bool (*fixup_init)(void *addr, enum debug_obj_state state);

	bool (*fixup_activate)(void *addr, enum debug_obj_state state);

	bool (*fixup_destroy)(void *addr, enum debug_obj_state state);

kernel/rcu/update.c

+3 −23
Original line number Diff line number Diff line
@@ -380,30 +380,10 @@ void destroy_rcu_head(struct rcu_head *head) 
	debug_object_free(head, &rcuhead_debug_descr);

}



/*

 * fixup_activate is called when:

 * - an active object is activated

 * - an unknown object is activated (might be a statically initialized object)

 * Activation is performed internally by call_rcu().

 */

static bool rcuhead_fixup_activate(void *addr, enum debug_obj_state state)

static bool rcuhead_is_static_object(void *addr)

{

	struct rcu_head *head = addr;



	switch (state) {



	case ODEBUG_STATE_NOTAVAILABLE:

		/*

		 * This is not really a fixup. We just make sure that it is

		 * tracked in the object tracker.

		 */

		debug_object_init(head, &rcuhead_debug_descr);

		debug_object_activate(head, &rcuhead_debug_descr);

		return false;

	default:

	return true;

}

}



/**

 * init_rcu_head_on_stack() - initialize on-stack rcu_head for debugobjects
@@ -440,7 +420,7 @@ EXPORT_SYMBOL_GPL(destroy_rcu_head_on_stack); 


struct debug_obj_descr rcuhead_debug_descr = {

	.name = "rcu_head",

	.fixup_activate = rcuhead_fixup_activate,

	.is_static_object = rcuhead_is_static_object,

};

EXPORT_SYMBOL_GPL(rcuhead_debug_descr);

#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */

kernel/time/hrtimer.c

+1 −6
Original line number Diff line number Diff line
@@ -351,16 +351,11 @@ static bool hrtimer_fixup_init(void *addr, enum debug_obj_state state) 
/*

 * fixup_activate is called when:

 * - an active object is activated

 * - an unknown object is activated (might be a statically initialized object)

 * - an unknown non-static object is activated

 */

static bool hrtimer_fixup_activate(void *addr, enum debug_obj_state state)

{

	switch (state) {



	case ODEBUG_STATE_NOTAVAILABLE:

		WARN_ON_ONCE(1);

		return false;



	case ODEBUG_STATE_ACTIVE:

		WARN_ON(1);

kernel/time/timer.c

+14 −29
Original line number Diff line number Diff line
@@ -489,6 +489,14 @@ static void *timer_debug_hint(void *addr) 
	return ((struct timer_list *) addr)->function;

}



static bool timer_is_static_object(void *addr)

{

	struct timer_list *timer = addr;



	return (timer->entry.pprev == NULL &&

		timer->entry.next == TIMER_ENTRY_STATIC);

}



/*

 * fixup_init is called when:

 * - an active object is initialized
@@ -516,30 +524,16 @@ static void stub_timer(unsigned long data) 
/*

 * fixup_activate is called when:

 * - an active object is activated

 * - an unknown object is activated (might be a statically initialized object)

 * - an unknown non-static object is activated

 */

static bool timer_fixup_activate(void *addr, enum debug_obj_state state)

{

	struct timer_list *timer = addr;



	switch (state) {



	case ODEBUG_STATE_NOTAVAILABLE:

		/*

		 * This is not really a fixup. The timer was

		 * statically initialized. We just make sure that it

		 * is tracked in the object tracker.

		 */

		if (timer->entry.pprev == NULL &&

		    timer->entry.next == TIMER_ENTRY_STATIC) {

			debug_object_init(timer, &timer_debug_descr);

			debug_object_activate(timer, &timer_debug_descr);

			return false;

		} else {

		setup_timer(timer, stub_timer, 0);

		return true;

		}

		return false;



	case ODEBUG_STATE_ACTIVE:

		WARN_ON(1);
@@ -577,18 +571,8 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state) 


	switch (state) {

	case ODEBUG_STATE_NOTAVAILABLE:

		if (timer->entry.next == TIMER_ENTRY_STATIC) {

			/*

			 * This is not really a fixup. The timer was

			 * statically initialized. We just make sure that it

			 * is tracked in the object tracker.

			 */

			debug_object_init(timer, &timer_debug_descr);

			return false;

		} else {

		setup_timer(timer, stub_timer, 0);

		return true;

		}

	default:

		return false;

	}
@@ -597,6 +581,7 @@ static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state) 
static struct debug_obj_descr timer_debug_descr = {

	.name			= "timer_list",

	.debug_hint		= timer_debug_hint,

	.is_static_object	= timer_is_static_object,

	.fixup_init		= timer_fixup_init,

	.fixup_activate		= timer_fixup_activate,

	.fixup_free		= timer_fixup_free,

kernel/workqueue.c

+8 −34
Original line number Diff line number Diff line
@@ -433,6 +433,13 @@ static void *work_debug_hint(void *addr) 
	return ((struct work_struct *) addr)->func;

}



static bool work_is_static_object(void *addr)

{

	struct work_struct *work = addr;



	return test_bit(WORK_STRUCT_STATIC_BIT, work_data_bits(work));

}



/*

 * fixup_init is called when:

 * - an active object is initialized
@@ -451,39 +458,6 @@ static bool work_fixup_init(void *addr, enum debug_obj_state state) 
	}

}



/*

 * fixup_activate is called when:

 * - an active object is activated

 * - an unknown object is activated (might be a statically initialized object)

 */

static bool work_fixup_activate(void *addr, enum debug_obj_state state)

{

	struct work_struct *work = addr;



	switch (state) {



	case ODEBUG_STATE_NOTAVAILABLE:

		/*

		 * This is not really a fixup. The work struct was

		 * statically initialized. We just make sure that it

		 * is tracked in the object tracker.

		 */

		if (test_bit(WORK_STRUCT_STATIC_BIT, work_data_bits(work))) {

			debug_object_init(work, &work_debug_descr);

			debug_object_activate(work, &work_debug_descr);

			return false;

		}

		WARN_ON_ONCE(1);

		return false;



	case ODEBUG_STATE_ACTIVE:

		WARN_ON(1);



	default:

		return false;

	}

}



/*

 * fixup_free is called when:

 * - an active object is freed
@@ -505,8 +479,8 @@ static bool work_fixup_free(void *addr, enum debug_obj_state state) 
static struct debug_obj_descr work_debug_descr = {

	.name		= "work_struct",

	.debug_hint	= work_debug_hint,

	.is_static_object = work_is_static_object,

	.fixup_init	= work_fixup_init,

	.fixup_activate	= work_fixup_activate,

	.fixup_free	= work_fixup_free,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE