fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-23 11:40:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium/u_queue: guard fence->signalled checks with fence->mutex

Browse source 
I have seen a hang during application shutdown that could be explained by the
following race condition which this patch fixes:

1. Worker thread enters util_queue_fence_signal, sets fence->signalled = true.
2. Main thread calls util_queue_job_wait, which returns immediately.
3. Main thread deletes the job and fence structures, leaving garbage behind.
4. Worker thread calls pipe_condvar_broadcast, which gets stuck forever because
   it is accessing garbage.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Nicolai Hähnle 2016-07-09 19:40:51 +02:00
parent 5c17fb2cd6
commit a0a616720a
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/auxiliary/util/u_queue.c
View file

@ -41,9 +41,6 @@ util_queue_fence_signal(struct util_queue_fence *fence)
void
util_queue_job_wait(struct util_queue_fence *fence)
{
if (fence->signalled)
return;
pipe_mutex_lock(fence->mutex);
while (!fence->signalled)
pipe_condvar_wait(fence->cond, fence->mutex);