Commit 261842b7 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: add same level recursion detection 



The tracing infrastructure allows for recursion. That is, an interrupt
may interrupt the act of tracing an event, and that interrupt may very well
perform its own trace. This is a recursive trace, and is fine to do.

The problem arises when there is a bug, and the utility doing the trace
calls something that recurses back into the tracer. This recursion is not
caused by an external event like an interrupt, but by code that is not
expected to recurse. The result could be a lockup.

This patch adds a bitmask to the task structure that keeps track
of the trace recursion. To find the interrupt depth, the following
algorithm is used:

  level = hardirq_count() + softirq_count() + in_nmi;

Here, level will be the depth of interrutps and softirqs, and even handles
the nmi. Then the corresponding bit is set in the recursion bitmask.
If the bit was already set, we know we had a recursion at the same level
and we warn about it and fail the writing to the buffer.

After the data has been committed to the buffer, we clear the bit.
No atomics are needed. The only races are with interrupts and they reset
the bitmask before returning anywy.

[ Impact: detect same irq level trace recursion ]

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 12acd473

include/linux/ftrace.h

+7 −0
Original line number Diff line number Diff line
@@ -488,8 +488,15 @@ static inline int test_tsk_trace_graph(struct task_struct *tsk) 


extern int ftrace_dump_on_oops;



#ifdef CONFIG_PREEMPT

#define INIT_TRACE_RECURSION		.trace_recursion = 0,

#endif



#endif /* CONFIG_TRACING */



#ifndef INIT_TRACE_RECURSION

#define INIT_TRACE_RECURSION

#endif



#ifdef CONFIG_HW_BRANCH_TRACER

include/linux/init_task.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ extern struct cred init_cred; 
	INIT_TRACE_IRQFLAGS						\

	INIT_LOCKDEP							\

	INIT_FTRACE_GRAPH						\

	INIT_TRACE_RECURSION						\

}

include/linux/sched.h

+3 −1
Original line number Diff line number Diff line
@@ -1428,7 +1428,9 @@ struct task_struct { 
#ifdef CONFIG_TRACING

	/* state flags for use by tracers */

	unsigned long trace;

#endif

	/* bitmask of trace recursion */

	unsigned long trace_recursion;

#endif /* CONFIG_TRACING */

};



/* Future-safe accessor for struct task_struct's cpus_allowed. */

kernel/trace/ring_buffer.c

+42 −0
Original line number Diff line number Diff line
@@ -1481,6 +1481,40 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, 
	return event;

}



static int trace_irq_level(void)

{

	return hardirq_count() + softirq_count() + in_nmi();

}



static int trace_recursive_lock(void)

{

	int level;



	level = trace_irq_level();



	if (unlikely(current->trace_recursion & (1 << level))) {

		/* Disable all tracing before we do anything else */

		tracing_off_permanent();

		WARN_ON_ONCE(1);

		return -1;

	}



	current->trace_recursion |= 1 << level;



	return 0;

}



static void trace_recursive_unlock(void)

{

	int level;



	level = trace_irq_level();



	WARN_ON_ONCE(!current->trace_recursion & (1 << level));



	current->trace_recursion &= ~(1 << level);

}



static DEFINE_PER_CPU(int, rb_need_resched);



/**
@@ -1514,6 +1548,9 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length) 
	/* If we are tracing schedule, we don't want to recurse */

	resched = ftrace_preempt_disable();



	if (trace_recursive_lock())

		goto out_nocheck;



	cpu = raw_smp_processor_id();



	if (!cpumask_test_cpu(cpu, buffer->cpumask))
@@ -1543,6 +1580,9 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length) 
	return event;



 out:

	trace_recursive_unlock();



 out_nocheck:

	ftrace_preempt_enable(resched);

	return NULL;

}
@@ -1581,6 +1621,8 @@ int ring_buffer_unlock_commit(struct ring_buffer *buffer, 


	rb_commit(cpu_buffer, event);



	trace_recursive_unlock();



	/*

	 * Only the last preempt count needs to restore preemption.

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE