amdgpu: Take a lock before removing devices from fd_tab hash table.
authorJan Vesely <jan.vesely@rutgers.edu>
Thu, 10 May 2018 23:22:17 +0000 (19:22 -0400)
committerJan Vesely <jan.vesely@rutgers.edu>
Fri, 25 May 2018 16:12:00 +0000 (12:12 -0400)
Close the file descriptors under lock as well.
v2: close fds after removing from hash table

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
amdgpu/amdgpu_device.c

index 983b19a..e23dd3b 100644 (file)
@@ -126,6 +126,13 @@ static int amdgpu_get_auth(int fd, int *auth)
 
 static void amdgpu_device_free_internal(amdgpu_device_handle dev)
 {
+       pthread_mutex_lock(&fd_mutex);
+       util_hash_table_remove(fd_tab, UINT_TO_PTR(dev->fd));
+       close(dev->fd);
+       if ((dev->flink_fd >= 0) && (dev->fd != dev->flink_fd))
+               close(dev->flink_fd);
+       pthread_mutex_unlock(&fd_mutex);
+
        amdgpu_vamgr_deinit(&dev->vamgr_32);
        amdgpu_vamgr_deinit(&dev->vamgr);
        amdgpu_vamgr_deinit(&dev->vamgr_high_32);
@@ -133,10 +140,6 @@ static void amdgpu_device_free_internal(amdgpu_device_handle dev)
        util_hash_table_destroy(dev->bo_flink_names);
        util_hash_table_destroy(dev->bo_handles);
        pthread_mutex_destroy(&dev->bo_table_mutex);
-       util_hash_table_remove(fd_tab, UINT_TO_PTR(dev->fd));
-       close(dev->fd);
-       if ((dev->flink_fd >= 0) && (dev->fd != dev->flink_fd))
-               close(dev->flink_fd);
        free(dev->marketing_name);
        free(dev);
 }