drm/i915: Cancel the modeset retry work during modeset cleanup
Subsystems (2)
PATCH 1/1 drm/i915: Cancel the modeset retry work during modeset cleanup
During modeset cleanup on driver unload we may have a pending hotplug work. This needs to be cancel early during the teardown so that it does not fire after we have freed the connector. We do this after drm_kms_helper_poll_fini(dev) since this might cause link retrain and before intel_fbdev_fini() since this tries to free the connector.
If this is not done we may see something like:
DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))
------------[ cut here ]------------ WARNING: CPU: 4 PID: 5010 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x4e/0x60 Modules linked in: i915(-) snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep snd_hda_core snd_pcm vgem ax88179_178 +a usbnet mii x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel e1000e ptp pps_core prime_numbers i2c_hid +[last unloaded: snd_hda_intel] CPU: 4 PID: 5010 Comm: drv_module_relo Tainted: G U 4.14.0-rc3-CI-CI_DRM_3186+ #1 Hardware name: Intel Corporation CoffeeLake Client Platform/CoffeeLake S UDIMM RVP, BIOS CNLSFWX1.R00.X104.A03.1709140524 09/14/2017 task: ffff8803c827aa40 task.stack: ffffc90000520000 RIP: 0010:mutex_destroy+0x4e/0x60 RSP: 0018:ffffc90000523d58 EFLAGS: 00010292 RAX: 000000000000002a RBX: ffff88044fbef648 RCX: 0000000000000000 RDX: 0000000080000001 RSI: 0000000000000001 RDI: ffffffff810f0cf0 RBP: ffffc90000523d60 R08: 0000000000000001 R09: 0000000000000001 R10: 000000000f21cb81 R11: 0000000000000000 R12: ffff88044f71efc8 R13: ffffffffa02b3d20 R14: ffffffffa02b3d90 R15: ffff880459b29308 FS: 00007f5df4d6e8c0(0000) GS:ffff88045d300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055ec51f00a18 CR3: 0000000451782006 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: drm_fb_helper_fini+0xd9/0x130 intel_fbdev_destroy+0x12/0x60 [i915] intel_fbdev_fini+0x28/0x30 [i915] intel_modeset_cleanup+0x45/0xa0 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] pci_device_remove+0x39/0xb0 device_release_driver_internal+0x15d/0x220 driver_detach+0x40/0x80 bus_remove_driver+0x58/0xd0 driver_unregister+0x2c/0x40 pci_unregister_driver+0x36/0xb0 i915_exit+0x1a/0x8b [i915] SyS_delete_module+0x18c/0x1e0 entry_SYSCALL_64_fastpath+0x1c/0xb1 RIP: 0033:0x7f5df3286287 RSP: 002b:00007fff8e107cc8 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: ffffffff81493a03 RCX: 00007f5df3286287 RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000564c7be02e48 RBP: ffffc90000523f88 R08: 0000000000000000 R09: 0000000000000080 R10: 00007f5df4d6e8c0 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fff8e107eb0 R14: 0000000000000000 R15: 0000000000000000
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -4114,6 +4114,7 @@ extern void intel_modeset_gem_init(struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev);extern int intel_connector_register (struct drm_connector *);extern void intel_connector_unregister (struct drm_connector *); +extern void intel_connector_work_fn_cleanup (struct drm_device *dev);extern int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state);extern void intel_display_resume (struct drm_device *dev);
drivers/gpu/drm/i915/intel_display.c +16 -0
@@ -15200,6 +15200,19 @@ void intel_connector_unregister(struct drm_connector *connector)intel_panel_destroy_backlight (connector); } +void intel_connector_work_fn_cleanup (struct drm_device *dev) +{ +struct intel_connector *connector; +struct drm_connector_list_iter conn_iter; + +drm_connector_list_iter_begin (dev, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (connector->modeset_retry_work.func) +cancel_work_sync (&connector->modeset_retry_work); + } +drm_connector_list_iter_end (&conn_iter); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -15222,6 +15235,9 @@ void intel_modeset_cleanup(struct drm_device *dev)*/ drm_kms_helper_poll_fini (dev); +/* Cancel pending modeset retry work in intel_connector */ +intel_connector_work_fn_cleanup (dev); +/* poll work can call into fbdev, hence clean that up afterwards */ intel_fbdev_fini (dev_priv);
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Cancel the modeset retry work during modeset cleanup
== Series Details ==
== Series Details ==
Series: drm/i915: Cancel the modeset retry work during modeset cleanup
URL : https://patchwork.freedesktop.org/series/32668/
State : success
== Summary ==
Series 32668v1 drm/i915: Cancel the modeset retry work during modeset cleanup
https://patchwork.freedesktop.org/api/1.0/series/32668/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:453s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:373s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:514s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:262s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:498s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:497s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:496s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:476s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:562s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:617s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:423s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:251s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:585s fi-glk-dsi total:289 pass:258 dwarn:0 dfail:0 fail:1 skip:30 time:480s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:431s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:433s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:438s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:484s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:458s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:481s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:571s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:582s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:542s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:596s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:650s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:525s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:511s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:455s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:565s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:417s
2ea0b3d47030274c97624258e09fc7d1ffd0e0f2 drm-tip: 2017y-10m-25d-18h-42m-20s UTC integration manifest 915d7d4ca0f1 drm/i915: Cancel the modeset retry work during modeset cleanup
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6197/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Cancel the modeset retry work during modeset cleanup
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915: Cancel the modeset retry work during modeset cleanup
URL : https://patchwork.freedesktop.org/series/32668/
State : success
== Summary ==
Test kms_busy:
Subgroup extended-modeset-hang-oldfb-with-reset-render-B:
dmesg-warn -> PASS (shard-hsw) fdo#102249
Test kms_cursor_legacy:
Subgroup flip-vs-cursor-legacy:
fail -> PASS (shard-hsw) fdo#102670fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
shard-hsw total:2539 pass:1433 dwarn:1 dfail:1 fail:7 skip:1097 time:9299s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6197/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Manasi Navare (2017-10-26 02:20:04)
Quoted 89 lines
During modeset cleanup on driver unload we may have a pending hotplug work. This needs to be cancel early during the teardown so that it does not fire after we have freed the connector. We do this after
drm_kms_helper_poll_fini(dev)since this might cause link retrain and beforeintel_fbdev_fini()since this tries to free the connector.If this is not done we may see something like:
DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))------------[ cut here ]------------ WARNING: CPU: 4 PID: 5010 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x4e/0x60 Modules linked in: i915(-) snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep snd_hda_core snd_pcm vgem ax88179_178 +a usbnet mii x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel e1000e ptp pps_core prime_numbers i2c_hid +[last unloaded: snd_hda_intel] CPU: 4 PID: 5010 Comm: drv_module_relo Tainted: G U 4.14.0-rc3-CI-CI_DRM_3186+ #1 Hardware name: Intel Corporation CoffeeLake Client Platform/CoffeeLake S UDIMM RVP, BIOS CNLSFWX1.R00.X104.A03.1709140524 09/14/2017 task: ffff8803c827aa40 task.stack: ffffc90000520000 RIP: 0010:mutex_destroy+0x4e/0x60 RSP: 0018:ffffc90000523d58 EFLAGS: 00010292 RAX: 000000000000002a RBX: ffff88044fbef648 RCX: 0000000000000000 RDX: 0000000080000001 RSI: 0000000000000001 RDI: ffffffff810f0cf0 RBP: ffffc90000523d60 R08: 0000000000000001 R09: 0000000000000001 R10: 000000000f21cb81 R11: 0000000000000000 R12: ffff88044f71efc8 R13: ffffffffa02b3d20 R14: ffffffffa02b3d90 R15: ffff880459b29308 FS: 00007f5df4d6e8c0(0000) GS:ffff88045d300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055ec51f00a18 CR3: 0000000451782006 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: drm_fb_helper_fini+0xd9/0x130 intel_fbdev_destroy+0x12/0x60 [i915] intel_fbdev_fini+0x28/0x30 [i915] intel_modeset_cleanup+0x45/0xa0 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] pci_device_remove+0x39/0xb0 device_release_driver_internal+0x15d/0x220 driver_detach+0x40/0x80 bus_remove_driver+0x58/0xd0 driver_unregister+0x2c/0x40 pci_unregister_driver+0x36/0xb0 i915_exit+0x1a/0x8b [i915] SyS_delete_module+0x18c/0x1e0 entry_SYSCALL_64_fastpath+0x1c/0xb1 RIP: 0033:0x7f5df3286287 RSP: 002b:00007fff8e107cc8 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: ffffffff81493a03 RCX: 00007f5df3286287 RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000564c7be02e48 RBP: ffffc90000523f88 R08: 0000000000000000 R09: 0000000000000080 R10: 00007f5df4d6e8c0 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fff8e107eb0 R14: 0000000000000000 R15: 0000000000000000Suggested-by Maarten Lankhorst <[email protected]>Suggested-by Chris Wilson <[email protected]>Fixes 9301397a63b3 ("drm/i915: Implement Link Rate fallback on Link training failure")Cc Chris Wilson <[email protected]>Cc Tony Cheng <[email protected]>Cc Harry Wentland <[email protected]>Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Cc Manasi Navare <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -4114,6 +4114,7 @@ extern void intel_modeset_gem_init(struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev);extern int intel_connector_register (struct drm_connector *);extern void intel_connector_unregister (struct drm_connector *); +extern void intel_connector_work_fn_cleanup (struct drm_device *dev);extern int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state);extern void intel_display_resume (struct drm_device *dev);drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c void intel_connector_unregister(struct drm_connector *connector) · line 15203
Quoted 4 lines
drivers/gpu/drm/i915/intel_display.c +1
-0@@ -15200,6 +15200,19 @@ void intel_connector_unregister(struct drm_connector *connector)intel_panel_destroy_backlight (connector); } +void intel_connector_work_fn_cleanup (struct drm_device *dev)
^static
Quoted 16 lines
drivers/gpu/drm/i915/intel_display.c +12
-0+{ +struct intel_connector *connector; +struct drm_connector_list_iter conn_iter; + +drm_connector_list_iter_begin (dev, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (connector->modeset_retry_work.func) +cancel_work_sync (&connector->modeset_retry_work); + } +drm_connector_list_iter_end (&conn_iter); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_display.c void intel_modeset_cleanup(struct drm_device *dev) · line 15239
Quoted 5 lines
drivers/gpu/drm/i915/intel_display.c +2
-0@@ -15222,6 +15235,9 @@ void intel_modeset_cleanup(struct drm_device *dev)*/ drm_kms_helper_poll_fini (dev); +/* Cancel pending modeset retry work in intel_connector */ +intel_connector_work_fn_cleanup (dev);
If you call this intel_hpd_poll_fini() and do both the helper_poll_fini and the cancel_work_sync() afterwards, the coupling between the two is more obvious.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 93 lines · Chris Wilson
Quoting Manasi Navare (2017-10-26 02:20:04)
Quoted 92 lines
During modeset cleanup on driver unload we may have a pending hotplug work. This needs to be cancel early during the teardown so that it does not fire after we have freed the connector. We do this after
drm_kms_helper_poll_fini(dev)since this might cause link retrain and beforeintel_fbdev_fini()since this tries to free the connector.If this is not done we may see something like:
DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))------------[ cut here ]------------ WARNING: CPU: 4 PID: 5010 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x4e/0x60 Modules linked in: i915(-) snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep snd_hda_core snd_pcm vgem ax88179_178 +a usbnet mii x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel e1000e ptp pps_core prime_numbers i2c_hid +[last unloaded: snd_hda_intel] CPU: 4 PID: 5010 Comm: drv_module_relo Tainted: G U 4.14.0-rc3-CI-CI_DRM_3186+ #1 Hardware name: Intel Corporation CoffeeLake Client Platform/CoffeeLake S UDIMM RVP, BIOS CNLSFWX1.R00.X104.A03.1709140524 09/14/2017 task: ffff8803c827aa40 task.stack: ffffc90000520000 RIP: 0010:mutex_destroy+0x4e/0x60 RSP: 0018:ffffc90000523d58 EFLAGS: 00010292 RAX: 000000000000002a RBX: ffff88044fbef648 RCX: 0000000000000000 RDX: 0000000080000001 RSI: 0000000000000001 RDI: ffffffff810f0cf0 RBP: ffffc90000523d60 R08: 0000000000000001 R09: 0000000000000001 R10: 000000000f21cb81 R11: 0000000000000000 R12: ffff88044f71efc8 R13: ffffffffa02b3d20 R14: ffffffffa02b3d90 R15: ffff880459b29308 FS: 00007f5df4d6e8c0(0000) GS:ffff88045d300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055ec51f00a18 CR3: 0000000451782006 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: drm_fb_helper_fini+0xd9/0x130 intel_fbdev_destroy+0x12/0x60 [i915] intel_fbdev_fini+0x28/0x30 [i915] intel_modeset_cleanup+0x45/0xa0 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] pci_device_remove+0x39/0xb0 device_release_driver_internal+0x15d/0x220 driver_detach+0x40/0x80 bus_remove_driver+0x58/0xd0 driver_unregister+0x2c/0x40 pci_unregister_driver+0x36/0xb0 i915_exit+0x1a/0x8b [i915] SyS_delete_module+0x18c/0x1e0 entry_SYSCALL_64_fastpath+0x1c/0xb1 RIP: 0033:0x7f5df3286287 RSP: 002b:00007fff8e107cc8 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: ffffffff81493a03 RCX: 00007f5df3286287 RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000564c7be02e48 RBP: ffffc90000523f88 R08: 0000000000000000 R09: 0000000000000080 R10: 00007f5df4d6e8c0 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fff8e107eb0 R14: 0000000000000000 R15: 0000000000000000Suggested-by Maarten Lankhorst <[email protected]>Suggested-by Chris Wilson <[email protected]>Fixes 9301397a63b3 ("drm/i915: Implement Link Rate fallback on Link training failure")Cc Chris Wilson <[email protected]>Cc Tony Cheng <[email protected]>Cc Harry Wentland <[email protected]>Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Cc Manasi Navare <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -4114,6 +4114,7 @@ extern void intel_modeset_gem_init(struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev);extern int intel_connector_register (struct drm_connector *);extern void intel_connector_unregister (struct drm_connector *); +extern void intel_connector_work_fn_cleanup (struct drm_device *dev);extern int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state);extern void intel_display_resume (struct drm_device *dev);drivers/gpu/drm/i915/intel_display.c +0
-0@@ -15200,6 +15200,19 @@ void intel_connector_unregister(struct drm_connector *connector)intel_panel_destroy_backlight (connector); }
Quoted 3 lines
drivers/gpu/drm/i915/intel_display.c void intel_connector_unregister(struct drm_connector *connector) · line 15203
Quoted 1 line
drivers/gpu/drm/i915/intel_display.c +1
-0+void intel_connector_work_fn_cleanup (struct drm_device *dev)^static
Yes will make this static
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/intel_display.c +12
-0+{ +struct intel_connector *connector; +struct drm_connector_list_iter conn_iter; + +drm_connector_list_iter_begin (dev, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (connector->modeset_retry_work.func) +cancel_work_sync (&connector->modeset_retry_work); + } +drm_connector_list_iter_end (&conn_iter); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);@@ -15222,6 +15235,9 @@ void intel_modeset_cleanup(struct drm_device *dev)*/ drm_kms_helper_poll_fini (dev);
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c void intel_modeset_cleanup(struct drm_device *dev) · line 15239
Quoted 2 lines
drivers/gpu/drm/i915/intel_display.c +2
-0+/* Cancel pending modeset retry work in intel_connector */ +intel_connector_work_fn_cleanup (dev);If you call this
intel_hpd_poll_fini()and do both thehelper_poll_finiand thecancel_work_sync()afterwards, the coupling between the two is more obvious.
-Chris
So rename this function as intel_hpd_poll_fini() that will call drm_kms_helper_fini() first and then loop through the connector list and cancel_work_sync()?
Manasi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Op 26-10-17 om 03:20 schreef Manasi Navare:
Quoted 46 lines
During modeset cleanup on driver unload we may have a pending hotplug work. This needs to be cancel early during the teardown so that it does not fire after we have freed the connector. We do this after
drm_kms_helper_poll_fini(dev)since this might cause link retrain and beforeintel_fbdev_fini()since this tries to free the connector.If this is not done we may see something like:
DEBUG_LOCKS_WARN_ON(mutex_is_locked(lock))------------[ cut here ]------------ WARNING: CPU: 4 PID: 5010 at kernel/locking/mutex-debug.c:103 mutex_destroy+0x4e/0x60 Modules linked in: i915(-) snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep snd_hda_core snd_pcm vgem ax88179_178 +a usbnet mii x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel e1000e ptp pps_core prime_numbers i2c_hid +[last unloaded: snd_hda_intel] CPU: 4 PID: 5010 Comm: drv_module_relo Tainted: G U 4.14.0-rc3-CI-CI_DRM_3186+ #1 Hardware name: Intel Corporation CoffeeLake Client Platform/CoffeeLake S UDIMM RVP, BIOS CNLSFWX1.R00.X104.A03.1709140524 09/14/2017 task: ffff8803c827aa40 task.stack: ffffc90000520000 RIP: 0010:mutex_destroy+0x4e/0x60 RSP: 0018:ffffc90000523d58 EFLAGS: 00010292 RAX: 000000000000002a RBX: ffff88044fbef648 RCX: 0000000000000000 RDX: 0000000080000001 RSI: 0000000000000001 RDI: ffffffff810f0cf0 RBP: ffffc90000523d60 R08: 0000000000000001 R09: 0000000000000001 R10: 000000000f21cb81 R11: 0000000000000000 R12: ffff88044f71efc8 R13: ffffffffa02b3d20 R14: ffffffffa02b3d90 R15: ffff880459b29308 FS: 00007f5df4d6e8c0(0000) GS:ffff88045d300000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055ec51f00a18 CR3: 0000000451782006 CR4: 00000000003606e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: drm_fb_helper_fini+0xd9/0x130 intel_fbdev_destroy+0x12/0x60 [i915] intel_fbdev_fini+0x28/0x30 [i915] intel_modeset_cleanup+0x45/0xa0 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] i915_driver_unload+0x92/0x180 [i915] i915_pci_remove+0x19/0x30 [i915] pci_device_remove+0x39/0xb0 device_release_driver_internal+0x15d/0x220 driver_detach+0x40/0x80 bus_remove_driver+0x58/0xd0 driver_unregister+0x2c/0x40 pci_unregister_driver+0x36/0xb0 i915_exit+0x1a/0x8b [i915] SyS_delete_module+0x18c/0x1e0
Quoted 8 lines
entry_SYSCALL_64_fastpath+0x1c/0xb1 RIP: 0033:0x7f5df3286287 RSP: 002b:00007fff8e107cc8 EFLAGS: 00000246 ORIG_RAX: 00000000000000b0 RAX: ffffffffffffffda RBX: ffffffff81493a03 RCX: 00007f5df3286287 RDX: 0000000000000001 RSI: 0000000000000800 RDI: 0000564c7be02e48 RBP: ffffc90000523f88 R08: 0000000000000000 R09: 0000000000000080 R10: 00007f5df4d6e8c0 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fff8e107eb0 R14: 0000000000000000 R15: 0000000000000000
Or a GPF like:
general protection fault: 0000 [#1] PREEMPT SMP Modules linked in: i915(-) snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec snd_hwdep snd_hda_core snd_pcm vgem ax88179_178a usbnet mii x86_pkg_temp_thermal intel_powerclamp coretemp crct10dif_pclmul crc32_pclmul ghash_clmulni_intel e1000e ptp pps_core prime_numbers i2c_hid [last unloaded: snd_hda_intel] CPU: 0 PID: 82 Comm: kworker/0:1 Tainted: G U W 4.14.0-rc3-CI-CI_DRM_3186+ #1 Hardware name: Intel Corporation CoffeeLake Client Platform/CoffeeLake S UDIMM RVP, BIOS CNLSFWX1.R00.X104.A03.1709140524 09/14/2017 Workqueue: events intel_dp_modeset_retry_work_fn [i915] task: ffff88045a5caa40 task.stack: ffffc90000378000 RIP: 0010:drm_setup_crtcs+0x143/0xbf0 RSP: 0018:ffffc9000037bd20 EFLAGS: 00010202 RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000002 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 0000000000000780 RDI: 00000000ffffffff RBP: ffffc9000037bdb8 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000780 R11: 0000000000000000 R12: 0000000000000002 R13: ffff88044fbef4e8 R14: 0000000000000780 R15: 0000000000000438 FS: 0000000000000000(0000) GS:ffff88045d200000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055ec51ee5168 CR3: 000000044c89d003 CR4: 00000000003606f0 Call Trace: drm_fb_helper_hotplug_event.part.18+0x7e/0xc0 drm_fb_helper_hotplug_event+0x1a/0x20 intel_fbdev_output_poll_changed+0x1a/0x20 [i915] drm_kms_helper_hotplug_event+0x27/0x30 intel_dp_modeset_retry_work_fn+0x77/0x80 [i915] process_one_work+0x233/0x660 worker_thread+0x206/0x3b0 kthread+0x152/0x190 ? process_one_work+0x660/0x660 ? kthread_create_on_node+0x40/0x40 ret_from_fork+0x27/0x40 Code: 06 00 00 45 8b 45 20 31 db 45 31 e4 45 85 c0 0f 8e 91 06 00 00 44 8b 75 94 44 8b 7d 90 49 8b 45 28 49 63 d4 44 89 f6 41 83 c4 01 <48> 8b 04 d0 44 89 fa 48 8b 38 48 8b 87 a8 01 00 00 ff 50 20 01 RIP: drm_setup_crtcs+0x143/0xbf0 RSP: ffffc9000037bd20 ---[ end trace 08901ff1a77d30c7 ]---
The second backtrace is also needed, since it shows the full picture of the race.
retry_work_fn calling kms helper hotplug event, which ends up calling drm_fb_helper_hotplug_event.
This is the race, and the reason why retry_work_fn has to be killed after poll_fini and before fbdev_fini.
I agree with Chris though, having a separate function makes the dependency wrt poll_fini more clear.
The connector isn't freed yet, but fbdev is at the point of the GPF. :)
Quoted 54 lines
Suggested-by Maarten Lankhorst <[email protected]>Suggested-by Chris Wilson <[email protected]>Fixes 9301397a63b3 ("drm/i915: Implement Link Rate fallback on Link training failure")Cc Chris Wilson <[email protected]>Cc Tony Cheng <[email protected]>Cc Harry Wentland <[email protected]>Cc Jani Nikula <[email protected]>Cc Daniel Vetter <[email protected]>Cc Ville Syrjala <[email protected]>Cc Manasi Navare <[email protected]>Cc Maarten Lankhorst <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_display.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+)drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -4114,6 +4114,7 @@ extern void intel_modeset_gem_init(struct drm_device *dev);extern void intel_modeset_cleanup (struct drm_device *dev);extern int intel_connector_register (struct drm_connector *);extern void intel_connector_unregister (struct drm_connector *); +extern void intel_connector_work_fn_cleanup (struct drm_device *dev);extern int intel_modeset_vga_set_state (struct drm_i915_private *dev_priv,bool state);extern void intel_display_resume (struct drm_device *dev);drivers/gpu/drm/i915/intel_display.c +13
-0@@ -15200,6 +15200,19 @@ void intel_connector_unregister(struct drm_connector *connector)intel_panel_destroy_backlight (connector); } +void intel_connector_work_fn_cleanup (struct drm_device *dev) +{ +struct intel_connector *connector; +struct drm_connector_list_iter conn_iter; + +drm_connector_list_iter_begin (dev, &conn_iter); +for_each_intel_connector_iter (connector, &conn_iter) { +if (connector->modeset_retry_work.func) +cancel_work_sync (&connector->modeset_retry_work); + } +drm_connector_list_iter_end (&conn_iter); +} +void intel_modeset_cleanup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/intel_display.c void intel_modeset_cleanup(struct drm_device *dev) · line 15243
Quoted 9 lines
drivers/gpu/drm/i915/intel_display.c +3
-0@@ -15222,6 +15235,9 @@ void intel_modeset_cleanup(struct drm_device *dev)*/ drm_kms_helper_poll_fini (dev); +/* Cancel pending modeset retry work in intel_connector */ +intel_connector_work_fn_cleanup (dev); +/* poll work can call into fbdev, hence clean that up afterwards */ intel_fbdev_fini (dev_priv);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx