drm/i915: Clean up pinned bo capture
Subsystems (2)
PATCH 1/2 drm/i915: Clean up pinned bo capture
Somewhere between removing the pinned bo list and adding full ppgtt support we've started to no longer filter the active buffers out of the captured pinned buffers. I've tried to dig out exactly where but didn't spot it.
At first I've thought (checked, but without warning about it) array overrun. But we have the same issue when counting the pinned bo.
Still not pretty, so switch over to walking the inactive per-vm list, which will naturally filter out all active buffers.
v2: While at it only capture pinned bo for the global gtt, we don't care about them for real ppgtt (since only execbuf pins those, and only temporarily).
v3: Don't WARN_ON about overruns, this code is still racy. So just debug output instead.
--- drivers/gpu/drm/i915/i915_gpu_error.c | 43 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +20 -23
@@ -696,35 +696,33 @@ static u32 capture_active_bo(struct drm_i915_error_buffer *err,list_for_each_entry (vma, head, mm_list) {capture_bo (err++, vma); -if (++i == count) +if (++i == count) { +DRM_DEBUG ("Capture array overrun\n" );break ; + } }return i; }static u32 capture_pinned_bo (struct drm_i915_error_buffer *err, -int count,struct list_head *head, -struct i915_address_space *vm) +int count,struct list_head *head) { -struct drm_i915_gem_object *obj; -struct drm_i915_error_buffer *const first = err; -struct drm_i915_error_buffer *const last = err + count; - -list_for_each_entry (obj, head, global_list) { -struct i915_vma *vma; +struct i915_vma *vma; +int i =0 ; -if (err == last) +list_for_each_entry (vma, head, mm_list) { +if (vma->pin_count ==0 )break ; -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { -capture_bo (err++, vma); -break ; - } +capture_bo (err++, vma); +if (++i == count) { +DRM_DEBUG ("Capture array overrun\n" ); +break ; + } } -return err - first; +return i; }/* Generate a semi-unique error code. The code is not meant to have meaning, The
@@ -1085,7 +1083,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, const int ndx) {struct drm_i915_error_buffer *active_bo =NULL , *pinned_bo =NULL ; -struct drm_i915_gem_object *obj;struct i915_vma *vma;int i;
@@ -1094,12 +1091,12 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; error->active_bo_count[ndx] = i; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { - i++; +if (i915_is_ggtt (vm)) { +list_for_each_entry (vma, &vm->inactive_list, mm_list) { +if (vma->pin_count ==0 )break ; - } + i++; + } } error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];
@@ -1119,7 +1116,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, error->pinned_bo_count[ndx] =capture_pinned_bo (pinned_bo, error->pinned_bo_count[ndx], - &dev_priv->mm.bound_list, vm); + &vm->inactive_list); error->active_bo[ndx] = active_bo; error->pinned_bo[ndx] = pinned_bo; }
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Don't capture pinned bo separately
We only care about pinned bo in the global ggtt, so simplify the logic a bit. Since we don't yet capture any per-vm state the pretty-printing isn't too pretty.
v2: git add to make it build ...
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++++------------------- 2 files changed, 6 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -2
@@ -450,9 +450,9 @@ struct drm_i915_error_state { u32 userptr:1; s32 ring:4; u32 cache_level:3; - } **active_bo, **pinned_bo; + } **active_bo; -u32 *active_bo_count, *pinned_bo_count; +u32 *active_bo_count;u32 vm_count; };
drivers/gpu/drm/i915/i915_gpu_error.c +4 -19
@@ -398,13 +398,9 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,for (i =0 ; i < error->vm_count; i++) {err_printf (m,"vm[%d]\n" , i); -print_error_buffers (m,"Active" , +print_error_buffers (m,"Active (+ pinned for ggtt)" , error->active_bo[i], error->active_bo_count[i]); - -print_error_buffers (m,"Pinned" , - error->pinned_bo[i], - error->pinned_bo_count[i]); }for (i =0 ; i <ARRAY_SIZE (error->ring); i++) {
@@ -1098,7 +1094,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; } } - error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];if (i) { active_bo =kcalloc (i,sizeof (*active_bo),GFP_ATOMIC );
@@ -1113,12 +1108,11 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, &vm->active_list);if (pinned_bo) - error->pinned_bo_count[ndx] = + error->active_bo_count[ndx] +=capture_pinned_bo (pinned_bo, - error->pinned_bo_count[ndx], + i - error->active_bo_count[ndx], &vm->inactive_list); error->active_bo[ndx] = active_bo; - error->pinned_bo[ndx] = pinned_bo; } static void i915_gem_capture_buffers(struct drm_i915_private *dev_priv,
@@ -1131,25 +1125,16 @@ static void i915_gem_capture_buffers(struct drm_i915_private *dev_priv, cnt++; error->active_bo =kcalloc (cnt,sizeof (*error->active_bo),GFP_ATOMIC ); - error->pinned_bo =kcalloc (cnt,sizeof (*error->pinned_bo),GFP_ATOMIC ); error->active_bo_count =kcalloc (cnt,sizeof (*error->active_bo_count),GFP_ATOMIC ); - error->pinned_bo_count =kcalloc (cnt,sizeof (*error->pinned_bo_count), -GFP_ATOMIC );if (error->active_bo ==NULL || - error->pinned_bo ==NULL || - error->active_bo_count ==NULL || - error->pinned_bo_count ==NULL ) { + error->active_bo_count ==NULL ) {kfree (error->active_bo);kfree (error->active_bo_count); -kfree (error->pinned_bo); -kfree (error->pinned_bo_count); error->active_bo =NULL ; error->active_bo_count =NULL ; - error->pinned_bo =NULL ; - error->pinned_bo_count =NULL ; }else {list_for_each_entry (vm, &dev_priv->vm_list, global_link)i915_gem_capture_vm (dev_priv, error, vm, i++);
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Don't capture pinned bo separately
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -2 364/364 362/364 ILK +1 365/366 366/366 SNB 450/450 450/450 IVB 498/498 498/498 BYT 289/289 289/289 HSW 564/564 564/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *PNV igt_gem_fence_thrash_bo-write-verify-x PASS(2, M25M23) NO_RESULT(1, M23) *PNV igt_gem_tiled_partial_pwrite_pread_writes-after-reads PASS(2, M25M23) NO_RESULT(1, M23) ILK igt_kms_flip_wf_vblank-ts-check DMESG_WARN(2, M26)PASS(11, M26M37) PASS(1, M37)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Daniel Vetter
/* Generate a semi-unique error code. The code is not meant to have meaning, The
drivers/gpu/drm/i915/i915_gpu_error.c +5
-6@@ -1085,7 +1083,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, const int ndx) {struct drm_i915_error_buffer *active_bo =NULL , *pinned_bo =NULL ; -struct drm_i915_gem_object *obj;struct i915_vma *vma;int i;@@ -1094,12 +1091,12 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; error->active_bo_count[ndx] = i; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { - i++; +if (i915_is_ggtt (vm)) { +list_for_each_entry (vma, &vm->inactive_list, mm_list) { +if (vma->pin_count ==0 )break ; - } + i++; + } } error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, · line 1119
Quoted 5 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-1@@ -1119,7 +1116,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, error->pinned_bo_count[ndx] =capture_pinned_bo (pinned_bo, error->pinned_bo_count[ndx], - &dev_priv->mm.bound_list, vm); + &vm->inactive_list);
I much prefer this to be an iteraction over the bound_list and check if the object has a ggtt bound vma. Combined with the request to only print out the pinned bo in the GGTT, it becomes much clearer and doesn't need to result in the confusing "active + pinned for GGTT". -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Chris Wilson
Quoted 27 lines · Daniel Vetter
/* Generate a semi-unique error code. The code is not meant to have meaning, The
drivers/gpu/drm/i915/i915_gpu_error.c +5
-6@@ -1085,7 +1083,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, const int ndx) {struct drm_i915_error_buffer *active_bo =NULL , *pinned_bo =NULL ; -struct drm_i915_gem_object *obj;struct i915_vma *vma;int i;@@ -1094,12 +1091,12 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; error->active_bo_count[ndx] = i; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { - i++; +if (i915_is_ggtt (vm)) { +list_for_each_entry (vma, &vm->inactive_list, mm_list) { +if (vma->pin_count ==0 )break ; - } + i++; + } } error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];
Quoted 11 lines
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, · line 1119
Quoted 6 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-1@@ -1119,7 +1116,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, error->pinned_bo_count[ndx] =capture_pinned_bo (pinned_bo, error->pinned_bo_count[ndx], - &dev_priv->mm.bound_list, vm); + &vm->inactive_list);I much prefer this to be an iteraction over the
bound_listand check if the object has a ggtt bound vma. Combined with the request to only print out the pinned bo in the GGTT, it becomes much clearer and doesn't need to result in the confusing "active + pinned for GGTT".
We do still want to dump active objects for the GGTT, e.g. shadow batch (well we probably should add the GGTT vm to the dumper ...) and definitely when full ppgtt isn't enabled (i.e. everything).
And if we dump the active list then I think we should scan only the inactive list for pinned bo to avoid duplicate listing. -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 41 lines · Daniel Vetter
Quoted 28 lines · Chris Wilson
Quoted 27 lines · Daniel Vetter
/* Generate a semi-unique error code. The code is not meant to have meaning, The
drivers/gpu/drm/i915/i915_gpu_error.c +5
-6@@ -1085,7 +1083,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, const int ndx) {struct drm_i915_error_buffer *active_bo =NULL , *pinned_bo =NULL ; -struct drm_i915_gem_object *obj;struct i915_vma *vma;int i;@@ -1094,12 +1091,12 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; error->active_bo_count[ndx] = i; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { - i++; +if (i915_is_ggtt (vm)) { +list_for_each_entry (vma, &vm->inactive_list, mm_list) { +if (vma->pin_count ==0 )break ; - } + i++; + } } error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];Quoted 11 lines
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, · line 1119
Quoted 6 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-1@@ -1119,7 +1116,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, error->pinned_bo_count[ndx] =capture_pinned_bo (pinned_bo, error->pinned_bo_count[ndx], - &dev_priv->mm.bound_list, vm); + &vm->inactive_list);I much prefer this to be an iteraction over the
bound_listand check if the object has a ggtt bound vma. Combined with the request to only print out the pinned bo in the GGTT, it becomes much clearer and doesn't need to result in the confusing "active + pinned for GGTT".
Quoted 6 lines
We do still want to dump active objects for the GGTT, e.g. shadow batch (well we probably should add the GGTT vm to the dumper ...) and definitely when full ppgtt isn't enabled (i.e. everything).
And if we dump the active list then I think we should scan only the inactive list for pinned bo to avoid duplicate listing.
No. The pinned list includes the pinned active bo because it makes it easier for me when checking if the right objects are being pinned (I only have to crosscheck a single list rather than multiple). -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 46 lines · Chris Wilson
Quoted 45 lines · Daniel Vetter
Quoted 28 lines · Chris Wilson
Quoted 27 lines · Daniel Vetter
/* Generate a semi-unique error code. The code is not meant to have meaning, The
drivers/gpu/drm/i915/i915_gpu_error.c +5
-6@@ -1085,7 +1083,6 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, const int ndx) {struct drm_i915_error_buffer *active_bo =NULL , *pinned_bo =NULL ; -struct drm_i915_gem_object *obj;struct i915_vma *vma;int i;@@ -1094,12 +1091,12 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, i++; error->active_bo_count[ndx] = i; -list_for_each_entry (obj, &dev_priv->mm.bound_list, global_list) { -list_for_each_entry (vma, &obj->vma_list, vma_link) -if (vma->vm == vm && vma->pin_count >0 ) { - i++; +if (i915_is_ggtt (vm)) { +list_for_each_entry (vma, &vm->inactive_list, mm_list) { +if (vma->pin_count ==0 )break ; - } + i++; + } } error->pinned_bo_count[ndx] = i - error->active_bo_count[ndx];Quoted 11 lines
drivers/gpu/drm/i915/i915_gpu_error.c static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, · line 1119
Quoted 6 lines
drivers/gpu/drm/i915/i915_gpu_error.c +1
-1@@ -1119,7 +1116,7 @@ static void i915_gem_capture_vm(struct drm_i915_private *dev_priv, error->pinned_bo_count[ndx] =capture_pinned_bo (pinned_bo, error->pinned_bo_count[ndx], - &dev_priv->mm.bound_list, vm); + &vm->inactive_list);I much prefer this to be an iteraction over the
bound_listand check if the object has a ggtt bound vma. Combined with the request to only print out the pinned bo in the GGTT, it becomes much clearer and doesn't need to result in the confusing "active + pinned for GGTT".We do still want to dump active objects for the GGTT, e.g. shadow batch (well we probably should add the GGTT vm to the dumper ...) and definitely when full ppgtt isn't enabled (i.e. everything).
Quoted 6 lines
Quoted 2 lines
And if we dump the active list then I think we should scan only the inactive list for pinned bo to avoid duplicate listing.
No. The pinned list includes the pinned active bo because it makes it easier for me when checking if the right objects are being pinned (I only have to crosscheck a single list rather than multiple).
But I've thought the point of patch 2 was to long longer have that disdinction? Or why did you want to remove the separate pinned_bo list? Throughroughly confused over here now ..
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx