drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
Subsystems (2)
Maarten Lankhorst
maintainerPATCH 1/1 drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
When I was writing an atomic wrapper for rmfb, I ran into the following backtrace from lockdep:
=============================================
[ INFO: possible recursive locking detected ]
4.5.0-patser+ #4696 Tainted: G U
---------------------------------------------
kworker/2:2/2608 is trying to acquire lock:
(crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c9ddc>] drm_modeset_lock+0x7c/0x120 [drm]
but task is already holding lock:
(crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c98cd>] modeset_backoff+0x8d/0x220 [drm]
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(crtc_ww_class_mutex);
lock(crtc_ww_class_mutex);
*** DEADLOCK ***
May be due to missing lock nesting notation
4 locks held by kworker/2:2/2608:
#0: ("events"){.+.+.+}, at: [<ffffffff810a5eea>] process_one_work+0x15a/0x6c0
#1: ((&arg.work)){+.+.+.}, at: [<ffffffff810a5eea>] process_one_work+0x15a/0x6c0
#2: (crtc_ww_class_acquire){+.+.+.}, at: [<ffffffffc004532a>] drm_atomic_helper_remove_fb+0x4a/0x1d0 [drm_kms_helper]
#3: (crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c98cd>] modeset_backoff+0x8d/0x220 [drm]While lockdep probably catches this bug when it happens, it's better to explicitly warn when state->acquire_ctx is not set.
--- drivers/gpu/drm/drm_atomic.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_atomic.c +6 -0
@@ -263,6 +263,8 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,int ret, index =drm_crtc_index (crtc);struct drm_crtc_state *crtc_state; +WARN_ON (!state->acquire_ctx); + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc);if (crtc_state)return crtc_state;
@@ -622,6 +624,8 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,int ret, index =drm_plane_index (plane);struct drm_plane_state *plane_state; +WARN_ON (!state->acquire_ctx); + plane_state =drm_atomic_get_existing_plane_state (state, plane);if (plane_state)return plane_state;
@@ -890,6 +894,8 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,struct drm_mode_config *config = &connector->dev->mode_config;struct drm_connector_state *connector_state; +WARN_ON (!state->acquire_ctx); + ret =drm_modeset_lock (&config->connection_mutex, state->acquire_ctx);if (ret)return ERR_PTR (ret);
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
== Series Details ==
== Series Details ==
Series: drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
URL : https://patchwork.freedesktop.org/series/6650/
State : success
== Summary ==
Series 6650v1 drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
http://patchwork.freedesktop.org/api/1.0/series/6650/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-uc-pro-default:
fail -> PASS (byt-nuc)
Test kms_force_connector_basic:
Subgroup force-load-detect:
skip -> PASS (snb-x220t)
Subgroup prune-stale-modes:
skip -> PASS (snb-x220t)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (hsw-gt2)bdw-nuci7-2 total:221 pass:209 dwarn:0 dfail:0 fail:0 skip:12 bdw-ultra total:221 pass:196 dwarn:0 dfail:0 fail:0 skip:25 byt-nuc total:220 pass:177 dwarn:0 dfail:0 fail:2 skip:41 hsw-brixbox total:221 pass:195 dwarn:0 dfail:0 fail:0 skip:26 hsw-gt2 total:221 pass:199 dwarn:0 dfail:0 fail:1 skip:21 ilk-hp8440p total:221 pass:158 dwarn:0 dfail:0 fail:2 skip:61 ivb-t430s total:221 pass:190 dwarn:0 dfail:0 fail:0 skip:31 skl-i7k-2 total:221 pass:194 dwarn:0 dfail:0 fail:0 skip:27 skl-nuci5 total:221 pass:210 dwarn:0 dfail:0 fail:0 skip:11 snb-dellxps total:221 pass:179 dwarn:0 dfail:0 fail:0 skip:42 snb-x220t total:221 pass:179 dwarn:0 dfail:0 fail:1 skip:41
Results at /archive/results/CI_IGT_test/Patchwork_2127/
4c6b0d9cea0a81653fc290fe64d5c43e7d5c5762 drm-intel-nightly: 2016y-05m-03d-08h-18m-32s UTC integration manifest e0334a1 drm/atomic: Add WARN_ON when state->acquire_ctx is not set.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 31 lines · Maarten Lankhorst
When I was writing an atomic wrapper for rmfb, I ran into the following backtrace from lockdep:
=============================================
[ INFO: possible recursive locking detected ]
4.5.0-patser+ #4696 Tainted: G U
---------------------------------------------
kworker/2:2/2608 is trying to acquire lock:
(crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c9ddc>]drm_modeset_lock+0x7c/0x120[drm]but task is already holding lock:
(crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c98cd>]modeset_backoff+0x8d/0x220[drm]other info that might help us debug this:
Possible unsafe locking scenario:CPU0 ----
lock(crtc_ww_class_mutex);
lock(crtc_ww_class_mutex);*** DEADLOCK ***
May be due to missing lock nesting notation
4 locks held by kworker/2:2/2608:
#0: ("events"){.+.+.+}, at: [<ffffffff810a5eea>] process_one_work+0x15a/0x6c0 #1: ((&arg.work)){+.+.+.}, at: [<ffffffff810a5eea>] process_one_work+0x15a/0x6c0 #2: (crtc_ww_class_acquire){+.+.+.}, at: [<ffffffffc004532a>] drm_atomic_helper_remove_fb+0x4a/0x1d0 [drm_kms_helper] #3: (crtc_ww_class_mutex){+.+.+.}, at: [<ffffffffc00c98cd>] modeset_backoff+0x8d/0x220 [drm]
Quoted 4 lines
While lockdep probably catches this bug when it happens, it's better to explicitly warn when
state->acquire_ctxis not set.Signed-off-by Maarten Lankhorst <[email protected]>
Yeah, because of the automagic fallback to normal mutex semantics when acquire_ctx == NULL in ww_mutex_lock this can go boom, and the lockdep splat is pretty hard to read. Makes sense to have an explicit WARN_ON about it.
Applied to drm-misc, thanks.
-Daniel
Quoted 42 lines
--- drivers/gpu/drm/drm_atomic.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/gpu/drm/drm_atomic.c +6
-0@@ -263,6 +263,8 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state,int ret, index =drm_crtc_index (crtc);struct drm_crtc_state *crtc_state; +WARN_ON (!state->acquire_ctx); + crtc_state =drm_atomic_get_existing_crtc_state (state, crtc);if (crtc_state)return crtc_state;@@ -622,6 +624,8 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state,int ret, index =drm_plane_index (plane);struct drm_plane_state *plane_state; +WARN_ON (!state->acquire_ctx); + plane_state =drm_atomic_get_existing_plane_state (state, plane);if (plane_state)return plane_state;@@ -890,6 +894,8 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state,struct drm_mode_config *config = &connector->dev->mode_config;struct drm_connector_state *connector_state; +WARN_ON (!state->acquire_ctx); + ret =drm_modeset_lock (&config->connection_mutex, state->acquire_ctx);if (ret)return ERR_PTR (ret);Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel