drm: fix deadlock of syncobj v6
Subsystems (2)
PATCH 1/1 drm: fix deadlock of syncobj v6
v2:
add a mutex between sync_cb execution and free.
v3:
clearly separating the roles for pt_lock and cb_mutex (Chris) v4:
the cb_mutex should be taken outside of the pt_lock around this if() block. (Chris)
v5:
fix a corner case
v6:
tidy drm_syncobj_fence_get_or_add_callback up. (Chris)
Tested by syncobj_basic and syncobj_wait of igt.
--- drivers/gpu/drm/drm_syncobj.c | 156 ++++++++++++++++------------------ include/drm/drm_syncobj.h | 8 +- 2 files changed, 81 insertions(+), 83 deletions(-)
drivers/gpu/drm/drm_syncobj.c +75 -81
@@ -106,6 +106,42 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find); +static struct dma_fence +*drm_syncobj_find_signal_pt_for_point (struct drm_syncobj *syncobj, +uint64_t point) +{ +struct drm_syncobj_signal_pt *signal_pt; + +if ((syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) && + (point <= syncobj->timeline)) { +struct drm_syncobj_stub_fence *fence = +kzalloc (sizeof (struct drm_syncobj_stub_fence ), +GFP_KERNEL ); + +if (!fence) +return NULL ; +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, + &drm_syncobj_stub_fence_ops, + &fence->lock, + syncobj->timeline_context, + point); + +dma_fence_signal (&fence->base); +return &fence->base; + } + +list_for_each_entry (signal_pt, &syncobj->signal_pt_list, list) { +if (point > signal_pt->value) +continue ; +if ((syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) && + (point != signal_pt->value)) +continue ; +return dma_fence_get (&signal_pt->fence_array->base); + } +return NULL ; +} +static void drm_syncobj_add_callback_locked (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb,drm_syncobj_func_t func)
@@ -114,115 +150,71 @@ static void drm_syncobj_add_callback_locked(struct drm_syncobj *syncobj,list_add_tail (&cb->node, &syncobj->cb_list); } -static int drm_syncobj_fence_get_or_add_callback (struct drm_syncobj *syncobj, -struct dma_fence **fence, -struct drm_syncobj_cb *cb, -drm_syncobj_func_t func) +static void drm_syncobj_fence_get_or_add_callback (struct drm_syncobj *syncobj, +struct dma_fence **fence, +struct drm_syncobj_cb *cb, +drm_syncobj_func_t func) { -int ret; +u64 pt_value =0 ; - ret =drm_syncobj_search_fence (syncobj,0 ,0 , fence); -if (!ret) -return 1 ; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) { +/*BINARY syncobj always wait on last pt */ + pt_value = syncobj->signal_point; -spin_lock (&syncobj->lock); -/* We've already tried once to get a fence and failed. Now that we -* have the lock, try one more time just to be sure we don't add a -* callback when a fence has already been set. -*/ -if (!list_empty (&syncobj->signal_pt_list)) { -spin_unlock (&syncobj->lock); -drm_syncobj_search_fence (syncobj,0 ,0 , fence); -if (*fence) -return 1 ; -spin_lock (&syncobj->lock); - }else { - *fence =NULL ; -drm_syncobj_add_callback_locked (syncobj, cb, func); - ret =0 ; +if (pt_value ==0 ) + pt_value +=DRM_SYNCOBJ_BINARY_POINT ; } -spin_unlock (&syncobj->lock); -return ret; +mutex_lock (&syncobj->cb_mutex); +spin_lock (&syncobj->pt_lock); + *fence =drm_syncobj_find_signal_pt_for_point (syncobj, pt_value); +spin_unlock (&syncobj->pt_lock); +if (!*fence) +drm_syncobj_add_callback_locked (syncobj, cb, func); +mutex_unlock (&syncobj->cb_mutex); }void drm_syncobj_add_callback (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb,drm_syncobj_func_t func) { -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);drm_syncobj_add_callback_locked (syncobj, cb, func); -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); }void drm_syncobj_remove_callback (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb) { -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);list_del_init (&cb->node); -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); }static void drm_syncobj_init (struct drm_syncobj *syncobj) { -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); syncobj->timeline_context =dma_fence_context_alloc (1 ); syncobj->timeline =0 ; syncobj->signal_point =0 ;init_waitqueue_head (&syncobj->wq);INIT_LIST_HEAD (&syncobj->signal_pt_list); -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); }static void drm_syncobj_fini (struct drm_syncobj *syncobj) {struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);list_for_each_entry_safe (signal_pt, tmp, &syncobj->signal_pt_list, list) {list_del (&signal_pt->list);dma_fence_put (&signal_pt->fence_array->base);kfree (signal_pt); } -spin_unlock (&syncobj->lock); -} - -static struct dma_fence -*drm_syncobj_find_signal_pt_for_point (struct drm_syncobj *syncobj, -uint64_t point) -{ -struct drm_syncobj_signal_pt *signal_pt; - -if ((syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) && - (point <= syncobj->timeline)) { -struct drm_syncobj_stub_fence *fence = -kzalloc (sizeof (struct drm_syncobj_stub_fence ), -GFP_KERNEL ); - -if (!fence) -return NULL ; -spin_lock_init (&fence->lock); -dma_fence_init (&fence->base, - &drm_syncobj_stub_fence_ops, - &fence->lock, - syncobj->timeline_context, - point); - -dma_fence_signal (&fence->base); -return &fence->base; - } - -list_for_each_entry (signal_pt, &syncobj->signal_pt_list, list) { -if (point > signal_pt->value) -continue ; -if ((syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) && - (point != signal_pt->value)) -continue ; -return dma_fence_get (&signal_pt->fence_array->base); - } -return NULL ; +spin_unlock (&syncobj->pt_lock); } static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj,
@@ -249,14 +241,14 @@ static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj, fences[num_fences++] =dma_fence_get (fence);/* timeline syncobj must take this dependency */ if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);if (!list_empty (&syncobj->signal_pt_list)) { tail_pt =list_last_entry (&syncobj->signal_pt_list, struct drm_syncobj_signal_pt, list); fences[num_fences++] =dma_fence_get (&tail_pt->fence_array->base); } -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); } signal_pt->fence_array = dma_fence_array_create(num_fences, fences, syncobj->timeline_context,
@@ -266,16 +258,16 @@ static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj, goto fail; } -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);if (syncobj->signal_point >= point) {DRM_WARN ("A later signal is ready!" ); -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); goto exist; } signal_pt->value = point;list_add_tail (&signal_pt->list, &syncobj->signal_pt_list); syncobj->signal_point = point; -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock);wake_up_all (&syncobj->wq);return 0 ;
@@ -294,7 +286,7 @@ static void drm_syncobj_garbage_collection(struct drm_syncobj *syncobj) {struct drm_syncobj_signal_pt *signal_pt, *tmp, *tail_pt; -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); tail_pt =list_last_entry (&syncobj->signal_pt_list, struct drm_syncobj_signal_pt, list);
@@ -315,7 +307,7 @@ static void drm_syncobj_garbage_collection(struct drm_syncobj *syncobj) } } -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); }/** * drm_syncobj_replace_fence - replace fence in a sync object.
@@ -344,13 +336,14 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,drm_syncobj_create_signal_pt (syncobj, fence, pt_value);if (fence) {struct drm_syncobj_cb *cur, *tmp; +LIST_HEAD (cb_list); -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);list_for_each_entry_safe (cur, tmp, &syncobj->cb_list, node) {list_del_init (&cur->node); cur->func (syncobj, cur); } -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); } }EXPORT_SYMBOL (drm_syncobj_replace_fence);
@@ -386,11 +379,11 @@ drm_syncobj_point_get(struct drm_syncobj *syncobj, u64 point, u64 flags,if (ret <0 )return ret; } -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); *fence =drm_syncobj_find_signal_pt_for_point (syncobj, point);if (!*fence) ret = -EINVAL ; -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock);return ret; }
@@ -500,7 +493,8 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list); -spin_lock_init (&syncobj->lock); +spin_lock_init (&syncobj->pt_lock); +mutex_init (&syncobj->cb_mutex);if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ;else
include/drm/drm_syncobj.h +6 -2
@@ -75,9 +75,13 @@ struct drm_syncobj {*/ struct list_head cb_list;/** -* @lock: Protects syncobj list and write-locks &fence. +* @pt_lock: Protects pt list. */ -spinlock_t lock; +spinlock_t pt_lock; +/** +* @cb_mutex: Protects syncobj cb list. +*/ +struct mutex cb_mutex;/** * @file: A file backing for this syncobj. */
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm: fix deadlock of syncobj v6
== Series Details ==
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
268f7a66feea drm: fix deadlock of syncobj v6
-:44: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE'
#44: FILE: drivers/gpu/drm/drm_syncobj.c:115:
+ if ((syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) &&
+ (point <= syncobj->timeline)) {-:44: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'point <= syncobj->timeline' #44: FILE: drivers/gpu/drm/drm_syncobj.c:115:
+ if ((syncobj->type == DRM_SYNCOBJ_TYPE_TIMELINE) &&
+ (point <= syncobj->timeline)) {
-:66: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'syncobj->type == DRM_SYNCOBJ_TYPE_BINARY' #66: FILE: drivers/gpu/drm/drm_syncobj.c:137:
+ if ((syncobj->type == DRM_SYNCOBJ_TYPE_BINARY) &&
+ (point != signal_pt->value))
-:66: CHECK:UNNECESSARY_PARENTHESES: Unnecessary parentheses around 'point != signal_pt->value' #66: FILE: drivers/gpu/drm/drm_syncobj.c:137:
+ if ((syncobj->type == DRM_SYNCOBJ_TYPE_BINARY) &&
+ (point != signal_pt->value))
-:326: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment #326: FILE: include/drm/drm_syncobj.h:80:
+ spinlock_t pt_lock;
total: 0 errors, 0 warnings, 5 checks, 286 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for drm: fix deadlock of syncobj v6
In reply to Chunming Zhou== Series Details ==
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.5.2 Commit: drm: fix deadlock of syncobj v6 -O:drivers/gpu/drm/drm_syncobj.c:149:6: warning: symbol 'drm_syncobj_add_callback' was not declared. Should it be static? -O:drivers/gpu/drm/drm_syncobj.c:158:6: warning: symbol 'drm_syncobj_remove_callback' was not declared. Should it be static? +drivers/gpu/drm/drm_syncobj.c:177:6: warning: symbol 'drm_syncobj_add_callback' was not declared. Should it be static? +drivers/gpu/drm/drm_syncobj.c:186:6: warning: symbol 'drm_syncobj_remove_callback' was not declared. Should it be static?
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm: fix deadlock of syncobj v6
In reply to Chunming Zhou== Series Details ==
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5020 -> Patchwork_10540 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51369/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10540 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
==== Possible fixes ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-WARN (fdo#102614) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS +1
igt@prime_vgem@basic-fence-flip:
fi-cfl-8700k: FAIL (fdo#104008) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
== Participating hosts (47 -> 43) ==
Additional (1): fi-icl-u
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5020 -> Patchwork_10540
CI_DRM_5020: 95151c25e0433a2fe771b8bc272f3f8fb54a7e27 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4686: 741bf7064c467df725c14cc0b3b8b50436f9ee09 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10540: 268f7a66feeaa2401eef8e2977e08ac8a34ca78d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
268f7a66feea drm: fix deadlock of syncobj v6
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10540/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm: fix deadlock of syncobj v6
In reply to Chunming Zhou== Series Details ==
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_5020 -> Patchwork_10540 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/51369/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_10540 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-blb-e6850: PASS -> INCOMPLETE (fdo#107718)
==== Possible fixes ====
igt@kms_frontbuffer_tracking@basic:
fi-hsw-peppy: DMESG-WARN (fdo#102614) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-byt-clapper: FAIL (fdo#107362, fdo#103191) -> PASS +1
igt@prime_vgem@basic-fence-flip:
fi-cfl-8700k: FAIL (fdo#104008) -> PASS fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
== Participating hosts (47 -> 43) ==
Additional (1): fi-icl-u
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600
== Build changes ==
* Linux: CI_DRM_5020 -> Patchwork_10540
CI_DRM_5020: 95151c25e0433a2fe771b8bc272f3f8fb54a7e27 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4686: 741bf7064c467df725c14cc0b3b8b50436f9ee09 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10540: 268f7a66feeaa2401eef8e2977e08ac8a34ca78d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
268f7a66feea drm: fix deadlock of syncobj v6
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10540/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Am 23.10.18 um 11:37 schrieb Chunming Zhou:
Quoted 12 lines
v2:
add a mutex betweensync_cbexecution and free.
v3:
clearly separating the roles forpt_lockandcb_mutex(Chris) v4:
thecb_mutexshould be taken outside of thept_lockaround thisif()block. (Chris)
v5:
fix a corner case
v6:
tidydrm_syncobj_fence_get_or_add_callbackup. (Chris)
Quoted 8 lines
Tested by
syncobj_basicandsyncobj_waitof igt.Signed-off-by Chunming Zhou <[email protected]>Cc Daniel Vetter <[email protected]>Cc Chris Wilson <[email protected]>Cc Christian König <[email protected]>Reviewed-by Chris Wilson <[email protected]>
I've gone ahead and pushed this to drm-misc-next.
Regards,
Christian.
Quoted 299 lines
--- drivers/gpu/drm/drm_syncobj.c | 156 ++++++++++++++++------------------ include/drm/drm_syncobj.h | 8 +- 2 files changed, 81 insertions(+), 83 deletions(-)drivers/gpu/drm/drm_syncobj.c +75
-81@@ -106,6 +106,42 @@ struct drm_syncobj *drm_syncobj_find(struct drm_file *file_private, }EXPORT_SYMBOL (drm_syncobj_find); +static struct dma_fence +*drm_syncobj_find_signal_pt_for_point (struct drm_syncobj *syncobj, +uint64_t point) +{ +struct drm_syncobj_signal_pt *signal_pt; + +if ((syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) && + (point <= syncobj->timeline)) { +struct drm_syncobj_stub_fence *fence = +kzalloc (sizeof (struct drm_syncobj_stub_fence ), +GFP_KERNEL ); + +if (!fence) +return NULL ; +spin_lock_init (&fence->lock); +dma_fence_init (&fence->base, + &drm_syncobj_stub_fence_ops, + &fence->lock, + syncobj->timeline_context, + point); + +dma_fence_signal (&fence->base); +return &fence->base; + } + +list_for_each_entry (signal_pt, &syncobj->signal_pt_list, list) { +if (point > signal_pt->value) +continue ; +if ((syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) && + (point != signal_pt->value)) +continue ; +return dma_fence_get (&signal_pt->fence_array->base); + } +return NULL ; +} +static void drm_syncobj_add_callback_locked (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb,drm_syncobj_func_t func)@@ -114,115 +150,71 @@ static void drm_syncobj_add_callback_locked(struct drm_syncobj *syncobj,list_add_tail (&cb->node, &syncobj->cb_list); } -static int drm_syncobj_fence_get_or_add_callback (struct drm_syncobj *syncobj, -struct dma_fence **fence, -struct drm_syncobj_cb *cb, -drm_syncobj_func_t func) +static void drm_syncobj_fence_get_or_add_callback (struct drm_syncobj *syncobj, +struct dma_fence **fence, +struct drm_syncobj_cb *cb, +drm_syncobj_func_t func) { -int ret; +u64 pt_value =0 ; - ret =drm_syncobj_search_fence (syncobj,0 ,0 , fence); -if (!ret) -return 1 ; +if (syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) { +/*BINARY syncobj always wait on last pt */ + pt_value = syncobj->signal_point; -spin_lock (&syncobj->lock); -/* We've already tried once to get a fence and failed. Now that we -* have the lock, try one more time just to be sure we don't add a -* callback when a fence has already been set. -*/ -if (!list_empty (&syncobj->signal_pt_list)) { -spin_unlock (&syncobj->lock); -drm_syncobj_search_fence (syncobj,0 ,0 , fence); -if (*fence) -return 1 ; -spin_lock (&syncobj->lock); - }else { - *fence =NULL ; -drm_syncobj_add_callback_locked (syncobj, cb, func); - ret =0 ; +if (pt_value ==0 ) + pt_value +=DRM_SYNCOBJ_BINARY_POINT ; } -spin_unlock (&syncobj->lock); -return ret; +mutex_lock (&syncobj->cb_mutex); +spin_lock (&syncobj->pt_lock); + *fence =drm_syncobj_find_signal_pt_for_point (syncobj, pt_value); +spin_unlock (&syncobj->pt_lock); +if (!*fence) +drm_syncobj_add_callback_locked (syncobj, cb, func); +mutex_unlock (&syncobj->cb_mutex); }void drm_syncobj_add_callback (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb,drm_syncobj_func_t func) { -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);drm_syncobj_add_callback_locked (syncobj, cb, func); -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); }void drm_syncobj_remove_callback (struct drm_syncobj *syncobj,struct drm_syncobj_cb *cb) { -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);list_del_init (&cb->node); -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); }static void drm_syncobj_init (struct drm_syncobj *syncobj) { -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); syncobj->timeline_context =dma_fence_context_alloc (1 ); syncobj->timeline =0 ; syncobj->signal_point =0 ;init_waitqueue_head (&syncobj->wq);INIT_LIST_HEAD (&syncobj->signal_pt_list); -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); }static void drm_syncobj_fini (struct drm_syncobj *syncobj) {struct drm_syncobj_signal_pt *signal_pt =NULL , *tmp; -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);list_for_each_entry_safe (signal_pt, tmp, &syncobj->signal_pt_list, list) {list_del (&signal_pt->list);dma_fence_put (&signal_pt->fence_array->base);kfree (signal_pt); } -spin_unlock (&syncobj->lock); -} - -static struct dma_fence -*drm_syncobj_find_signal_pt_for_point (struct drm_syncobj *syncobj, -uint64_t point) -{ -struct drm_syncobj_signal_pt *signal_pt; - -if ((syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) && - (point <= syncobj->timeline)) { -struct drm_syncobj_stub_fence *fence = -kzalloc (sizeof (struct drm_syncobj_stub_fence ), -GFP_KERNEL ); - -if (!fence) -return NULL ; -spin_lock_init (&fence->lock); -dma_fence_init (&fence->base, - &drm_syncobj_stub_fence_ops, - &fence->lock, - syncobj->timeline_context, - point); - -dma_fence_signal (&fence->base); -return &fence->base; - } - -list_for_each_entry (signal_pt, &syncobj->signal_pt_list, list) { -if (point > signal_pt->value) -continue ; -if ((syncobj->type ==DRM_SYNCOBJ_TYPE_BINARY ) && - (point != signal_pt->value)) -continue ; -return dma_fence_get (&signal_pt->fence_array->base); - } -return NULL ; +spin_unlock (&syncobj->pt_lock); } static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj,@@ -249,14 +241,14 @@ static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj, fences[num_fences++] =dma_fence_get (fence);/* timeline syncobj must take this dependency */ if (syncobj->type ==DRM_SYNCOBJ_TYPE_TIMELINE ) { -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);if (!list_empty (&syncobj->signal_pt_list)) { tail_pt =list_last_entry (&syncobj->signal_pt_list, struct drm_syncobj_signal_pt, list); fences[num_fences++] =dma_fence_get (&tail_pt->fence_array->base); } -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); } signal_pt->fence_array = dma_fence_array_create(num_fences, fences, syncobj->timeline_context,@@ -266,16 +258,16 @@ static int drm_syncobj_create_signal_pt(struct drm_syncobj *syncobj, goto fail; } -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock);if (syncobj->signal_point >= point) {DRM_WARN ("A later signal is ready!" ); -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); goto exist; } signal_pt->value = point;list_add_tail (&signal_pt->list, &syncobj->signal_pt_list); syncobj->signal_point = point; -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock);wake_up_all (&syncobj->wq);return 0 ;@@ -294,7 +286,7 @@ static void drm_syncobj_garbage_collection(struct drm_syncobj *syncobj) {struct drm_syncobj_signal_pt *signal_pt, *tmp, *tail_pt; -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); tail_pt =list_last_entry (&syncobj->signal_pt_list, struct drm_syncobj_signal_pt, list);@@ -315,7 +307,7 @@ static void drm_syncobj_garbage_collection(struct drm_syncobj *syncobj) } } -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock); }/** * drm_syncobj_replace_fence - replace fence in a sync object. @@ -344,13 +336,14 @@ void drm_syncobj_replace_fence(struct drm_syncobj *syncobj,drm_syncobj_create_signal_pt (syncobj, fence, pt_value);if (fence) {struct drm_syncobj_cb *cur, *tmp; +LIST_HEAD (cb_list); -spin_lock (&syncobj->lock); +mutex_lock (&syncobj->cb_mutex);list_for_each_entry_safe (cur, tmp, &syncobj->cb_list, node) {list_del_init (&cur->node); cur->func (syncobj, cur); } -spin_unlock (&syncobj->lock); +mutex_unlock (&syncobj->cb_mutex); } }EXPORT_SYMBOL (drm_syncobj_replace_fence);@@ -386,11 +379,11 @@ drm_syncobj_point_get(struct drm_syncobj *syncobj, u64 point, u64 flags,if (ret <0 )return ret; } -spin_lock (&syncobj->lock); +spin_lock (&syncobj->pt_lock); *fence =drm_syncobj_find_signal_pt_for_point (syncobj, point);if (!*fence) ret = -EINVAL ; -spin_unlock (&syncobj->lock); +spin_unlock (&syncobj->pt_lock);return ret; }@@ -500,7 +493,8 @@ int drm_syncobj_create(struct drm_syncobj **out_syncobj, uint32_t flags,kref_init (&syncobj->refcount);INIT_LIST_HEAD (&syncobj->cb_list); -spin_lock_init (&syncobj->lock); +spin_lock_init (&syncobj->pt_lock); +mutex_init (&syncobj->cb_mutex);if (flags &DRM_SYNCOBJ_CREATE_TYPE_TIMELINE ) syncobj->type =DRM_SYNCOBJ_TYPE_TIMELINE ;else include/drm/drm_syncobj.h +1
-1@@ -75,9 +75,13 @@ struct drm_syncobj {*/ struct list_head cb_list;/** -* @lock: Protects syncobj list and write-locks &fence. +* @pt_lock: Protects pt list.
include/drm/drm_syncobj.h struct drm_syncobj { · line 87
Quoted 10 lines
include/drm/drm_syncobj.h +5
-1*/ -spinlock_t lock; +spinlock_t pt_lock; +/** +* @cb_mutex: Protects syncobj cb list. +*/ +struct mutex cb_mutex;/** * @file: A file backing for this syncobj. */
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm: fix deadlock of syncobj v6
In reply to Chunming Zhou== Series Details ==
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_5020_full -> Patchwork_10540_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_10540_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_10540_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_10540_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_draw_crc@draw-method-xrgb8888-blt-ytiled:
shard-skl: NOTRUN -> FAIL== Known issues ==
Here are the changes found in Patchwork_10540_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_cpu_reloc@full:
shard-skl: NOTRUN -> INCOMPLETE (fdo#108073)
igt@gem_exec_schedule@pi-ringfull-bsd:
shard-skl: NOTRUN -> FAIL (fdo#103158) +2
igt@gem_softpin@noreloc-s3:
shard-skl: NOTRUN -> INCOMPLETE (fdo#104108, fdo#107773)
igt@kms_atomic_transition@3x-modeset-transitions:
shard-snb: NOTRUN -> INCOMPLETE (fdo#105411)
igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
shard-snb: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_busy@extended-pageflip-hang-newfb-render-b:
shard-apl: NOTRUN -> DMESG-WARN (fdo#107956) +1
shard-glk: NOTRUN -> DMESG-WARN (fdo#107956) +1
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-a:
shard-kbl: NOTRUN -> DMESG-WARN (fdo#107956)
shard-hsw: NOTRUN -> DMESG-WARN (fdo#107956)
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-hsw: PASS -> DMESG-WARN (fdo#107956)
shard-skl: NOTRUN -> DMESG-WARN (fdo#107956) +2
igt@kms_color@pipe-a-degamma:
shard-apl: PASS -> FAIL (fdo#104782, fdo#108145)
igt@kms_color@pipe-a-legacy-gamma:
shard-skl: PASS -> FAIL (fdo#104782, fdo#108145)
igt@kms_color@pipe-c-degamma:
shard-apl: PASS -> FAIL (fdo#104782)
igt@kms_cursor_crc@cursor-128x128-random:
shard-apl: PASS -> FAIL (fdo#103232) +3
igt@kms_cursor_crc@cursor-64x21-onscreen:
shard-glk: PASS -> FAIL (fdo#103232) +1
igt@kms_draw_crc@fill-fb:
shard-skl: NOTRUN -> FAIL (fdo#103184)
igt@kms_fbcon_fbt@fbc:
shard-skl: NOTRUN -> FAIL (fdo#105682, fdo#103833)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
shard-apl: PASS -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
shard-kbl: NOTRUN -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-plflip-blt:
shard-skl: NOTRUN -> FAIL (fdo#105682) +2
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
shard-apl: NOTRUN -> FAIL (fdo#103167) +1
shard-skl: NOTRUN -> FAIL (fdo#103167) +5
shard-glk: NOTRUN -> FAIL (fdo#103167) +1
igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-mmap-cpu:
shard-glk: PASS -> FAIL (fdo#103167) +3
igt@kms_frontbuffer_tracking@fbc-2p-rte:
shard-glk: PASS -> FAIL (fdo#105682, fdo#103167)
igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
shard-skl: NOTRUN -> FAIL (fdo#105683)
igt@kms_plane@pixel-format-pipe-b-planes:
shard-skl: NOTRUN -> DMESG-FAIL (fdo#103166, fdo#106885) +1
igt@kms_plane@pixel-format-pipe-c-planes:
shard-apl: NOTRUN -> FAIL (fdo#103166)
shard-glk: NOTRUN -> FAIL (fdo#103166)
shard-kbl: NOTRUN -> FAIL (fdo#103166)
igt@kms_plane@plane-position-covered-pipe-b-planes:
shard-glk: PASS -> FAIL (fdo#103166) +1
igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
shard-apl: NOTRUN -> FAIL (fdo#108145) +1
shard-skl: NOTRUN -> FAIL (fdo#107815, fdo#108145) +2
igt@kms_plane_alpha_blend@pipe-b-alpha-transparant-fb:
shard-kbl: NOTRUN -> FAIL (fdo#108145) +1
shard-glk: NOTRUN -> FAIL (fdo#108145) +1
shard-skl: NOTRUN -> FAIL (fdo#108145) +2
igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
shard-skl: NOTRUN -> FAIL (fdo#108146)
shard-kbl: NOTRUN -> FAIL (fdo#108146)
shard-apl: NOTRUN -> FAIL (fdo#108146)
shard-glk: NOTRUN -> FAIL (fdo#108146)
igt@kms_rotation_crc@exhaust-fences:
shard-skl: NOTRUN -> DMESG-WARN (fdo#105748)
igt@kms_setmode@basic:
shard-skl: NOTRUN -> FAIL (fdo#99912)
igt@kms_sysfs_edid_timing:
shard-skl: NOTRUN -> FAIL (fdo#100047)
igt@kms_vblank@pipe-c-query-busy-hang:
shard-glk: PASS -> INCOMPLETE (k.org#198133, fdo#103359)
igt@pm_backlight@fade_with_suspend:
shard-skl: NOTRUN -> FAIL (fdo#107847)
igt@pm_rpm@pm-caching:
shard-skl: PASS -> INCOMPLETE (fdo#107807)
==== Possible fixes ====
igt@kms_cursor_crc@cursor-128x128-suspend:
shard-apl: FAIL (fdo#103191, fdo#103232) -> PASS
igt@kms_cursor_crc@cursor-256x256-sliding:
shard-apl: FAIL (fdo#103232) -> PASS
igt@kms_cursor_crc@cursor-64x64-onscreen:
shard-glk: FAIL (fdo#103232) -> PASS
igt@kms_flip@modeset-vs-vblank-race:
shard-kbl: FAIL (fdo#103060) -> PASS
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
shard-apl: FAIL (fdo#103167) -> PASS +1
igt@kms_plane_multiple@atomic-pipe-c-tiling-y:
shard-apl: FAIL (fdo#103166) -> PASS +1
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
igt@syncobj_wait@reset-during-wait-for-submit:
shard-glk: INCOMPLETE (k.org#198133, fdo#103359) -> PASS +6
igt@syncobj_wait@wait-all-for-submit-complex:
shard-skl: INCOMPLETE (fdo#108490) -> PASS +3
igt@syncobj_wait@wait-all-for-submit-snapshot:
shard-hsw: INCOMPLETE (fdo#103540) -> PASS +6
igt@syncobj_wait@wait-for-submit-delayed-submit:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS +6
igt@syncobj_wait@wait-for-submit-snapshot:
shard-apl: INCOMPLETE (fdo#103927) -> PASS +7 fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103833 https://bugs.freedesktop.org/show_bug.cgi?id=103833
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104782 https://bugs.freedesktop.org/show_bug.cgi?id=104782
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
fdo#105683 https://bugs.freedesktop.org/show_bug.cgi?id=105683
fdo#105748 https://bugs.freedesktop.org/show_bug.cgi?id=105748
fdo#106885 https://bugs.freedesktop.org/show_bug.cgi?id=106885
fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
fdo#107847 https://bugs.freedesktop.org/show_bug.cgi?id=107847
fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
fdo#108073 https://bugs.freedesktop.org/show_bug.cgi?id=108073
fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
fdo#108146 https://bugs.freedesktop.org/show_bug.cgi?id=108146
fdo#108490 https://bugs.freedesktop.org/show_bug.cgi?id=108490
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_5020 -> Patchwork_10540
CI_DRM_5020: 95151c25e0433a2fe771b8bc272f3f8fb54a7e27 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4686: 741bf7064c467df725c14cc0b3b8b50436f9ee09 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10540: 268f7a66feeaa2401eef8e2977e08ac8a34ca78d @ 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_10540/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for drm: fix deadlock of syncobj v6
Quoting Patchwork (2018-10-23 13:26:51)
Quoted 12 lines
== Series Details ==
Series: drm: fix deadlock of syncobj v6
URL : https://patchwork.freedesktop.org/series/51369/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_5020_full->Patchwork_10540_full=== Summary - FAILURE ==
Quoted 16 lines
==== Possible fixes ====
igt@syncobj_wait@reset-during-wait-for-submit:
shard-glk: INCOMPLETE (k.org#198133, fdo#103359) -> PASS +6
igt@syncobj_wait@wait-all-for-submit-complex:
shard-skl: INCOMPLETE (fdo#108490) -> PASS +3
igt@syncobj_wait@wait-all-for-submit-snapshot:
shard-hsw: INCOMPLETE (fdo#103540) -> PASS +6
igt@syncobj_wait@wait-for-submit-delayed-submit:
shard-kbl: INCOMPLETE (fdo#103665) -> PASS +6
igt@syncobj_wait@wait-for-submit-snapshot:
shard-apl: INCOMPLETE (fdo#103927) -> PASS +7Which were the significant (and welcome) changes from the patch. -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx