drm/i915: Remove nest annotation from intel_context_unpin
Subsystems (2)
PATCH 1/1 drm/i915: Remove nest annotation from intel_context_unpin
Lets see what breaks, round 3?
--- drivers/gpu/drm/i915/gt/intel_context.c | 27 +++++++++++++------ drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + 2 files changed, 20 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/intel_context.c +19 -8
@@ -47,21 +47,30 @@ int __intel_context_do_pin(struct intel_context *ce) {int err; -if (mutex_lock_interruptible (&ce->pin_mutex)) -return -EINTR ; - -if (likely (!atomic_read (&ce->pin_count))) { -intel_wakeref_t wakeref; +if (unlikely (!test_bit (CONTEXT_ALLOC_BIT , &ce->flags))) { + err =mutex_lock_interruptible (&ce->alloc_mutex); +if (err) +return err; -if (unlikely (!test_bit (CONTEXT_ALLOC_BIT , &ce->flags))) { +if (!test_bit (CONTEXT_ALLOC_BIT , &ce->flags)) { err = ce->ops->alloc (ce);if (unlikely (err)) goto err; +smp_mb ();/* Make sure allocation is flushed to memory */ +__set_bit (CONTEXT_ALLOC_BIT , &ce->flags); } +mutex_unlock (&ce->alloc_mutex); + } + + err =mutex_lock_interruptible (&ce->pin_mutex); +if (err) +return err; + +if (likely (!atomic_read (&ce->pin_count))) { +intel_wakeref_t wakeref; - err =0 ;with_intel_runtime_pm (ce->engine->uncore->rpm, wakeref) err = ce->ops->pin(ce);if (err)
@@ -91,7 +100,7 @@ void intel_context_unpin(struct intel_context *ce)/* We may be called from inside intel_context_pin() to evict another */ intel_context_get (ce); -mutex_lock_nested (&ce->pin_mutex,SINGLE_DEPTH_NESTING ); +mutex_lock (&ce->pin_mutex);if (likely (atomic_dec_and_test (&ce->pin_count))) {CE_TRACE (ce,"retire\n" );
@@ -228,6 +237,7 @@ intel_context_init(struct intel_context *ce,INIT_LIST_HEAD (&ce->signals);mutex_init (&ce->pin_mutex); +mutex_init (&ce->alloc_mutex);i915_active_init (&ce->active, __intel_context_active, __intel_context_retire);
@@ -239,6 +249,7 @@ void intel_context_fini(struct intel_context *ce)intel_timeline_put (ce->timeline);i915_vm_put (ce->vm); +mutex_destroy (&ce->alloc_mutex);mutex_destroy (&ce->pin_mutex);i915_active_fini (&ce->active); }
drivers/gpu/drm/i915/gt/intel_context_types.h +1 -0
@@ -72,6 +72,7 @@ struct intel_context {atomic_t pin_count;struct mutex pin_mutex;/* guards pinning and associated on-gpuing */ +struct mutex alloc_mutex;/* guards against concurrent contex allocation */ /** * active: Active tracker for the rq activity (inc. external) on this
Signature · 6 lines
2.24.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Remove nest annotation from intel_context_unpin (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915: Remove nest annotation from intel_context_unpin (rev3)
URL : https://patchwork.freedesktop.org/series/71157/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7674 -> Patchwork_15989
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15989 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15989, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15989:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ctx_create@basic-files:
- fi-byt-n2820: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-byt-n2820/igt@[email protected]
- fi-hsw-4770: [PASS][2] -> [DMESG-WARN][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-hsw-4770/igt@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-hsw-4770/igt@[email protected]
- fi-ivb-3770: [PASS][4] -> [DMESG-WARN][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-ivb-3770/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-ivb-3770/igt@[email protected]
- fi-hsw-peppy: [PASS][6] -> [DMESG-WARN][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-hsw-peppy/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-hsw-peppy/igt@[email protected]
- fi-hsw-4770r: NOTRUN -> [DMESG-WARN][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-hsw-4770r/igt@[email protected]
- fi-byt-j1900: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-byt-j1900/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-byt-j1900/igt@[email protected]
* igt@gem_exec_gttfill@basic:
- fi-kbl-x1275: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-x1275/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-x1275/igt@[email protected]
- fi-icl-u3: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-u3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-u3/igt@[email protected]
- fi-kbl-8809g: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-8809g/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-8809g/igt@[email protected]
- fi-icl-y: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-y/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-y/igt@[email protected]
- fi-blb-e6850: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-blb-e6850/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-blb-e6850/igt@[email protected]
- fi-kbl-7500u: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-7500u/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-7500u/igt@[email protected]
- fi-kbl-guc: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-guc/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-guc/igt@[email protected]
- fi-icl-dsi: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-dsi/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-dsi/igt@[email protected]
- fi-cml-u2: [PASS][27] -> [DMESG-WARN][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-cml-u2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-cml-u2/igt@[email protected]
- fi-skl-6600u: [PASS][29] -> [DMESG-WARN][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-6600u/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-6600u/igt@[email protected]
- fi-skl-lmem: [PASS][31] -> [DMESG-WARN][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-lmem/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-lmem/igt@[email protected]
- fi-cml-s: [PASS][33] -> [DMESG-WARN][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-cml-s/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-cml-s/igt@[email protected]
- fi-skl-6770hq: [PASS][35] -> [DMESG-WARN][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-6770hq/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-6770hq/igt@[email protected]
- fi-skl-6700k2: [PASS][37] -> [DMESG-WARN][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-6700k2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-6700k2/igt@[email protected]
- fi-snb-2600: [PASS][39] -> [DMESG-WARN][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-snb-2600/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-snb-2600/igt@[email protected]
- fi-kbl-r: [PASS][41] -> [DMESG-WARN][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-r/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-r/igt@[email protected]
- fi-bdw-5557u: [PASS][43] -> [DMESG-WARN][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-bdw-5557u/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-bdw-5557u/igt@[email protected]
- fi-skl-guc: [PASS][45] -> [DMESG-WARN][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-guc/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-guc/igt@[email protected]
- fi-pnv-d510: [PASS][47] -> [DMESG-WARN][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-pnv-d510/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-pnv-d510/igt@[email protected]
- fi-cfl-8700k: [PASS][49] -> [DMESG-WARN][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-cfl-8700k/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-cfl-8700k/igt@[email protected]
- fi-whl-u: [PASS][51] -> [DMESG-WARN][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-whl-u/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-whl-u/igt@[email protected]
- fi-icl-u2: [PASS][53] -> [DMESG-WARN][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-u2/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-u2/igt@[email protected]
- fi-snb-2520m: [PASS][55] -> [DMESG-WARN][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-snb-2520m/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-snb-2520m/igt@[email protected]
- fi-cfl-guc: [PASS][57] -> [DMESG-WARN][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-cfl-guc/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-cfl-guc/igt@[email protected]
- fi-icl-guc: [PASS][59] -> [DMESG-WARN][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-guc/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-guc/igt@[email protected]
- fi-ilk-650: NOTRUN -> [DMESG-WARN][61]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-ilk-650/igt@[email protected]
* igt@i915_selftest@live_evict:
- fi-glk-dsi: [PASS][62] -> [DMESG-WARN][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-glk-dsi/igt@i915_selftest@live_evict.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-glk-dsi/igt@i915_selftest@live_evict.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_exec_gttfill@basic:
- {fi-tgl-u}: [PASS][64] -> [DMESG-WARN][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-tgl-u/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-tgl-u/igt@[email protected]
- {fi-ehl-1}: [INCOMPLETE][66] -> [DMESG-WARN][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-ehl-1/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-ehl-1/igt@[email protected]
* igt@kms_busy@basic-flip-pipe-c:
- {fi-ehl-1}: NOTRUN -> [INCOMPLETE][68]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-ehl-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_15989 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_blt:
- fi-ivb-3770: [PASS][69] -> [DMESG-FAIL][70] ([i915#725])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-ivb-3770/igt@i915_selftest@live_blt.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-ivb-3770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_evict:
- fi-bxt-dsi: [PASS][71] -> [DMESG-WARN][72] ([i915#211])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-bxt-dsi/igt@i915_selftest@live_evict.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-bxt-dsi/igt@i915_selftest@live_evict.html
* igt@i915_selftest@live_gem_contexts:
- fi-hsw-4770: [PASS][73] -> [DMESG-FAIL][74] ([i915#722])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-hsw-4770/igt@i915_selftest@live_gem_contexts.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-hsw-4770/igt@i915_selftest@live_gem_contexts.html
* igt@i915_selftest@live_hangcheck:
- fi-icl-u2: [PASS][75] -> [INCOMPLETE][76] ([fdo#108569] / [i915#140])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-u2/igt@i915_selftest@live_hangcheck.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-u2/igt@i915_selftest@live_hangcheck.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-dsi: [PASS][77] -> [INCOMPLETE][78] ([i915#140])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-icl-dsi/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-icl-dsi/igt@[email protected]
- fi-hsw-peppy: [PASS][79] -> [DMESG-WARN][80] ([i915#44])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-hsw-peppy/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-hsw-peppy/igt@[email protected]
#### Possible fixes ####
* igt@amdgpu/amd_basic@userptr:
- fi-kbl-8809g: [DMESG-WARN][81] ([i915#858]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-8809g/igt@amdgpu/[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-8809g/igt@amdgpu/[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6700k2: [INCOMPLETE][83] ([i915#671]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-6700k2/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-6700k2/igt@[email protected]
- fi-skl-6770hq: [INCOMPLETE][85] ([i915#671]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-skl-6770hq/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-skl-6770hq/igt@[email protected]
- fi-kbl-7500u: [INCOMPLETE][87] ([i915#879]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7674/fi-kbl-7500u/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/fi-kbl-7500u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[i915#140]: https://gitlab.freedesktop.org/drm/intel/issues/140
[i915#211]: https://gitlab.freedesktop.org/drm/intel/issues/211
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
[i915#722]: https://gitlab.freedesktop.org/drm/intel/issues/722
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#858]: https://gitlab.freedesktop.org/drm/intel/issues/858
[i915#879]: https://gitlab.freedesktop.org/drm/intel/issues/879
Participating hosts (46 -> 43)
------------------------------
Additional (4): fi-hsw-4770r fi-byt-n2820 fi-ilk-650 fi-bsw-n3050
Missing (7): fi-hsw-4200u fi-bwr-2160 fi-ctg-p8600 fi-bsw-kefka fi-tgl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7674 -> Patchwork_15989
CI-20190529: 20190529
CI_DRM_7674: 6cdc2db5a5641dd00f47fcc80b83bb8adb777797 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5357: a555a4b98f90dab655d24bb3d07e9291a8b8dac8 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15989: f0846ffe75e7e1b0773859ddd45891009570efa7 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f0846ffe75e7 drm/i915: Remove nest annotation from intel_context_unpin
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15989/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Maarten Lankhorst (2020-01-03 16:29:53)
Quoted 1 line
Lets see what breaks, round 3?
https://patchwork.freedesktop.org/patch/347285/?series=71568&rev=1
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx