| Message ID | 20180510233316.21437-1-jan.vesely@rutgers.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2018-05-10 at 19:33 -0400, Jan Vesely wrote: > Close the file descriptors under lock as well. > > Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> > --- > amdgpu/amdgpu_device.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c > index 983b19ab..f71fc050 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); > + close(dev->fd); > + if ((dev->flink_fd >= 0) && (dev->fd != dev->flink_fd)) > + close(dev->flink_fd); > + util_hash_table_remove(fd_tab, UINT_TO_PTR(dev->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); > } ping. Jan
diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c index 983b19ab..f71fc050 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); + close(dev->fd); + if ((dev->flink_fd >= 0) && (dev->fd != dev->flink_fd)) + close(dev->flink_fd); + util_hash_table_remove(fd_tab, UINT_TO_PTR(dev->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); }
Close the file descriptors under lock as well. Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> --- amdgpu/amdgpu_device.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)