Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe8c304 authored by Steven Rostedt's avatar Steven Rostedt Committed by Thomas Gleixner
Browse files

ftrace: printk and trace irqsoff and wakeups 



printk called from wakeup critical timings and irqs off can
cause deadlocks since printk might do a wakeup itself. If the
call to printk happens with the runqueue lock held, it can
deadlock.

This patch protects the printk from being called in trace irqs off
with a test to see if the runqueue for the current CPU is locked.
If it is locked, the printk is skipped.

The wakeup always holds the runqueue lock, so the printk is
simply removed.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8f96da02

kernel/trace/trace_irqsoff.c

+14 −12
Original line number Original line Diff line number Diff line
@@ -165,19 +165,21 @@ check_critical_timing(struct trace_array *tr, 




	update_max_tr_single(tr, current, cpu);

	update_max_tr_single(tr, current, cpu);





	if (!runqueue_is_locked()) {

		if (tracing_thresh) {

		if (tracing_thresh) {

		printk(KERN_INFO "(%16s-%-5d|#%d):"

			printk(KERN_INFO "(%16s-%-5d|#%d): %lu us critical"

			" %lu us critical section violates %lu us threshold.\n",

			       " section violates %lu us threshold.\n",

			       current->comm, current->pid,

			       current->comm, current->pid,

			       raw_smp_processor_id(),

			       raw_smp_processor_id(),

			       latency, nsecs_to_usecs(tracing_thresh));

			       latency, nsecs_to_usecs(tracing_thresh));

		} else {

		} else {

		printk(KERN_INFO "(%16s-%-5d|#%d):"

			printk(KERN_INFO "(%16s-%-5d|#%d): new %lu us"

		       " new %lu us maximum-latency critical section.\n",

			       " maximum-latency critical section.\n",

			       current->comm, current->pid,

			       current->comm, current->pid,

			       raw_smp_processor_id(),

			       raw_smp_processor_id(),

			       latency);

			       latency);

		}

		}

	}





	max_sequence++;

	max_sequence++;

kernel/trace/trace_sched_wakeup.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -106,19 +106,6 @@ wakeup_sched_switch(struct task_struct *prev, struct task_struct *next) 




	update_max_tr(tr, wakeup_task, wakeup_cpu);

	update_max_tr(tr, wakeup_task, wakeup_cpu);





	if (tracing_thresh) {

		printk(KERN_INFO "(%16s-%-5d|#%d):"

			" %lu us wakeup latency violates %lu us threshold.\n",

				wakeup_task->comm, wakeup_task->pid,

				raw_smp_processor_id(),

				latency, nsecs_to_usecs(tracing_thresh));

	} else {

		printk(KERN_INFO "(%16s-%-5d|#%d):"

			" new %lu us maximum wakeup latency.\n",

				wakeup_task->comm, wakeup_task->pid,

				cpu, latency);

	}



out_unlock:

out_unlock:

	__wakeup_reset(tr);

	__wakeup_reset(tr);

	spin_unlock_irqrestore(&wakeup_lock, flags);

	spin_unlock_irqrestore(&wakeup_lock, flags);