drm/amdgpu: add new amdgpu_vm_bo_trace_cs() function
Subsystems (2)
PATCH 1/1 drm/amdgpu: add new amdgpu_vm_bo_trace_cs() function
This allows us to trace all VM ranges which should be valid inside a CS.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -0
@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)static int amdgpu_cs_submit (struct amdgpu_cs_parser *p,union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;
@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5 -0
@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30 -0
@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket) +{ +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm *
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1 -0
@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
Signature · 6 lines
2.14.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): 20180727145743.1855-1-christian.koenig-5C7GfCeVMHo@public.gmane.org
Andrey
Quoted 92 lines · Christian König
This allows us to trace all VM ranges which should be valid inside a CS.
Signed-off-by Christian König <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2
-0@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)static int amdgpu_cs_submit (struct amdgpu_cs_parser *p,union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5
-0@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30
-0@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket) +{ +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, · line 324
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-0@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Huang Rui
Reviewed-byQuoted 3 lines · Christian König
This allows us to trace all VM ranges which should be valid inside a CS.
Signed-off-by Christian König <[email protected]>
A bit curious, what kind of situation that we need trace all VM ranges during the command submission?
Thanks,
Ray
Quoted 103 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2
-0@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)static int amdgpu_cs_submit (struct amdgpu_cs_parser *p,union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5
-0@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30
-0@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket) +{ +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-0@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,Signature · 6 lines
2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Grodzovsky, Andrey
Reviewed-by Huang RuiWhen VM fault happens it helps verify a that a BO for the faulted VA wasn't omitted from the BO list for the CS.
Andrey
________________________________________
From: amd-gfx <[email protected]> on behalf of Huang Rui <[email protected]>
Sent: 29 July 2018 08:16:30
To: Christian König
Cc: Grodzovsky, Andrey; [email protected]
Subject: Re: [PATCH] drm/amdgpu: add new amdgpu_vm_bo_trace_cs() function
Quoted 3 lines · Christian König
This allows us to trace all VM ranges which should be valid inside a CS.
Signed-off-by Christian König <[email protected]>
A bit curious, what kind of situation that we need trace all VM ranges during the command submission?
Thanks,
Ray
Quoted 99 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2
-0@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)static int amdgpu_cs_submit (struct amdgpu_cs_parser *p,union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5
-0@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30
-0@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket) +{ +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-1@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size, --2.14.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): MWHPR12MB1453B883372FA69F8C436CF8EA280-Gy0DoCVfaSWZBIDmKHdw+wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Quoted 2 lines · Andrey
When VM fault happens it helps verify a that a BO for the faulted VA wasn't omitted from the BO list for the CS.
Good to know. Thanks, Andrey.
Ray
Quoted 121 lines
Andrey
________________________________________
From: amd-gfx <[email protected]> on behalf of Huang Rui <[email protected]>
Sent: 29 July 2018 08:16:30
To: Christian K?nig
Cc: Grodzovsky, Andrey; [email protected]
Subject: Re: [PATCH] drm/amdgpu: add newamdgpu_vm_bo_trace_cs()functionQuoted 3 lines · Christian K?nig
This allows us to trace all VM ranges which should be valid inside a CS.
Signed-off-by Christian K?nig <[email protected]>Reviewed-by Huang Rui <[email protected]>A bit curious, what kind of situation that we need trace all VM ranges during the command submission?
Thanks,
RayQuoted 99 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2
-0@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p)static int amdgpu_cs_submit (struct amdgpu_cs_parser *p,union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5
-0@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30
-0@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket) +{ +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm * drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +1
-1@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx *ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va); void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size, --2.14.1
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zhou, David(ChunMing)
Reviewed-by Chunming Zhou-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian K?nig
Sent: Friday, July 27, 2018 10:58 PM
To: [email protected]; Grodzovsky, Andrey <[email protected]>
Subject: [PATCH] drm/amdgpu: add new amdgpu_vm_bo_trace_cs() function
This allows us to trace all VM ranges which should be valid inside a CS.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 5 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 30 ++++++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 + 4 files changed, 38 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +2 -0
@@ -1220,6 +1220,7 @@ static void amdgpu_cs_post_dependencies(struct amdgpu_cs_parser *p) static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, union drm_amdgpu_cs *cs) { +struct amdgpu_fpriv *fpriv = p->filp->driver_priv;struct amdgpu_ring *ring = p->ring;struct drm_sched_entity *entity = &p->ctx->rings[ring->idx].entity;enum drm_sched_priority priority;
@@ -1272,6 +1273,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,amdgpu_job_free_resources (job);trace_amdgpu_cs_ioctl (job); +amdgpu_vm_bo_trace_cs (&fpriv->vm, &p->ticket); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity);
drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h +5 -0
@@ -314,6 +314,11 @@ DEFINE_EVENT(amdgpu_vm_mapping, amdgpu_vm_bo_mapping,TP_ARGS (mapping) ); +DEFINE_EVENT (amdgpu_vm_mapping, amdgpu_vm_bo_cs, + TP_PROTO(struct amdgpu_bo_va_mapping *mapping), +TP_ARGS (mapping) +); + TRACE_EVENT(amdgpu_vm_set_ptes, TP_PROTO(uint64_t pe, uint64_t addr, unsigned count, uint32_t incr, uint64_t flags),
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +30 -0
@@ -2343,6 +2343,36 @@ struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,return amdgpu_vm_it_iter_first (&vm->va, addr, addr); } +/** +* amdgpu_vm_bo_trace_cs - trace all reserved mappings +* +* @vm: the requested vm +* @ticket: CS ticket +* +* Trace all mappings of BOs reserved during a command submission. +*/ +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx +*ticket) { +struct amdgpu_bo_va_mapping *mapping; + +if (!trace_amdgpu_vm_bo_cs_enabled ()) +return ; + +for (mapping =amdgpu_vm_it_iter_first (&vm->va,0 ,U64_MAX ); mapping; + mapping =amdgpu_vm_it_iter_next (mapping,0 ,U64_MAX )) { +struct amdgpu_bo *bo; + +if (!mapping->bo_va || !mapping->bo_va->base.bo) +continue ; + + bo = mapping->bo_va->base.bo; +if (READ_ONCE (bo->tbo.resv->lock.ctx) != ticket) +continue ; + +trace_amdgpu_vm_bo_cs (mapping); + } +} +/** * amdgpu_vm_bo_rmv - remove a bo to a specific vm *
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +2 -0
@@ -318,6 +318,7 @@ int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev, uint64_t saddr, uint64_t size);struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping (struct amdgpu_vm *vm,uint64_t addr); +void amdgpu_vm_bo_trace_cs (struct amdgpu_vm *vm,struct ww_acquire_ctx +*ticket);void amdgpu_vm_bo_rmv (struct amdgpu_device *adev,struct amdgpu_bo_va *bo_va);
void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t vm_size,
--
2.14.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx