* [Intel-gfx] [PATCH] drm/i915: Mark the GGTT as closed upon driver removal @ 2020-05-10 11:54 Chris Wilson 2020-05-10 12:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-10 16:00 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 0 siblings, 2 replies; 3+ messages in thread From: Chris Wilson @ 2020-05-10 11:54 UTC (permalink / raw) To: intel-gfx; +Cc: Chris Wilson We do not want to add any more VMA into the GGTT [accidentally] after we start removing the device, so mark it as closed. Similarly make sure that all remaining user mmaps are revoked. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> --- drivers/gpu/drm/i915/gt/intel_ggtt.c | 12 ++++++++++-- drivers/gpu/drm/i915/gt/intel_gtt.h | 1 + drivers/gpu/drm/i915/i915_drv.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index dfc979a24450..53cf7a93f363 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -682,8 +682,6 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt) { struct i915_vma *vma, *vn; - atomic_set(&ggtt->vm.open, 0); - rcu_barrier(); /* flush the RCU'ed__i915_vm_release */ flush_workqueue(ggtt->vm.i915->wq); @@ -710,6 +708,16 @@ static void ggtt_cleanup_hw(struct i915_ggtt *ggtt) io_mapping_fini(&ggtt->iomap); } +void i915_ggtt_driver_remove(struct drm_i915_private *i915) +{ + struct i915_ggtt *ggtt = &i915->ggtt; + + atomic_set(&ggtt->vm.open, 0); + + /* And revoke *all* residual GGTT mmaps */ + unmap_mapping_range(i915->drm.anon_inode->i_mapping, 0, -1, 1); +} + /** * i915_ggtt_driver_release - Clean up GGTT hardware initialization * @i915: i915 device diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.h b/drivers/gpu/drm/i915/gt/intel_gtt.h index 773fc76dfa1b..0e0b38e3a3f4 100644 --- a/drivers/gpu/drm/i915/gt/intel_gtt.h +++ b/drivers/gpu/drm/i915/gt/intel_gtt.h @@ -503,6 +503,7 @@ int i915_ggtt_enable_hw(struct drm_i915_private *i915); void i915_ggtt_enable_guc(struct i915_ggtt *ggtt); void i915_ggtt_disable_guc(struct i915_ggtt *ggtt); int i915_init_ggtt(struct drm_i915_private *i915); +void i915_ggtt_driver_remove(struct drm_i915_private *i915); void i915_ggtt_driver_release(struct drm_i915_private *i915); static inline bool i915_ggtt_has_aperture(const struct i915_ggtt *ggtt) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 34ee12f3f02d..d7026be4b10d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -768,6 +768,7 @@ static void i915_driver_hw_remove(struct drm_i915_private *dev_priv) i915_perf_fini(dev_priv); + i915_ggtt_driver_remove(dev_priv); if (pdev->msi_enabled) pci_disable_msi(pdev); -- 2.20.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Mark the GGTT as closed upon driver removal 2020-05-10 11:54 [Intel-gfx] [PATCH] drm/i915: Mark the GGTT as closed upon driver removal Chris Wilson @ 2020-05-10 12:34 ` Patchwork 2020-05-10 16:00 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-10 12:34 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Mark the GGTT as closed upon driver removal URL : https://patchwork.freedesktop.org/series/77123/ State : success == Summary == CI Bug Log - changes from CI_DRM_8461 -> Patchwork_17619 ==================================================== Summary ------- **SUCCESS** No regressions found. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/index.html Known issues ------------ Here are the changes found in Patchwork_17619 that come from known issues: ### IGT changes ### #### Possible fixes #### * igt@i915_selftest@live@hangcheck: - fi-icl-y: [INCOMPLETE][1] ([i915#1580]) -> [PASS][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/fi-icl-y/igt@i915_selftest@live@hangcheck.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/fi-icl-y/igt@i915_selftest@live@hangcheck.html #### Warnings #### * igt@i915_pm_rpm@module-reload: - fi-kbl-x1275: [SKIP][3] ([fdo#109271]) -> [FAIL][4] ([i915#62]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/fi-kbl-x1275/igt@i915_pm_rpm@module-reload.html [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [i915#1580]: https://gitlab.freedesktop.org/drm/intel/issues/1580 [i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62 Participating hosts (48 -> 43) ------------------------------ Additional (1): fi-kbl-7560u Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8461 -> Patchwork_17619 CI-20190529: 20190529 CI_DRM_8461: c0be14b9502e54c9ece4f4fc25872d665c6a6553 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5644: 16f067ae42a6a93b8f0c5835210e2575a883001b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17619: 76e95e8cc85ea3655544ce330fabf4e5a57d12f1 @ git://anongit.freedesktop.org/gfx-ci/linux == Linux commits == 76e95e8cc85e drm/i915: Mark the GGTT as closed upon driver removal == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Mark the GGTT as closed upon driver removal 2020-05-10 11:54 [Intel-gfx] [PATCH] drm/i915: Mark the GGTT as closed upon driver removal Chris Wilson 2020-05-10 12:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork @ 2020-05-10 16:00 ` Patchwork 1 sibling, 0 replies; 3+ messages in thread From: Patchwork @ 2020-05-10 16:00 UTC (permalink / raw) To: Chris Wilson; +Cc: intel-gfx == Series Details == Series: drm/i915: Mark the GGTT as closed upon driver removal URL : https://patchwork.freedesktop.org/series/77123/ State : success == Summary == CI Bug Log - changes from CI_DRM_8461_full -> Patchwork_17619_full ==================================================== Summary ------- **SUCCESS** No regressions found. Known issues ------------ Here are the changes found in Patchwork_17619_full that come from known issues: ### IGT changes ### #### Issues hit #### * igt@gem_exec_params@invalid-bsd-ring: - shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276]) [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-iclb4/igt@gem_exec_params@invalid-bsd-ring.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-iclb6/igt@gem_exec_params@invalid-bsd-ring.html * igt@i915_pm_rpm@system-suspend-execbuf: - shard-kbl: [PASS][3] -> [INCOMPLETE][4] ([i915#151] / [i915#155]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-kbl7/igt@i915_pm_rpm@system-suspend-execbuf.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-kbl3/igt@i915_pm_rpm@system-suspend-execbuf.html * igt@i915_suspend@forcewake: - shard-kbl: [PASS][5] -> [DMESG-WARN][6] ([i915#180]) +1 similar issue [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-kbl7/igt@i915_suspend@forcewake.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-kbl1/igt@i915_suspend@forcewake.html * igt@kms_big_fb@linear-64bpp-rotate-180: - shard-snb: [PASS][7] -> [SKIP][8] ([fdo#109271]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-snb2/igt@kms_big_fb@linear-64bpp-rotate-180.html [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-snb1/igt@kms_big_fb@linear-64bpp-rotate-180.html * igt@kms_cursor_crc@pipe-c-cursor-128x128-sliding: - shard-skl: [PASS][9] -> [FAIL][10] ([i915#54]) [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-skl7/igt@kms_cursor_crc@pipe-c-cursor-128x128-sliding.html [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-128x128-sliding.html * igt@kms_hdr@bpc-switch-suspend: - shard-skl: [PASS][11] -> [FAIL][12] ([i915#1188]) [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-skl10/igt@kms_hdr@bpc-switch-suspend.html [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-skl7/igt@kms_hdr@bpc-switch-suspend.html * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min: - shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108145] / [i915#265]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html * igt@kms_psr2_su@frontbuffer: - shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#109642] / [fdo#111068]) [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-iclb2/igt@kms_psr2_su@frontbuffer.html [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-iclb3/igt@kms_psr2_su@frontbuffer.html * igt@kms_psr@psr2_primary_mmap_cpu: - shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109441]) +2 similar issues [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-iclb7/igt@kms_psr@psr2_primary_mmap_cpu.html * igt@kms_vblank@pipe-a-ts-continuation-suspend: - shard-apl: [PASS][19] -> [DMESG-WARN][20] ([i915#180]) [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-apl2/igt@kms_vblank@pipe-a-ts-continuation-suspend.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-apl6/igt@kms_vblank@pipe-a-ts-continuation-suspend.html #### Possible fixes #### * {igt@gem_ctx_isolation@preservation-s3@rcs0}: - shard-kbl: [INCOMPLETE][21] ([i915#155]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-kbl3/igt@gem_ctx_isolation@preservation-s3@rcs0.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-kbl7/igt@gem_ctx_isolation@preservation-s3@rcs0.html * igt@gen9_exec_parse@allowed-all: - shard-kbl: [DMESG-WARN][23] ([i915#1436] / [i915#716]) -> [PASS][24] [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-kbl1/igt@gen9_exec_parse@allowed-all.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-kbl4/igt@gen9_exec_parse@allowed-all.html * igt@i915_suspend@sysfs-reader: - shard-apl: [DMESG-WARN][25] ([i915#180]) -> [PASS][26] +1 similar issue [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-apl6/igt@i915_suspend@sysfs-reader.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-apl2/igt@i915_suspend@sysfs-reader.html * igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen: - shard-skl: [FAIL][27] ([i915#54]) -> [PASS][28] [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-skl2/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-skl7/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html * igt@kms_cursor_legacy@cursor-vs-flip-toggle: - shard-hsw: [FAIL][29] ([i915#57]) -> [PASS][30] [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-toggle.html * igt@kms_draw_crc@fill-fb: - shard-apl: [FAIL][31] ([i915#95]) -> [PASS][32] [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-apl2/igt@kms_draw_crc@fill-fb.html [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-apl6/igt@kms_draw_crc@fill-fb.html * {igt@kms_flip@flip-vs-suspend-interruptible@a-dp1}: - shard-kbl: [DMESG-WARN][33] ([i915#180]) -> [PASS][34] +1 similar issue [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html * igt@kms_hdr@bpc-switch-dpms: - shard-skl: [FAIL][35] ([i915#1188]) -> [PASS][36] [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-skl2/igt@kms_hdr@bpc-switch-dpms.html [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-skl7/igt@kms_hdr@bpc-switch-dpms.html * igt@kms_psr@psr2_sprite_blt: - shard-iclb: [SKIP][37] ([fdo#109441]) -> [PASS][38] +2 similar issues [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-iclb8/igt@kms_psr@psr2_sprite_blt.html [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html #### Warnings #### * igt@i915_pm_dc@dc6-psr: - shard-tglb: [SKIP][39] ([i915#468]) -> [FAIL][40] ([i915#454]) [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-tglb2/igt@i915_pm_dc@dc6-psr.html [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-tglb3/igt@i915_pm_dc@dc6-psr.html * igt@kms_content_protection@atomic: - shard-apl: [TIMEOUT][41] ([i915#1319]) -> [FAIL][42] ([fdo#110321] / [fdo#110336]) [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-apl8/igt@kms_content_protection@atomic.html [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-apl4/igt@kms_content_protection@atomic.html * igt@kms_content_protection@lic: - shard-apl: [FAIL][43] ([fdo#110321]) -> [TIMEOUT][44] ([i915#1319]) [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8461/shard-apl4/igt@kms_content_protection@lic.html [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/shard-apl3/igt@kms_content_protection@lic.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642 [fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321 [fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336 [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068 [i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188 [i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319 [i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436 [i915#151]: https://gitlab.freedesktop.org/drm/intel/issues/151 [i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155 [i915#165]: https://gitlab.freedesktop.org/drm/intel/issues/165 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265 [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454 [i915#468]: https://gitlab.freedesktop.org/drm/intel/issues/468 [i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54 [i915#57]: https://gitlab.freedesktop.org/drm/intel/issues/57 [i915#61]: https://gitlab.freedesktop.org/drm/intel/issues/61 [i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716 [i915#78]: https://gitlab.freedesktop.org/drm/intel/issues/78 [i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79 [i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95 Participating hosts (11 -> 11) ------------------------------ No changes in participating hosts Build changes ------------- * CI: CI-20190529 -> None * Linux: CI_DRM_8461 -> Patchwork_17619 CI-20190529: 20190529 CI_DRM_8461: c0be14b9502e54c9ece4f4fc25872d665c6a6553 @ git://anongit.freedesktop.org/gfx-ci/linux IGT_5644: 16f067ae42a6a93b8f0c5835210e2575a883001b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools Patchwork_17619: 76e95e8cc85ea3655544ce330fabf4e5a57d12f1 @ git://anongit.freedesktop.org/gfx-ci/linux piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17619/index.html _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-10 16:00 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-10 11:54 [Intel-gfx] [PATCH] drm/i915: Mark the GGTT as closed upon driver removal Chris Wilson 2020-05-10 12:34 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork 2020-05-10 16:00 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.