amdgpu: add a function to create amdgpu bo internally (v2)
PATCH 1/1 amdgpu: add a function to create amdgpu bo internally (v2)
a helper function to create and initialize amdgpu bo
v2: update error handling: add label and free bo
--- amdgpu/amdgpu_bo.c | 186 +++++++++++++++++++++++++---------------------------- 1 file changed, 89 insertions(+), 97 deletions(-)
amdgpu/amdgpu_bo.c +89 -97
@@ -48,11 +48,32 @@ static void amdgpu_close_kms_handle(amdgpu_device_handle dev,drmIoctl (dev->fd,DRM_IOCTL_GEM_CLOSE , &args); } +static int amdgpu_bo_create (amdgpu_device_handle dev, +uint64_t size, +uint32_t handle, +amdgpu_bo_handle *buf_handle) +{ +struct amdgpu_bo *bo; +int r =0 ; + + bo =calloc (1 ,sizeof (struct amdgpu_bo )); +if (!bo) +return -ENOMEM ; + +atomic_set (&bo->refcount,1 ); + bo->dev = dev; + bo->alloc_size = size; + bo->handle = handle; +pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + + *buf_handle = bo; +return 0 ; +} +int amdgpu_bo_alloc (amdgpu_device_handle dev,struct amdgpu_bo_alloc_request *alloc_buffer,amdgpu_bo_handle *buf_handle) { -struct amdgpu_bo *bo;union drm_amdgpu_gem_create args;unsigned heap = alloc_buffer->preferred_heap;int r =0 ;
@@ -61,14 +82,6 @@ int amdgpu_bo_alloc(amdgpu_device_handle dev,if (!(heap & (AMDGPU_GEM_DOMAIN_GTT |AMDGPU_GEM_DOMAIN_VRAM )))return -EINVAL ; - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) -return -ENOMEM ; - -atomic_set (&bo->refcount,1 ); - bo->dev = dev; - bo->alloc_size = alloc_buffer->alloc_size; -memset (&args,0 ,sizeof (args)); args.in.bo_size = alloc_buffer->alloc_size; args.in.alignment = alloc_buffer->phys_alignment;
@@ -80,24 +93,23 @@ int amdgpu_bo_alloc(amdgpu_device_handle dev,/* Allocate the buffer with the preferred heap. */ r =drmCommandWriteRead (dev->fd,DRM_AMDGPU_GEM_CREATE , &args,sizeof (args)); +if (r) + goto out; + + r =amdgpu_bo_create (dev, alloc_buffer->alloc_size, args.out.handle, + buf_handle);if (r) { -free (bo); -return r; +amdgpu_close_kms_handle (dev, args.out.handle); + goto out; } - bo->handle = args.out.handle; - -pthread_mutex_lock (&bo->dev->bo_table_mutex); - r =handle_table_insert (&bo->dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&bo->dev->bo_table_mutex); - -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); - +pthread_mutex_lock (&dev->bo_table_mutex); + r =handle_table_insert (&dev->bo_handles, (*buf_handle)->handle, + *buf_handle); +pthread_mutex_unlock (&dev->bo_table_mutex);if (r) -amdgpu_bo_free (bo); -else - *buf_handle = bo; - +amdgpu_bo_free (*buf_handle); +out:return r; }
@@ -256,7 +268,9 @@ int amdgpu_bo_import(amdgpu_device_handle dev, {struct drm_gem_open open_arg = {};struct amdgpu_bo *bo =NULL ; -int r; +uint32_t handle =0 , flink_name =0 ; +uint64_t alloc_size =0 ; +int r =0 ;int dma_fd;uint64_t dma_buf_size =0 ;
@@ -266,22 +280,18 @@ int amdgpu_bo_import(amdgpu_device_handle dev,/* Convert a DMA buf handle to a KMS handle now. */ if (type == amdgpu_bo_handle_type_dma_buf_fd) { -uint32_t handle;off_t size;/* Get a KMS handle. */ r =drmPrimeFDToHandle (dev->fd, shared_handle, &handle); -if (r) { -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } +if (r) + goto unlock;/* Query the buffer size. */ size =lseek (shared_handle,0 ,SEEK_END );if (size == (off_t)-1 ) { -pthread_mutex_unlock (&dev->bo_table_mutex); -amdgpu_close_kms_handle (dev, handle); -return -errno; + r = -errno; + goto unlock; }lseek (shared_handle,0 ,SEEK_SET );
@@ -320,58 +330,32 @@ int amdgpu_bo_import(amdgpu_device_handle dev,return 0 ; } - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) { -pthread_mutex_unlock (&dev->bo_table_mutex); -if (type == amdgpu_bo_handle_type_dma_buf_fd) { -amdgpu_close_kms_handle (dev, shared_handle); - } -return -ENOMEM ; - } -/* Open the handle. */ switch (type) {case amdgpu_bo_handle_type_gem_flink_name: open_arg.name = shared_handle; r =drmIoctl (dev->flink_fd,DRM_IOCTL_GEM_OPEN , &open_arg); -if (r) { -free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } +if (r) + goto unlock; - bo->handle = open_arg.handle; + flink_name = shared_handle; + handle = open_arg.handle; + alloc_size = open_arg.size;if (dev->flink_fd != dev->fd) { - r =drmPrimeHandleToFD (dev->flink_fd, bo->handle,DRM_CLOEXEC , &dma_fd); -if (r) { -free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } - r =drmPrimeFDToHandle (dev->fd, dma_fd, &bo->handle ); - + r =drmPrimeHandleToFD (dev->flink_fd, handle, +DRM_CLOEXEC , &dma_fd); +if (r) + goto unlock; + r =drmPrimeFDToHandle (dev->fd, dma_fd, &handle);close (dma_fd); - -if (r) { -free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } - } - bo->flink_name = shared_handle; - bo->alloc_size = open_arg.size; - r =handle_table_insert (&dev->bo_flink_names, shared_handle, - bo); -if (r) { -pthread_mutex_unlock (&dev->bo_table_mutex); -amdgpu_bo_free (bo); -return r; +if (r) + goto unlock; }break ;case amdgpu_bo_handle_type_dma_buf_fd: - bo->handle = shared_handle; - bo->alloc_size = dma_buf_size; + handle = shared_handle; + alloc_size = dma_buf_size;break ;case amdgpu_bo_handle_type_kms:
@@ -380,16 +364,32 @@ int amdgpu_bo_import(amdgpu_device_handle dev, }/* Initialize it. */ -atomic_set (&bo->refcount,1 ); - bo->dev = dev; -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + r =amdgpu_bo_create (dev, alloc_size, handle, &bo); +if (r) + goto unlock; -handle_table_insert (&dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&dev->bo_table_mutex); +if (flink_name) { + r =handle_table_insert (&dev->bo_flink_names, flink_name, + bo); +if (r) + goto bo_free; + } + r =handle_table_insert (&dev->bo_handles, bo->handle, bo); +if (r) + goto bo_free; output->buf_handle = bo; output->alloc_size = bo->alloc_size; +pthread_mutex_unlock (&dev->bo_table_mutex);return 0 ; + +bo_free: +amdgpu_bo_free (bo); +unlock: +pthread_mutex_unlock (&dev->bo_table_mutex); +if (type == amdgpu_bo_handle_type_dma_buf_fd && handle) +amdgpu_close_kms_handle (dev, handle); +return r; }int amdgpu_bo_free (amdgpu_bo_handle buf_handle)
@@ -574,7 +574,6 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, amdgpu_bo_handle *buf_handle) {int r; -struct amdgpu_bo *bo;struct drm_amdgpu_gem_userptr args; args.addr = (uintptr_t )cpu;
@@ -584,28 +583,21 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, r =drmCommandWriteRead (dev->fd,DRM_AMDGPU_GEM_USERPTR , &args,sizeof (args));if (r) -return r; - - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) -return -ENOMEM ; - -atomic_set (&bo->refcount,1 ); - bo->dev = dev; - bo->alloc_size = size; - bo->handle = args.handle; - -pthread_mutex_lock (&bo->dev->bo_table_mutex); - r =handle_table_insert (&bo->dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&bo->dev->bo_table_mutex); + goto out; -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + r =amdgpu_bo_create (dev, size, args.handle, buf_handle); +if (r) { +amdgpu_close_kms_handle (dev, args.handle); + goto out; + } +pthread_mutex_lock (&dev->bo_table_mutex); + r =handle_table_insert (&dev->bo_handles, (*buf_handle)->handle, + *buf_handle); +pthread_mutex_unlock (&dev->bo_table_mutex);if (r) -amdgpu_bo_free (bo); -else - *buf_handle = bo; - +amdgpu_bo_free (*buf_handle); +out:return r; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1533806952-11227-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
Am 09.08.2018 um 11:29 schrieb Junwei Zhang:
Quoted 171 lines
a helper function to create and initialize amdgpu bo
v2: update error handling: add label and free bo
Signed-off-by Junwei Zhang <[email protected]>--- amdgpu/amdgpu_bo.c | 186 +++++++++++++++++++++++++---------------------------- 1 file changed, 89 insertions(+), 97 deletions(-)amdgpu/amdgpu_bo.c +47
-49@@ -48,11 +48,32 @@ static void amdgpu_close_kms_handle(amdgpu_device_handle dev,drmIoctl (dev->fd,DRM_IOCTL_GEM_CLOSE , &args); } +static int amdgpu_bo_create (amdgpu_device_handle dev, +uint64_t size, +uint32_t handle, +amdgpu_bo_handle *buf_handle) +{ +struct amdgpu_bo *bo; +int r =0 ; + + bo =calloc (1 ,sizeof (struct amdgpu_bo )); +if (!bo) +return -ENOMEM ; + +atomic_set (&bo->refcount,1 ); + bo->dev = dev; + bo->alloc_size = size; + bo->handle = handle; +pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + + *buf_handle = bo; +return 0 ; +} +int amdgpu_bo_alloc (amdgpu_device_handle dev,struct amdgpu_bo_alloc_request *alloc_buffer,amdgpu_bo_handle *buf_handle) { -struct amdgpu_bo *bo;union drm_amdgpu_gem_create args;unsigned heap = alloc_buffer->preferred_heap;int r =0 ;@@ -61,14 +82,6 @@ int amdgpu_bo_alloc(amdgpu_device_handle dev,if (!(heap & (AMDGPU_GEM_DOMAIN_GTT |AMDGPU_GEM_DOMAIN_VRAM )))return -EINVAL ; - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) -return -ENOMEM ; - -atomic_set (&bo->refcount,1 ); - bo->dev = dev; - bo->alloc_size = alloc_buffer->alloc_size; -memset (&args,0 ,sizeof (args)); args.in.bo_size = alloc_buffer->alloc_size; args.in.alignment = alloc_buffer->phys_alignment;@@ -80,24 +93,23 @@ int amdgpu_bo_alloc(amdgpu_device_handle dev,/* Allocate the buffer with the preferred heap. */ r =drmCommandWriteRead (dev->fd,DRM_AMDGPU_GEM_CREATE , &args,sizeof (args)); +if (r) + goto out; + + r =amdgpu_bo_create (dev, alloc_buffer->alloc_size, args.out.handle, + buf_handle);if (r) { -free (bo); -return r; +amdgpu_close_kms_handle (dev, args.out.handle); + goto out; } - bo->handle = args.out.handle; - -pthread_mutex_lock (&bo->dev->bo_table_mutex); - r =handle_table_insert (&bo->dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&bo->dev->bo_table_mutex); - -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); - +pthread_mutex_lock (&dev->bo_table_mutex); + r =handle_table_insert (&dev->bo_handles, (*buf_handle)->handle, + *buf_handle); +pthread_mutex_unlock (&dev->bo_table_mutex);if (r) -amdgpu_bo_free (bo); -else - *buf_handle = bo; - +amdgpu_bo_free (*buf_handle); +out:return r; }@@ -256,7 +268,9 @@ int amdgpu_bo_import(amdgpu_device_handle dev, {struct drm_gem_open open_arg = {};struct amdgpu_bo *bo =NULL ; -int r; +uint32_t handle =0 , flink_name =0 ; +uint64_t alloc_size =0 ; +int r =0 ;int dma_fd;uint64_t dma_buf_size =0 ;@@ -266,22 +280,18 @@ int amdgpu_bo_import(amdgpu_device_handle dev,/* Convert a DMA buf handle to a KMS handle now. */ if (type == amdgpu_bo_handle_type_dma_buf_fd) { -uint32_t handle;off_t size;/* Get a KMS handle. */ r =drmPrimeFDToHandle (dev->fd, shared_handle, &handle); -if (r) { -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } +if (r) + goto unlock;/* Query the buffer size. */ size =lseek (shared_handle,0 ,SEEK_END );if (size == (off_t)-1 ) { -pthread_mutex_unlock (&dev->bo_table_mutex); -amdgpu_close_kms_handle (dev, handle); -return -errno; + r = -errno; + goto unlock; }lseek (shared_handle,0 ,SEEK_SET );@@ -320,58 +330,32 @@ int amdgpu_bo_import(amdgpu_device_handle dev,return 0 ; } - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) { -pthread_mutex_unlock (&dev->bo_table_mutex); -if (type == amdgpu_bo_handle_type_dma_buf_fd) { -amdgpu_close_kms_handle (dev, shared_handle); - } -return -ENOMEM ; - } -/* Open the handle. */ switch (type) {case amdgpu_bo_handle_type_gem_flink_name: open_arg.name = shared_handle; r =drmIoctl (dev->flink_fd,DRM_IOCTL_GEM_OPEN , &open_arg); -if (r) { -free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } +if (r) + goto unlock; - bo->handle = open_arg.handle; + flink_name = shared_handle; + handle = open_arg.handle; + alloc_size = open_arg.size;if (dev->flink_fd != dev->fd) { - r =drmPrimeHandleToFD (dev->flink_fd, bo->handle,DRM_CLOEXEC , &dma_fd); -if (r) {
amdgpu/amdgpu_bo.c int amdgpu_bo_import(amdgpu_device_handle dev, · line 348
Quoted 10 lines
amdgpu/amdgpu_bo.c +4
-6-free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } - r =drmPrimeFDToHandle (dev->fd, dma_fd, &bo->handle ); - + r =drmPrimeHandleToFD (dev->flink_fd, handle, +DRM_CLOEXEC , &dma_fd); +if (r) + goto unlock;
Where is the temporary handle closed here?
Quoted 38 lines
amdgpu/amdgpu_bo.c +6
-20+ r =drmPrimeFDToHandle (dev->fd, dma_fd, &handle);close (dma_fd); - -if (r) { -free (bo); -pthread_mutex_unlock (&dev->bo_table_mutex); -return r; - } - } - bo->flink_name = shared_handle; - bo->alloc_size = open_arg.size; - r =handle_table_insert (&dev->bo_flink_names, shared_handle, - bo); -if (r) { -pthread_mutex_unlock (&dev->bo_table_mutex); -amdgpu_bo_free (bo); -return r; +if (r) + goto unlock; }break ;case amdgpu_bo_handle_type_dma_buf_fd: - bo->handle = shared_handle; - bo->alloc_size = dma_buf_size; + handle = shared_handle; + alloc_size = dma_buf_size;break ;case amdgpu_bo_handle_type_kms:@@ -380,16 +364,32 @@ int amdgpu_bo_import(amdgpu_device_handle dev, }/* Initialize it. */ -atomic_set (&bo->refcount,1 ); - bo->dev = dev; -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + r =amdgpu_bo_create (dev, alloc_size, handle, &bo);
amdgpu/amdgpu_bo.c int amdgpu_bo_import(amdgpu_device_handle dev, · line 375
Quoted 10 lines
amdgpu/amdgpu_bo.c +7
-2+if (r) + goto unlock; -handle_table_insert (&dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&dev->bo_table_mutex); +if (flink_name) { + r =handle_table_insert (&dev->bo_flink_names, flink_name, + bo); +if (r) + goto bo_free;
That looks buggy to me. Where is bo->flink_name assigned in this case?
Quoted 6 lines
amdgpu/amdgpu_bo.c +4
-0+ } + r =handle_table_insert (&dev->bo_handles, bo->handle, bo); +if (r) + goto bo_free; output->buf_handle = bo;
amdgpu/amdgpu_bo.c int amdgpu_bo_import(amdgpu_device_handle dev, · line 391
Quoted 10 lines
amdgpu/amdgpu_bo.c +8
-0output->alloc_size = bo->alloc_size; +pthread_mutex_unlock (&dev->bo_table_mutex);return 0 ; + +bo_free: +amdgpu_bo_free (bo); +unlock: +pthread_mutex_unlock (&dev->bo_table_mutex); +if (type == amdgpu_bo_handle_type_dma_buf_fd && handle) +amdgpu_close_kms_handle (dev, handle);
I would still prefer a separate label to close to handle instead of this test.
Cause to me it looks like we could now close the handle accidentally twice.
Regards,
Christian.
Quoted 43 lines
amdgpu/amdgpu_bo.c +11
-16+return r; }int amdgpu_bo_free (amdgpu_bo_handle buf_handle)@@ -574,7 +574,6 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, amdgpu_bo_handle *buf_handle) {int r; -struct amdgpu_bo *bo;struct drm_amdgpu_gem_userptr args; args.addr = (uintptr_t )cpu;@@ -584,28 +583,21 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, r =drmCommandWriteRead (dev->fd,DRM_AMDGPU_GEM_USERPTR , &args,sizeof (args));if (r) -return r; - - bo =calloc (1 ,sizeof (struct amdgpu_bo )); -if (!bo) -return -ENOMEM ; - -atomic_set (&bo->refcount,1 ); - bo->dev = dev; - bo->alloc_size = size; - bo->handle = args.handle; - -pthread_mutex_lock (&bo->dev->bo_table_mutex); - r =handle_table_insert (&bo->dev->bo_handles, bo->handle, bo); -pthread_mutex_unlock (&bo->dev->bo_table_mutex); + goto out; -pthread_mutex_init (&bo->cpu_access_mutex,NULL ); + r =amdgpu_bo_create (dev, size, args.handle, buf_handle); +if (r) { +amdgpu_close_kms_handle (dev, args.handle); + goto out; + } +pthread_mutex_lock (&dev->bo_table_mutex); + r =handle_table_insert (&dev->bo_handles, (*buf_handle)->handle, + *buf_handle); +pthread_mutex_unlock (&dev->bo_table_mutex);
amdgpu/amdgpu_bo.c int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, · line 603
Quoted 10 lines
amdgpu/amdgpu_bo.c +2
-4if (r) -amdgpu_bo_free (bo); -else - *buf_handle = bo; - +amdgpu_bo_free (*buf_handle); +out:return r; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx