amdgpu: add bo from user memory to handle table
PATCH 1/3 amdgpu: add bo from user memory to handle table
When create bo from user memory, add it to handle table for future query.
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Christian König <[email protected]>
--- amdgpu/amdgpu_bo.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
amdgpu/amdgpu_bo.c +10 -1
@@ -556,7 +556,16 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, bo->alloc_size = size; bo->handle = args.handle; - *buf_handle = bo; +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 ); + +if (r) +amdgpu_bo_free (bo); +else + *buf_handle = bo;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): 1533722207-961-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 amdgpu: add a function to find bo by cpu mapping (v2)
Userspace needs to know if the user memory is from BO or malloc.
v2: update mutex range and rebase
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Christian König <[email protected]>
--- amdgpu/amdgpu.h | 23 +++++++++++++++++++++++ amdgpu/amdgpu_bo.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)
amdgpu/amdgpu.h +23 -0
@@ -678,6 +678,29 @@ int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, amdgpu_bo_handle *buf_handle);/** +* Validate if the user memory comes from BO +* +* \param dev - [in] Device handle. See #amdgpu_device_initialize() +* \param cpu - [in] CPU address of user allocated memory which we +* want to map to GPU address space (make GPU accessible) +* (This address must be correctly aligned). +* \param size - [in] Size of allocation (must be correctly aligned) +* \param buf_handle - [out] Buffer handle for the userptr memory +* if the user memory is not from BO, the buf_handle will be NULL. +* \param offset_in_bo - [out] offset in this BO for this user memory +* +* +* \return 0 on success\n +* <0 - Negative POSIX Error code +* +*/ +int amdgpu_find_bo_by_cpu_mapping (amdgpu_device_handle dev, +void *cpu, +uint64_t size, +amdgpu_bo_handle *buf_handle, +uint64_t *offset_in_bo); + +/** * Free previosuly allocated memory * * \param dev - \c [in] Device handle. See #amdgpu_device_initialize()
amdgpu/amdgpu_bo.c +39 -0
@@ -529,6 +529,45 @@ int amdgpu_bo_wait_for_idle(amdgpu_bo_handle bo, } } +int amdgpu_find_bo_by_cpu_mapping (amdgpu_device_handle dev, +void *cpu, +uint64_t size, +amdgpu_bo_handle *buf_handle, +uint64_t *offset_in_bo) +{ +int i; +struct amdgpu_bo *bo; + +if (cpu ==NULL || size ==0 ) +return -EINVAL ; + +/* +* Workaround for a buggy application which tries to import previously +* exposed CPU pointers. If we find a real world use case we should +* improve that by asking the kernel for the right handle. +*/ +pthread_mutex_lock (&dev->bo_table_mutex); +for (i =0 ; i < dev->bo_handles.max_key; i++) { + bo =handle_table_lookup (&dev->bo_handles, i); +if (!bo || !bo->cpu_ptr || size > bo->alloc_size) +continue ; +if (cpu >= bo->cpu_ptr && cpu < (bo->cpu_ptr + bo->alloc_size)) +break ; + } + +if (i < dev->bo_handles.max_key) { +atomic_inc (&bo->refcount); + *buf_handle = bo; + *offset_in_bo = cpu - bo->cpu_ptr; + }else { + *buf_handle =NULL ; + *offset_in_bo =0 ; + } +pthread_mutex_unlock (&dev->bo_table_mutex); + +return 0 ; +} + int amdgpu_create_bo_from_user_mem(amdgpu_device_handle dev, void *cpu, uint64_t size,
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 tests/amdgpu: add test for finding bo by CPU mapping
In reply to a message not in the archiveAdd a test for API to query bo by CPU mapping
Signed-off-by Junwei Zhang <[email protected]>
Reviewed-by Christian König <[email protected]>
--- tests/amdgpu/bo_tests.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
tests/amdgpu/bo_tests.c +33 -0
@@ -27,6 +27,7 @@#include "amdgpu_test.h" #include "amdgpu_drm.h" +#include "amdgpu_internal.h" #define BUFFER_SIZE (4*1024)#define BUFFER_ALIGN (4*1024)
@@ -44,6 +45,7 @@ static void amdgpu_bo_metadata(void);static void amdgpu_bo_map_unmap (void );static void amdgpu_memory_alloc (void );static void amdgpu_mem_fail_alloc (void ); +static void amdgpu_bo_find_by_cpu_mapping (void );CU_TestInfo bo_tests[] = { {"Export/Import" , amdgpu_bo_export_import },
@@ -51,6 +53,7 @@ CU_TestInfo bo_tests[] = { { "CPU map/unmap", amdgpu_bo_map_unmap }, { "Memory alloc Test", amdgpu_memory_alloc }, { "Memory fail alloc Test", amdgpu_mem_fail_alloc }, + { "Find bo by CPU mapping", amdgpu_bo_find_by_cpu_mapping }, CU_TEST_INFO_NULL, };
@@ -262,3 +265,33 @@ static void amdgpu_mem_fail_alloc(void)CU_ASSERT_EQUAL (r,0 ); } } + +static void amdgpu_bo_find_by_cpu_mapping (void ) +{ +amdgpu_bo_handle bo_handle, find_bo_handle; +amdgpu_va_handle va_handle; +void *bo_cpu; +uint64_t bo_mc_address; +uint64_t offset; +int r; + + r =amdgpu_bo_alloc_and_map (device_handle,4096 ,4096 , +AMDGPU_GEM_DOMAIN_GTT ,0 , + &bo_handle, &bo_cpu, + &bo_mc_address, &va_handle); +CU_ASSERT_EQUAL (r,0 ); + + r =amdgpu_find_bo_by_cpu_mapping (device_handle, + bo_cpu, +4096 , + &find_bo_handle, + &offset); +CU_ASSERT_EQUAL (r,0 ); +CU_ASSERT_EQUAL (offset,0 ); +CU_ASSERT_EQUAL (bo_handle->handle, find_bo_handle->handle); + +atomic_dec (&find_bo_handle->refcount,1 ); + r =amdgpu_bo_unmap_and_free (bo_handle, va_handle, + bo_mc_address,4096 ); +CU_ASSERT_EQUAL (r,0 ); +}
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx