* [PATCH] drm/i915: Protect guc_fini_wq() against module load abort
@ 2018-07-24 13:40 Chris Wilson
2018-07-24 14:15 ` ✓ Fi.CI.BAT: success for " Patchwork
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Chris Wilson @ 2018-07-24 13:40 UTC (permalink / raw)
To: intel-gfx
Prevent
[ 397.873143] general protection fault: 0000 [#1] PREEMPT SMP PTI
[ 397.873154] CPU: 4 PID: 4799 Comm: drv_module_relo Tainted: G U 4.18.0-rc6-CI-CI_DRM_4534+ #1
[ 397.873162] Hardware name: Micro-Star International Co., Ltd. MS-7B54/Z370M MORTAR (MS-7B54), BIOS 1.10 12/28/2017
[ 397.873175] RIP: 0010:__lock_acquire+0xf6/0x1b50
[ 397.873179] Code: 85 c0 4c 8b 9d 40 ff ff ff 8b 8d 38 ff ff ff 44 8b 8d 30 ff ff ff 4c 8b 85 28 ff ff ff 44 8b 95 24 ff ff ff 0f 84 54 03 00 00 <f0> ff 80 38 01 00 00 8b 15 45 8c 59 02 45 8b bc 24 70 08 00 00 85
[ 397.873240] RSP: 0018:ffffc90000497b40 EFLAGS: 00010002
[ 397.873246] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000001 RCX: 0000000000000000
[ 397.873252] RDX: 0000000000000046 RSI: 0000000000000000 RDI: 0000000000000000
[ 397.873258] RBP: ffffc90000497c20 R08: ffffffff810a25e9 R09: 0000000000000000
[ 397.873264] R10: 0000000000000000 R11: ffff880255c63c28 R12: ffff8801093b2840
[ 397.873270] R13: 0000000000000001 R14: 0000000000000001 R15: 0000000000000246
[ 397.873277] FS: 00007faf88d71980(0000) GS:ffff880266300000(0000) knlGS:0000000000000000
[ 397.873284] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 397.873289] CR2: 000055d866c9ca10 CR3: 000000025472e006 CR4: 00000000003606e0
[ 397.873295] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 397.873301] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 397.873308] Call Trace:
[ 397.873318] ? lock_acquire+0xa6/0x210
[ 397.873323] lock_acquire+0xa6/0x210
[ 397.873331] ? drain_workqueue+0x19/0x180
[ 397.873339] __mutex_lock+0x89/0x980
[ 397.873346] ? drain_workqueue+0x19/0x180
[ 397.873352] ? _raw_spin_unlock_irqrestore+0x4c/0x60
[ 397.873359] ? trace_hardirqs_on_caller+0xe0/0x1b0
[ 397.873365] ? drain_workqueue+0x19/0x180
[ 397.873373] ? debug_object_active_state+0x127/0x150
[ 397.873381] ? drain_workqueue+0x19/0x180
[ 397.873387] drain_workqueue+0x19/0x180
[ 397.873395] destroy_workqueue+0x12/0x1f0
[ 397.873476] intel_guc_fini_misc+0x36/0x90 [i915]
[ 397.873540] i915_gem_fini+0x91/0x100 [i915]
[ 397.873588] i915_driver_unload+0xd2/0x110 [i915]
[ 397.873638] i915_pci_remove+0x19/0x30 [i915]
[ 397.873646] pci_device_remove+0x36/0xb0
[ 397.873653] device_release_driver_internal+0x185/0x250
[ 397.873660] driver_detach+0x35/0x70
[ 397.873668] bus_remove_driver+0x53/0xd0
[ 397.873675] pci_unregister_driver+0x25/0xa0
[ 397.873683] __se_sys_delete_module+0x162/0x210
[ 397.873691] ? do_syscall_64+0xd/0x190
[ 397.873697] do_syscall_64+0x55/0x190
[ 397.873704] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 397.873710] RIP: 0033:0x7faf884231b7
[ 397.873714] Code: 73 01 c3 48 8b 0d d1 8c 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a1 8c 2c 00 f7 d8 64 89 01 48
[ 397.873775] RSP: 002b:00007ffda4e98cf8 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
[ 397.873784] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007faf884231b7
[ 397.873790] RDX: 0000000000000000 RSI: 0000000000000800 RDI: 000055fbb18f1bd8
[ 397.873796] RBP: 000055fbb18f1b70 R08: 000055fbb18f1bdc R09: 00007ffda4e98d38
[ 397.873802] R10: 00007ffda4e97cf4 R11: 0000000000000206 R12: 000055fbb0d32470
[ 397.873808] R13: 00007ffda4e992e0 R14: 0000000000000000 R15: 0000000000000000
Testcase: igt/drv_module_reload/basic-reload-inject
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
drivers/gpu/drm/i915/intel_guc.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 846d693ecb53..afb217d7ffdf 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -128,13 +128,11 @@ static int guc_init_wq(struct intel_guc *guc)
static void guc_fini_wq(struct intel_guc *guc)
{
- struct drm_i915_private *dev_priv = guc_to_i915(guc);
-
- if (HAS_LOGICAL_RING_PREEMPTION(dev_priv) &&
- USES_GUC_SUBMISSION(dev_priv))
+ if (guc->preempt_wq)
destroy_workqueue(guc->preempt_wq);
- destroy_workqueue(guc->log.relay.flush_wq);
+ if (guc->log.relay.flush_wq)
+ destroy_workqueue(guc->log.relay.flush_wq);
}
int intel_guc_init_misc(struct intel_guc *guc)
--
2.18.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Protect guc_fini_wq() against module load abort
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
@ 2018-07-24 14:15 ` Patchwork
2018-07-24 14:17 ` [PATCH] " Chris Wilson
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-24 14:15 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Protect guc_fini_wq() against module load abort
URL : https://patchwork.freedesktop.org/series/47127/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4534 -> Patchwork_9754 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47127/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9754 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@mock_sanitycheck:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#107344)
igt@kms_flip@basic-flip-vs-dpms:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000, fdo#106097)
igt@kms_flip@basic-plain-flip:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106097)
==== Possible fixes ====
igt@drv_selftest@live_workarounds:
{fi-cfl-8109u}: DMESG-FAIL (fdo#107292) -> PASS
igt@gem_exec_flush@basic-wb-ro-default:
fi-glk-j4005: DMESG-WARN (fdo#105719) -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107344 https://bugs.freedesktop.org/show_bug.cgi?id=107344
== Participating hosts (52 -> 43) ==
Missing (9): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-u fi-skl-caroline fi-byt-clapper fi-bdw-samus
== Build changes ==
* Linux: CI_DRM_4534 -> Patchwork_9754
CI_DRM_4534: a59bbda34ede6f5685fdc86b58f143bada751617 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4572: 9b064015df14506b23cd2d7245a73e1b1d16ee1f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9754: a210f55676b8ed911808f92836edc7e401e131f5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
a210f55676b8 drm/i915: Protect guc_fini_wq() against module load abort
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9754/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] drm/i915: Protect guc_fini_wq() against module load abort
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
2018-07-24 14:15 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-07-24 14:17 ` Chris Wilson
2018-07-24 14:19 ` [PATCH v2] " Chris Wilson
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Chris Wilson @ 2018-07-24 14:17 UTC (permalink / raw)
To: intel-gfx
Quoting Chris Wilson (2018-07-24 14:40:46)
> Prevent
> [ 397.873143] general protection fault: 0000 [#1] PREEMPT SMP PTI
> [ 397.873154] CPU: 4 PID: 4799 Comm: drv_module_relo Tainted: G U 4.18.0-rc6-CI-CI_DRM_4534+ #1
> [ 397.873162] Hardware name: Micro-Star International Co., Ltd. MS-7B54/Z370M MORTAR (MS-7B54), BIOS 1.10 12/28/2017
> [ 397.873175] RIP: 0010:__lock_acquire+0xf6/0x1b50
> [ 397.873179] Code: 85 c0 4c 8b 9d 40 ff ff ff 8b 8d 38 ff ff ff 44 8b 8d 30 ff ff ff 4c 8b 85 28 ff ff ff 44 8b 95 24 ff ff ff 0f 84 54 03 00 00 <f0> ff 80 38 01 00 00 8b 15 45 8c 59 02 45 8b bc 24 70 08 00 00 85
> [ 397.873240] RSP: 0018:ffffc90000497b40 EFLAGS: 00010002
> [ 397.873246] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000001 RCX: 0000000000000000
On second thoughts, that's POISON_FREE.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] drm/i915: Protect guc_fini_wq() against module load abort
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
2018-07-24 14:15 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-24 14:17 ` [PATCH] " Chris Wilson
@ 2018-07-24 14:19 ` Chris Wilson
2018-07-25 16:17 ` Michal Wajdeczko
2018-07-24 15:00 ` ✓ Fi.CI.BAT: success for drm/i915: Protect guc_fini_wq() against module load abort (rev2) Patchwork
` (2 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Chris Wilson @ 2018-07-24 14:19 UTC (permalink / raw)
To: intel-gfx
Prevent
[ 397.873143] general protection fault: 0000 [#1] PREEMPT SMP PTI
[ 397.873154] CPU: 4 PID: 4799 Comm: drv_module_relo Tainted: G U 4.18.0-rc6-CI-CI_DRM_4534+ #1
[ 397.873162] Hardware name: Micro-Star International Co., Ltd. MS-7B54/Z370M MORTAR (MS-7B54), BIOS 1.10 12/28/2017
[ 397.873175] RIP: 0010:__lock_acquire+0xf6/0x1b50
[ 397.873179] Code: 85 c0 4c 8b 9d 40 ff ff ff 8b 8d 38 ff ff ff 44 8b 8d 30 ff ff ff 4c 8b 85 28 ff ff ff 44 8b 95 24 ff ff ff 0f 84 54 03 00 00 <f0> ff 80 38 01 00 00 8b 15 45 8c 59 02 45 8b bc 24 70 08 00 00 85
[ 397.873240] RSP: 0018:ffffc90000497b40 EFLAGS: 00010002
[ 397.873246] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000001 RCX: 0000000000000000
[ 397.873252] RDX: 0000000000000046 RSI: 0000000000000000 RDI: 0000000000000000
[ 397.873258] RBP: ffffc90000497c20 R08: ffffffff810a25e9 R09: 0000000000000000
[ 397.873264] R10: 0000000000000000 R11: ffff880255c63c28 R12: ffff8801093b2840
[ 397.873270] R13: 0000000000000001 R14: 0000000000000001 R15: 0000000000000246
[ 397.873277] FS: 00007faf88d71980(0000) GS:ffff880266300000(0000) knlGS:0000000000000000
[ 397.873284] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 397.873289] CR2: 000055d866c9ca10 CR3: 000000025472e006 CR4: 00000000003606e0
[ 397.873295] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 397.873301] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[ 397.873308] Call Trace:
[ 397.873318] ? lock_acquire+0xa6/0x210
[ 397.873323] lock_acquire+0xa6/0x210
[ 397.873331] ? drain_workqueue+0x19/0x180
[ 397.873339] __mutex_lock+0x89/0x980
[ 397.873346] ? drain_workqueue+0x19/0x180
[ 397.873352] ? _raw_spin_unlock_irqrestore+0x4c/0x60
[ 397.873359] ? trace_hardirqs_on_caller+0xe0/0x1b0
[ 397.873365] ? drain_workqueue+0x19/0x180
[ 397.873373] ? debug_object_active_state+0x127/0x150
[ 397.873381] ? drain_workqueue+0x19/0x180
[ 397.873387] drain_workqueue+0x19/0x180
[ 397.873395] destroy_workqueue+0x12/0x1f0
[ 397.873476] intel_guc_fini_misc+0x36/0x90 [i915]
[ 397.873540] i915_gem_fini+0x91/0x100 [i915]
[ 397.873588] i915_driver_unload+0xd2/0x110 [i915]
[ 397.873638] i915_pci_remove+0x19/0x30 [i915]
[ 397.873646] pci_device_remove+0x36/0xb0
[ 397.873653] device_release_driver_internal+0x185/0x250
[ 397.873660] driver_detach+0x35/0x70
[ 397.873668] bus_remove_driver+0x53/0xd0
[ 397.873675] pci_unregister_driver+0x25/0xa0
[ 397.873683] __se_sys_delete_module+0x162/0x210
[ 397.873691] ? do_syscall_64+0xd/0x190
[ 397.873697] do_syscall_64+0x55/0x190
[ 397.873704] entry_SYSCALL_64_after_hwframe+0x49/0xbe
[ 397.873710] RIP: 0033:0x7faf884231b7
[ 397.873714] Code: 73 01 c3 48 8b 0d d1 8c 2c 00 f7 d8 64 89 01 48 83 c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a1 8c 2c 00 f7 d8 64 89 01 48
[ 397.873775] RSP: 002b:00007ffda4e98cf8 EFLAGS: 00000206 ORIG_RAX: 00000000000000b0
[ 397.873784] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007faf884231b7
[ 397.873790] RDX: 0000000000000000 RSI: 0000000000000800 RDI: 000055fbb18f1bd8
[ 397.873796] RBP: 000055fbb18f1b70 R08: 000055fbb18f1bdc R09: 00007ffda4e98d38
[ 397.873802] R10: 00007ffda4e97cf4 R11: 0000000000000206 R12: 000055fbb0d32470
[ 397.873808] R13: 00007ffda4e992e0 R14: 0000000000000000 R15: 0000000000000000
v2: It's use-after-free; not a NULL pointer.
Testcase: igt/drv_module_reload/basic-reload-inject
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
drivers/gpu/drm/i915/intel_guc.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c
index 846d693ecb53..3082d7670f05 100644
--- a/drivers/gpu/drm/i915/intel_guc.c
+++ b/drivers/gpu/drm/i915/intel_guc.c
@@ -128,13 +128,15 @@ static int guc_init_wq(struct intel_guc *guc)
static void guc_fini_wq(struct intel_guc *guc)
{
- struct drm_i915_private *dev_priv = guc_to_i915(guc);
+ struct workqueue_struct *wq;
- if (HAS_LOGICAL_RING_PREEMPTION(dev_priv) &&
- USES_GUC_SUBMISSION(dev_priv))
- destroy_workqueue(guc->preempt_wq);
+ wq = fetch_and_zero(&guc->preempt_wq);
+ if (wq)
+ destroy_workqueue(wq);
- destroy_workqueue(guc->log.relay.flush_wq);
+ wq = fetch_and_zero(&guc->log.relay.flush_wq);
+ if (wq)
+ destroy_workqueue(wq);
}
int intel_guc_init_misc(struct intel_guc *guc)
--
2.18.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Protect guc_fini_wq() against module load abort (rev2)
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
` (2 preceding siblings ...)
2018-07-24 14:19 ` [PATCH v2] " Chris Wilson
@ 2018-07-24 15:00 ` Patchwork
2018-07-24 17:39 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-07-25 16:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Protect guc_fini_wq() against module load abort (rev3) Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-24 15:00 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Protect guc_fini_wq() against module load abort (rev2)
URL : https://patchwork.freedesktop.org/series/47127/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4534 -> Patchwork_9756 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/47127/revisions/2/mbox/
== Known issues ==
Here are the changes found in Patchwork_9756 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
fi-skl-6700k2: PASS -> DMESG-FAIL (fdo#106560, fdo#107174)
fi-skl-guc: PASS -> DMESG-FAIL (fdo#107174)
igt@kms_chamelium@dp-crc-fast:
fi-kbl-7500u: PASS -> DMESG-FAIL (fdo#103841)
==== Possible fixes ====
igt@gem_exec_flush@basic-wb-ro-default:
fi-glk-j4005: DMESG-WARN (fdo#105719) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-c:
fi-bxt-dsi: INCOMPLETE (fdo#103927) -> PASS
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#107174 https://bugs.freedesktop.org/show_bug.cgi?id=107174
== Participating hosts (52 -> 44) ==
Missing (8): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-skl-caroline fi-byt-clapper fi-bdw-samus
== Build changes ==
* Linux: CI_DRM_4534 -> Patchwork_9756
CI_DRM_4534: a59bbda34ede6f5685fdc86b58f143bada751617 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4572: 9b064015df14506b23cd2d7245a73e1b1d16ee1f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9756: cbd1dfaa9f3c1b9dff51c78195c666f41ba53f20 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cbd1dfaa9f3c drm/i915: Protect guc_fini_wq() against module load abort
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9756/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* ✗ Fi.CI.IGT: failure for drm/i915: Protect guc_fini_wq() against module load abort (rev2)
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
` (3 preceding siblings ...)
2018-07-24 15:00 ` ✓ Fi.CI.BAT: success for drm/i915: Protect guc_fini_wq() against module load abort (rev2) Patchwork
@ 2018-07-24 17:39 ` Patchwork
2018-07-25 16:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Protect guc_fini_wq() against module load abort (rev3) Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-24 17:39 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Protect guc_fini_wq() against module load abort (rev2)
URL : https://patchwork.freedesktop.org/series/47127/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4534_full -> Patchwork_9756_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9756_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9756_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9756_full:
=== IGT changes ===
==== Possible regressions ====
igt@gem_eio@in-flight-contexts-10ms:
shard-snb: PASS -> FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: PASS -> SKIP +2
igt@pm_rc6_residency@rc6-accuracy:
shard-snb: PASS -> SKIP
== Known issues ==
Here are the changes found in Patchwork_9756_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_ctx_isolation@vecs0-s3:
shard-apl: PASS -> FAIL (fdo#103375)
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: PASS -> INCOMPLETE (fdo#103665, fdo#106023)
igt@kms_flip@dpms-vs-vblank-race-interruptible:
shard-hsw: PASS -> FAIL (fdo#103060)
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
shard-kbl: PASS -> INCOMPLETE (fdo#103665)
igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
shard-snb: PASS -> DMESG-WARN (fdo#102365)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-apl: FAIL (fdo#106886) -> PASS
igt@kms_fbcon_fbt@fbc:
shard-apl: INCOMPLETE (fdo#103927) -> PASS
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: FAIL (fdo#105363) -> PASS
igt@kms_flip@basic-flip-vs-wf_vblank:
shard-glk: FAIL (fdo#100368) -> PASS
igt@perf@polling:
shard-hsw: FAIL (fdo#102252) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4534 -> Patchwork_9756
CI_DRM_4534: a59bbda34ede6f5685fdc86b58f143bada751617 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4572: 9b064015df14506b23cd2d7245a73e1b1d16ee1f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9756: cbd1dfaa9f3c1b9dff51c78195c666f41ba53f20 @ 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_9756/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] drm/i915: Protect guc_fini_wq() against module load abort
2018-07-24 14:19 ` [PATCH v2] " Chris Wilson
@ 2018-07-25 16:17 ` Michal Wajdeczko
0 siblings, 0 replies; 8+ messages in thread
From: Michal Wajdeczko @ 2018-07-25 16:17 UTC (permalink / raw)
To: intel-gfx, Chris Wilson
On Tue, 24 Jul 2018 16:19:36 +0200, Chris Wilson
<chris@chris-wilson.co.uk> wrote:
> Prevent
> [ 397.873143] general protection fault: 0000 [#1] PREEMPT SMP PTI
> [ 397.873154] CPU: 4 PID: 4799 Comm: drv_module_relo Tainted: G
> U 4.18.0-rc6-CI-CI_DRM_4534+ #1
> [ 397.873162] Hardware name: Micro-Star International Co., Ltd.
> MS-7B54/Z370M MORTAR (MS-7B54), BIOS 1.10 12/28/2017
> [ 397.873175] RIP: 0010:__lock_acquire+0xf6/0x1b50
> [ 397.873179] Code: 85 c0 4c 8b 9d 40 ff ff ff 8b 8d 38 ff ff ff 44 8b
> 8d 30 ff ff ff 4c 8b 85 28 ff ff ff 44 8b 95 24 ff ff ff 0f 84 54 03 00
> 00 <f0> ff 80 38 01 00 00 8b 15 45 8c 59 02 45 8b bc 24 70 08 00 00 85
> [ 397.873240] RSP: 0018:ffffc90000497b40 EFLAGS: 00010002
> [ 397.873246] RAX: 6b6b6b6b6b6b6b6b RBX: 0000000000000001 RCX:
> 0000000000000000
> [ 397.873252] RDX: 0000000000000046 RSI: 0000000000000000 RDI:
> 0000000000000000
> [ 397.873258] RBP: ffffc90000497c20 R08: ffffffff810a25e9 R09:
> 0000000000000000
> [ 397.873264] R10: 0000000000000000 R11: ffff880255c63c28 R12:
> ffff8801093b2840
> [ 397.873270] R13: 0000000000000001 R14: 0000000000000001 R15:
> 0000000000000246
> [ 397.873277] FS: 00007faf88d71980(0000) GS:ffff880266300000(0000)
> knlGS:0000000000000000
> [ 397.873284] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 397.873289] CR2: 000055d866c9ca10 CR3: 000000025472e006 CR4:
> 00000000003606e0
> [ 397.873295] DR0: 0000000000000000 DR1: 0000000000000000 DR2:
> 0000000000000000
> [ 397.873301] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7:
> 0000000000000400
> [ 397.873308] Call Trace:
> [ 397.873318] ? lock_acquire+0xa6/0x210
> [ 397.873323] lock_acquire+0xa6/0x210
> [ 397.873331] ? drain_workqueue+0x19/0x180
> [ 397.873339] __mutex_lock+0x89/0x980
> [ 397.873346] ? drain_workqueue+0x19/0x180
> [ 397.873352] ? _raw_spin_unlock_irqrestore+0x4c/0x60
> [ 397.873359] ? trace_hardirqs_on_caller+0xe0/0x1b0
> [ 397.873365] ? drain_workqueue+0x19/0x180
> [ 397.873373] ? debug_object_active_state+0x127/0x150
> [ 397.873381] ? drain_workqueue+0x19/0x180
> [ 397.873387] drain_workqueue+0x19/0x180
> [ 397.873395] destroy_workqueue+0x12/0x1f0
> [ 397.873476] intel_guc_fini_misc+0x36/0x90 [i915]
> [ 397.873540] i915_gem_fini+0x91/0x100 [i915]
> [ 397.873588] i915_driver_unload+0xd2/0x110 [i915]
> [ 397.873638] i915_pci_remove+0x19/0x30 [i915]
> [ 397.873646] pci_device_remove+0x36/0xb0
> [ 397.873653] device_release_driver_internal+0x185/0x250
> [ 397.873660] driver_detach+0x35/0x70
> [ 397.873668] bus_remove_driver+0x53/0xd0
> [ 397.873675] pci_unregister_driver+0x25/0xa0
> [ 397.873683] __se_sys_delete_module+0x162/0x210
> [ 397.873691] ? do_syscall_64+0xd/0x190
> [ 397.873697] do_syscall_64+0x55/0x190
> [ 397.873704] entry_SYSCALL_64_after_hwframe+0x49/0xbe
> [ 397.873710] RIP: 0033:0x7faf884231b7
> [ 397.873714] Code: 73 01 c3 48 8b 0d d1 8c 2c 00 f7 d8 64 89 01 48 83
> c8 ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 b8 b0 00 00 00 0f
> 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d a1 8c 2c 00 f7 d8 64 89 01 48
> [ 397.873775] RSP: 002b:00007ffda4e98cf8 EFLAGS: 00000206 ORIG_RAX:
> 00000000000000b0
> [ 397.873784] RAX: ffffffffffffffda RBX: 0000000000000000 RCX:
> 00007faf884231b7
> [ 397.873790] RDX: 0000000000000000 RSI: 0000000000000800 RDI:
> 000055fbb18f1bd8
> [ 397.873796] RBP: 000055fbb18f1b70 R08: 000055fbb18f1bdc R09:
> 00007ffda4e98d38
> [ 397.873802] R10: 00007ffda4e97cf4 R11: 0000000000000206 R12:
> 000055fbb0d32470
> [ 397.873808] R13: 00007ffda4e992e0 R14: 0000000000000000 R15:
> 0000000000000000
>
> v2: It's use-after-free; not a NULL pointer.
>
> Testcase: igt/drv_module_reload/basic-reload-inject
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michał Winiarski <michal.winiarski@intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> ---
> drivers/gpu/drm/i915/intel_guc.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc.c
> b/drivers/gpu/drm/i915/intel_guc.c
> index 846d693ecb53..3082d7670f05 100644
> --- a/drivers/gpu/drm/i915/intel_guc.c
> +++ b/drivers/gpu/drm/i915/intel_guc.c
> @@ -128,13 +128,15 @@ static int guc_init_wq(struct intel_guc *guc)
> static void guc_fini_wq(struct intel_guc *guc)
> {
> - struct drm_i915_private *dev_priv = guc_to_i915(guc);
> + struct workqueue_struct *wq;
> - if (HAS_LOGICAL_RING_PREEMPTION(dev_priv) &&
> - USES_GUC_SUBMISSION(dev_priv))
> - destroy_workqueue(guc->preempt_wq);
> + wq = fetch_and_zero(&guc->preempt_wq);
> + if (wq)
> + destroy_workqueue(wq);
> - destroy_workqueue(guc->log.relay.flush_wq);
> + wq = fetch_and_zero(&guc->log.relay.flush_wq);
> + if (wq)
> + destroy_workqueue(wq);
> }
> int intel_guc_init_misc(struct intel_guc *guc)
instead of adding (already undesired) "if"s in fini functions,
I would rather consider fixing i915_gem_init() as in [1]
diff --git a/drivers/gpu/drm/i915/i915_gem.c
b/drivers/gpu/drm/i915/i915_gem.c
index a4031fa..7da9860 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5592,10 +5592,10 @@ int i915_gem_init(struct drm_i915_private
*dev_priv)
mutex_unlock(&dev_priv->drm.struct_mutex);
err_uc_misc:
- intel_uc_fini_misc(dev_priv);
-
- if (ret != -EIO)
+ if (ret != -EIO) {
+ intel_uc_fini_misc(dev_priv);
i915_gem_cleanup_userptr(dev_priv);
+ }
if (ret == -EIO) {
/*
Thanks,
Michal
[1] https://patchwork.freedesktop.org/patch/205722/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Protect guc_fini_wq() against module load abort (rev3)
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
` (4 preceding siblings ...)
2018-07-24 17:39 ` ✗ Fi.CI.IGT: failure " Patchwork
@ 2018-07-25 16:26 ` Patchwork
5 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2018-07-25 16:26 UTC (permalink / raw)
To: Michal Wajdeczko; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Protect guc_fini_wq() against module load abort (rev3)
URL : https://patchwork.freedesktop.org/series/47127/
State : failure
== Summary ==
Applying: drm/i915: Protect guc_fini_wq() against module load abort
error: corrupt patch at line 8
error: could not build fake ancestor
Patch failed at 0001 drm/i915: Protect guc_fini_wq() against module load abort
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-07-25 16:26 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-24 13:40 [PATCH] drm/i915: Protect guc_fini_wq() against module load abort Chris Wilson
2018-07-24 14:15 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-24 14:17 ` [PATCH] " Chris Wilson
2018-07-24 14:19 ` [PATCH v2] " Chris Wilson
2018-07-25 16:17 ` Michal Wajdeczko
2018-07-24 15:00 ` ✓ Fi.CI.BAT: success for drm/i915: Protect guc_fini_wq() against module load abort (rev2) Patchwork
2018-07-24 17:39 ` ✗ Fi.CI.IGT: failure " Patchwork
2018-07-25 16:26 ` ✗ Fi.CI.BAT: failure for drm/i915: Protect guc_fini_wq() against module load abort (rev3) Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).