* [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2
@ 2017-07-18 3:57 Felix Kuehling
2017-07-18 3:57 ` [PATCH 2/2] drm/amdgpu: Implement ttm_bo_driver.access_memory callback v2 Felix Kuehling
[not found] ` <1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>
0 siblings, 2 replies; 4+ messages in thread
From: Felix Kuehling @ 2017-07-18 3:57 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: 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.
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
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 ++++++++++++++++++++++++++++++++++++++++-
include/drm/ttm/ttm_bo_driver.h | 17 +++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 9f53df9..945985e 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -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,
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 6bbd34d..04380ba 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -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);
};
/**
--
1.9.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu: Implement ttm_bo_driver.access_memory callback v2
2017-07-18 3:57 [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2 Felix Kuehling
@ 2017-07-18 3:57 ` Felix Kuehling
[not found] ` <1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>
1 sibling, 0 replies; 4+ messages in thread
From: Felix Kuehling @ 2017-07-18 3:57 UTC (permalink / raw)
To: dri-devel, amd-gfx; +Cc: Felix Kuehling
Allows gdb to access contents of user mode mapped VRAM BOs.
v2: return error for non-VRAM pools
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 62 +++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ff5614b..4d2a454 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -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)
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2
[not found] ` <1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>
@ 2017-07-18 14:14 ` Christian König
2017-07-18 14:21 ` Michel Dänzer
1 sibling, 0 replies; 4+ messages in thread
From: Christian König @ 2017-07-18 14:14 UTC (permalink / raw)
To: Felix Kuehling, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 18.07.2017 um 05:57 schrieb 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.
>
> 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
>
> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com> for both.
> ---
> drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 ++++++++++++++++++++++++++++++++++++++++-
> include/drm/ttm/ttm_bo_driver.h | 17 +++++++++
> 2 files changed, 95 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> index 9f53df9..945985e 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> @@ -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,
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 6bbd34d..04380ba 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -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);
> };
>
> /**
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2
[not found] ` <1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>
2017-07-18 14:14 ` [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2 Christian König
@ 2017-07-18 14:21 ` Michel Dänzer
1 sibling, 0 replies; 4+ messages in thread
From: Michel Dänzer @ 2017-07-18 14:21 UTC (permalink / raw)
To: Felix Kuehling
Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 17/07/17 11:57 PM, Felix Kuehling wrote:
> 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
>
> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-07-18 14:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-18 3:57 [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2 Felix Kuehling
2017-07-18 3:57 ` [PATCH 2/2] drm/amdgpu: Implement ttm_bo_driver.access_memory callback v2 Felix Kuehling
[not found] ` <1500350223-4913-1-git-send-email-Felix.Kuehling-5C7GfCeVMHo@public.gmane.org>
2017-07-18 14:14 ` [PATCH 1/2] drm/ttm: Implement vm_operations_struct.access v2 Christian König
2017-07-18 14:21 ` Michel Dänzer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).