Skip to content

Commit 3f7ba5c

Browse files
Sebastian Andrzej Siewiorsys-oak
authored andcommitted
drm/i915: Disable tracing points on PREEMPT_RT
Luca Abeni reported this: | BUG: scheduling while atomic: kworker/u8:2/15203/0x00000003 | CPU: 1 PID: 15203 Comm: kworker/u8:2 Not tainted 4.19.1-rt3 #10 | Call Trace: | rt_spin_lock+0x3f/0x50 | gen6_read32+0x45/0x1d0 [i915] | g4x_get_vblank_counter+0x36/0x40 [i915] | trace_event_raw_event_i915_pipe_update_start+0x7d/0xf0 [i915] The tracing events use trace_intel_pipe_update_start() among other events use functions acquire spinlock_t locks which are transformed into sleeping locks on PREEMPT_RT. A few trace points use intel_get_crtc_scanline(), others use ->get_vblank_counter() wich also might acquire a sleeping locks on PREEMPT_RT. At the time the arguments are evaluated within trace point, preemption is disabled and so the locks must not be acquired on PREEMPT_RT. Based on this I don't see any other way than disable trace points on PREMPT_RT. Acked-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Reported-by: Luca Abeni <lucabe72@gmail.com> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
1 parent 44357df commit 3f7ba5c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

drivers/gpu/drm/i915/display/intel_display_trace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
#if !defined(__INTEL_DISPLAY_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
1010
#define __INTEL_DISPLAY_TRACE_H__
1111

12+
#if defined(CONFIG_PREEMPT_RT) && !defined(NOTRACE)
13+
#define NOTRACE
14+
#endif
15+
1216
#include <linux/string_helpers.h>
1317
#include <linux/types.h>
1418
#include <linux/tracepoint.h>

drivers/gpu/drm/i915/i915_trace.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
#if !defined(_I915_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)
77
#define _I915_TRACE_H_
88

9+
#if defined(CONFIG_PREEMPT_RT) && !defined(NOTRACE)
10+
#define NOTRACE
11+
#endif
12+
913
#include <linux/stringify.h>
1014
#include <linux/types.h>
1115
#include <linux/tracepoint.h>

0 commit comments

Comments
 (0)