drm/ttm: Implement vm_operations_struct.access v2
Subsystems (4)
PATCH 1/2 drm/ttm: Implement vm_operations_struct.access v2
Allows gdb to access contents of user mode mapped BOs. System memory is handled by TTM using kmap. Other memory pools require a new driver callback in ttm_bo_driver.
v2:
* kmap only one page at a time
* swap in BO if needed
* make driver callback more generic to handle private memory pools
* document callback return value
* WARN_ON -> WARN_ON_ONCE
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 ++++++++++++++++++++++++++++++++++++++++- include/drm/ttm/ttm_bo_driver.h | 17 +++++++++ 2 files changed, 95 insertions(+), 1 deletion(-)
drivers/gpu/drm/ttm/ttm_bo_vm.c +78 -1
@@ -294,10 +294,87 @@ static void ttm_bo_vm_close(struct vm_area_struct *vma) vma->vm_private_data =NULL ; } +static int ttm_bo_vm_access_kmap (struct ttm_buffer_object *bo, +unsigned long offset, +void *buf,int len,int write) +{ +unsigned long page = offset >>PAGE_SHIFT ; +unsigned long bytes_left = len; +int ret; + +/* Copy a page at a time, that way no extra virtual address +* mapping is needed +*/ + offset -= page <<PAGE_SHIFT ; +do { +unsigned long bytes =min (bytes_left,PAGE_SIZE - offset); +struct ttm_bo_kmap_obj map; +void *ptr; +bool is_iomem; + + ret =ttm_bo_kmap (bo, page,1 , &map); +if (ret) +return ret; + + ptr = (uint8_t *)ttm_kmap_obj_virtual (&map, &is_iomem) + offset; +WARN_ON_ONCE (is_iomem); +if (write) +memcpy (ptr, buf, bytes); +else +memcpy (buf, ptr, bytes); +ttm_bo_kunmap (&map); + + page++; + bytes_left -= bytes; + offset =0 ; + }while (bytes_left); + +return len; +} + +static int ttm_bo_vm_access (struct vm_area_struct *vma,unsigned long addr, +void *buf,int len,int write) +{ +unsigned long offset = (addr) - vma->vm_start; +struct ttm_buffer_object *bo = vma->vm_private_data; +int ret; + +if (len <1 || (offset + len) >>PAGE_SHIFT > bo->num_pages) +return -EIO ; + + ret =ttm_bo_reserve (bo, true, false,NULL ); +if (ret) +return ret; + +switch (bo->mem.mem_type) { +case TTM_PL_SYSTEM : +if (unlikely (bo->ttm->page_flags &TTM_PAGE_FLAG_SWAPPED )) { + ret =ttm_tt_swapin (bo->ttm); +if (unlikely (ret !=0 )) +return ret; + } +/* fall through */ +case TTM_PL_TT : + ret =ttm_bo_vm_access_kmap (bo, offset, buf, len, write); +break ; +default : +if (bo->bdev->driver->access_memory) + ret = bo->bdev->driver->access_memory ( + bo, offset, buf, len, write); +else + ret = -EIO ; + } + +ttm_bo_unreserve (bo); + +return ret; +} +static const struct vm_operations_struct ttm_bo_vm_ops = { .fault = ttm_bo_vm_fault, .open = ttm_bo_vm_open, - .close = ttm_bo_vm_close + .close = ttm_bo_vm_close, + .access = ttm_bo_vm_access }; static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,
include/drm/ttm/ttm_bo_driver.h +17 -0
@@ -471,6 +471,23 @@ struct ttm_bo_driver {*/ unsigned long (*io_mem_pfn)(struct ttm_buffer_object *bo,unsigned long page_offset); + +/** +* Read/write memory buffers for ptrace access +* +* @bo: the BO to access +* @offset: the offset from the start of the BO +* @buf: pointer to source/destination buffer +* @len: number of bytes to copy +* @write: whether to read (0) from or write (non-0) to BO +* +* If successful, this function should return the number of +* bytes copied, -EIO otherwise. If the number of bytes +* returned is < len, the function may be called again with +* the remainder of the buffer to copy. +*/ +int (*access_memory)(struct ttm_buffer_object *bo,unsigned long offset, +void *buf,int len,int write); };/**
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: Implement ttm_bo_driver.access_memory callback v2
Allows gdb to access contents of user mode mapped VRAM BOs.
v2: return error for non-VRAM pools
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +62 -0
@@ -1115,6 +1115,67 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo,return ttm_bo_eviction_valuable (bo, place); } +static int amdgpu_ttm_access_memory (struct ttm_buffer_object *bo, +unsigned long offset, +void *buf,int len,int write) +{ + struct amdgpu_bo *abo = container_of(bo, struct amdgpu_bo, tbo); +struct amdgpu_device *adev =amdgpu_ttm_adev (abo->tbo.bdev); +struct drm_mm_node *nodes = abo->tbo.mem.mm_node; +uint32_t value =0 ; +int ret =0 ; +uint64_t pos; +unsigned long flags; + +if (bo->mem.mem_type !=TTM_PL_VRAM ) +return -EIO ; + +while (offset >= (nodes->size <<PAGE_SHIFT )) { + offset -= nodes->size <<PAGE_SHIFT ; + ++nodes; + } + pos = (nodes->start <<PAGE_SHIFT ) + offset; + +while (len && pos < adev->mc.mc_vram_size) { +uint64_t aligned_pos = pos & ~(uint64_t )3 ; +uint32_t bytes =4 - (pos &3 ); +uint32_t shift = (pos &3 ) *8 ; +uint32_t mask =0xffffffff << shift; + +if (len < bytes) { + mask &=0xffffffff >> (bytes - len) *8 ; + bytes = len; + } + +spin_lock_irqsave (&adev->mmio_idx_lock, flags); +WREG32 (mmMM_INDEX, ((uint32_t )aligned_pos) |0x80000000 ); +WREG32 (mmMM_INDEX_HI, aligned_pos >>31 ); +if (!write || mask !=0xffffffff ) + value =RREG32 (mmMM_DATA); +if (write) { + value &= ~mask; + value |= (*(uint32_t *)buf << shift) & mask; +WREG32 (mmMM_DATA, value); + } +spin_unlock_irqrestore (&adev->mmio_idx_lock, flags); +if (!write) { + value = (value & mask) >> shift; +memcpy (buf, &value, bytes); + } + + ret += bytes; + buf = (uint8_t *)buf + bytes; + pos += bytes; + len -= bytes; +if (pos >= (nodes->start + nodes->size) <<PAGE_SHIFT ) { + ++nodes; + pos = (nodes->start <<PAGE_SHIFT ); + } + } + +return ret; +} +static struct ttm_bo_driver amdgpu_bo_driver = { .ttm_tt_create = &amdgpu_ttm_tt_create, .ttm_tt_populate = &amdgpu_ttm_tt_populate,
@@ -1130,6 +1191,7 @@ static bool amdgpu_ttm_bo_eviction_valuable(struct ttm_buffer_object *bo, .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, .io_mem_free = &amdgpu_ttm_io_mem_free, .io_mem_pfn = amdgpu_ttm_io_mem_pfn, + .access_memory = &amdgpu_ttm_access_memory };int amdgpu_ttm_init (struct amdgpu_device *adev)
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): 1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 18.07.2017 um 05:57 schrieb Felix Kuehling:
Quoted 4 lines
Allows gdb to access contents of user mode mapped BOs. System memory is handled by TTM using kmap. Other memory pools require a new driver callback in
ttm_bo_driver.
Quoted 8 lines
v2:
* kmap only one page at a time
* swap in BO if needed
* make driver callback more generic to handle private memory pools
* document callback return value
*WARN_ON->WARN_ON_ONCESigned-off-by Felix Kuehling <[email protected]>
Quoted 116 lines
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 ++++++++++++++++++++++++++++++++++++++++- include/drm/ttm/ttm_bo_driver.h | 17 +++++++++ 2 files changed, 95 insertions(+), 1 deletion(-)drivers/gpu/drm/ttm/ttm_bo_vm.c +78
-1@@ -294,10 +294,87 @@ static void ttm_bo_vm_close(struct vm_area_struct *vma) vma->vm_private_data =NULL ; } +static int ttm_bo_vm_access_kmap (struct ttm_buffer_object *bo, +unsigned long offset, +void *buf,int len,int write) +{ +unsigned long page = offset >>PAGE_SHIFT ; +unsigned long bytes_left = len; +int ret; + +/* Copy a page at a time, that way no extra virtual address +* mapping is needed +*/ + offset -= page <<PAGE_SHIFT ; +do { +unsigned long bytes =min (bytes_left,PAGE_SIZE - offset); +struct ttm_bo_kmap_obj map; +void *ptr; +bool is_iomem; + + ret =ttm_bo_kmap (bo, page,1 , &map); +if (ret) +return ret; + + ptr = (uint8_t *)ttm_kmap_obj_virtual (&map, &is_iomem) + offset; +WARN_ON_ONCE (is_iomem); +if (write) +memcpy (ptr, buf, bytes); +else +memcpy (buf, ptr, bytes); +ttm_bo_kunmap (&map); + + page++; + bytes_left -= bytes; + offset =0 ; + }while (bytes_left); + +return len; +} + +static int ttm_bo_vm_access (struct vm_area_struct *vma,unsigned long addr, +void *buf,int len,int write) +{ +unsigned long offset = (addr) - vma->vm_start; +struct ttm_buffer_object *bo = vma->vm_private_data; +int ret; + +if (len <1 || (offset + len) >>PAGE_SHIFT > bo->num_pages) +return -EIO ; + + ret =ttm_bo_reserve (bo, true, false,NULL ); +if (ret) +return ret; + +switch (bo->mem.mem_type) { +case TTM_PL_SYSTEM : +if (unlikely (bo->ttm->page_flags &TTM_PAGE_FLAG_SWAPPED )) { + ret =ttm_tt_swapin (bo->ttm); +if (unlikely (ret !=0 )) +return ret; + } +/* fall through */ +case TTM_PL_TT : + ret =ttm_bo_vm_access_kmap (bo, offset, buf, len, write); +break ; +default : +if (bo->bdev->driver->access_memory) + ret = bo->bdev->driver->access_memory ( + bo, offset, buf, len, write); +else + ret = -EIO ; + } + +ttm_bo_unreserve (bo); + +return ret; +} +static const struct vm_operations_struct ttm_bo_vm_ops = { .fault = ttm_bo_vm_fault, .open = ttm_bo_vm_open, - .close = ttm_bo_vm_close + .close = ttm_bo_vm_close, + .access = ttm_bo_vm_access }; static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,include/drm/ttm/ttm_bo_driver.h +10
-0@@ -471,6 +471,23 @@ struct ttm_bo_driver {*/ unsigned long (*io_mem_pfn)(struct ttm_buffer_object *bo,unsigned long page_offset); + +/** +* Read/write memory buffers for ptrace access +* +* @bo: the BO to access +* @offset: the offset from the start of the BO +* @buf: pointer to source/destination buffer +* @len: number of bytes to copy +* @write: whether to read (0) from or write (non-0) to BO +*
include/drm/ttm/ttm_bo_driver.h struct ttm_bo_driver { · line 493
Quoted 10 lines
include/drm/ttm/ttm_bo_driver.h +7
-0+* If successful, this function should return the number of +* bytes copied, -EIO otherwise. If the number of bytes +* returned is < len, the function may be called again with +* the remainder of the buffer to copy. +*/ +int (*access_memory)(struct ttm_buffer_object *bo,unsigned long offset, +void *buf,int len,int write); };/**
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Michel Dänzer
Reviewed-byQuoted 4 lines · Felix Kuehling
Allows gdb to access contents of user mode mapped BOs. System memory is handled by TTM using kmap. Other memory pools require a new driver callback in
ttm_bo_driver.
Quoted 8 lines
v2:
* kmap only one page at a time
* swap in BO if needed
* make driver callback more generic to handle private memory pools
* document callback return value
*WARN_ON->WARN_ON_ONCESigned-off-by Felix Kuehling <[email protected]>
Signature · 6 lines
Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx