OSDN Git Service

amdgpu: Fix segfault in deadlock test.
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Thu, 25 Jan 2018 18:03:32 +0000 (13:03 -0500)
committerAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Fri, 26 Jan 2018 12:45:48 +0000 (07:45 -0500)
If amdgpu_cs_query_fence_status terminates prematurely the BO
sometimes is unmapped before helper thread writes a vlaue
into it causing a segfault.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
tests/amdgpu/deadlock_tests.c

index 9a42885..fc49c48 100644 (file)
@@ -245,6 +245,8 @@ static void amdgpu_deadlock_helper(unsigned ip_type)
                        AMDGPU_TIMEOUT_INFINITE,0, &expired);
        CU_ASSERT_EQUAL((r == 0 || r == -ECANCELED), 1);
 
+       pthread_join(stress_thread, NULL);
+
        r = amdgpu_bo_list_destroy(bo_list);
        CU_ASSERT_EQUAL(r, 0);
 
@@ -254,6 +256,4 @@ static void amdgpu_deadlock_helper(unsigned ip_type)
 
        r = amdgpu_cs_ctx_free(context_handle);
        CU_ASSERT_EQUAL(r, 0);
-
-       pthread_join(stress_thread, NULL);
 }