diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2018-05-10 19:22:17 -0400 |
|---|---|---|
| committer | Jan Vesely <jan.vesely@rutgers.edu> | 2018-05-25 12:12:00 -0400 |
| commit | 712fa0f3f420a7b9b42ae6d6fcb513aca97d541d (patch) | |
| tree | 88dd0f96f7610f09c450fd042ba3a911ae5e4585 | |
| parent | 35615697f787f0ac46a2c00e61651cba668e6ef7 (diff) | |
| download | external_libdrm-712fa0f3f420a7b9b42ae6d6fcb513aca97d541d.tar.gz external_libdrm-712fa0f3f420a7b9b42ae6d6fcb513aca97d541d.tar.bz2 external_libdrm-712fa0f3f420a7b9b42ae6d6fcb513aca97d541d.zip | |
amdgpu: Take a lock before removing devices from fd_tab hash table.
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>
| -rw-r--r-- | amdgpu/amdgpu_device.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c index 983b19ab..e23dd3b3 100644 --- a/amdgpu/amdgpu_device.c +++ b/amdgpu/amdgpu_device.c @@ -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); } |