drm/i915: Remove short term pins from execbuf by requiring lock to unbind.
Subsystems (4)
v4 cover drm/i915: Remove short term pins from execbuf by requiring lock to unbind.
Previously, short term pinning in execbuf was required because i915_vma was effectively independent from objects, and has its own refcount, locking, lifetime rules and pinning.
This series removes the separate locking, by requiring vma->obj->resv to be held when pinning and unbinding. This will also be required for VM_BIND work. Some patches have already been merged, but this contains the mremainder of the conversion.
With pinning required for pinning and unbinding, the lock is enough to prevent unbinding when trying to pin with the lock held, for example in execbuf.
This makes binding/unbinding similar to ttm_bo_validate()'s use, which just cares that an object is in a certain place, without pinning it in place.
Having the VMA part of gem bo removes a lot of the vma refcounting, and makes i915_vma more a part of the bo, instead of its own floating object that just happens to be part of a bo. This is also required to make it more compatible with TTM, and migration in general.
For future work, it makes things a lot simpler and clear. We want to end up with i915_vma just being a specific mapping of the BO, just like is the case in other drivers. i915_vma->active removal is the next step there, and makes it when object is destroyed, the bindings are destroyed (after idle), instead of object being destroyed when bindings are idle.
Maarten Lankhorst (7):
drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC
errors, v2.
drm/i915: Add locking to i915_gem_evict_vm()
drm/i915: Add object locking to i915_gem_evict_for_node and
i915_gem_evict_something
drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for
i915_vma_unbind, v2. drm/i915: Remove assert_object_held_shared drm/i915: Remove support for unlocked i915_vma unbind drm/i915: Remove short-term pins from execbuf, v6.
drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 220 +++++++++--------- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 17 +- drivers/gpu/drm/i915/gem/i915_gem_object.c | 4 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 14 -- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 +- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 6 + drivers/gpu/drm/i915/gt/intel_ggtt.c | 51 +++- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 - drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 5 +- drivers/gpu/drm/i915/i915_gem.c | 2 + drivers/gpu/drm/i915/i915_gem_evict.c | 64 ++++- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.h | 4 + drivers/gpu/drm/i915/i915_vgpu.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 122 +++++----- drivers/gpu/drm/i915/i915_vma.h | 1 + .../gpu/drm/i915/selftests/i915_gem_evict.c | 27 ++- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 36 +-- drivers/gpu/drm/i915/selftests/i915_vma.c | 8 +- 25 files changed, 361 insertions(+), 253 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/7 drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors, v2.
Now that we cannot unbind kill the currently locked object directly because we're removing short term pinning, we may have to unbind the object from gtt manually, using a i915_gem_evict_vm() call.
Changes since v1:
- Remove -ENOSPC warning, can still happen with concurrent mmaps where we can't unbind the other mmap because of the lock held. This fixes the gem_mmap_gtt@cpuset tests.
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +15 -2
@@ -358,8 +358,21 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf) vma =i915_gem_object_ggtt_pin_ww (obj, &ww, &view,0 ,0 , flags); } -/* The entire mappable GGTT is pinned? Unexpected! */ -GEM_BUG_ON (vma ==ERR_PTR (-ENOSPC )); +/* +* The entire mappable GGTT is pinned? Unexpected! +* Try to evict the object we locked too, as normally we skip it +* due to lack of short term pinning inside execbuf. +*/ +if (vma ==ERR_PTR (-ENOSPC )) { + ret =mutex_lock_interruptible (&ggtt->vm.mutex); +if (!ret) { + ret =i915_gem_evict_vm (&ggtt->vm); +mutex_unlock (&ggtt->vm.mutex); + } +if (ret) + goto err_reset; + vma =i915_gem_object_ggtt_pin_ww (obj, &ww, &view,0 ,0 , flags); + } }if (IS_ERR (vma)) { ret =PTR_ERR (vma);
Signature · 1 line
2.34.1
PATCH v4 2/7 drm/i915: Add locking to i915_gem_evict_vm()
In reply to Maarten Lankhorsti915_gem_evict_vm will need to be able to evict objects that are locked by the current ctx. By testing if the current context already locked the object, we can do this correctly. This allows us to evict the entire vm even if we already hold some objects' locks.
Previously, this was spread over several commits, but it makes more sense to commit the changes to i915_gem_evict_vm separately from the changes to i915_gem_evict_something() and i915_gem_evict_for_node().
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_evict.c | 30 +++++++++++++++++-- drivers/gpu/drm/i915/i915_vma.c | 7 ++++- .../gpu/drm/i915/selftests/i915_gem_evict.c | 10 +++++-- 6 files changed, 46 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -1
@@ -766,7 +766,7 @@ static int eb_reserve(struct i915_execbuffer *eb)case 1 :/* Too fragmented, unbind everything and retry */ mutex_lock (&eb->context->vm->mutex); - err =i915_gem_evict_vm (eb->context->vm); + err =i915_gem_evict_vm (eb->context->vm, &eb->ww);mutex_unlock (&eb->context->vm->mutex);if (err)return err;
drivers/gpu/drm/i915/gem/i915_gem_mman.c +1 -1
@@ -366,7 +366,7 @@ static vm_fault_t vm_fault_gtt(struct vm_fault *vmf)if (vma ==ERR_PTR (-ENOSPC )) { ret =mutex_lock_interruptible (&ggtt->vm.mutex);if (!ret) { - ret =i915_gem_evict_vm (&ggtt->vm); + ret =i915_gem_evict_vm (&ggtt->vm, &ww);mutex_unlock (&ggtt->vm.mutex); }if (ret)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -1729,7 +1729,8 @@ int __must_check i915_gem_evict_something(struct i915_address_space *vm,int __must_check i915_gem_evict_for_node (struct i915_address_space *vm,struct drm_mm_node *node,unsigned int flags); -int i915_gem_evict_vm (struct i915_address_space *vm); +int i915_gem_evict_vm (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww);/* i915_gem_internal.c */ struct drm_i915_gem_object *
drivers/gpu/drm/i915/i915_gem_evict.c +28 -2
@@ -367,7 +367,7 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,* To clarify: This is for freeing up virtual address space, not for freeing * memory in e.g. the shrinker. */ -int i915_gem_evict_vm (struct i915_address_space *vm) +int i915_gem_evict_vm (struct i915_address_space *vm,struct i915_gem_ww_ctx *ww) {int ret =0 ;
@@ -388,24 +388,50 @@ int i915_gem_evict_vm(struct i915_address_space *vm)do {struct i915_vma *vma, *vn;LIST_HEAD (eviction_list); +LIST_HEAD (locked_eviction_list);list_for_each_entry (vma, &vm->bound_list, vm_link) {if (i915_vma_is_pinned (vma))continue ; +/* +* If we already own the lock, trylock fails. In case the resv +* is shared among multiple objects, we still need the object ref. +*/ +if (ww && (dma_resv_locking_ctx (vma->obj->base.resv) == &ww->ctx)) { +__i915_vma_pin (vma); +list_add (&vma->evict_link, &locked_eviction_list); +continue ; + } + +if (!i915_gem_object_trylock (vma->obj, ww)) +continue ; +__i915_vma_pin (vma);list_add (&vma->evict_link, &eviction_list); } -if (list_empty (&eviction_list)) +if (list_empty (&eviction_list) &&list_empty (&locked_eviction_list))break ; ret =0 ; +/* Unbind locked objects first, before unlocking the eviction_list */ +list_for_each_entry_safe (vma, vn, &locked_eviction_list, evict_link) { +__i915_vma_unpin (vma); + +if (ret ==0 ) + ret =__i915_vma_unbind (vma); +if (ret != -EINTR )/* "Get me out of here!" */ + ret =0 ; + } +list_for_each_entry_safe (vma, vn, &eviction_list, evict_link) {__i915_vma_unpin (vma);if (ret ==0 ) ret =__i915_vma_unbind (vma);if (ret != -EINTR )/* "Get me out of here!" */ ret =0 ; + +i915_gem_object_unlock (vma->obj); } }while (ret ==0 );
drivers/gpu/drm/i915/i915_vma.c +6 -1
@@ -1463,7 +1463,12 @@ static int __i915_ggtt_pin(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,/* Unlike i915_vma_pin, we don't take no for an answer! */ flush_idle_contexts (vm->gt);if (mutex_lock_interruptible (&vm->mutex) ==0 ) { -i915_gem_evict_vm (vm); +/* +* We pass NULL ww here, as we don't want to unbind +* locked objects when called from execbuf when pinning +* is removed. This would probably regress badly. +*/ +i915_gem_evict_vm (vm,NULL );mutex_unlock (&vm->mutex); } }while (1 );
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +8 -2
@@ -331,6 +331,7 @@ static int igt_evict_vm(void *arg) {struct intel_gt *gt = arg;struct i915_ggtt *ggtt = gt->ggtt; +struct i915_gem_ww_ctx ww;LIST_HEAD (objects);int err;
@@ -342,7 +343,7 @@ static int igt_evict_vm(void *arg)/* Everything is pinned, nothing should happen */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_vm (&ggtt->vm); + err =i915_gem_evict_vm (&ggtt->vm,NULL );mutex_unlock (&ggtt->vm.mutex);if (err) { pr_err("i915_gem_evict_vm on a full GGTT returned err=%d]\n",
@@ -352,9 +353,14 @@ static int igt_evict_vm(void *arg)unpin_ggtt (ggtt); +i915_gem_ww_ctx_init (&ww, false);mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_vm (&ggtt->vm); + err =i915_gem_evict_vm (&ggtt->vm, &ww);mutex_unlock (&ggtt->vm.mutex); + +/* no -EDEADLK handling; can't happen with vm.mutex in place */ +i915_gem_ww_ctx_fini (&ww); +if (err) {pr_err ("i915_gem_evict_vm on a full GGTT returned err=%d]\n" , err);
Signature · 1 line
2.34.1
PATCH v4 3/7 drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something
In reply to Maarten LankhorstBecause we will start to require the obj->resv lock for unbinding, ensure these shrinker functions also take the lock.
This requires some function signature changes, to ensure that the ww context is passed around, but is mostly straightforward.
Previously this was split up into several patches, but reworking should allow for easier bisection.
--- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- drivers/gpu/drm/i915/gvt/aperture_gm.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 ++ drivers/gpu/drm/i915/i915_gem_evict.c | 34 +++++++++++++++---- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +++-- drivers/gpu/drm/i915/i915_gem_gtt.h | 3 ++ drivers/gpu/drm/i915/i915_vgpu.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 9 ++--- .../gpu/drm/i915/selftests/i915_gem_evict.c | 17 +++++----- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 14 ++++---- 11 files changed, 63 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/gt/intel_ggtt.c +1 -1
@@ -504,7 +504,7 @@ static int ggtt_reserve_guc_top(struct i915_ggtt *ggtt)GEM_BUG_ON (ggtt->vm.total <=GUC_GGTT_TOP ); size = ggtt->vm.total -GUC_GGTT_TOP ; - ret =i915_gem_gtt_reserve (&ggtt->vm, &ggtt->uc_fw, size, + ret =i915_gem_gtt_reserve (&ggtt->vm,NULL , &ggtt->uc_fw, size,GUC_GGTT_TOP ,I915_COLOR_UNEVICTABLE ,PIN_NOEVICT );if (ret)
drivers/gpu/drm/i915/gt/selftest_hangcheck.c +1 -1
@@ -1382,7 +1382,7 @@ static int evict_vma(void *data)complete (&arg->completion);mutex_lock (&vm->mutex); - err =i915_gem_evict_for_node (vm, &evict,0 ); + err =i915_gem_evict_for_node (vm,NULL , &evict,0 );mutex_unlock (&vm->mutex);return err;
drivers/gpu/drm/i915/gvt/aperture_gm.c +1 -1
@@ -63,7 +63,7 @@ static int alloc_gm(struct intel_vgpu *vgpu, bool high_gm)mutex_lock (>->ggtt->vm.mutex);mmio_hw_access_pre (gt); - ret =i915_gem_gtt_insert (>->ggtt->vm, node, + ret =i915_gem_gtt_insert (>->ggtt->vm,NULL , node, size,I915_GTT_PAGE_SIZE ,I915_COLOR_UNEVICTABLE , start, end, flags);
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1722,11 +1722,13 @@ i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)/* i915_gem_evict.c */ int __must_check i915_gem_evict_something (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,u64 min_size,u64 alignment,unsigned long color,u64 start,u64 end,unsigned flags);int __must_check i915_gem_evict_for_node (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,unsigned int flags); int i915_gem_evict_vm(struct i915_address_space *vm,
drivers/gpu/drm/i915/i915_gem_evict.c +28 -6
@@ -51,6 +51,7 @@ static int ggtt_flush(struct intel_gt *gt)static bool mark_free (struct drm_mm_scan *scan, +struct i915_gem_ww_ctx *ww,struct i915_vma *vma,unsigned int flags,struct list_head *unwind)
@@ -58,6 +59,9 @@ mark_free(struct drm_mm_scan *scan,if (i915_vma_is_pinned (vma))return false; +if (!i915_gem_object_trylock (vma->obj, ww)) +return false; +list_add (&vma->evict_link, unwind);return drm_mm_scan_add_block (scan, &vma->node); }
@@ -98,6 +102,7 @@ static bool defer_evict(struct i915_vma *vma)*/ int i915_gem_evict_something(struct i915_address_space *vm, + struct i915_gem_ww_ctx *ww, u64 min_size, u64 alignment, unsigned long color, u64 start, u64 end,
@@ -170,7 +175,7 @@ i915_gem_evict_something(struct i915_address_space *vm,continue ; } -if (mark_free (&scan, vma, flags, &eviction_list)) +if (mark_free (&scan, ww, vma, flags, &eviction_list)) goto found; }
@@ -178,6 +183,7 @@ i915_gem_evict_something(struct i915_address_space *vm,list_for_each_entry_safe (vma, next, &eviction_list, evict_link) { ret =drm_mm_scan_remove_block (&scan, &vma->node);BUG_ON (ret); +i915_gem_object_unlock (vma->obj); }/*
@@ -222,10 +228,12 @@ i915_gem_evict_something(struct i915_address_space *vm,* of any of our objects, thus corrupting the list). */ list_for_each_entry_safe (vma, next, &eviction_list, evict_link) { -if (drm_mm_scan_remove_block (&scan, &vma->node)) +if (drm_mm_scan_remove_block (&scan, &vma->node)) {__i915_vma_pin (vma); -else + }else {list_del (&vma->evict_link); +i915_gem_object_unlock (vma->obj); + } }/* Unbinding will emit any required flushes */
@@ -234,16 +242,22 @@ i915_gem_evict_something(struct i915_address_space *vm,__i915_vma_unpin (vma);if (ret ==0 ) ret =__i915_vma_unbind (vma); + +i915_gem_object_unlock (vma->obj); }while (ret ==0 && (node =drm_mm_scan_color_evict (&scan))) { vma = container_of(node, struct i915_vma, node); +/* If we find any non-objects (!vma), we cannot evict them */ -if (vma->node.color !=I915_COLOR_UNEVICTABLE ) +if (vma->node.color !=I915_COLOR_UNEVICTABLE && +i915_gem_object_trylock (vma->obj, ww)) { ret =__i915_vma_unbind (vma); -else - ret = -ENOSPC ;/* XXX search failed, try again? */ +i915_gem_object_unlock (vma->obj); + }else { + ret = -ENOSPC ; + } }return ret;
@@ -261,6 +275,7 @@ i915_gem_evict_something(struct i915_address_space *vm,* memory in e.g. the shrinker. */ int i915_gem_evict_for_node (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *target,unsigned int flags) {
@@ -333,6 +348,11 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,break ; } +if (!i915_gem_object_trylock (vma->obj, ww)) { + ret = -ENOSPC ; +break ; + } +/* * Never show fear in the face of dragons! *
@@ -350,6 +370,8 @@ int i915_gem_evict_for_node(struct i915_address_space *vm,__i915_vma_unpin (vma);if (ret ==0 ) ret =__i915_vma_unbind (vma); + +i915_gem_object_unlock (vma->obj); }return ret;
drivers/gpu/drm/i915/i915_gem_gtt.c +5 -3
@@ -93,6 +93,7 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj,* asked to wait for eviction and interrupted. */ int i915_gem_gtt_reserve (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,u64 size,u64 offset,unsigned long color,unsigned int flags)
@@ -117,7 +118,7 @@ int i915_gem_gtt_reserve(struct i915_address_space *vm,if (flags &PIN_NOEVICT )return -ENOSPC ; - err =i915_gem_evict_for_node (vm, node, flags); + err =i915_gem_evict_for_node (vm, ww, node, flags);if (err ==0 ) err =drm_mm_reserve_node (&vm->mm, node);
@@ -184,6 +185,7 @@ static u64 random_offset(u64 start, u64 end, u64 len, u64 align)* asked to wait for eviction and interrupted. */ int i915_gem_gtt_insert (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,u64 size,u64 alignment,unsigned long color,u64 start,u64 end,unsigned int flags)
@@ -269,7 +271,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,*/ offset =random_offset (start, end, size, alignment ?:I915_GTT_MIN_ALIGNMENT ); - err =i915_gem_gtt_reserve (vm, node, size, offset, color, flags); + err =i915_gem_gtt_reserve (vm, ww, node, size, offset, color, flags);if (err != -ENOSPC )return err;
@@ -277,7 +279,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,return -ENOSPC ;/* Randomly selected placement is pinned, do a search */ - err =i915_gem_evict_something (vm, size, alignment, color, + err =i915_gem_evict_something (vm, ww, size, alignment, color, start, end, flags);if (err)return err;
drivers/gpu/drm/i915/i915_gem_gtt.h +3 -0
@@ -16,6 +16,7 @@struct drm_i915_gem_object ;struct i915_address_space ; +struct i915_gem_ww_ctx ;int __must_check i915_gem_gtt_prepare_pages (struct drm_i915_gem_object *obj,struct sg_table *pages);
@@ -23,11 +24,13 @@ void i915_gem_gtt_finish_pages(struct drm_i915_gem_object *obj, struct sg_table *pages);int i915_gem_gtt_reserve (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,u64 size,u64 offset,unsigned long color,unsigned int flags);int i915_gem_gtt_insert (struct i915_address_space *vm, +struct i915_gem_ww_ctx *ww,struct drm_mm_node *node,u64 size,u64 alignment,unsigned long color,u64 start,u64 end,unsigned int flags);
drivers/gpu/drm/i915/i915_vgpu.c +1 -1
@@ -197,7 +197,7 @@ static int vgt_balloon_space(struct i915_ggtt *ggtt,drm_info (&dev_priv->drm,"balloon space: range [ 0x%lx - 0x%lx ] %lu KiB.\n" , start, end, size /1024 ); - ret =i915_gem_gtt_reserve (&ggtt->vm, node, + ret =i915_gem_gtt_reserve (&ggtt->vm,NULL , node, size, start,I915_COLOR_UNEVICTABLE ,0 );if (!ret)
drivers/gpu/drm/i915/i915_vma.c +5 -4
@@ -651,7 +651,8 @@ bool i915_gem_valid_gtt_space(struct i915_vma *vma, unsigned long color)* 0 on success, negative error code otherwise. */ static int -i915_vma_insert (struct i915_vma *vma,u64 size,u64 alignment,u64 flags) +i915_vma_insert (struct i915_vma *vma,struct i915_gem_ww_ctx *ww, +u64 size,u64 alignment,u64 flags) {unsigned long color;u64 start, end;
@@ -703,7 +704,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) range_overflows(offset, size, end))return -EINVAL ; - ret =i915_gem_gtt_reserve (vma->vm, &vma->node, + ret =i915_gem_gtt_reserve (vma->vm, ww, &vma->node, size, offset, color, flags);if (ret)
@@ -742,7 +743,7 @@ i915_vma_insert(struct i915_vma *vma, u64 size, u64 alignment, u64 flags) size =round_up (size,I915_GTT_PAGE_SIZE_2M ); } - ret =i915_gem_gtt_insert (vma->vm, &vma->node, + ret =i915_gem_gtt_insert (vma->vm, ww, &vma->node, size, alignment, color, start, end, flags);if (ret)
@@ -1383,7 +1384,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, goto err_unlock;if (!(bound &I915_VMA_BIND_MASK )) { - err =i915_vma_insert (vma, size, alignment, flags); + err =i915_vma_insert (vma, ww, size, alignment, flags);if (err) goto err_active;
drivers/gpu/drm/i915/selftests/i915_gem_evict.c +9 -8
@@ -117,7 +117,7 @@ static int igt_evict_something(void *arg)/* Everything is pinned, nothing should happen */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_something (&ggtt->vm, + err =i915_gem_evict_something (&ggtt->vm,NULL ,I915_GTT_PAGE_SIZE ,0 ,0 ,0 ,U64_MAX ,0 );
@@ -132,11 +132,12 @@ static int igt_evict_something(void *arg)/* Everything is unpinned, we should be able to evict something */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_something (&ggtt->vm, + err =i915_gem_evict_something (&ggtt->vm,NULL ,I915_GTT_PAGE_SIZE ,0 ,0 ,0 ,U64_MAX ,0 );mutex_unlock (&ggtt->vm.mutex); +if (err) {pr_err ("i915_gem_evict_something failed on a full GGTT with err=%d\n" , err);
@@ -204,7 +205,7 @@ static int igt_evict_for_vma(void *arg)/* Everything is pinned, nothing should happen */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_for_node (&ggtt->vm, &target,0 ); + err =i915_gem_evict_for_node (&ggtt->vm,NULL , &target,0 );mutex_unlock (&ggtt->vm.mutex);if (err != -ENOSPC ) { pr_err("i915_gem_evict_for_node on a full GGTT returned err=%d\n",
@@ -216,7 +217,7 @@ static int igt_evict_for_vma(void *arg)/* Everything is unpinned, we should be able to evict the node */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_for_node (&ggtt->vm, &target,0 ); + err =i915_gem_evict_for_node (&ggtt->vm,NULL , &target,0 );mutex_unlock (&ggtt->vm.mutex);if (err) { pr_err("i915_gem_evict_for_node returned err=%d\n",
@@ -297,7 +298,7 @@ static int igt_evict_for_cache_color(void *arg)/* Remove just the second vma */ mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_for_node (&ggtt->vm, &target,0 ); + err =i915_gem_evict_for_node (&ggtt->vm,NULL , &target,0 );mutex_unlock (&ggtt->vm.mutex);if (err) {pr_err ("[0]i915_gem_evict_for_node returned err=%d\n" , err);
@@ -310,7 +311,7 @@ static int igt_evict_for_cache_color(void *arg) target.color =I915_CACHE_L3_LLC ;mutex_lock (&ggtt->vm.mutex); - err =i915_gem_evict_for_node (&ggtt->vm, &target,0 ); + err =i915_gem_evict_for_node (&ggtt->vm,NULL , &target,0 );mutex_unlock (&ggtt->vm.mutex);if (!err) {pr_err ("[1]i915_gem_evict_for_node returned err=%d\n" , err);
@@ -408,7 +409,7 @@ static int igt_evict_contexts(void *arg)/* Reserve a block so that we know we have enough to fit a few rq */ memset (&hole,0 ,sizeof (hole));mutex_lock (&ggtt->vm.mutex); - err =i915_gem_gtt_insert (&ggtt->vm, &hole, + err =i915_gem_gtt_insert (&ggtt->vm,NULL , &hole,PRETEND_GGTT_SIZE ,0 ,I915_COLOR_UNEVICTABLE ,0 , ggtt->vm.total,PIN_NOEVICT );
@@ -428,7 +429,7 @@ static int igt_evict_contexts(void *arg) goto out_locked; } -if (i915_gem_gtt_insert (&ggtt->vm, &r->node, +if (i915_gem_gtt_insert (&ggtt->vm,NULL , &r->node,1ul <<20 ,0 ,I915_COLOR_UNEVICTABLE ,0 , ggtt->vm.total,PIN_NOEVICT )) {
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +7 -7
@@ -1378,7 +1378,7 @@ static int igt_gtt_reserve(void *arg) }mutex_lock (&ggtt->vm.mutex); - err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node, + err = i915_gem_gtt_reserve(&ggtt->vm, NULL, &vma->node, obj->base.size, total, obj->cache_level,
@@ -1430,7 +1430,7 @@ static int igt_gtt_reserve(void *arg) }mutex_lock (&ggtt->vm.mutex); - err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node, + err = i915_gem_gtt_reserve(&ggtt->vm, NULL, &vma->node, obj->base.size, total, obj->cache_level,
@@ -1477,7 +1477,7 @@ static int igt_gtt_reserve(void *arg) I915_GTT_MIN_ALIGNMENT);mutex_lock (&ggtt->vm.mutex); - err = i915_gem_gtt_reserve(&ggtt->vm, &vma->node, + err = i915_gem_gtt_reserve(&ggtt->vm, NULL, &vma->node, obj->base.size, offset, obj->cache_level,
@@ -1552,7 +1552,7 @@ static int igt_gtt_insert(void *arg)/* Check a couple of obviously invalid requests */ for (ii = invalid_insert; ii->size; ii++) {mutex_lock (&ggtt->vm.mutex); - err = i915_gem_gtt_insert(&ggtt->vm, &tmp, + err = i915_gem_gtt_insert(&ggtt->vm, NULL, &tmp, ii->size, ii->alignment, I915_COLOR_UNEVICTABLE, ii->start, ii->end,
@@ -1594,7 +1594,7 @@ static int igt_gtt_insert(void *arg) }mutex_lock (&ggtt->vm.mutex); - err =i915_gem_gtt_insert (&ggtt->vm, &vma->node, + err =i915_gem_gtt_insert (&ggtt->vm,NULL , &vma->node, obj->base.size,0 , obj->cache_level,0 , ggtt->vm.total,0 );
@@ -1654,7 +1654,7 @@ static int igt_gtt_insert(void *arg) }mutex_lock (&ggtt->vm.mutex); - err =i915_gem_gtt_insert (&ggtt->vm, &vma->node, + err =i915_gem_gtt_insert (&ggtt->vm,NULL , &vma->node, obj->base.size,0 , obj->cache_level,0 , ggtt->vm.total,0 );
@@ -1703,7 +1703,7 @@ static int igt_gtt_insert(void *arg) }mutex_lock (&ggtt->vm.mutex); - err =i915_gem_gtt_insert (&ggtt->vm, &vma->node, + err =i915_gem_gtt_insert (&ggtt->vm,NULL , &vma->node, obj->base.size,0 , obj->cache_level,0 , ggtt->vm.total,0 );
Signature · 1 line
2.34.1
PATCH v4 4/7 drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind, v2.
In reply to Maarten LankhorstWe want to remove more members of i915_vma, which requires the locking to be held more often.
Start requiring gem object lock for i915_vma_unbind, as it's one of the callers that may unpin pages.
Some special care is needed when evicting, because the last reference to the object may be held by the VMA, so after __i915_vma_unbind, vma may be garbage, and we need to cache vma->obj before unlocking.
Changes since v1:
- Make trylock failing a WARN. (Matt)
- Remove double i915_vma_wait_for_bind() (Matt)
- Move atomic_set to right before mutex_unlock(), to make it more clear they belong together. (Matt)
--- drivers/gpu/drm/i915/display/intel_fb_pin.c | 2 +- .../gpu/drm/i915/gem/selftests/huge_pages.c | 2 +- .../i915/gem/selftests/i915_gem_client_blt.c | 2 +- .../drm/i915/gem/selftests/i915_gem_mman.c | 6 +++ drivers/gpu/drm/i915/gt/intel_ggtt.c | 49 ++++++++++++++++--- drivers/gpu/drm/i915/i915_gem.c | 2 + drivers/gpu/drm/i915/i915_vma.c | 27 +++++++++- drivers/gpu/drm/i915/i915_vma.h | 1 + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 22 ++++----- drivers/gpu/drm/i915/selftests/i915_vma.c | 8 +-- 10 files changed, 95 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/display/intel_fb_pin.c +1 -1
@@ -47,7 +47,7 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb, goto err;if (i915_vma_misplaced (vma,0 , alignment,0 )) { - ret =i915_vma_unbind (vma); + ret =i915_vma_unbind_unlocked (vma);if (ret) { vma =ERR_PTR (ret); goto err;
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +1 -1
@@ -647,7 +647,7 @@ static int igt_mock_ppgtt_misaligned_dma(void *arg)* pages. */ for (offset =4096 ; offset < page_size; offset +=4096 ) { - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) goto out_unpin;
drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +1 -1
@@ -318,7 +318,7 @@ static int pin_buffer(struct i915_vma *vma, u64 addr)int err;if (drm_mm_node_allocated (&vma->node) && vma->node.start != addr) { - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err)return err; }
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +6 -0
@@ -166,7 +166,9 @@ static int check_partial_mapping(struct drm_i915_gem_object *obj,kunmap (p); out: +i915_gem_object_lock (obj,NULL );__i915_vma_put (vma); +i915_gem_object_unlock (obj);return err; }
@@ -261,7 +263,9 @@ static int check_partial_mappings(struct drm_i915_gem_object *obj,if (err)return err; +i915_gem_object_lock (obj,NULL );__i915_vma_put (vma); +i915_gem_object_unlock (obj); if (igt_timeout(end_time, "%s: timed out after tiling=%d stride=%d\n",
@@ -1352,7 +1356,9 @@ static int __igt_mmap_revoke(struct drm_i915_private *i915,* for other objects. Ergo we have to revoke the previous mmap PTE * access as it no longer points to the same object. */ +i915_gem_object_lock (obj,NULL ); err =i915_gem_object_unbind (obj,I915_GEM_OBJECT_UNBIND_ACTIVE ); +i915_gem_object_unlock (obj);if (err) {pr_err ("Failed to unbind object!\n" ); goto out_unmap;
drivers/gpu/drm/i915/gt/intel_ggtt.c +43 -6
76 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -119,6 +119,8 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj,struct i915_vma *vma;int ret; +assert_object_held (obj); +if (list_empty (&obj->vma.list))return 0 ;
drivers/gpu/drm/i915/i915_vma.c +25 -2
@@ -1605,8 +1605,16 @@ void i915_vma_parked(struct intel_gt *gt)struct drm_i915_gem_object *obj = vma->obj;struct i915_address_space *vm = vma->vm; -INIT_LIST_HEAD (&vma->closed_link); -__i915_vma_put (vma); +if (i915_gem_object_trylock (obj,NULL )) { +INIT_LIST_HEAD (&vma->closed_link); +__i915_vma_put (vma); +i915_gem_object_unlock (obj); + }else { +/* back you go.. */ +spin_lock_irq (>->closed_lock); +list_add (&vma->closed_link, >->closed_vma); +spin_unlock_irq (>->closed_lock); + }i915_gem_object_put (obj);i915_vm_close (vm);
@@ -1722,6 +1730,7 @@ int _i915_vma_move_to_active(struct i915_vma *vma,void __i915_vma_evict (struct i915_vma *vma) {GEM_BUG_ON (i915_vma_is_pinned (vma)); +assert_object_held_shared (vma->obj);if (i915_vma_is_map_and_fenceable (vma)) {/* Force a pagefault for domain tracking on next user access */
@@ -1767,6 +1776,7 @@ int __i915_vma_unbind(struct i915_vma *vma)int ret;lockdep_assert_held (&vma->vm->mutex); +assert_object_held_shared (vma->obj);if (!drm_mm_node_allocated (&vma->node))return 0 ;
@@ -1798,6 +1808,8 @@ int i915_vma_unbind(struct i915_vma *vma)intel_wakeref_t wakeref =0 ;int err; +assert_object_held_shared (vma->obj); +/* Optimistic wait before taking the mutex */ err =i915_vma_sync (vma);if (err)
@@ -1828,6 +1840,17 @@ int i915_vma_unbind(struct i915_vma *vma)return err; } +int i915_vma_unbind_unlocked (struct i915_vma *vma) +{ +int err; + +i915_gem_object_lock (vma->obj,NULL ); + err =i915_vma_unbind (vma); +i915_gem_object_unlock (vma->obj); + +return err; +} +struct i915_vma *i915_vma_make_unshrinkable (struct i915_vma *vma) {i915_gem_object_make_unshrinkable (vma->obj);
drivers/gpu/drm/i915/i915_vma.h +1 -0
@@ -214,6 +214,7 @@ void i915_vma_revoke_mmap(struct i915_vma *vma);void __i915_vma_evict (struct i915_vma *vma);int __i915_vma_unbind (struct i915_vma *vma);int __must_check i915_vma_unbind (struct i915_vma *vma); +int __must_check i915_vma_unbind_unlocked (struct i915_vma *vma);void i915_vma_unlink_ctx (struct i915_vma *vma);void i915_vma_close (struct i915_vma *vma);void i915_vma_reopen (struct i915_vma *vma);
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +11 -11
@@ -385,7 +385,7 @@ static void close_object_list(struct list_head *objects, vma =i915_vma_instance (obj, vm,NULL );if (!IS_ERR (vma)) - ignored =i915_vma_unbind (vma); + ignored =i915_vma_unbind_unlocked (vma);list_del (&obj->st_link);i915_gem_object_put (obj);
@@ -496,7 +496,7 @@ static int fill_hole(struct i915_address_space *vm, goto err; } - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) { pr_err("%s(%s) (forward) unbind of vma.node=%llx + %llx failed with err=%d\n", __func__, p->name, vma->node.start, vma->node.size,
@@ -569,7 +569,7 @@ static int fill_hole(struct i915_address_space *vm, goto err; } - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) { pr_err("%s(%s) (backward) unbind of vma.node=%llx + %llx failed with err=%d\n", __func__, p->name, vma->node.start, vma->node.size,
@@ -655,7 +655,7 @@ static int walk_hole(struct i915_address_space *vm, goto err_put; } - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("%s unbind failed at %llx + %llx with err=%d\n" , __func__, addr, vma->size, err);
@@ -732,13 +732,13 @@ static int pot_hole(struct i915_address_space *vm,pr_err ("%s incorrect at %llx + %llx\n" , __func__, addr, vma->size);i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma); err = -EINVAL ; goto err_obj; }i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);GEM_BUG_ON (err); }
@@ -832,13 +832,13 @@ static int drunk_hole(struct i915_address_space *vm,pr_err ("%s incorrect at %llx + %llx\n" , __func__, addr,BIT_ULL (size));i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma); err = -EINVAL ; goto err_obj; }i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);GEM_BUG_ON (err); if (igt_timeout(end_time,
@@ -906,7 +906,7 @@ static int __shrink_hole(struct i915_address_space *vm,pr_err ("%s incorrect at %llx + %llx\n" , __func__, addr, size);i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma); err = -EINVAL ;break ; }
@@ -1465,7 +1465,7 @@ static int igt_gtt_reserve(void *arg) goto out; } - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("i915_vma_unbind failed with err=%d!\n" , err); goto out;
@@ -1647,7 +1647,7 @@ static int igt_gtt_insert(void *arg)GEM_BUG_ON (!drm_mm_node_allocated (&vma->node)); offset = vma->node.start; - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("i915_vma_unbind failed with err=%d!\n" , err); goto out;
drivers/gpu/drm/i915/selftests/i915_vma.c +4 -4
@@ -340,7 +340,7 @@ static int igt_vma_pin1(void *arg)if (!err) {i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("Failed to unbind single page from GGTT, err=%d\n" , err); goto out;
@@ -691,7 +691,7 @@ static int igt_vma_rotate_remap(void *arg) }i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("Unbinding returned %i\n" , err); goto out_object;
@@ -852,7 +852,7 @@ static int igt_vma_partial(void *arg)i915_vma_unpin (vma); nvma++; - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("Unbinding returned %i\n" , err); goto out_object;
@@ -891,7 +891,7 @@ static int igt_vma_partial(void *arg)i915_vma_unpin (vma); - err =i915_vma_unbind (vma); + err =i915_vma_unbind_unlocked (vma);if (err) {pr_err ("Unbinding returned %i\n" , err); goto out_object;
Signature · 1 line
2.34.1
PATCH v4 5/7 drm/i915: Remove assert_object_held_shared
In reply to Maarten LankhorstThis duck tape workaround is no longer required, unbind and destroy are fixed to take the obj->resv mutex before destroying and obj->mm.lock has been removed, always requiring obj->resv as well.
--- drivers/gpu/drm/i915/gem/i915_gem_object.c | 4 ++-- drivers/gpu/drm/i915/gem/i915_gem_object.h | 14 -------------- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 10 +++++----- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 6 +++--- 5 files changed, 11 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.c +2 -2
@@ -550,7 +550,7 @@ bool i915_gem_object_has_struct_page(const struct drm_i915_gem_object *obj)#ifdef CONFIG_LOCKDEP if (IS_DGFX (to_i915 (obj->base.dev)) &&i915_gem_object_evictable ((void __force *)obj)) -assert_object_held_shared (obj); +assert_object_held (obj);#endif return obj->mem_flags &I915_BO_FLAG_STRUCT_PAGE ; }
@@ -569,7 +569,7 @@ bool i915_gem_object_has_iomem(const struct drm_i915_gem_object *obj)#ifdef CONFIG_LOCKDEP if (IS_DGFX (to_i915 (obj->base.dev)) &&i915_gem_object_evictable ((void __force *)obj)) -assert_object_held_shared (obj); +assert_object_held (obj);#endif return obj->mem_flags &I915_BO_FLAG_IOMEM ; }
drivers/gpu/drm/i915/gem/i915_gem_object.h +0 -14
@@ -157,20 +157,6 @@ i915_gem_object_put(struct drm_i915_gem_object *obj)#define assert_object_held (obj) dma_resv_assert_held((obj)->base.resv) -/* -* If more than one potential simultaneous locker, assert held. -*/ -static inline void assert_object_held_shared (const struct drm_i915_gem_object *obj) -{ -/* -* Note mm list lookup is protected by -* kref_get_unless_zero(). -*/ -if (IS_ENABLED (CONFIG_LOCKDEP ) && -kref_read (&obj->base.refcount) >0 ) -assert_object_held (obj); -} -static inline int __i915_gem_object_lock (struct drm_i915_gem_object *obj,struct i915_gem_ww_ctx *ww,bool intr)
drivers/gpu/drm/i915/gem/i915_gem_pages.c +5 -5
@@ -19,7 +19,7 @@ void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj,bool shrinkable;int i; -assert_object_held_shared (obj); +assert_object_held (obj);if (i915_gem_object_is_volatile (obj)) obj->mm.madv =I915_MADV_DONTNEED ;
@@ -95,7 +95,7 @@ int ____i915_gem_object_get_pages(struct drm_i915_gem_object *obj)struct drm_i915_private *i915 =to_i915 (obj->base.dev);int err; -assert_object_held_shared (obj); +assert_object_held (obj);if (unlikely (obj->mm.madv !=I915_MADV_WILLNEED )) { drm_dbg(&i915->drm,
@@ -122,7 +122,7 @@ int __i915_gem_object_get_pages(struct drm_i915_gem_object *obj)assert_object_held (obj); -assert_object_held_shared (obj); +assert_object_held (obj);if (unlikely (!i915_gem_object_has_pages (obj))) {GEM_BUG_ON (i915_gem_object_has_pinned_pages (obj));
@@ -191,7 +191,7 @@ __i915_gem_object_unset_pages(struct drm_i915_gem_object *obj) {struct sg_table *pages; -assert_object_held_shared (obj); +assert_object_held (obj); pages =fetch_and_zero (&obj->mm.pages);if (IS_ERR_OR_NULL (pages))
@@ -222,7 +222,7 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj)return -EBUSY ;/* May be called by shrinker from within get_pages() (on another bo) */ -assert_object_held_shared (obj); +assert_object_held (obj);i915_gem_object_release_mmap_offset (obj);
drivers/gpu/drm/i915/gem/i915_gem_userptr.c +1 -1
@@ -109,7 +109,7 @@ static void i915_gem_object_userptr_drop_ref(struct drm_i915_gem_object *obj) {struct page **pvec =NULL ; -assert_object_held_shared (obj); +assert_object_held (obj);if (!--obj->userptr.page_ref) { pvec = obj->userptr.pvec;
drivers/gpu/drm/i915/i915_vma.c +3 -3
@@ -1730,7 +1730,7 @@ int _i915_vma_move_to_active(struct i915_vma *vma,void __i915_vma_evict (struct i915_vma *vma) {GEM_BUG_ON (i915_vma_is_pinned (vma)); -assert_object_held_shared (vma->obj); +assert_object_held (vma->obj);if (i915_vma_is_map_and_fenceable (vma)) {/* Force a pagefault for domain tracking on next user access */
@@ -1776,7 +1776,7 @@ int __i915_vma_unbind(struct i915_vma *vma)int ret;lockdep_assert_held (&vma->vm->mutex); -assert_object_held_shared (vma->obj); +assert_object_held (vma->obj);if (!drm_mm_node_allocated (&vma->node))return 0 ;
@@ -1808,7 +1808,7 @@ int i915_vma_unbind(struct i915_vma *vma)intel_wakeref_t wakeref =0 ;int err; -assert_object_held_shared (vma->obj); +assert_object_held (vma->obj);/* Optimistic wait before taking the mutex */ err =i915_vma_sync (vma);
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH v4 5/7] drm/i915: Remove assert_object_held_shared
I love your patch! Yet something to improve:
Hi Maarten,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on drm-tip/drm-tip drm/drm-next next-20220110]
[cannot apply to drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.16] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Maarten-Lankhorst/drm-i915-Remove-short-term-pins-from-execbuf-by-requiring-lock-to-unbind/20220110-195316 base: git://anongit.freedesktop.org/drm-intel for-linux-next config: i386-allyesconfig (https://download.01.org/0day-ci/archive/20220111/202201110312.Jy9aTX6l-lkp(a)intel.com/config) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/944270fef255e0cdb97d2804f8df6b9fb288b753
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Maarten-Lankhorst/drm-i915-Remove-short-term-pins-from-execbuf-by-requiring-lock-to-unbind/20220110-195316 git checkout 944270fef255e0cdb97d2804f8df6b9fb288b753
# save the config file to linux build tree
mkdir build_dir
make W=1 O=build_dir ARCH=i386 SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/gem/i915_gem_pages.c: In function 'i915_gem_object_writeback':
>> drivers/gpu/drm/i915/gem/i915_gem_pages.c:174:2: error: implicit declaration of function 'assert_object_held_shared'; did you mean 'assert_object_held'? [-Werror=implicit-function-declaration]
174 | assert_object_held_shared(obj);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| assert_object_heldcc1: all warnings being treated as errors
vim +174 drivers/gpu/drm/i915/gem/i915_gem_pages.c
f033428db28bdf Chris Wilson 2019-05-28 170
f033428db28bdf Chris Wilson 2019-05-28 171 /* Try to discard unwanted pages */
f033428db28bdf Chris Wilson 2019-05-28 172 void i915_gem_object_writeback(struct drm_i915_gem_object *obj)
f033428db28bdf Chris Wilson 2019-05-28 173 {
a3258dbd87f1f6 Thomas Hellström 2021-03-23 @174 assert_object_held_shared(obj);
f033428db28bdf Chris Wilson 2019-05-28 175 GEM_BUG_ON(i915_gem_object_has_pages(obj));
f033428db28bdf Chris Wilson 2019-05-28 176
f033428db28bdf Chris Wilson 2019-05-28 177 if (obj->ops->writeback)
f033428db28bdf Chris Wilson 2019-05-28 178 obj->ops->writeback(obj);
f033428db28bdf Chris Wilson 2019-05-28 179 }
f033428db28bdf Chris Wilson 2019-05-28 180 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v4 6/7 drm/i915: Remove support for unlocked i915_vma unbind
In reply to Maarten LankhorstNow that we require the object lock for all ops, some code handling race conditions can be removed.
This is required to not take short-term pins inside execbuf.
--- drivers/gpu/drm/i915/i915_vma.c | 55 +++++---------------------------- 1 file changed, 8 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_vma.c +8 -47
@@ -777,7 +777,6 @@ i915_vma_detach(struct i915_vma *vma)static bool try_qad_pin (struct i915_vma *vma,unsigned int flags) {unsigned int bound; -bool pinned = true; bound =atomic_read (&vma->flags); do {
@@ -787,34 +786,10 @@ static bool try_qad_pin(struct i915_vma *vma, unsigned int flags)if (unlikely (bound & (I915_VMA_OVERFLOW |I915_VMA_ERROR )))return false; -if (!(bound &I915_VMA_PIN_MASK )) - goto unpinned; -GEM_BUG_ON (((bound +1 ) &I915_VMA_PIN_MASK ) ==0 ); }while (!atomic_try_cmpxchg (&vma->flags, &bound, bound +1 ));return true; - -unpinned: -/* -* If pin_count==0, but we are bound, check under the lock to avoid -* racing with a concurrent i915_vma_unbind(). -*/ -mutex_lock (&vma->vm->mutex); -do { -if (unlikely (bound & (I915_VMA_OVERFLOW |I915_VMA_ERROR ))) { - pinned = false; -break ; - } - -if (unlikely (flags & ~bound)) { - pinned = false; -break ; - } - }while (!atomic_try_cmpxchg (&vma->flags, &bound, bound +1 )); -mutex_unlock (&vma->vm->mutex); - -return pinned; } static struct scatterlist *
@@ -1153,7 +1128,6 @@ static int __i915_vma_get_pages(struct i915_vma *vma) {struct sg_table *pages; -int ret;/* * The vma->pages are only valid within the lifespan of the borrowed
@@ -1186,18 +1160,16 @@ __i915_vma_get_pages(struct i915_vma *vma)break ; } - ret =0 ;if (IS_ERR (pages)) { - ret =PTR_ERR (pages); - pages =NULL ;drm_err (&vma->vm->i915->drm, -"Failed to get pages for VMA view type %u (%d)!\n" , - vma->ggtt_view.type, ret); +"Failed to get pages for VMA view type %u (%ld)!\n" , + vma->ggtt_view.type,PTR_ERR (pages)); +return PTR_ERR (pages); } vma->pages = pages; -return ret; +return 0 ; } I915_SELFTEST_EXPORT int i915_vma_get_pages(struct i915_vma *vma)
@@ -1229,25 +1201,14 @@ I915_SELFTEST_EXPORT int i915_vma_get_pages(struct i915_vma *vma)static void __vma_put_pages (struct i915_vma *vma,unsigned int count) {/* We allocate under vma_get_pages, so beware the shrinker */ -struct sg_table *pages =READ_ONCE (vma->pages); -GEM_BUG_ON (atomic_read (&vma->pages_count) < count);if (atomic_sub_return (count, &vma->pages_count) ==0 ) { -/* -* The atomic_sub_return is a read barrier for the READ_ONCE of -* vma->pages above. -* -* READ_ONCE is safe because this is either called from the same -* function (i915_vma_pin_ww), or guarded by vma->vm->mutex. -* -* TODO: We're leaving vma->pages dangling, until vma->obj->resv -* lock is required. -*/ -if (pages != vma->obj->mm.pages) { -sg_free_table (pages); -kfree (pages); +if (vma->pages != vma->obj->mm.pages) { +sg_free_table (vma->pages); +kfree (vma->pages); } + vma->pages =NULL ;i915_gem_object_unpin_pages (vma->obj); }
Signature · 1 line
2.34.1
PATCH v4 7/7 drm/i915: Remove short-term pins from execbuf, v6.
In reply to Maarten LankhorstAdd a flag PIN_VALIDATE, to indicate we don't need to pin and only protected by the object lock.
This removes the need to unpin, which is done by just releasing the lock.
eb_reserve is slightly reworked for readability, but the same steps are still done:
- First pass pins with NONBLOCK.
- Second pass unbinds all objects first, then pins.
- Third pass is only called when not all objects are softpinned, and unbinds all objects, then calls i915_gem_evict_vm(), then pins.
Changes since v1:
- Split out eb_reserve() into separate functions for readability. Changes since v2:
- Make batch buffer mappable on platforms where only GGTT is available, to prevent moving the batch buffer during relocations.
Changes since v3:
- Preserve current behavior for batch buffer, instead be cautious when calling i915_gem_object_ggtt_pin_ww, and re-use the current batch vma if it's inside ggtt and map-and-fenceable.
- Remove impossible condition check from eb_reserve. (Matt) Changes since v5:
- Do not even temporarily pin, just call i915_gem_evict_vm() and mark all vma's as unpinned.
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 220 +++++++++--------- drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 - drivers/gpu/drm/i915/i915_gem_gtt.h | 1 + drivers/gpu/drm/i915/i915_vma.c | 24 +- 4 files changed, 128 insertions(+), 118 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +109 -111
@@ -441,7 +441,7 @@ eb_pin_vma(struct i915_execbuffer *eb,else pin_flags = entry->offset &PIN_OFFSET_MASK ; - pin_flags |=PIN_USER |PIN_NOEVICT |PIN_OFFSET_FIXED ; + pin_flags |=PIN_USER |PIN_NOEVICT |PIN_OFFSET_FIXED |PIN_VALIDATE ;if (unlikely (ev->flags &EXEC_OBJECT_NEEDS_GTT )) pin_flags |=PIN_GLOBAL ;
@@ -459,17 +459,15 @@ eb_pin_vma(struct i915_execbuffer *eb, entry->pad_to_size, entry->alignment,eb_pin_flags (entry, ev->flags) | - PIN_USER | PIN_NOEVICT); + PIN_USER | PIN_NOEVICT | PIN_VALIDATE);if (unlikely (err))return err; }if (unlikely (ev->flags &EXEC_OBJECT_NEEDS_FENCE )) { err =i915_vma_pin_fence (vma); -if (unlikely (err)) { -i915_vma_unpin (vma); +if (unlikely (err))return err; - }if (vma->fence) ev->flags |= __EXEC_OBJECT_HAS_FENCE;
@@ -485,13 +483,9 @@ eb_pin_vma(struct i915_execbuffer *eb,static inline void eb_unreserve_vma (struct eb_vma *ev) { -if (!(ev->flags & __EXEC_OBJECT_HAS_PIN)) -return ; -if (unlikely (ev->flags & __EXEC_OBJECT_HAS_FENCE))__i915_vma_unpin_fence (ev->vma); -__i915_vma_unpin (ev->vma); ev->flags &= ~__EXEC_OBJECT_RESERVED; }
@@ -684,10 +678,8 @@ static int eb_reserve_vma(struct i915_execbuffer *eb,if (unlikely (ev->flags &EXEC_OBJECT_NEEDS_FENCE )) { err =i915_vma_pin_fence (vma); -if (unlikely (err)) { -i915_vma_unpin (vma); +if (unlikely (err))return err; - }if (vma->fence) ev->flags |= __EXEC_OBJECT_HAS_FENCE;
@@ -699,85 +691,95 @@ static int eb_reserve_vma(struct i915_execbuffer *eb,return 0 ; } -static int eb_reserve (struct i915_execbuffer *eb) +static bool eb_unbind (struct i915_execbuffer *eb,bool force) {const unsigned int count = eb->buffer_count; -unsigned int pin_flags =PIN_USER |PIN_NONBLOCK ; +unsigned int i;struct list_head last; +bool unpinned = false; + +/* Resort *all* the objects into priority order */ +INIT_LIST_HEAD (&eb->unbound); +INIT_LIST_HEAD (&last); + +for (i =0 ; i < count; i++) { +struct eb_vma *ev = &eb->vma[i]; +unsigned int flags = ev->flags; + +if (!force && flags &EXEC_OBJECT_PINNED && + flags & __EXEC_OBJECT_HAS_PIN) +continue ; + + unpinned = true; +eb_unreserve_vma (ev); + +if (flags &EXEC_OBJECT_PINNED ) +/* Pinned must have their slot */ +list_add (&ev->bind_link, &eb->unbound); +else if (flags & __EXEC_OBJECT_NEEDS_MAP) +/* Map require the lowest 256MiB (aperture) */ +list_add_tail (&ev->bind_link, &eb->unbound); +else if (!(flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS )) +/* Prioritise 4GiB region for restricted bo */ +list_add (&ev->bind_link, &last); +else +list_add_tail (&ev->bind_link, &last); + } + +list_splice_tail (&last, &eb->unbound); +return unpinned; +} + +static int eb_reserve (struct i915_execbuffer *eb) +{struct eb_vma *ev; -unsigned int i, pass; +unsigned int pass;int err =0 ; +bool unpinned;/* * Attempt to pin all of the buffers into the GTT. -* This is done in 3 phases: +* This is done in 2 phases: * -* 1a. Unbind all objects that do not match the GTT constraints for -* the execbuffer (fenceable, mappable, alignment etc). -* 1b. Increment pin count for already bound objects. -* 2. Bind new objects. -* 3. Decrement pin count. +* 1. Unbind all objects that do not match the GTT constraints for +* the execbuffer (fenceable, mappable, alignment etc). +* 2. Bind new objects. * * This avoid unnecessary unbinding of later objects in order to make * room for the earlier objects *unless* we need to defragment. +* +* Defragmenting is skipped if all objects are pinned at a fixed location. */ - pass =0 ; -do { -list_for_each_entry (ev, &eb->unbound, bind_link) { - err =eb_reserve_vma (eb, ev, pin_flags); -if (err) -break ; - } -if (err != -ENOSPC ) -return err; +for (pass =0 ; pass <=2 ; pass++) { +int pin_flags =PIN_USER |PIN_VALIDATE ; -/* Resort *all* the objects into priority order */ -INIT_LIST_HEAD (&eb->unbound); -INIT_LIST_HEAD (&last); -for (i =0 ; i < count; i++) { -unsigned int flags; +if (pass ==0 ) + pin_flags |=PIN_NONBLOCK ; - ev = &eb->vma[i]; - flags = ev->flags; -if (flags &EXEC_OBJECT_PINNED && - flags & __EXEC_OBJECT_HAS_PIN) -continue ; +if (pass >=1 ) + unpinned =eb_unbind (eb, pass ==2 ); -eb_unreserve_vma (ev); - -if (flags &EXEC_OBJECT_PINNED ) -/* Pinned must have their slot */ -list_add (&ev->bind_link, &eb->unbound); -else if (flags & __EXEC_OBJECT_NEEDS_MAP) -/* Map require the lowest 256MiB (aperture) */ -list_add_tail (&ev->bind_link, &eb->unbound); -else if (!(flags &EXEC_OBJECT_SUPPORTS_48B_ADDRESS )) -/* Prioritise 4GiB region for restricted bo */ -list_add (&ev->bind_link, &last); -else -list_add_tail (&ev->bind_link, &last); - } -list_splice_tail (&last, &eb->unbound); - -switch (pass++) { -case 0 : -break ; - -case 1 : -/* Too fragmented, unbind everything and retry */ -mutex_lock (&eb->context->vm->mutex); - err =i915_gem_evict_vm (eb->context->vm, &eb->ww); -mutex_unlock (&eb->context->vm->mutex); +if (pass ==2 ) { + err =mutex_lock_interruptible (&eb->context->vm->mutex); +if (!err) { + err =i915_gem_evict_vm (eb->context->vm, &eb->ww); +mutex_unlock (&eb->context->vm->mutex); + }if (err)return err; -break ; + } -default : -return -ENOSPC ; +list_for_each_entry (ev, &eb->unbound, bind_link) { + err =eb_reserve_vma (eb, ev, pin_flags); +if (err) +break ; } - pin_flags =PIN_USER ; - }while (1 ); +if (err != -ENOSPC ) +break ; + } + +return err; }static int eb_select_context (struct i915_execbuffer *eb)
@@ -1225,10 +1227,11 @@ static void *reloc_kmap(struct drm_i915_gem_object *obj,return vaddr; } -static void *reloc_iomap (struct drm_i915_gem_object *obj, +static void *reloc_iomap (struct i915_vma *batch,struct i915_execbuffer *eb,unsigned long page) { +struct drm_i915_gem_object *obj = batch->obj;struct reloc_cache *cache = &eb->reloc_cache;struct i915_ggtt *ggtt =cache_to_ggtt (cache);unsigned long offset;
@@ -1238,7 +1241,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj,intel_gt_flush_ggtt_writes (ggtt->vm.gt);io_mapping_unmap_atomic ((void __force __iomem *)unmask_page (cache->vaddr)); }else { -struct i915_vma *vma; +struct i915_vma *vma =ERR_PTR (-ENODEV );int err;if (i915_gem_object_is_tiled (obj))
@@ -1251,10 +1254,23 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj,if (err)return ERR_PTR (err); - vma =i915_gem_object_ggtt_pin_ww (obj, &eb->ww,NULL ,0 ,0 , -PIN_MAPPABLE | -PIN_NONBLOCK /* NOWARN */ | -PIN_NOEVICT ); +/* +* i915_gem_object_ggtt_pin_ww may attempt to remove the batch +* VMA from the object list because we no longer pin. +* +* Only attempt to pin the batch buffer to ggtt if the current batch +* is not inside ggtt, or the batch buffer is not misplaced. +*/ +if (!i915_is_ggtt (batch->vm)) { + vma =i915_gem_object_ggtt_pin_ww (obj, &eb->ww,NULL ,0 ,0 , +PIN_MAPPABLE | +PIN_NONBLOCK /* NOWARN */ | +PIN_NOEVICT ); + }else if (i915_vma_is_map_and_fenceable (batch)) { +__i915_vma_pin (batch); + vma = batch; + } +if (vma ==ERR_PTR (-EDEADLK ))return vma;
@@ -1292,7 +1308,7 @@ static void *reloc_iomap(struct drm_i915_gem_object *obj,return vaddr; } -static void *reloc_vaddr (struct drm_i915_gem_object *obj, +static void *reloc_vaddr (struct i915_vma *vma,struct i915_execbuffer *eb,unsigned long page) {
@@ -1304,9 +1320,9 @@ static void *reloc_vaddr(struct drm_i915_gem_object *obj, }else { vaddr =NULL ;if ((cache->vaddr &KMAP ) ==0 ) - vaddr =reloc_iomap (obj, eb, page); + vaddr =reloc_iomap (vma, eb, page);if (!vaddr) - vaddr =reloc_kmap (obj, cache, page); + vaddr =reloc_kmap (vma->obj, cache, page); }return vaddr;
@@ -1347,7 +1363,7 @@ relocate_entry(struct i915_vma *vma,void *vaddr; repeat: - vaddr =reloc_vaddr (vma->obj, eb, + vaddr =reloc_vaddr (vma, eb, offset >>PAGE_SHIFT );if (IS_ERR (vaddr))return PTR_ERR (vaddr);
@@ -2209,7 +2225,7 @@ shadow_batch_pin(struct i915_execbuffer *eb,if (IS_ERR (vma))return vma; - err =i915_vma_pin_ww (vma, &eb->ww,0 ,0 , flags); + err =i915_vma_pin_ww (vma, &eb->ww,0 ,0 , flags |PIN_VALIDATE );if (err)return ERR_PTR (err);
@@ -2223,7 +2239,7 @@ static struct i915_vma *eb_dispatch_secure(struct i915_execbuffer *eb, struct i9* batch" bit. Hence we need to pin secure batches into the global gtt. * hsw should have this fixed, but bdw mucks it up again. */ if (eb->batch_flags &I915_DISPATCH_SECURE ) -return i915_gem_object_ggtt_pin_ww (vma->obj, &eb->ww,NULL ,0 ,0 ,0 ); +return i915_gem_object_ggtt_pin_ww (vma->obj, &eb->ww,NULL ,0 ,0 ,PIN_VALIDATE );return NULL ; }
@@ -2274,13 +2290,12 @@ static int eb_parse(struct i915_execbuffer *eb) err =i915_gem_object_lock (pool->obj, &eb->ww);if (err) - goto err; +return err; shadow =shadow_batch_pin (eb, pool->obj, eb->context->vm,PIN_USER ); -if (IS_ERR (shadow)) { - err =PTR_ERR (shadow); - goto err; - } +if (IS_ERR (shadow)) +return PTR_ERR (shadow); +intel_gt_buffer_pool_mark_used (pool);i915_gem_object_set_readonly (shadow->obj); shadow->private = pool;
@@ -2292,25 +2307,21 @@ static int eb_parse(struct i915_execbuffer *eb) shadow =shadow_batch_pin (eb, pool->obj, &eb->gt->ggtt->vm,PIN_GLOBAL ); -if (IS_ERR (shadow)) { - err =PTR_ERR (shadow); - shadow = trampoline; - goto err_shadow; - } +if (IS_ERR (shadow)) +return PTR_ERR (shadow); + shadow->private = pool; eb->batch_flags |=I915_DISPATCH_SECURE ; } batch =eb_dispatch_secure (eb, shadow); -if (IS_ERR (batch)) { - err =PTR_ERR (batch); - goto err_trampoline; - } +if (IS_ERR (batch)) +return PTR_ERR (batch); err =dma_resv_reserve_shared (shadow->obj->base.resv,1 );if (err) - goto err_trampoline; +return err; err = intel_engine_cmd_parser(eb->context->engine, eb->batches[0]->vma,
@@ -2318,7 +2329,7 @@ static int eb_parse(struct i915_execbuffer *eb) eb->batch_len[0 ], shadow, trampoline);if (err) - goto err_unpin_batch; +return err; eb->batches[0 ] = &eb->vma[eb->buffer_count++]; eb->batches[0 ]->vma =i915_vma_get (shadow);
@@ -2337,17 +2348,6 @@ static int eb_parse(struct i915_execbuffer *eb) eb->batches[0 ]->vma =i915_vma_get (batch); }return 0 ; - -err_unpin_batch: -if (batch) -i915_vma_unpin (batch); -err_trampoline: -if (trampoline) -i915_vma_unpin (trampoline); -err_shadow: -i915_vma_unpin (shadow); -err: -return err; } static int eb_request_submit(struct i915_execbuffer *eb,
@@ -3468,8 +3468,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, err_vma:eb_release_vmas (&eb, true); -if (eb.trampoline) -i915_vma_unpin (eb.trampoline);WARN_ON (err == -EDEADLK );i915_gem_ww_ctx_fini (&eb.ww);
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c +0 -1
@@ -425,7 +425,6 @@ int i915_vma_pin_fence(struct i915_vma *vma)* must keep the device awake whilst using the fence. */ assert_rpm_wakelock_held (vma->vm->gt->uncore->rpm); -GEM_BUG_ON (!i915_vma_is_pinned (vma));GEM_BUG_ON (!i915_vma_is_ggtt (vma)); err =mutex_lock_interruptible (&vma->vm->mutex);
drivers/gpu/drm/i915/i915_gem_gtt.h +1 -0
@@ -44,6 +44,7 @@ int i915_gem_gtt_insert(struct i915_address_space *vm,#define PIN_HIGH BIT_ULL(5)#define PIN_OFFSET_BIAS BIT_ULL(6)#define PIN_OFFSET_FIXED BIT_ULL(7) +#define PIN_VALIDATE BIT_ULL(8)/* validate placement only, no need to call unpin() */ #define PIN_GLOBAL BIT_ULL(10)/* I915_VMA_GLOBAL_BIND */ #define PIN_USER BIT_ULL(11)/* I915_VMA_LOCAL_BIND */
drivers/gpu/drm/i915/i915_vma.c +18 -6
@@ -779,6 +779,15 @@ static bool try_qad_pin(struct i915_vma *vma, unsigned int flags)unsigned int bound; bound =atomic_read (&vma->flags); + +if (flags &PIN_VALIDATE ) { + flags &=I915_VMA_BIND_MASK ; + +return (flags & bound) == flags; + } + +/* with the lock mandatory for unbind, we don't race here */ + flags &=I915_VMA_BIND_MASK ; do { if (unlikely(flags & ~bound)) return false;
@@ -1254,7 +1263,7 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,GEM_BUG_ON (!(flags & (PIN_USER |PIN_GLOBAL )));/* First try and grab the pin without rebinding the vma */ -if (try_qad_pin (vma, flags &I915_VMA_BIND_MASK )) +if (try_qad_pin (vma, flags))return 0 ; err =i915_vma_get_pages (vma);
@@ -1336,7 +1345,8 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww, }if (unlikely (!(flags & ~bound &I915_VMA_BIND_MASK ))) { -__i915_vma_pin (vma); +if (!(flags &PIN_VALIDATE )) +__i915_vma_pin (vma); goto err_unlock; }
@@ -1365,8 +1375,10 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct i915_gem_ww_ctx *ww,atomic_add (I915_VMA_PAGES_ACTIVE , &vma->pages_count);list_move_tail (&vma->vm_link, &vma->vm->bound_list); -__i915_vma_pin (vma); -GEM_BUG_ON (!i915_vma_is_pinned (vma)); +if (!(flags &PIN_VALIDATE )) { +__i915_vma_pin (vma); +GEM_BUG_ON (!i915_vma_is_pinned (vma)); + }GEM_BUG_ON (!i915_vma_is_bound (vma, flags));GEM_BUG_ON (i915_vma_misplaced (vma, size, alignment, flags));
@@ -1626,8 +1638,6 @@ static int __i915_vma_move_to_active(struct i915_vma *vma, struct i915_request * {int err; -GEM_BUG_ON (!i915_vma_is_pinned (vma)); -/* Wait for the vma to be bound before we start! */ err =__i915_request_await_bind (rq, vma);if (err)
@@ -1646,6 +1656,8 @@ int _i915_vma_move_to_active(struct i915_vma *vma,assert_object_held (obj); +GEM_BUG_ON (!vma->pages); + err =__i915_vma_move_to_active (vma, rq);if (unlikely (err))return err;
Signature · 1 line
2.34.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
URL : https://patchwork.freedesktop.org/series/98137/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 0a564d5e4bd9 drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors, v2. 2ffa12202a76 drm/i915: Add locking to i915_gem_evict_vm() 775c2d0a1bd1 drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something -:148: CHECK:LINE_SPACING: Please don't use multiple blank lines #148: FILE: drivers/gpu/drm/i915/i915_gem_evict.c:252:
+
total: 0 errors, 0 warnings, 1 checks, 364 lines checkedec557f8e7070 drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind, v2. -:7: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #7:
We want to remove more members of i915_vma, which requires the locking to be
total: 0 errors, 1 warnings, 0 checks, 317 lines checked 24fe65e145e6 drm/i915: Remove assert_object_held_shared f5cb09503ae0 drm/i915: Remove support for unlocked i915_vma unbind 953cc81f3a16 drm/i915: Remove short-term pins from execbuf, v6.
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
URL : https://patchwork.freedesktop.org/series/98137/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
URL : https://patchwork.freedesktop.org/series/98137/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11059 -> Patchwork_21948
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/index.html
Participating hosts (43 -> 35)
------------------------------
Missing (8): bat-dg1-6 bat-dg1-5 bat-adlp-6 bat-adlp-4 bat-rpls-1 fi-bdw-samus bat-jsl-2 bat-jsl-1
Known issues
------------
Here are the changes found in Patchwork_21948 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-kbl-soraka: NOTRUN -> [SKIP][1] ([fdo#109271]) +2 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/fi-kbl-soraka/igt@amdgpu/[email protected]
* igt@amdgpu/amd_prime@amd-to-i915:
- fi-pnv-d510: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/fi-pnv-d510/igt@amdgpu/[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-cfl-8700k: [DMESG-FAIL][3] ([i915#541]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@requests:
- fi-pnv-d510: [DMESG-FAIL][5] ([i915#2927] / [i915#4528]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/fi-pnv-d510/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/fi-pnv-d510/igt@i915_selftest@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][7] ([i915#4269]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/fi-cml-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/fi-cml-u2/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#2927]: https://gitlab.freedesktop.org/drm/intel/issues/2927
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
Build changes
-------------
* Linux: CI_DRM_11059 -> Patchwork_21948
CI-20190529: 20190529
CI_DRM_11059: 1d8aba1cfbab48b322c4d464437dd0c34da468ec @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6325: ac29e097d4ff0f2e269a955ca86c5eb23908467a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21948: 953cc81f3a16f407d1aba0a97deb4496b6a56c47 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
953cc81f3a16 drm/i915: Remove short-term pins from execbuf, v6.f5cb09503ae0 drm/i915: Remove support for unlocked i915_vma unbind24fe65e145e6 drm/i915: Remove assert_object_held_sharedec557f8e7070 drm/i915: Add i915_vma_unbind_unlocked, and take obj lock for i915_vma_unbind, v2. 775c2d0a1bd1 drm/i915: Add object locking to i915_gem_evict_for_node and i915_gem_evict_something 2ffa12202a76 drm/i915: Add locking to i915_gem_evict_vm()0a564d5e4bd9 drm/i915: Call i915_gem_evict_vm in vm_fault_gtt to prevent new ENOSPC errors, v2.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: drm/i915: Remove short term pins from execbuf by requiring lock to unbind. (rev2)
URL : https://patchwork.freedesktop.org/series/98137/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11059_full -> Patchwork_21948_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21948_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21948_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (13 -> 13)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21948_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_ppgtt@blt-vs-render-ctxn:
- shard-tglb: [PASS][1] -> [FAIL][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglb5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb2/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_create@busy-create:
- {shard-rkl}: [PASS][3] -> ([PASS][4], [FAIL][5])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-4/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-5/igt@[email protected]
* igt@gem_exec_whisper@basic-contexts-priority-all:
- {shard-rkl}: [PASS][6] -> [INCOMPLETE][7] +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-6/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-5/igt@[email protected]
* igt@gem_ppgtt@blt-vs-render-ctx0:
- {shard-dg1}: NOTRUN -> [FAIL][8]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-dg1-13/igt@[email protected]
* igt@gem_ppgtt@blt-vs-render-ctxn:
- {shard-tglu}: [PASS][9] -> [FAIL][10] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglu-1/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglu-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_21948_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@psr2:
- shard-iclb: [PASS][11] -> [SKIP][12] ([i915#658])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb6/igt@[email protected]
* igt@gem_ctx_sseu@invalid-args:
- shard-apl: NOTRUN -> [SKIP][13] ([fdo#109271]) +89 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl6/igt@[email protected]
* igt@gem_eio@kms:
- shard-tglb: [PASS][14] -> [FAIL][15] ([i915#232])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglb8/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb1/igt@[email protected]
* igt@gem_exec_balancer@parallel:
- shard-iclb: [PASS][16] -> [SKIP][17] ([i915#4525])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb1/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb3/igt@[email protected]
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: [PASS][18] -> [INCOMPLETE][19] ([i915#4547])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl9/igt@gem_exec_capture@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl2/igt@gem_exec_capture@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-glk: [PASS][20] -> [FAIL][21] ([i915#2846])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-glk8/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-glk6/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs1:
- shard-iclb: NOTRUN -> [FAIL][22] ([i915#2842])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb1/igt@gem_exec_fair@[email protected]
- shard-kbl: [PASS][23] -> [FAIL][24] ([i915#2842])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl1/igt@gem_exec_fair@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_params@no-vebox:
- shard-iclb: NOTRUN -> [SKIP][25] ([fdo#109283])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@gem_exec_whisper@basic-fds-forked:
- shard-glk: [PASS][26] -> [DMESG-WARN][27] ([i915#118]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-glk8/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-glk7/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][28] -> [SKIP][29] ([i915#2190])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglb8/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb7/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random:
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#4613]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl1/igt@[email protected]
* igt@gem_lmem_swapping@random:
- shard-kbl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#4613])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl4/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- shard-kbl: NOTRUN -> [FAIL][32] ([i915#454])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl6/igt@[email protected]
* igt@i915_query@query-topology-known-pci-ids:
- shard-tglb: NOTRUN -> [SKIP][33] ([fdo#109303])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb3/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][34] -> [DMESG-WARN][35] ([i915#180]) +5 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-apl3/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl3/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-90:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#110725] / [fdo#111614])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][37] ([i915#3743]) +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl1/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3886]) +1 similar issue
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl4/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][39] ([fdo#109271] / [i915#3886]) +1 similar issue
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl7/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
- shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109278] / [i915#3886])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#3886]) +5 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl1/igt@kms_ccs@pipe-c-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@dp-edid-change-during-suspend:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271] / [fdo#111827]) +7 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl6/igt@[email protected]
* igt@kms_chamelium@dp-hpd-storm-disable:
- shard-skl: NOTRUN -> [SKIP][43] ([fdo#109271] / [fdo#111827]) +11 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-storm:
- shard-kbl: NOTRUN -> [SKIP][44] ([fdo#109271] / [fdo#111827]) +7 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl6/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-0-75:
- shard-iclb: NOTRUN -> [SKIP][45] ([fdo#109284] / [fdo#111827])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@kms_color_chamelium@pipe-c-ctm-green-to-red:
- shard-tglb: NOTRUN -> [SKIP][46] ([fdo#109284] / [fdo#111827])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb3/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-limited-range:
- shard-iclb: NOTRUN -> [SKIP][47] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@kms_content_protection@srm:
- shard-kbl: NOTRUN -> [TIMEOUT][48] ([i915#1319])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][49] -> [DMESG-WARN][50] ([i915#180]) +8 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl3/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl7/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- shard-iclb: NOTRUN -> [SKIP][51] ([fdo#109278]) +1 similar issue
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-kbl: NOTRUN -> [SKIP][52] ([fdo#109271] / [i915#533]) +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl1/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible@a-edp1:
- shard-skl: [PASS][53] -> [FAIL][54] ([i915#2122])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl7/igt@kms_flip@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl5/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling:
- shard-iclb: [PASS][55] -> [SKIP][56] ([i915#3701])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb6/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling.html
* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109280]) +2 similar issues
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][58] ([fdo#109271]) +115 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl10/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-draw-mmap-cpu:
- shard-tglb: NOTRUN -> [SKIP][59] ([fdo#109280] / [fdo#111825]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-cur-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@psr-rgb101010-draw-mmap-wc:
- shard-kbl: NOTRUN -> [SKIP][60] ([fdo#109271]) +81 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl1/igt@[email protected]
* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][61] -> [FAIL][62] ([i915#1188])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl1/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl7/igt@[email protected]
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-d:
- shard-apl: NOTRUN -> [SKIP][63] ([fdo#109271] / [i915#533]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl4/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-skl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#533])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][65] ([i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][66] -> [FAIL][67] ([fdo#108145] / [i915#265])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl5/igt@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: NOTRUN -> [FAIL][68] ([fdo#108145] / [i915#265]) +1 similar issue
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-apl: NOTRUN -> [FAIL][69] ([fdo#108145] / [i915#265])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl6/igt@[email protected]
* igt@kms_plane_lowres@pipe-b-tiling-x:
- shard-tglb: NOTRUN -> [SKIP][70] ([i915#3536])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb3/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-apl: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#658]) +1 similar issue
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl3/igt@[email protected]
* igt@kms_psr2_su@frontbuffer-xrgb8888:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#658])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl7/igt@[email protected]
* igt@kms_psr@psr2_dpms:
- shard-iclb: NOTRUN -> [SKIP][73] ([fdo#109441])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@kms_psr@psr2_dpms.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][74] -> [SKIP][75] ([fdo#109441]) +2 similar issues
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html
* igt@kms_vblank@pipe-d-query-forked-hang:
- shard-snb: NOTRUN -> [SKIP][76] ([fdo#109271]) +12 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-snb7/igt@[email protected]
* igt@nouveau_crc@pipe-d-source-outp-complete:
- shard-iclb: NOTRUN -> [SKIP][77] ([fdo#109278] / [i915#2530])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: [PASS][78] -> [FAIL][79] ([i915#1542])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl6/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@prime_nv_pcopy@test3_2:
- shard-tglb: NOTRUN -> [SKIP][80] ([fdo#109291])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb3/igt@prime_nv_pcopy@test3_2.html
* igt@sysfs_clients@fair-3:
- shard-skl: NOTRUN -> [SKIP][81] ([fdo#109271] / [i915#2994]) +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@sysfs_clients@sema-25:
- shard-kbl: NOTRUN -> [SKIP][82] ([fdo#109271] / [i915#2994]) +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl1/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][83] ([fdo#109271] / [i915#2994])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl4/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_persistence@engines-hang@rcs0:
- {shard-dg1}: [DMESG-WARN][84] ([i915#4892]) -> [PASS][85] +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-dg1-16/igt@gem_ctx_persistence@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-dg1-15/igt@gem_ctx_persistence@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-tglb: [FAIL][86] ([i915#232]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglb8/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglb6/igt@[email protected]
* igt@gem_exec_balancer@bonded-dual:
- {shard-tglu}: [FAIL][88] ([i915#1888]) -> [PASS][89] +1 similar issue
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-tglu-6/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-tglu-8/igt@[email protected]
* igt@gem_exec_balancer@parallel-out-fence:
- shard-iclb: [SKIP][90] ([i915#4525]) -> [PASS][91]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb3/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb4/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][92] ([i915#2842]) -> [PASS][93] +2 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl1/igt@gem_exec_fair@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-apl: [FAIL][94] ([i915#2842]) -> [PASS][95] +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-apl6/igt@gem_exec_fair@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][96] ([i915#2842]) -> [PASS][97] +2 similar issues
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-glk4/igt@gem_exec_fair@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-glk2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_flush@basic-wb-prw-default:
- {shard-rkl}: [DMESG-WARN][98] -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-5/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-1/igt@[email protected]
* igt@gem_exec_suspend@basic-s3@smem:
- shard-kbl: [DMESG-WARN][100] ([i915#180]) -> [PASS][101]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl7/igt@gem_exec_suspend@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl6/igt@gem_exec_suspend@[email protected]
* igt@gem_exec_whisper@basic-queues-forked:
- {shard-rkl}: ([PASS][102], [INCOMPLETE][103]) -> ([PASS][104], [PASS][105])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-4/igt@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-5/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-5/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-4/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][106] ([i915#1436] / [i915#716]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl3/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl3/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][108] ([i915#454]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb6/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb2/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- shard-snb: [INCOMPLETE][110] ([i915#3921]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-snb6/igt@i915_selftest@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-snb7/igt@i915_selftest@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-apl: [DMESG-WARN][112] ([i915#180]) -> [PASS][113] +3 similar issues
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-apl6/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl7/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [FAIL][114] ([i915#2346]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl1/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl9/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- shard-iclb: [FAIL][116] ([i915#2346]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb7/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb1/igt@[email protected]
* igt@kms_cursor_legacy@pipe-a-torture-move:
- {shard-rkl}: [INCOMPLETE][118] -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-rkl-5/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-rkl-2/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [INCOMPLETE][120] ([i915#180] / [i915#1982]) -> [PASS][121]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-apl3/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl4/igt@[email protected]
- shard-kbl: [INCOMPLETE][122] ([i915#180] / [i915#636]) -> [PASS][123]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl7/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl1/igt@[email protected]
* igt@kms_flip@2x-plain-flip-fb-recreate@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][124] ([i915#2122]) -> [PASS][125]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-glk4/igt@kms_flip@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-glk4/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-dp1:
- shard-apl: [FAIL][126] ([i915#79]) -> [PASS][127]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-apl4/igt@kms_flip@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-apl4/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-kbl: [INCOMPLETE][128] ([i915#180] / [i915#3614]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-kbl7/igt@kms_flip@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-kbl4/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling:
- shard-iclb: [SKIP][130] ([i915#3701]) -> [PASS][131]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb6/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][132] ([fdo#108145] / [i915#265]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-skl1/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-skl9/igt@[email protected]
* igt@kms_plane_cursor@pipe-c-overlay-size-256:
- shard-iclb: [FAIL][134] ([i915#1888] / [i915#4729]) -> [PASS][135]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb8/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb5/igt@[email protected]
* igt@sysfs_timeslice_duration@timeout@bcs0:
- {shard-dg1}: [FAIL][136] ([i915#1755]) -> [PASS][137]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-dg1-17/igt@sysfs_timeslice_duration@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-dg1-17/igt@sysfs_timeslice_duration@[email protected]
#### Warnings ####
* igt@gem_exec_balancer@parallel-ordering:
- shard-iclb: [INCOMPLETE][138] -> [SKIP][139] ([i915#4525])
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb4/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb8/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][140] ([i915#2684]) -> [WARN][141] ([i915#1804] / [i915#2684])
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb2/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb6/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-iclb: [SKIP][142] ([fdo#111068] / [i915#658]) -> [SKIP][143] ([i915#2920])
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11059/shard-iclb6/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/shard-iclb2/igt@[email protected]
* igt@runner@aborted:
- shard-kbl: ([FAIL][144], [FAIL][145], [FAIL][146], [FAIL][147], [FAIL][148]) ([i915#180] / [i915#3002] / [i915#4312] / [i915#92]) -> ([FAIL][149], [FAIL][150], [FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156], [FAIL][157]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#4312]
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21948/index.html