Prepare error capture for asynchronous migration
Subsystems (2)
v4 cover Prepare error capture for asynchronous migration
This patch series prepares error capture for asynchronous migration, where the vma pages may not reflect the pages the GPU is currently executing from but may be several migrations ahead.
The first patch deals with refcounting sg-list so that they don't disappear under the capture code, which typically otherwise happens at put_pages() time.
The second patch introduces vma state snapshots that record the vma state at request submission time.
It also takes additional measures to make sure that
the capture list and request is not disappearing from under us while capturing. The latter may otherwise happen if a heartbeat triggered parallel capture is running during a manual reset which retires the request.
The third patch changes the allocation mode during capture to reflect that capturing is typically done in the fence signalling critical path. More details on the patch itself.
Finally the last patch is more of a POC patch and not strictly needed yet, but will be (or at least something very similar) soon for async unbinding. It will make sure that unbinding doesn't complete or signal completion before capture is done. Async reuse of memory can't happen until unbinding signals complete and without waiting for capture done, we might capture contents of reused memory.
Before the last patch the vma active is instead still keeping the vma alive, but that will not work with async unbinding anymore, and also it is still not clear how we guarantee keeping the vma alive long enough to even grab an active reference during capture.
v2:
- Mostly Fixes for selftests and rebinding. See patch 3. v3:
- Honor the unbind fence also when evicting for suspend on gen6.
- Cleanups on patch 1
- Minor cleanups on patch 3.
v4:
- Break out patch 3 from patch 2.
- Move a fix from patch 4 to patch 1.
Thomas Hellström (4):
drm/i915: Introduce refcounted sg-tables
drm/i915: Update error capture code to avoid using the current vma
state
drm/i915: Use GFP_NOWAIT in the capture code
drm/i915: Initial introduction of vma resources
drivers/gpu/drm/i915/Makefile | 1 + .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 137 ++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 49 ++--- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 186 +++++++++------- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 +- .../drm/i915/gt/intel_execlists_submission.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 180 ++++++++++----- drivers/gpu/drm/i915/i915_request.c | 63 ++++-- drivers/gpu/drm/i915/i915_request.h | 18 +- drivers/gpu/drm/i915/i915_scatterlist.c | 62 ++++-- drivers/gpu/drm/i915/i915_scatterlist.h | 76 ++++++- drivers/gpu/drm/i915/i915_vma.c | 206 +++++++++++++++++- drivers/gpu/drm/i915/i915_vma.h | 20 +- drivers/gpu/drm/i915/i915_vma_snapshot.c | 131 +++++++++++ drivers/gpu/drm/i915/i915_vma_snapshot.h | 112 ++++++++++ drivers/gpu/drm/i915/i915_vma_types.h | 5 + drivers/gpu/drm/i915/intel_region_ttm.c | 15 +- drivers/gpu/drm/i915/intel_region_ttm.h | 5 +- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 98 +++++---- drivers/gpu/drm/i915/selftests/mock_region.c | 12 +- 22 files changed, 1111 insertions(+), 290 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h
Signature · 1 line
2.31.1
PATCH v4 1/4 drm/i915: Introduce refcounted sg-tables
As we start to introduce asynchronous failsafe object migration, where we update the object state and then submit asynchronous commands we need to record what memory resources are actually used by various part of the command stream. Initially for three purposes:
1) Error capture.
2) Asynchronous migration error recovery.
3) Asynchronous vma bind.
At the time where these happens, the object state may have been updated to be several migrations ahead and object sg-tables discarded.
In order to make it possible to keep sg-tables with memory resource information for these operations, introduce refcounted sg-tables that aren't freed until the last user is done with them.
The alternative would be to reference information sitting on the corresponding ttm_resources which typically have the same lifetime as these refcountes sg_tables, but that leads to other awkward constructs:
Due to the design direction chosen for ttm resource managers that would lead to diamond-style inheritance, the LMEM resources may sometimes be prematurely freed, and finally the subclassed struct ttm_resource would have to bleed into the asynchronous vma bind code.
v3:
- Address a number of style issues (Matthew Auld)
v4:
- Dont check for st->sgl being NULL in i915_ttm_tt__shmem_unpopulate(), that should never happen. (Matthew Auld)
--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 49 +++-- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 186 ++++++++++-------- drivers/gpu/drm/i915/i915_scatterlist.c | 62 ++++-- drivers/gpu/drm/i915/i915_scatterlist.h | 76 ++++++- drivers/gpu/drm/i915/intel_region_ttm.c | 15 +- drivers/gpu/drm/i915/intel_region_ttm.h | 5 +- drivers/gpu/drm/i915/selftests/mock_region.c | 12 +- 9 files changed, 276 insertions(+), 144 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_object.h +6 -6
@@ -620,12 +620,12 @@ int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,bool i915_gem_object_placement_possible (struct drm_i915_gem_object *obj,enum intel_memory_type type); -struct sg_table *shmem_alloc_st (struct drm_i915_private *i915, -size_t size,struct intel_memory_region *mr, -struct address_space *mapping, -unsigned int max_segment); -void shmem_free_st (struct sg_table *st,struct address_space *mapping, -bool dirty,bool backup); +int shmem_sg_alloc_table (struct drm_i915_private *i915,struct sg_table *st, +size_t size,struct intel_memory_region *mr, +struct address_space *mapping, +unsigned int max_segment); +void shmem_sg_free_table (struct sg_table *st,struct address_space *mapping, +bool dirty,bool backup);void __shmem_writeback (size_t size,struct address_space *mapping);#ifdef CONFIG_MMU_NOTIFIER
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +2 -1
@@ -544,6 +544,7 @@ struct drm_i915_gem_object {*/ struct list_head region_link; +struct i915_refct_sgt *rsgt;struct sg_table *pages;void *mapping;
@@ -597,7 +598,7 @@ struct drm_i915_gem_object { } mm;struct { -struct sg_table *cached_io_st; +struct i915_refct_sgt *cached_io_rsgt;struct i915_gem_object_page_iter get_io_page;struct drm_i915_gem_object *backup;bool created:1 ;
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +24 -25
118 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +108 -78
410 lines not on this page · raw message
drivers/gpu/drm/i915/i915_scatterlist.c +46 -16
126 lines not on this page · raw message
drivers/gpu/drm/i915/i915_scatterlist.h +72 -4
82 lines not on this page · raw message
drivers/gpu/drm/i915/intel_region_ttm.c +8 -7
@@ -115,8 +115,8 @@ void intel_region_ttm_fini(struct intel_memory_region *mem) }/** -* intel_region_ttm_resource_to_st - Convert an opaque TTM resource manager resource -* to an sg_table. +* intel_region_ttm_resource_to_rsgt - +* Convert an opaque TTM resource manager resource to a refcounted sg_table. * @mem: The memory region. * @res: The resource manager resource obtained from the TTM resource manager. *
@@ -126,17 +126,18 @@ void intel_region_ttm_fini(struct intel_memory_region *mem)* * Return: A malloced sg_table on success, an error pointer on failure. */ -struct sg_table *intel_region_ttm_resource_to_st (struct intel_memory_region *mem, -struct ttm_resource *res) +struct i915_refct_sgt * +intel_region_ttm_resource_to_rsgt (struct intel_memory_region *mem, +struct ttm_resource *res) {if (mem->is_range_manager) {struct ttm_range_mgr_node *range_node =to_ttm_range_mgr_node (res); -return i915_sg_from_mm_node (&range_node->mm_nodes[0 ], - mem->region.start); +return i915_rsgt_from_mm_node (&range_node->mm_nodes[0 ], + mem->region.start); }else { -return i915_sg_from_buddy_resource (res, mem->region.start); +return i915_rsgt_from_buddy_resource (res, mem->region.start); } }
drivers/gpu/drm/i915/intel_region_ttm.h +3 -2
@@ -22,8 +22,9 @@ int intel_region_ttm_init(struct intel_memory_region *mem);void intel_region_ttm_fini (struct intel_memory_region *mem); -struct sg_table *intel_region_ttm_resource_to_st (struct intel_memory_region *mem, -struct ttm_resource *res); +struct i915_refct_sgt * +intel_region_ttm_resource_to_rsgt (struct intel_memory_region *mem, +struct ttm_resource *res);void intel_region_ttm_resource_free (struct intel_memory_region *mem,struct ttm_resource *res);
drivers/gpu/drm/i915/selftests/mock_region.c +7 -5
@@ -15,9 +15,9 @@static void mock_region_put_pages (struct drm_i915_gem_object *obj,struct sg_table *pages) { +i915_refct_sgt_put (obj->mm.rsgt); + obj->mm.rsgt =NULL ;intel_region_ttm_resource_free (obj->mm.region, obj->mm.res); -sg_free_table (pages); -kfree (pages); }static int mock_region_get_pages (struct drm_i915_gem_object *obj)
@@ -36,12 +36,14 @@ static int mock_region_get_pages(struct drm_i915_gem_object *obj)if (IS_ERR (obj->mm.res))return PTR_ERR (obj->mm.res); - pages =intel_region_ttm_resource_to_st (obj->mm.region, obj->mm.res); -if (IS_ERR (pages)) { - err =PTR_ERR (pages); + obj->mm.rsgt =intel_region_ttm_resource_to_rsgt (obj->mm.region, + obj->mm.res); +if (IS_ERR (obj->mm.rsgt)) { + err =PTR_ERR (obj->mm.rsgt); goto err_free_resource; } + pages = &obj->mm.rsgt->table;__i915_gem_object_set_pages (obj, pages,i915_sg_dma_sizes (pages->sgl));return 0 ;
Signature · 1 line
2.31.1
PATCH v4 4/4 drm/i915: Initial introduction of vma resources
In reply to Thomas HellströmFrom: Thomas Hellström <[email protected]>
The vma resource are needed for asynchronous bind management and are similar to TTM resources. They contain the data needed for asynchronous unbinding (typically the vm range, any backend private information and a means to do refcounting and to hold the unbinding for error capture).
When a vma is bound, a vma resource is created and attached to the vma, and on async unbinding it is detached from the vma, and instead the vm records the fence marking unbind complete. This fence needs to be waited on before we can bind the same region again, so either the fence can be recorded for this particular range only, using an interval tree, or as a simpler approach, for the whole vm. The latter means no binding can take place on a vm until all detached vma resources scheduled for unbind are signaled. With an interval tree fence recording, the interval tree needs to be searched for fences to be signaled before binding can take place.
But most of that is for later, this patch only introduces stub vma resources without unbind capability and the fences of which are waited for sync during unbinding. At this point we're interested in the hold capability as a POC for error capture. Note that the current sync waiting at unbind time is done uninterruptible, but that's OK since we're only ever waiting during error capture, and in that case there's very little gpu activity (if any) that can stall.
v2:
- Fix the mock gtt selftest to bind with vma resources.
- Update a code comment.
- Account for rebinding the same vma with different I915_VMA_*_BIND flags v3:
- Some style fixups.
- Move the sync fence wait to __i915_vma_evict instead of __i915_vma_unbind to catch also the evict case on suspend.
v4:
- Remove a minor fix that incorrectly landed in this patch.
--- .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_vma.c | 206 +++++++++++++++++- drivers/gpu/drm/i915/i915_vma.h | 20 +- drivers/gpu/drm/i915/i915_vma_snapshot.c | 14 +- drivers/gpu/drm/i915/i915_vma_snapshot.h | 2 +- drivers/gpu/drm/i915/i915_vma_types.h | 5 + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 98 +++++---- 7 files changed, 288 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +1 -1
@@ -1376,7 +1376,7 @@ eb_relocate_entry(struct i915_execbuffer *eb, GRAPHICS_VER(eb->i915) == 6) { err =i915_vma_bind (target->vma, target->vma->obj->cache_level, -PIN_GLOBAL ,NULL ); +PIN_GLOBAL ,NULL ,NULL );if (err)return err; }
drivers/gpu/drm/i915/i915_vma.c +200 -6
298 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vma.h +19 -1
@@ -206,7 +206,8 @@ struct i915_vma_work *i915_vma_work(void);int i915_vma_bind (struct i915_vma *vma,enum i915_cache_level cache_level,u32 flags, -struct i915_vma_work *work); +struct i915_vma_work *work, +struct i915_vma_resource *vma_res);bool i915_gem_valid_gtt_space (struct i915_vma *vma,unsigned long color); bool i915_vma_misplaced(const struct i915_vma *vma,
@@ -433,7 +434,24 @@ static inline int i915_vma_sync(struct i915_vma *vma) return i915_active_wait(&vma->active); } +bool i915_vma_resource_hold (struct i915_vma_resource *vma_res, +bool *lockdep_cookie); + +void i915_vma_resource_unhold (struct i915_vma_resource *vma_res, +bool lockdep_cookie); + +void i915_vma_resource_put (struct i915_vma_resource *vma_res); + +struct i915_vma_resource *i915_vma_get_current_resource (struct i915_vma *vma); + +struct i915_vma_resource *i915_vma_resource_alloc (void ); +void i915_vma_module_exit (void );int i915_vma_module_init (void ); +#ifdef CONFIG_DRM_I915_SELFTEST +void i915_vma_resource_init (struct i915_vma_resource *vma_res, +struct i915_vma *vma); +#endif +#endif
drivers/gpu/drm/i915/i915_vma_snapshot.c +4 -10
@@ -36,7 +36,7 @@ void i915_vma_snapshot_init(struct i915_vma_snapshot *vsnap,if (vma->obj->mm.region) vsnap->mr =intel_memory_region_get (vma->obj->mm.region);kref_init (&vsnap->kref); - vsnap->vma_resource = &vma->active; + vsnap->vma_resource =i915_vma_get_current_resource (vma); vsnap->onstack = false; vsnap->present = true; }
@@ -63,6 +63,7 @@ static void vma_snapshot_release(struct kref *ref)container_of (ref,typeof (*vsnap), kref); vsnap->present = false; +i915_vma_resource_put (vsnap->vma_resource);if (vsnap->mr)intel_memory_region_put (vsnap->mr);if (vsnap->pages_rsgt)
@@ -112,12 +113,7 @@ void i915_vma_snapshot_put_onstack(struct i915_vma_snapshot *vsnap)bool i915_vma_snapshot_resource_pin (struct i915_vma_snapshot *vsnap,bool *lockdep_cookie) { -bool pinned =i915_active_acquire_if_busy (vsnap->vma_resource); - -if (pinned) - *lockdep_cookie =dma_fence_begin_signalling (); - -return pinned; +return i915_vma_resource_hold (vsnap->vma_resource, lockdep_cookie); }/**
@@ -131,7 +127,5 @@ bool i915_vma_snapshot_resource_pin(struct i915_vma_snapshot *vsnap,void i915_vma_snapshot_resource_unpin (struct i915_vma_snapshot *vsnap,bool lockdep_cookie) { -dma_fence_end_signalling (lockdep_cookie); - -return i915_active_release (vsnap->vma_resource); +i915_vma_resource_unhold (vsnap->vma_resource, lockdep_cookie); }
drivers/gpu/drm/i915/i915_vma_snapshot.h +1 -1
@@ -49,7 +49,7 @@ struct i915_vma_snapshot {struct i915_refct_sgt *pages_rsgt;struct intel_memory_region *mr;struct kref kref; -struct i915_active *vma_resource; +struct i915_vma_resource *vma_resource;u32 page_sizes; bool onstack:1; bool present:1;
drivers/gpu/drm/i915/i915_vma_types.h +5 -0
@@ -95,6 +95,8 @@ enum i915_cache_level;* */ +struct i915_vma_resource ; +struct intel_remapped_plane_info {/* in gtt pages */ u32 offset;
@@ -284,6 +286,9 @@ struct i915_vma {struct list_head evict_link;struct list_head closed_link; + +/** The async vma resource. Protected by the vm_mutex */ + struct i915_vma_resource *resource; };#endif
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +58 -40
152 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH v4 3/4 drm/i915: Use GFP_NOWAIT in the capture code
In reply to Thomas HellströmThe capture code is typically run entirely in the fence signalling critical path. Recently added lockdep annotation reveals a lockdep splat similar to the below one.
Fix the splats and the associated potential deadlocks using GFP_NOWAIT rather than GFP_KERNEL for memory allocation in the capture path. This has the potential drawback that capture might fail in situations with memory pressure.
Reliably being able to use GFP_KERNEL allocations during capture might require that we pin all relevant vmas first, then reset and retire the request, and finally capture and unpin.
[ 234.842048] WARNING: possible circular locking dependency detected
[ 234.842050] 5.15.0-rc7+ #20 Tainted: G U W
[ 234.842052] ------------------------------------------------------
[ 234.842054] gem_exec_captur/1180 is trying to acquire lock:
[ 234.842056] ffffffffa3e51c00 (fs_reclaim){+.+.}-{0:0}, at: __kmalloc+0x4d/0x330
[ 234.842063]
but task is already holding lock:
[ 234.842064] ffffffffa3f57620 (dma_fence_map){++++}-{0:0}, at: i915_vma_snapshot_resource_pin+0x27/0x30 [i915]
[ 234.842138]
which lock already depends on the new lock.[ 234.842140]
the existing dependency chain (in reverse order) is:
[ 234.842142]
-> #2 (dma_fence_map){++++}-{0:0}:
[ 234.842145] __dma_fence_might_wait+0x41/0xa0
[ 234.842149] dma_resv_lockdep+0x1dc/0x28f
[ 234.842151] do_one_initcall+0x58/0x2d0
[ 234.842154] kernel_init_freeable+0x273/0x2bf
[ 234.842157] kernel_init+0x16/0x120
[ 234.842160] ret_from_fork+0x1f/0x30
[ 234.842163]
-> #1 (mmu_notifier_invalidate_range_start){+.+.}-{0:0}:
[ 234.842166] fs_reclaim_acquire+0x6d/0xd0
[ 234.842168] __kmalloc_node+0x51/0x3a0
[ 234.842171] alloc_cpumask_var_node+0x1b/0x30
[ 234.842174] native_smp_prepare_cpus+0xc7/0x292
[ 234.842177] kernel_init_freeable+0x160/0x2bf
[ 234.842179] kernel_init+0x16/0x120
[ 234.842181] ret_from_fork+0x1f/0x30
[ 234.842184]
-> #0 (fs_reclaim){+.+.}-{0:0}:
[ 234.842186] __lock_acquire+0x1161/0x1dc0
[ 234.842189] lock_acquire+0xb5/0x2b0
[ 234.842192] fs_reclaim_acquire+0xa1/0xd0
[ 234.842193] __kmalloc+0x4d/0x330
[ 234.842196] i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842253] intel_engine_coredump_add_vma+0x36/0xe0 [i915]
[ 234.842307] __i915_gpu_coredump+0x290/0x5e0 [i915]
[ 234.842365] i915_capture_error_state+0x57/0xa0 [i915]
[ 234.842415] intel_gt_handle_error+0x348/0x3e0 [i915]
[ 234.842462] intel_gt_debugfs_reset_store+0x3c/0x90 [i915]
[ 234.842504] simple_attr_write+0xc1/0xe0
[ 234.842507] full_proxy_write+0x53/0x80
[ 234.842509] vfs_write+0xbc/0x350
[ 234.842513] ksys_write+0x58/0xd0
[ 234.842514] do_syscall_64+0x38/0x90
[ 234.842516] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 234.842519]
other info that might help us debug this:[ 234.842521] Chain exists of:
fs_reclaim --> mmu_notifier_invalidate_range_start --> dma_fence_map[ 234.842526] Possible unsafe locking scenario:
[ 234.842528] CPU0 CPU1
[ 234.842529] ---- ----
[ 234.842531] lock(dma_fence_map);
[ 234.842532] lock(mmu_notifier_invalidate_range_start);
[ 234.842535] lock(dma_fence_map);
[ 234.842537] lock(fs_reclaim);
[ 234.842539]
*** DEADLOCK ***[ 234.842540] 4 locks held by gem_exec_captur/1180:
[ 234.842543] #0: ffff9007812d9460 (sb_writers#17){.+.+}-{0:0}, at: ksys_write+0x58/0xd0
[ 234.842547] #1: ffff900781d9ecb8 (&attr->mutex){+.+.}-{3:3}, at: simple_attr_write+0x3a/0xe0
[ 234.842552] #2: ffffffffc11913a8 (capture_mutex){+.+.}-{3:3}, at: i915_capture_error_state+0x1a/0xa0 [i915]
[ 234.842602] #3: ffffffffa3f57620 (dma_fence_map){++++}-{0:0}, at: i915_vma_snapshot_resource_pin+0x27/0x30 [i915]
[ 234.842656]
stack backtrace:
[ 234.842658] CPU: 0 PID: 1180 Comm: gem_exec_captur Tainted: G U W 5.15.0-rc7+ #20
[ 234.842661] Hardware name: ASUS System Product Name/PRIME B560M-A AC, BIOS 0403 01/26/2021
[ 234.842664] Call Trace:
[ 234.842666] dump_stack_lvl+0x57/0x72
[ 234.842669] check_noncircular+0xde/0x100
[ 234.842672] ? __lock_acquire+0x3bf/0x1dc0
[ 234.842675] __lock_acquire+0x1161/0x1dc0
[ 234.842678] lock_acquire+0xb5/0x2b0
[ 234.842680] ? __kmalloc+0x4d/0x330
[ 234.842683] ? finish_task_switch.isra.0+0xf2/0x360
[ 234.842686] ? i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842734] fs_reclaim_acquire+0xa1/0xd0
[ 234.842737] ? __kmalloc+0x4d/0x330
[ 234.842739] __kmalloc+0x4d/0x330
[ 234.842742] i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842793] ? capture_vma+0xbe/0x110 [i915]
[ 234.842844] intel_engine_coredump_add_vma+0x36/0xe0 [i915]
[ 234.842892] __i915_gpu_coredump+0x290/0x5e0 [i915]
[ 234.842939] i915_capture_error_state+0x57/0xa0 [i915]
[ 234.842985] intel_gt_handle_error+0x348/0x3e0 [i915]
[ 234.843032] ? __mutex_lock+0x81/0x830
[ 234.843035] ? simple_attr_write+0x3a/0xe0
[ 234.843038] ? __lock_acquire+0x3bf/0x1dc0
[ 234.843041] intel_gt_debugfs_reset_store+0x3c/0x90 [i915]
[ 234.843083] ? _copy_from_user+0x45/0x80
[ 234.843086] simple_attr_write+0xc1/0xe0
[ 234.843089] full_proxy_write+0x53/0x80
[ 234.843091] vfs_write+0xbc/0x350
[ 234.843094] ksys_write+0x58/0xd0
[ 234.843096] do_syscall_64+0x38/0x90
[ 234.843098] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 234.843101] RIP: 0033:0x7fa467480877
[ 234.843103] Code: 75 05 48 83 c4 58 c3 e8 37 4e ff ff 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24
[ 234.843108] RSP: 002b:00007ffd14d79b08 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 234.843112] RAX: ffffffffffffffda RBX: 00007ffd14d79b60 RCX: 00007fa467480877
[ 234.843114] RDX: 0000000000000014 RSI: 00007ffd14d79b60 RDI: 0000000000000007
[ 234.843116] RBP: 0000000000000007 R08: 0000000000000000 R09: 00007ffd14d79ab0
[ 234.843119] R10: ffffffffffffffff R11: 0000000000000246 R12: 0000000000000014
[ 234.843121] R13: 0000000000000000 R14: 00007ffd14d79b60 R15: 0000000000000005--- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -50,7 +50,7 @@#include "i915_scatterlist.h" #include "i915_vma_snapshot.h" -#define ALLOW_FAIL (GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN) +#define ALLOW_FAIL (GFP_NOWAIT | __GFP_RETRY_MAYFAIL | __GFP_NOWARN)#define ATOMIC_MAYFAIL (GFP_ATOMIC | __GFP_NOWARN) static void __sg_set_buf(struct scatterlist *sg,
Signature · 1 line
2.31.1
PATCH v4 2/4 drm/i915: Update error capture code to avoid using the current vma state
In reply to Thomas HellströmWith asynchronous migrations, the vma state may be several migrations ahead of the state that matches the request we're capturing. Address that by introducing an i915_vma_snapshot structure that can be used to snapshot relevant state at request submission. In order to make sure we access the correct memory, the snapshots take references on relevant sg-tables and memory regions.
Also move the capture list allocation out of the fence signaling critical path and use the CONFIG_DRM_I915_CAPTURE_ERROR define to avoid compiling in members and functions used for error capture when they're not used.
Finally, Introducing lockdep annotation means we will be start seeing lockdep splats in the capture code. This is because typically the capture code runs in the fence signalling critical path. These splats and the associated deadlocks will be worked around in an upcoming patch.
Splats look like these:
[ 234.842048] WARNING: possible circular locking dependency detected
[ 234.842050] 5.15.0-rc7+ #20 Tainted: G U W
[ 234.842052] ------------------------------------------------------
[ 234.842054] gem_exec_captur/1180 is trying to acquire lock:
[ 234.842056] ffffffffa3e51c00 (fs_reclaim){+.+.}-{0:0}, at: __kmalloc+0x4d/0x330
[ 234.842063]
but task is already holding lock:
[ 234.842064] ffffffffa3f57620 (dma_fence_map){++++}-{0:0}, at: i915_vma_snapshot_resource_pin+0x27/0x30 [i915]
[ 234.842138]
which lock already depends on the new lock.[ 234.842140]
the existing dependency chain (in reverse order) is:
[ 234.842142]
-> #2 (dma_fence_map){++++}-{0:0}:
[ 234.842145] __dma_fence_might_wait+0x41/0xa0
[ 234.842149] dma_resv_lockdep+0x1dc/0x28f
[ 234.842151] do_one_initcall+0x58/0x2d0
[ 234.842154] kernel_init_freeable+0x273/0x2bf
[ 234.842157] kernel_init+0x16/0x120
[ 234.842160] ret_from_fork+0x1f/0x30
[ 234.842163]
-> #1 (mmu_notifier_invalidate_range_start){+.+.}-{0:0}:
[ 234.842166] fs_reclaim_acquire+0x6d/0xd0
[ 234.842168] __kmalloc_node+0x51/0x3a0
[ 234.842171] alloc_cpumask_var_node+0x1b/0x30
[ 234.842174] native_smp_prepare_cpus+0xc7/0x292
[ 234.842177] kernel_init_freeable+0x160/0x2bf
[ 234.842179] kernel_init+0x16/0x120
[ 234.842181] ret_from_fork+0x1f/0x30
[ 234.842184]
-> #0 (fs_reclaim){+.+.}-{0:0}:
[ 234.842186] __lock_acquire+0x1161/0x1dc0
[ 234.842189] lock_acquire+0xb5/0x2b0
[ 234.842192] fs_reclaim_acquire+0xa1/0xd0
[ 234.842193] __kmalloc+0x4d/0x330
[ 234.842196] i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842253] intel_engine_coredump_add_vma+0x36/0xe0 [i915]
[ 234.842307] __i915_gpu_coredump+0x290/0x5e0 [i915]
[ 234.842365] i915_capture_error_state+0x57/0xa0 [i915]
[ 234.842415] intel_gt_handle_error+0x348/0x3e0 [i915]
[ 234.842462] intel_gt_debugfs_reset_store+0x3c/0x90 [i915]
[ 234.842504] simple_attr_write+0xc1/0xe0
[ 234.842507] full_proxy_write+0x53/0x80
[ 234.842509] vfs_write+0xbc/0x350
[ 234.842513] ksys_write+0x58/0xd0
[ 234.842514] do_syscall_64+0x38/0x90
[ 234.842516] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 234.842519]
other info that might help us debug this:[ 234.842521] Chain exists of:
fs_reclaim --> mmu_notifier_invalidate_range_start --> dma_fence_map[ 234.842526] Possible unsafe locking scenario:
[ 234.842528] CPU0 CPU1
[ 234.842529] ---- ----
[ 234.842531] lock(dma_fence_map);
[ 234.842532] lock(mmu_notifier_invalidate_range_start);
[ 234.842535] lock(dma_fence_map);
[ 234.842537] lock(fs_reclaim);
[ 234.842539]
*** DEADLOCK ***[ 234.842540] 4 locks held by gem_exec_captur/1180:
[ 234.842543] #0: ffff9007812d9460 (sb_writers#17){.+.+}-{0:0}, at: ksys_write+0x58/0xd0
[ 234.842547] #1: ffff900781d9ecb8 (&attr->mutex){+.+.}-{3:3}, at: simple_attr_write+0x3a/0xe0
[ 234.842552] #2: ffffffffc11913a8 (capture_mutex){+.+.}-{3:3}, at: i915_capture_error_state+0x1a/0xa0 [i915]
[ 234.842602] #3: ffffffffa3f57620 (dma_fence_map){++++}-{0:0}, at: i915_vma_snapshot_resource_pin+0x27/0x30 [i915]
[ 234.842656]
stack backtrace:
[ 234.842658] CPU: 0 PID: 1180 Comm: gem_exec_captur Tainted: G U W 5.15.0-rc7+ #20
[ 234.842661] Hardware name: ASUS System Product Name/PRIME B560M-A AC, BIOS 0403 01/26/2021
[ 234.842664] Call Trace:
[ 234.842666] dump_stack_lvl+0x57/0x72
[ 234.842669] check_noncircular+0xde/0x100
[ 234.842672] ? __lock_acquire+0x3bf/0x1dc0
[ 234.842675] __lock_acquire+0x1161/0x1dc0
[ 234.842678] lock_acquire+0xb5/0x2b0
[ 234.842680] ? __kmalloc+0x4d/0x330
[ 234.842683] ? finish_task_switch.isra.0+0xf2/0x360
[ 234.842686] ? i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842734] fs_reclaim_acquire+0xa1/0xd0
[ 234.842737] ? __kmalloc+0x4d/0x330
[ 234.842739] __kmalloc+0x4d/0x330
[ 234.842742] i915_vma_coredump_create+0x78/0x5b0 [i915]
[ 234.842793] ? capture_vma+0xbe/0x110 [i915]
[ 234.842844] intel_engine_coredump_add_vma+0x36/0xe0 [i915]
[ 234.842892] __i915_gpu_coredump+0x290/0x5e0 [i915]
[ 234.842939] i915_capture_error_state+0x57/0xa0 [i915]
[ 234.842985] intel_gt_handle_error+0x348/0x3e0 [i915]
[ 234.843032] ? __mutex_lock+0x81/0x830
[ 234.843035] ? simple_attr_write+0x3a/0xe0
[ 234.843038] ? __lock_acquire+0x3bf/0x1dc0
[ 234.843041] intel_gt_debugfs_reset_store+0x3c/0x90 [i915]
[ 234.843083] ? _copy_from_user+0x45/0x80
[ 234.843086] simple_attr_write+0xc1/0xe0
[ 234.843089] full_proxy_write+0x53/0x80
[ 234.843091] vfs_write+0xbc/0x350
[ 234.843094] ksys_write+0x58/0xd0
[ 234.843096] do_syscall_64+0x38/0x90
[ 234.843098] entry_SYSCALL_64_after_hwframe+0x44/0xae
[ 234.843101] RIP: 0033:0x7fa467480877
[ 234.843103] Code: 75 05 48 83 c4 58 c3 e8 37 4e ff ff 0f 1f 80 00 00 00 00 f3 0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 48 89 54 24 18 48 89 74 24
[ 234.843108] RSP: 002b:00007ffd14d79b08 EFLAGS: 00000246 ORIG_RAX: 0000000000000001
[ 234.843112] RAX: ffffffffffffffda RBX: 00007ffd14d79b60 RCX: 00007fa467480877
[ 234.843114] RDX: 0000000000000014 RSI: 00007ffd14d79b60 RDI: 0000000000000007
[ 234.843116] RBP: 0000000000000007 R08: 0000000000000000 R09: 00007ffd14d79ab0
[ 234.843119] R10: ffffffffffffffff R11: 0000000000000246 R12: 0000000000000014
[ 234.843121] R13: 0000000000000000 R14: 00007ffd14d79b60 R15: 0000000000000005v4:
- Break out the capture allocation mode change to a separate patch.
--- drivers/gpu/drm/i915/Makefile | 1 + .../gpu/drm/i915/gem/i915_gem_execbuffer.c | 135 ++++++++++--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 8 +- .../drm/i915/gt/intel_execlists_submission.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 178 +++++++++++++----- drivers/gpu/drm/i915/i915_request.c | 63 +++++-- drivers/gpu/drm/i915/i915_request.h | 18 +- drivers/gpu/drm/i915/i915_vma_snapshot.c | 137 ++++++++++++++ drivers/gpu/drm/i915/i915_vma_snapshot.h | 112 +++++++++++ 9 files changed, 557 insertions(+), 97 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.c create mode 100644 drivers/gpu/drm/i915/i915_vma_snapshot.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -173,6 +173,7 @@ i915-y += \ i915_trace_points.o \ i915_ttm_buddy_manager.o \ i915_vma.o \ + i915_vma_snapshot.o \ intel_wopcm.o # general-purpose microcontroller (GuC) support
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +112 -23
202 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_engine_cs.c +6 -2
@@ -1676,14 +1676,18 @@ static void intel_engine_print_registers(struct intel_engine_cs *engine,static void print_request_ring (struct drm_printer *m,struct i915_request *rq) { +struct i915_vma_snapshot *vsnap = &rq->batch_snapshot;void *ring;int size; +if (!i915_vma_snapshot_present (vsnap)) + vsnap =NULL ; +drm_printf (m,"[head %04x, postfix %04x, tail %04x, batch 0x%08x_%08x]:\n" , rq->head, rq->postfix, rq->tail, - rq->batch ?upper_32_bits (rq->batch->node.start) : ~0u , - rq->batch ?lower_32_bits (rq->batch->node.start) : ~0u ); + vsnap ?upper_32_bits (vsnap->gtt_offset) : ~0u , + vsnap ?lower_32_bits (vsnap->gtt_offset) : ~0u ); size = rq->tail - rq->head;if (rq->tail < rq->head)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +1 -1
@@ -2186,7 +2186,7 @@ struct execlists_capture {static void execlists_capture_work (struct work_struct *work) {struct execlists_capture *cap =container_of (work,typeof (*cap), work); -const gfp_t gfp =GFP_KERNEL | __GFP_RETRY_MAYFAIL | __GFP_NOWARN; +const gfp_t gfp =GFP_NOWAIT | __GFP_RETRY_MAYFAIL | __GFP_NOWARN;struct intel_engine_cs *engine = cap->rq->engine;struct intel_gt_coredump *gt = cap->error->gt;struct intel_engine_capture_vma *vma;
drivers/gpu/drm/i915/i915_gpu_error.c +129 -49
318 lines not on this page · raw message
drivers/gpu/drm/i915/i915_request.c +46 -17
105 lines not on this page · raw message
drivers/gpu/drm/i915/i915_request.h +13 -5
@@ -40,6 +40,7 @@#include "i915_scheduler.h" #include "i915_selftest.h" #include "i915_sw_fence.h" +#include "i915_vma_snapshot.h" #include <uapi/drm/i915_drm.h>
@@ -48,11 +49,15 @@ struct drm_i915_gem_object;struct drm_printer ;struct i915_request ; +#ifdef CONFIG_DRM_I915_CAPTURE_ERROR struct i915_capture_list { +struct i915_vma_snapshot *vma_snapshot;struct i915_capture_list *next; -struct i915_vma *vma; }; +void i915_request_free_capture_list (struct i915_capture_list *capture); +#endif +#define RQ_TRACE (rq, fmt, ...) do { \ const struct i915_request *rq__ = (rq); \ ENGINE_TRACE(rq__->engine, "fence %llx:%lld, current %d " fmt, \
@@ -289,10 +294,12 @@ struct i915_request {/** Preallocate space in the ring for the emitting the request */ u32 reserved_space; -/** Batch buffer related to this request if any (used for -* error state dump only). -*/ -struct i915_vma *batch; +/** Batch buffer pointer for selftest internal use. */ + I915_SELFTEST_DECLARE(struct i915_vma *batch); + +struct i915_vma_snapshot batch_snapshot; + +#ifdef CONFIG_DRM_I915_CAPTURE_ERROR /** * Additional buffers requested by userspace to be captured upon * a GPU hang. The vma/obj on this list are protected by their
@@ -300,6 +307,7 @@ struct i915_request {* on the active_list (of their final request). */ struct i915_capture_list *capture_list; +#endif /** Time at which this request was emitted, in jiffies. */ unsigned long emitted_jiffies;
drivers/gpu/drm/i915/i915_vma_snapshot.c new file +137 -0
137 lines not on this page · raw message
drivers/gpu/drm/i915/i915_vma_snapshot.h new file +112 -0
112 lines not on this page · raw message
Signature · 1 line
2.31.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Prepare error capture for asynchronous migration (rev5)
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: Prepare error capture for asynchronous migration (rev5)
URL : https://patchwork.freedesktop.org/series/96281/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 24b403667c6b drm/i915: Introduce refcounted sg-tables 46ad510d88a8 drm/i915: Update error capture code to avoid using the current vma state -:918: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #918: new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 955 lines checked afda3687579e drm/i915: Use GFP_NOWAIT in the capture code 641501837041 drm/i915: Initial introduction of vma resources
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Prepare error capture for asynchronous migration (rev5)
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: Prepare error capture for asynchronous migration (rev5)
URL : https://patchwork.freedesktop.org/series/96281/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10813 -> Patchwork_21488
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/index.html
Participating hosts (33 -> 34)
------------------------------
Additional (3): fi-tgl-1115g4 fi-icl-u2 fi-pnv-d510
Missing (2): bat-dg1-6 bat-adlp-4
Known issues
------------
Here are the changes found in Patchwork_21488 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@query-info:
- fi-tgl-1115g4: NOTRUN -> [SKIP][1] ([fdo#109315])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][2] ([fdo#109315]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@nop-gfx0:
- fi-tgl-1115g4: NOTRUN -> [SKIP][3] ([fdo#109315] / [i915#2575]) +16 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@amdgpu/[email protected]
* igt@debugfs_test@read_all_entries:
- fi-apl-guc: [PASS][4] -> [DMESG-WARN][5] ([i915#1610])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/fi-apl-guc/igt@debugfs_test@read_all_entries.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-apl-guc/igt@debugfs_test@read_all_entries.html
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-1115g4: NOTRUN -> [FAIL][6] ([i915#1888])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-pnv-d510: NOTRUN -> [SKIP][7] ([fdo#109271]) +53 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-pnv-d510/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][8] ([i915#2190])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][9] ([i915#2190])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@[email protected]
* igt@i915_pm_backlight@basic-brightness:
- fi-tgl-1115g4: NOTRUN -> [SKIP][10] ([i915#1155])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][11] ([fdo#111827]) +8 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@vga-hpd-fast:
- fi-tgl-1115g4: NOTRUN -> [SKIP][12] ([fdo#111827]) +8 similar issues
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-icl-u2: NOTRUN -> [SKIP][13] ([fdo#109278]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][14] ([i915#4103]) +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-tgl-1115g4: NOTRUN -> [SKIP][15] ([fdo#109285])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][16] ([fdo#109285])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@[email protected]
* igt@kms_psr@primary_mmap_gtt:
- fi-tgl-1115g4: NOTRUN -> [SKIP][17] ([i915#1072]) +3 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@kms_psr@primary_mmap_gtt.html
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][18] ([i915#3301])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-icl-u2/igt@[email protected]
- fi-tgl-1115g4: NOTRUN -> [SKIP][19] ([i915#3301])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-tgl-1115g4/igt@[email protected]
#### Possible fixes ####
* igt@kms_frontbuffer_tracking@basic:
- {fi-hsw-gt1}: [DMESG-WARN][20] ([i915#4290]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/fi-hsw-gt1/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/fi-hsw-gt1/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4290]: https://gitlab.freedesktop.org/drm/intel/issues/4290
Build changes
-------------
* Linux: CI_DRM_10813 -> Patchwork_21488
CI-20190529: 20190529
CI_DRM_10813: 1025cf52c55966384b9724e0679b37e3115179ab @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6264: 3458490c14afe3cb8aa873fa9e520e1c815ea068 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21488: 6415018370419432c5e545c7a178b89f4d52aba1 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
641501837041 drm/i915: Initial introduction of vma resources afda3687579e drm/i915: Use GFP_NOWAIT in the capture code46ad510d88a8 drm/i915: Update error capture code to avoid using the current vma state 24b403667c6b drm/i915: Introduce refcounted sg-tables
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/index.html
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for Prepare error capture for asynchronous migration (rev5)
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: Prepare error capture for asynchronous migration (rev5)
URL : https://patchwork.freedesktop.org/series/96281/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10813_full -> Patchwork_21488_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21488_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21488_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (9 -> 9)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21488_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_cursor_edge_walk@pipe-c-256x256-bottom-edge:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb7/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_21488_full that come from known issues:
### CI changes ###
#### Possible fixes ####
* boot:
- shard-glk: ([PASS][3], [PASS][4], [PASS][5], [PASS][6], [PASS][7], [FAIL][8], [PASS][9], [PASS][10], [PASS][11], [PASS][12], [FAIL][13], [PASS][14], [PASS][15], [PASS][16], [PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25], [PASS][26], [PASS][27]) ([i915#4392]) -> ([PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [PASS][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41], [PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [PASS][48], [PASS][49], [PASS][50], [PASS][51], [PASS][52])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk4/boot.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk1/boot.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk1/boot.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk1/boot.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk2/boot.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk2/boot.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk2/boot.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk3/boot.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk9/boot.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk9/boot.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk3/boot.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk9/boot.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk8/boot.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk8/boot.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk8/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk7/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk7/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk6/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk6/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk5/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk5/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk5/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk3/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk4/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk4/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk9/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk9/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk9/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk2/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk2/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk2/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk3/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk3/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk3/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk4/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk4/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk4/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk5/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk5/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk5/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk7/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk7/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk8/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk8/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk8/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_param@set-priority-not-supported:
- shard-tglb: NOTRUN -> [SKIP][53] ([fdo#109314])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb1/igt@[email protected]
* igt@gem_ctx_sseu@mmap-args:
- shard-tglb: NOTRUN -> [SKIP][54] ([i915#280])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][55] -> [TIMEOUT][56] ([i915#2369] / [i915#3063] / [i915#3648])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb1/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb1/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: NOTRUN -> [FAIL][57] ([i915#2842]) +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: NOTRUN -> [FAIL][58] ([i915#2842])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [PASS][59] -> [SKIP][60] ([fdo#109271])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-apl3/igt@gem_exec_fair@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [PASS][61] -> [FAIL][62] ([i915#2842]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-kbl7/igt@gem_exec_fair@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@rcs0:
- shard-tglb: [PASS][63] -> [FAIL][64] ([i915#2842])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb5/igt@gem_exec_fair@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][65] ([i915#2842])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-iclb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][66] -> [FAIL][67] ([i915#2849])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-iclb8/igt@gem_exec_fair@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-iclb4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_params@no-blt:
- shard-tglb: NOTRUN -> [SKIP][68] ([fdo#109283])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb5/igt@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][69] -> [SKIP][70] ([i915#2190])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb2/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb6/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][71] ([fdo#109271] / [i915#2190])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-tglb: NOTRUN -> [WARN][72] ([i915#2658])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb1/igt@[email protected]
* igt@gem_pxp@verify-pxp-key-change-after-suspend-resume:
- shard-tglb: NOTRUN -> [SKIP][73] ([i915#4270])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb1/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-tglb: NOTRUN -> [SKIP][74] ([i915#3323])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-tglb: NOTRUN -> [DMESG-WARN][75] ([i915#3002])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@[email protected]
- shard-kbl: NOTRUN -> [DMESG-WARN][76] ([i915#3002])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl6/igt@[email protected]
* igt@gem_userptr_blits@vma-merge:
- shard-glk: NOTRUN -> [FAIL][77] ([i915#3318])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@[email protected]
- shard-skl: NOTRUN -> [FAIL][78] ([i915#3318])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@[email protected]
* igt@gen7_exec_parse@basic-allowed:
- shard-tglb: NOTRUN -> [SKIP][79] ([fdo#109289]) +4 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@gen9_exec_parse@basic-rejected-ctx-param:
- shard-tglb: NOTRUN -> [SKIP][80] ([i915#2856])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@[email protected]
* igt@i915_module_load@reload-no-display:
- shard-iclb: [PASS][81] -> [DMESG-WARN][82] ([i915#2867])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-iclb3/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-iclb8/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- shard-skl: [PASS][83] -> [FAIL][84] ([i915#454])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-skl7/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl9/igt@[email protected]
* igt@i915_pm_rpm@modeset-non-lpsp-stress-no-wait:
- shard-tglb: NOTRUN -> [SKIP][85] ([fdo#111644] / [i915#1397] / [i915#2411])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@i915_selftest@live@hangcheck:
- shard-snb: [PASS][86] -> [INCOMPLETE][87] ([i915#3921])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-snb5/igt@i915_selftest@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-snb6/igt@i915_selftest@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-glk: [PASS][88] -> [DMESG-WARN][89] ([i915#118]) +1 similar issue
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk4/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk8/igt@[email protected]
* igt@kms_big_fb@linear-32bpp-rotate-90:
- shard-tglb: NOTRUN -> [SKIP][90] ([fdo#111614])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-glk: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#3777])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip:
- shard-tglb: NOTRUN -> [SKIP][92] ([fdo#111615]) +3 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip-async-flip.html
* igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#3886]) +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl2/igt@kms_ccs@pipe-a-bad-pixel-format-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][94] ([fdo#109271] / [i915#3886]) +4 similar issues
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][95] ([fdo#109271] / [i915#3886]) +7 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][96] ([fdo#109271] / [i915#3886]) +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][97] ([i915#3689]) +3 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs.html
* igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][98] ([fdo#109271]) +60 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@vga-hpd:
- shard-skl: NOTRUN -> [SKIP][99] ([fdo#109271] / [fdo#111827]) +4 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@[email protected]
* igt@kms_chamelium@vga-hpd-after-suspend:
- shard-tglb: NOTRUN -> [SKIP][100] ([fdo#109284] / [fdo#111827]) +7 similar issues
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb5/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-0-75:
- shard-kbl: NOTRUN -> [SKIP][101] ([fdo#109271] / [fdo#111827]) +6 similar issues
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl1/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-blue-to-red:
- shard-apl: NOTRUN -> [SKIP][102] ([fdo#109271] / [fdo#111827]) +4 similar issues
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl2/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-25:
- shard-glk: NOTRUN -> [SKIP][103] ([fdo#109271] / [fdo#111827]) +8 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@[email protected]
* igt@kms_content_protection@atomic-dpms:
- shard-tglb: NOTRUN -> [SKIP][104] ([fdo#111828])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [PASS][105] -> [DMESG-WARN][106] ([i915#180]) +3 similar issues
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-kbl7/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-suspend:
- shard-tglb: [PASS][107] -> [INCOMPLETE][108] ([i915#456])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb1/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb7/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-32x10-sliding:
- shard-tglb: NOTRUN -> [SKIP][109] ([i915#3359]) +4 similar issues
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-512x170-onscreen:
- shard-tglb: NOTRUN -> [SKIP][110] ([fdo#109279] / [i915#3359])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-tglb: [PASS][111] -> [INCOMPLETE][112] ([i915#2411] / [i915#4211])
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb5/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb7/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- shard-tglb: NOTRUN -> [SKIP][113] ([i915#4103])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-skl: [PASS][114] -> [FAIL][115] ([i915#2346])
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-skl10/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl1/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: NOTRUN -> [FAIL][116] ([i915#2346] / [i915#533])
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][117] -> [INCOMPLETE][118] ([i915#180] / [i915#636])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-kbl3/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl7/igt@[email protected]
* igt@kms_fbcon_fbt@psr-suspend:
- shard-tglb: [PASS][119] -> [INCOMPLETE][120] ([i915#2411] / [i915#456])
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-tglb3/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][121] ([fdo#109271]) +51 similar issues
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: NOTRUN -> [DMESG-WARN][122] ([i915#180])
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-cpu:
- shard-tglb: NOTRUN -> [SKIP][123] ([fdo#111825]) +14 similar issues
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-pri-indfb-draw-mmap-cpu.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-cpu:
- shard-glk: NOTRUN -> [SKIP][124] ([fdo#109271]) +69 similar issues
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][125] -> [FAIL][126] ([i915#1188]) +1 similar issue
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-skl6/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl1/igt@[email protected]
* igt@kms_pipe_b_c_ivb@disable-pipe-b-enable-pipe-c:
- shard-apl: NOTRUN -> [SKIP][127] ([fdo#109271]) +52 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][128] ([i915#265])
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@[email protected]
- shard-glk: NOTRUN -> [FAIL][129] ([i915#265])
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max:
- shard-apl: NOTRUN -> [FAIL][130] ([fdo#108145] / [i915#265])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl6/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][131] -> [FAIL][132] ([fdo#108145] / [i915#265]) +2 similar issues
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-skl8/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl9/igt@[email protected]
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping:
- shard-glk: NOTRUN -> [SKIP][133] ([fdo#109271] / [i915#2733])
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-c-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-skl: NOTRUN -> [SKIP][134] ([fdo#109271] / [i915#658]) +1 similar issue
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl7/igt@[email protected]
- shard-glk: NOTRUN -> [SKIP][135] ([fdo#109271] / [i915#658]) +1 similar issue
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk1/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-4:
- shard-apl: NOTRUN -> [SKIP][136] ([fdo#109271] / [i915#658]) +1 similar issue
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl6/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
- shard-kbl: NOTRUN -> [SKIP][137] ([fdo#109271] / [i915#658])
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-1:
- shard-tglb: NOTRUN -> [SKIP][138] ([i915#2920]) +1 similar issue
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb3/igt@[email protected]
* igt@kms_psr@psr2_basic:
- shard-iclb: [PASS][139] -> [SKIP][140] ([fdo#109441]) +1 similar issue
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-iclb2/igt@kms_psr@psr2_basic.html
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-iclb7/igt@kms_psr@psr2_basic.html
* igt@kms_psr@psr2_sprite_render:
- shard-tglb: NOTRUN -> [FAIL][141] ([i915#132] / [i915#3467])
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@kms_psr@psr2_sprite_render.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [PASS][142] -> [DMESG-WARN][143] ([i915#180]) +1 similar issue
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-apl7/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl1/igt@[email protected]
- shard-skl: [PASS][144] -> [INCOMPLETE][145] ([i915#198] / [i915#2828])
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-skl9/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-skl1/igt@[email protected]
* igt@kms_writeback@writeback-fb-id:
- shard-kbl: NOTRUN -> [SKIP][146] ([fdo#109271] / [i915#2437])
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl4/igt@[email protected]
* igt@kms_writeback@writeback-invalid-parameters:
- shard-glk: NOTRUN -> [SKIP][147] ([fdo#109271] / [i915#2437])
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@[email protected]
* igt@nouveau_crc@pipe-c-source-outp-complete:
- shard-tglb: NOTRUN -> [SKIP][148] ([i915#2530]) +2 similar issues
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb5/igt@[email protected]
* igt@prime_nv_pcopy@test3_1:
- shard-tglb: NOTRUN -> [SKIP][149] ([fdo#109291]) +2 similar issues
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb5/igt@prime_nv_pcopy@test3_1.html
* igt@sysfs_clients@busy:
- shard-tglb: NOTRUN -> [SKIP][150] ([i915#2994]) +1 similar issue
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-tglb2/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][151] ([fdo#109271] / [i915#2994]) +1 similar issue
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl6/igt@[email protected]
* igt@sysfs_clients@split-50:
- shard-glk: NOTRUN -> [SKIP][152] ([fdo#109271] / [i915#2994])
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk6/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-kbl: [DMESG-WARN][153] ([i915#180]) -> [PASS][154] +4 similar issues
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-kbl1/igt@gem_ctx_isolation@[email protected]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-kbl3/igt@gem_ctx_isolation@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-iclb: [TIMEOUT][155] ([i915#2369] / [i915#2481] / [i915#3070]) -> [PASS][156]
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-iclb6/igt@[email protected]
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-iclb5/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-apl: [FAIL][157] ([i915#2842]) -> [PASS][158]
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-apl6/igt@gem_exec_fair@[email protected]
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-apl4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [FAIL][159] ([i915#2842]) -> [PASS][160]
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-glk4/igt@gem_exec_fair@[email protected]
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/shard-glk8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-kbl: [SKIP][161] ([fdo#109271]) -> [PASS][162]
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10813/shard-kbl7/igt@gem_exec_fair@[email protected]
[162]: htt
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21488/index.html
kernel test robot
build botRe: [Intel-gfx] [PATCH v4 2/4] drm/i915: Update error capture code to avoid using the current vma state
In reply to Thomas HellströmThank you for the patch! Yet something to improve:
Hi "Thomas,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next drm/drm-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.15-rc7 next-20211029] [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/Thomas-Hellstr-m/Prepare-error-capture-for-asynchronous-migration/20211029-162401 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-randconfig-a016-20211029 (attached as .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/8f96eab37bc957404f16471b6dea28c82a1b7d40 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Thomas-Hellstr-m/Prepare-error-capture-for-asynchronous-migration/20211029-162401 git checkout 8f96eab37bc957404f16471b6dea28c82a1b7d40 # save the attached .config to linux build tree make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/gpu/drm/i915/i915_request.c: In function 'i915_fence_release':
>> drivers/gpu/drm/i915/i915_request.c:116:2: error: implicit declaration of function 'i915_request_free_capture_list' [-Werror=implicit-function-declaration]
116 | i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/i915_active_types.h:18,
from drivers/gpu/drm/i915/gt/intel_context_types.h:15,
from drivers/gpu/drm/i915/gem/i915_gem_context_types.h:20,
from drivers/gpu/drm/i915/gem/i915_gem_context.h:10,
from drivers/gpu/drm/i915/i915_request.c:33:
>> drivers/gpu/drm/i915/i915_request.c:116:51: error: 'struct i915_request' has no member named 'capture_list'
116 | i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
| ^~
drivers/gpu/drm/i915/i915_utils.h:199:10: note: in definition of macro 'fetch_and_zero'
199 | typeof(*ptr) __T = *(ptr); \
| ^~~
>> drivers/gpu/drm/i915/i915_request.c:116:51: error: 'struct i915_request' has no member named 'capture_list'
116 | i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
| ^~
drivers/gpu/drm/i915/i915_utils.h:199:23: note: in definition of macro 'fetch_and_zero'
199 | typeof(*ptr) __T = *(ptr); \
| ^~~
>> drivers/gpu/drm/i915/i915_request.c:116:51: error: 'struct i915_request' has no member named 'capture_list'
116 | i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
| ^~
drivers/gpu/drm/i915/i915_utils.h:200:4: note: in definition of macro 'fetch_and_zero'
200 | *(ptr) = (typeof(*ptr))0; \
| ^~~
>> drivers/gpu/drm/i915/i915_request.c:116:51: error: 'struct i915_request' has no member named 'capture_list'
116 | i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
| ^~
drivers/gpu/drm/i915/i915_utils.h:200:20: note: in definition of macro 'fetch_and_zero'
200 | *(ptr) = (typeof(*ptr))0; \
| ^~~cc1: some warnings being treated as errors
vim +/i915_request_free_capture_list +116 drivers/gpu/drm/i915/i915_request.c
108
109 static void i915_fence_release(struct dma_fence *fence)
110 {
111 struct i915_request *rq = to_request(fence);
112
113 GEM_BUG_ON(rq->guc_prio != GUC_PRIO_INIT &&
114 rq->guc_prio != GUC_PRIO_FINI);
115
> 116 i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
117 if (i915_vma_snapshot_present(&rq->batch_snapshot))
118 i915_vma_snapshot_put_onstack(&rq->batch_snapshot);
119
120 /*
121 * The request is put onto a RCU freelist (i.e. the address
122 * is immediately reused), mark the fences as being freed now.
123 * Otherwise the debugobjects for the fences are only marked as
124 * freed when the slab cache itself is freed, and so we would get
125 * caught trying to reuse dead objects.
126 */
127 i915_sw_fence_fini(&rq->submit);
128 i915_sw_fence_fini(&rq->semaphore);
129
130 /*
131 * Keep one request on each engine for reserved use under mempressure,
132 * do not use with virtual engines as this really is only needed for
133 * kernel contexts.
134 */
135 if (!intel_engine_is_virtual(rq->engine) &&
136 !cmpxchg(&rq->engine->request_pool, NULL, rq)) {
137 intel_context_put(rq->context);
138 return;
139 }
140
141 intel_context_put(rq->context);
142
143 kmem_cache_free(slab_requests, rq);
144 }
145
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [Intel-gfx] [PATCH v4 2/4] drm/i915: Update error capture code to avoid using the current vma state
In reply to Thomas HellströmThank you for the patch! Yet something to improve:
Hi "Thomas,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[cannot apply to drm-intel/for-linux-next drm-exynos/exynos-drm-next drm/drm-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.15-rc7 next-20211029] [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/Thomas-Hellstr-m/Prepare-error-capture-for-asynchronous-migration/20211029-162401 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: x86_64-randconfig-a013-20211028 (attached as .config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 5db7568a6a1fcb408eb8988abdaff2a225a8eb72)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/8f96eab37bc957404f16471b6dea28c82a1b7d40
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Thomas-Hellstr-m/Prepare-error-capture-for-asynchronous-migration/20211029-162401 git checkout 8f96eab37bc957404f16471b6dea28c82a1b7d40
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/i915/i915_request.c:116:2: error: implicit declaration of function 'i915_request_free_capture_list' [-Werror,-Wimplicit-function-declaration]
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
^
>> drivers/gpu/drm/i915/i915_request.c:116:53: error: no member named 'capture_list' in 'struct i915_request'
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
~~ ^
drivers/gpu/drm/i915/i915_utils.h:199:10: note: expanded from macro 'fetch_and_zero'
typeof(*ptr) __T = *(ptr); \
^~~
>> drivers/gpu/drm/i915/i915_request.c:116:53: error: no member named 'capture_list' in 'struct i915_request'
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
~~ ^
drivers/gpu/drm/i915/i915_utils.h:199:23: note: expanded from macro 'fetch_and_zero'
typeof(*ptr) __T = *(ptr); \
^~~
>> drivers/gpu/drm/i915/i915_request.c:116:53: error: no member named 'capture_list' in 'struct i915_request'
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
~~ ^
drivers/gpu/drm/i915/i915_utils.h:200:4: note: expanded from macro 'fetch_and_zero'
*(ptr) = (typeof(*ptr))0; \
^~~
>> drivers/gpu/drm/i915/i915_request.c:116:53: error: no member named 'capture_list' in 'struct i915_request'
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
~~ ^
drivers/gpu/drm/i915/i915_utils.h:200:20: note: expanded from macro 'fetch_and_zero'
*(ptr) = (typeof(*ptr))0; \
^~~
>> drivers/gpu/drm/i915/i915_request.c:116:33: error: argument type 'void' is incomplete
i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/i915/i915_utils.h:198:29: note: expanded from macro 'fetch_and_zero'
#define fetch_and_zero(ptr) ({ \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~6 errors generated.
vim +/i915_request_free_capture_list +116 drivers/gpu/drm/i915/i915_request.c
108
109 static void i915_fence_release(struct dma_fence *fence)
110 {
111 struct i915_request *rq = to_request(fence);
112
113 GEM_BUG_ON(rq->guc_prio != GUC_PRIO_INIT &&
114 rq->guc_prio != GUC_PRIO_FINI);
115
> 116 i915_request_free_capture_list(fetch_and_zero(&rq->capture_list));
117 if (i915_vma_snapshot_present(&rq->batch_snapshot))
118 i915_vma_snapshot_put_onstack(&rq->batch_snapshot);
119
120 /*
121 * The request is put onto a RCU freelist (i.e. the address
122 * is immediately reused), mark the fences as being freed now.
123 * Otherwise the debugobjects for the fences are only marked as
124 * freed when the slab cache itself is freed, and so we would get
125 * caught trying to reuse dead objects.
126 */
127 i915_sw_fence_fini(&rq->submit);
128 i915_sw_fence_fini(&rq->semaphore);
129
130 /*
131 * Keep one request on each engine for reserved use under mempressure,
132 * do not use with virtual engines as this really is only needed for
133 * kernel contexts.
134 */
135 if (!intel_engine_is_virtual(rq->engine) &&
136 !cmpxchg(&rq->engine->request_pool, NULL, rq)) {
137 intel_context_put(rq->context);
138 return;
139 }
140
141 intel_context_put(rq->context);
142
143 kmem_cache_free(slab_requests, rq);
144 }
145
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [Intel-gfx] [PATCH v4 1/4] drm/i915: Introduce refcounted sg-tables
In reply to Thomas HellströmQuoted 128 lines · Thomas Hellström
As we start to introduce asynchronous failsafe object migration, where we update the object state and then submit asynchronous commands we need to record what memory resources are actually used by various part of the command stream. Initially for three purposes:
1) Error capture.
2) Asynchronous migration error recovery.
3) Asynchronous vma bind.At the time where these happens, the object state may have been updated to be several migrations ahead and object sg-tables discarded.
In order to make it possible to keep sg-tables with memory resource information for these operations, introduce refcounted sg-tables that aren't freed until the last user is done with them.
The alternative would be to reference information sitting on the corresponding
ttm_resourceswhich typically have the same lifetime as these refcountessg_tables, but that leads to other awkward constructs:
Due to the design direction chosen for ttm resource managers that would lead to diamond-style inheritance, the LMEM resources may sometimes be prematurely freed, and finally the subclassed structttm_resourcewould have to bleed into the asynchronous vma bind code.v3:
- Address a number of style issues (Matthew Auld)
v4:
- Dont check forst->sglbeing NULL ini915_ttm_tt__shmem_unpopulate(), that should never happen. (Matthew Auld)Signed-off-by Thomas Hellström <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_object.h | 12 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +- drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 49 +++-- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 186 ++++++++++-------- drivers/gpu/drm/i915/i915_scatterlist.c | 62 ++++-- drivers/gpu/drm/i915/i915_scatterlist.h | 76 ++++++- drivers/gpu/drm/i915/intel_region_ttm.c | 15 +- drivers/gpu/drm/i915/intel_region_ttm.h | 5 +- drivers/gpu/drm/i915/selftests/mock_region.c | 12 +- 9 files changed, 276 insertions(+), 144 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_object.h +6
-6@@ -620,12 +620,12 @@ int i915_gem_object_wait_migration(struct drm_i915_gem_object *obj,bool i915_gem_object_placement_possible (struct drm_i915_gem_object *obj,enum intel_memory_type type); -struct sg_table *shmem_alloc_st (struct drm_i915_private *i915, -size_t size,struct intel_memory_region *mr, -struct address_space *mapping, -unsigned int max_segment); -void shmem_free_st (struct sg_table *st,struct address_space *mapping, -bool dirty,bool backup); +int shmem_sg_alloc_table (struct drm_i915_private *i915,struct sg_table *st, +size_t size,struct intel_memory_region *mr, +struct address_space *mapping, +unsigned int max_segment); +void shmem_sg_free_table (struct sg_table *st,struct address_space *mapping, +bool dirty,bool backup);void __shmem_writeback (size_t size,struct address_space *mapping);#ifdef CONFIG_MMU_NOTIFIER drivers/gpu/drm/i915/gem/i915_gem_object_types.h +2
-1@@ -544,6 +544,7 @@ struct drm_i915_gem_object {*/ struct list_head region_link; +struct i915_refct_sgt *rsgt;struct sg_table *pages;void *mapping;@@ -597,7 +598,7 @@ struct drm_i915_gem_object { } mm;struct { -struct sg_table *cached_io_st; +struct i915_refct_sgt *cached_io_rsgt;struct i915_gem_object_page_iter get_io_page;struct drm_i915_gem_object *backup;bool created:1 ;drivers/gpu/drm/i915/gem/i915_gem_shmem.c +6
-8@@ -25,8 +25,8 @@ static void check_release_pagevec(struct pagevec *pvec)cond_resched (); } -void shmem_free_st (struct sg_table *st,struct address_space *mapping, -bool dirty,bool backup) +void shmem_sg_free_table (struct sg_table *st,struct address_space *mapping, +bool dirty,bool backup) {struct sgt_iter sgt_iter;struct pagevec pvec;@@ -49,17 +49,15 @@ void shmem_free_st(struct sg_table *st, struct address_space *mapping,check_release_pagevec (&pvec);sg_free_table (st); -kfree (st); } -struct sg_table *shmem_alloc_st (struct drm_i915_private *i915, -size_t size,struct intel_memory_region *mr, -struct address_space *mapping, -unsigned int max_segment) +int shmem_sg_alloc_table (struct drm_i915_private *i915,struct sg_table *st, +size_t size,struct intel_memory_region *mr, +struct address_space *mapping, +unsigned int max_segment) {const unsigned long page_count = size /PAGE_SIZE ;unsigned long i; -struct sg_table *st;struct scatterlist *sg;struct page *page;unsigned long last_pfn =0 ;/* suppress gcc warning */ @@ -71,15 +69,11 @@ struct sg_table *shmem_alloc_st(struct drm_i915_private *i915,* object, bail early. */
drivers/gpu/drm/i915/gem/i915_gem_shmem.c struct sg_table *shmem_alloc_st(struct drm_i915_private *i915, · line 75
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +1
-5if (size >resource_size (&mr->region)) -return ERR_PTR (-ENOMEM ); - - st =kmalloc (sizeof (*st),GFP_KERNEL ); -if (!st) -return ERR_PTR (-ENOMEM ); +return -ENOMEM ;if (sg_alloc_table (st, page_count,GFP_KERNEL )) {kfree (st);
Potential double free?
Quoted 292 lines
drivers/gpu/drm/i915/gem/i915_gem_shmem.c +17
-12-return ERR_PTR (-ENOMEM ); +return -ENOMEM ; }/* @@ -167,15 +161,14 @@ struct sg_table *shmem_alloc_st(struct drm_i915_private *i915,/* Trim unused sg entries to avoid wasting memory. */ i915_sg_trim (st); -return st; +return 0 ; err_sg:sg_mark_end (sg);if (sg != st->sgl) { -shmem_free_st (st, mapping, false, false); +shmem_sg_free_table (st, mapping, false, false); }else {mapping_clear_unevictable (mapping);sg_free_table (st); -kfree (st); }/* @@ -190,7 +183,7 @@ struct sg_table *shmem_alloc_st(struct drm_i915_private *i915,if (ret == -ENOSPC ) ret = -ENOMEM ; -return ERR_PTR (ret); +return ret; }static int shmem_get_pages (struct drm_i915_gem_object *obj)@@ -214,11 +207,14 @@ static int shmem_get_pages(struct drm_i915_gem_object *obj)GEM_BUG_ON (obj->write_domain &I915_GEM_GPU_DOMAINS ); rebuild_st: - st =shmem_alloc_st (i915, obj->base.size, mem, mapping, max_segment); -if (IS_ERR (st)) { - ret =PTR_ERR (st); + st =kmalloc (sizeof (*st),GFP_KERNEL ); +if (!st) +return -ENOMEM ; + + ret =shmem_sg_alloc_table (i915, st, obj->base.size, mem, mapping, + max_segment); +if (ret) goto err_st; - } ret =i915_gem_gtt_prepare_pages (obj, st);if (ret) {@@ -254,7 +250,7 @@ static int shmem_get_pages(struct drm_i915_gem_object *obj)return 0 ; err_pages: -shmem_free_st (st, mapping, false, false); +shmem_sg_free_table (st, mapping, false, false);/* * shmemfs first checks if there is enough memory to allocate the page * and reports ENOSPC should there be insufficient, along with the usual @@ -268,6 +264,8 @@ static int shmem_get_pages(struct drm_i915_gem_object *obj)if (ret == -ENOSPC ) ret = -ENOMEM ; +kfree (st); +return ret; }@@ -374,8 +372,9 @@ void i915_gem_object_put_pages_shmem(struct drm_i915_gem_object *obj, struct sg_if (i915_gem_object_needs_bit17_swizzle (obj))i915_gem_object_save_bit_17_swizzle (obj, pages); -shmem_free_st (pages,file_inode (obj->base.filp)->i_mapping, - obj->mm.dirty, obj->mm.madv ==I915_MADV_WILLNEED ); +shmem_sg_free_table (pages,file_inode (obj->base.filp)->i_mapping, + obj->mm.dirty, obj->mm.madv ==I915_MADV_WILLNEED ); +kfree (pages); obj->mm.dirty = false; }drivers/gpu/drm/i915/gem/i915_gem_ttm.c +47
-43@@ -34,7 +34,7 @@* struct i915_ttm_tt - TTM page vector with additional private information * @ttm: The base TTM page vector. * @dev: The struct device used for dma mapping and unmapping. -* @cached_st: The cached scatter-gather table. +* @cached_rsgt: The cached scatter-gather table. * @is_shmem: Set if using shmem. * @filp: The shmem file, if using shmem backend. * @@ -47,7 +47,7 @@struct i915_ttm_tt {struct ttm_tt ttm;struct device *dev; -struct sg_table *cached_st; +struct i915_refct_sgt cached_rsgt;bool is_shmem;struct file *filp;@@ -217,18 +217,16 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev, i915_tt->filp = filp; } - st =shmem_alloc_st (i915, size, mr, filp->f_mapping, max_segment); -if (IS_ERR (st)) -return PTR_ERR (st); + st = &i915_tt->cached_rsgt.table; + err =shmem_sg_alloc_table (i915, st, size, mr, filp->f_mapping, + max_segment); +if (err) +return err; - err =dma_map_sg_attrs (i915_tt->dev, - st->sgl, st->nents, -DMA_BIDIRECTIONAL , -DMA_ATTR_SKIP_CPU_SYNC ); -if (err <=0 ) { - err = -EINVAL ; + err =dma_map_sgtable (i915_tt->dev, st,DMA_BIDIRECTIONAL , +DMA_ATTR_SKIP_CPU_SYNC ); +if (err) goto err_free_st; - } i =0 ;for_each_sgt_page (page, sgt_iter, st)@@ -237,11 +235,11 @@ static int i915_ttm_tt_shmem_populate(struct ttm_device *bdev,if (ttm->page_flags &TTM_TT_FLAG_SWAPPED ) ttm->page_flags &= ~TTM_TT_FLAG_SWAPPED ; - i915_tt->cached_st = st;return 0 ; err_free_st: -shmem_free_st (st, filp->f_mapping, false, false); +shmem_sg_free_table (st, filp->f_mapping, false, false); +return err; }@@ -249,16 +247,27 @@ static void i915_ttm_tt_shmem_unpopulate(struct ttm_tt *ttm) {struct i915_ttm_tt *i915_tt =container_of (ttm,typeof (*i915_tt), ttm);bool backup = ttm->page_flags &TTM_TT_FLAG_SWAPPED ; +struct sg_table *st = &i915_tt->cached_rsgt.table; + +shmem_sg_free_table (st,file_inode (i915_tt->filp)->i_mapping, + backup, backup); +} -dma_unmap_sg (i915_tt->dev, i915_tt->cached_st->sgl, - i915_tt->cached_st->nents, -DMA_BIDIRECTIONAL ); +static void i915_ttm_tt_release (struct kref *ref) +{ +struct i915_ttm_tt *i915_tt = +container_of (ref,typeof (*i915_tt), cached_rsgt.kref); +struct sg_table *st = &i915_tt->cached_rsgt.table; -shmem_free_st (fetch_and_zero (&i915_tt->cached_st), -file_inode (i915_tt->filp)->i_mapping, - backup, backup); +GEM_WARN_ON (st->sgl); + +kfree (i915_tt); } +static const struct i915_refct_sgt_ops tt_rsgt_ops = { + .release = i915_ttm_tt_release +}; +static struct ttm_tt *i915_ttm_tt_create (struct ttm_buffer_object *bo,uint32_t page_flags) {@@ -287,6 +296,9 @@ static struct ttm_tt *i915_ttm_tt_create(struct ttm_buffer_object *bo,if (ret) goto err_free; +__i915_refct_sgt_init (&i915_tt->cached_rsgt, bo->base.size, + &tt_rsgt_ops); + i915_tt->dev = obj->base.dev->dev;return &i915_tt->ttm;@@ -311,17 +323,15 @@ static int i915_ttm_tt_populate(struct ttm_device *bdev,static void i915_ttm_tt_unpopulate (struct ttm_device *bdev,struct ttm_tt *ttm) {struct i915_ttm_tt *i915_tt =container_of (ttm,typeof (*i915_tt), ttm); +struct sg_table *st = &i915_tt->cached_rsgt.table; + +if (st->sgl) +dma_unmap_sgtable (i915_tt->dev, st,DMA_BIDIRECTIONAL ,0 );if (i915_tt->is_shmem) {i915_ttm_tt_shmem_unpopulate (ttm); }else { -if (i915_tt->cached_st) { -dma_unmap_sgtable (i915_tt->dev, i915_tt->cached_st, -DMA_BIDIRECTIONAL ,0 ); -sg_free_table (i915_tt->cached_st); -kfree (i915_tt->cached_st); - i915_tt->cached_st =NULL ; - } +sg_free_table (st);ttm_pool_free (&bdev->pool, ttm); } }@@ -334,7 +344,7 @@ static void i915_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm)fput (i915_tt->filp);ttm_tt_fini (ttm); -kfree (i915_tt); +i915_refct_sgt_put (&i915_tt->cached_rsgt); } static bool i915_ttm_eviction_valuable(struct ttm_buffer_object *bo,@@ -376,12 +386,12 @@ static int i915_ttm_move_notify(struct ttm_buffer_object *bo)return 0 ; } -static void i915_ttm_free_cached_io_st (struct drm_i915_gem_object *obj) +static void i915_ttm_free_cached_io_rsgt (struct drm_i915_gem_object *obj) {struct radix_tree_iter iter;void __rcu **slot; -if (!obj->ttm.cached_io_st) +if (!obj->ttm.cached_io_rsgt)return ;rcu_read_lock ();@@ -389,9 +399,8 @@ static void i915_ttm_free_cached_io_st(struct drm_i915_gem_object *obj)radix_tree_delete (&obj->ttm.get_io_page.radix, iter.index);rcu_read_unlock (); -sg_free_table (obj->ttm.cached_io_st); -kfree (obj->ttm.cached_io_st); - obj->ttm.cached_io_st =NULL ; +i915_refct_sgt_put (obj->ttm.cached_io_rsgt); + obj->ttm.cached_io_rsgt =NULL ; } static void@@ -477,7 +486,7 @@ static int i915_ttm_purge(struct drm_i915_gem_object *obj) obj->write_domain =0 ; obj->read_domains =0 ;i915_ttm_adjust_gem_after_move (obj); -i915_ttm_free_cached_io_st (obj); +i915_ttm_free_cached_io_rsgt (obj); obj->mm.madv = __I915_MADV_PURGED;return 0 ; }@@ -532,7 +541,7 @@ static void i915_ttm_swap_notify(struct ttm_buffer_object *bo)int ret =i915_ttm_move_notify (bo);GEM_WARN_ON (ret); -GEM_WARN_ON (obj->ttm.cached_io_st); +GEM_WARN_ON (obj->ttm.cached_io_rsgt);if (!ret && obj->mm.madv !=I915_MADV_WILLNEED )i915_ttm_purge (obj); }@@ -543,7 +552,7 @@ static void i915_ttm_delete_mem_notify(struct ttm_buffer_object *bo)if (likely (obj)) {__i915_gem_object_pages_fini (obj); -i915_ttm_free_cached_io_st (obj); +i915_ttm_free_cached_io_rsgt (obj); } }@@ -563,40 +572,35 @@ i915_ttm_region(struct ttm_device *bdev, int ttm_mem_type) ttm_mem_type - I915_PL_LMEM0); } -static struct sg_table *i915_ttm_tt_get_st (struct ttm_tt *ttm) +static struct i915_refct_sgt *i915_ttm_tt_get_st (struct ttm_tt *ttm) {struct i915_ttm_tt *i915_tt =container_of (ttm,typeof (*i915_tt), ttm);struct sg_table *st;int ret; -if (i915_tt->cached_st) -return i915_tt->cached_st; - - st =kzalloc (sizeof (*st),GFP_KERNEL ); -if (!st) -return ERR_PTR (-ENOMEM ); +if (i915_tt->cached_rsgt.table.sgl)
drivers/gpu/drm/i915/gem/i915_gem_ttm.c i915_ttm_region(struct ttm_device *bdev, int ttm_mem_type) · line 590
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +3
-1+return i915_refct_sgt_get (&i915_tt->cached_rsgt); + st = &i915_tt->cached_rsgt.table; ret =sg_alloc_table_from_pages_segment (st, ttm->pages, ttm->num_pages,0 , (unsigned long )ttm->num_pages <<PAGE_SHIFT ,i915_sg_segment_size (),GFP_KERNEL );if (ret) { -kfree (st); + st->sgl =NULL ;
Apparently sg_alloc_table* already ensures this.
Quoted 224 lines
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +58
-34return ERR_PTR (ret); } ret =dma_map_sgtable (i915_tt->dev, st,DMA_BIDIRECTIONAL ,0 );if (ret) {sg_free_table (st); -kfree (st);return ERR_PTR (ret); } - i915_tt->cached_st = st; -return st; +return i915_refct_sgt_get (&i915_tt->cached_rsgt); } -static struct sg_table * +static struct i915_refct_sgt *i915_ttm_resource_get_st (struct drm_i915_gem_object *obj,struct ttm_resource *res) {@@ -610,7 +614,21 @@ i915_ttm_resource_get_st(struct drm_i915_gem_object *obj,* the resulting st. Might make sense for GGTT. */ GEM_WARN_ON (!cpu_maps_iomem (res)); -return intel_region_ttm_resource_to_st (obj->mm.region, res); +if (bo->resource == res) { +if (!obj->ttm.cached_io_rsgt) { +struct i915_refct_sgt *rsgt; + + rsgt =intel_region_ttm_resource_to_rsgt (obj->mm.region, + res); +if (IS_ERR (rsgt)) +return rsgt; + + obj->ttm.cached_io_rsgt = rsgt; + } +return i915_refct_sgt_get (obj->ttm.cached_io_rsgt); + } + +return intel_region_ttm_resource_to_rsgt (obj->mm.region, res); } static int i915_ttm_accel_move(struct ttm_buffer_object *bo,@@ -621,10 +639,7 @@ static int i915_ttm_accel_move(struct ttm_buffer_object *bo, {struct drm_i915_private *i915 =container_of (bo->bdev,typeof (*i915), bdev); -struct ttm_resource_manager *src_man = -ttm_manager_type (bo->bdev, bo->resource->mem_type);struct drm_i915_gem_object *obj =i915_ttm_to_gem (bo); -struct sg_table *src_st;struct i915_request *rq;struct ttm_tt *src_ttm = bo->ttm;enum i915_cache_level src_level, dst_level;@@ -650,17 +665,22 @@ static int i915_ttm_accel_move(struct ttm_buffer_object *bo, }intel_engine_pm_put (i915->gt.migrate.context->engine); }else { - src_st = src_man->use_tt ?i915_ttm_tt_get_st (src_ttm) : - obj->ttm.cached_io_st; +struct i915_refct_sgt *src_rsgt = +i915_ttm_resource_get_st (obj, bo->resource); + +if (IS_ERR (src_rsgt)) +return PTR_ERR (src_rsgt); src_level =i915_ttm_cache_level (i915, bo->resource, src_ttm);intel_engine_pm_get (i915->gt.migrate.context->engine); ret =intel_context_migrate_copy (i915->gt.migrate.context, -NULL , src_st->sgl, src_level, +NULL , src_rsgt->table.sgl, + src_level,gpu_binds_iomem (bo->resource), dst_st->sgl, dst_level,gpu_binds_iomem (dst_mem), &rq); +i915_refct_sgt_put (src_rsgt);if (!ret && rq) {i915_request_wait (rq,0 ,MAX_SCHEDULE_TIMEOUT );i915_request_put (rq);@@ -674,13 +694,14 @@ static int i915_ttm_accel_move(struct ttm_buffer_object *bo,static void __i915_ttm_move (struct ttm_buffer_object *bo,bool clear,struct ttm_resource *dst_mem,struct ttm_tt *dst_ttm, -struct sg_table *dst_st, +struct i915_refct_sgt *dst_rsgt,bool allow_accel) {int ret = -EINVAL ;if (allow_accel) - ret =i915_ttm_accel_move (bo, clear, dst_mem, dst_ttm, dst_st); + ret =i915_ttm_accel_move (bo, clear, dst_mem, dst_ttm, + &dst_rsgt->table);if (ret) {struct drm_i915_gem_object *obj =i915_ttm_to_gem (bo);struct intel_memory_region *dst_reg, *src_reg;@@ -697,12 +718,13 @@ static void __i915_ttm_move(struct ttm_buffer_object *bo, bool clear, dst_iter = !cpu_maps_iomem (dst_mem) ?ttm_kmap_iter_tt_init (&_dst_iter.tt, dst_ttm) :ttm_kmap_iter_iomap_init (&_dst_iter.io, &dst_reg->iomap, - dst_st, dst_reg->region.start); + &dst_rsgt->table, + dst_reg->region.start); src_iter = !cpu_maps_iomem (bo->resource) ?ttm_kmap_iter_tt_init (&_src_iter.tt, bo->ttm) :ttm_kmap_iter_iomap_init (&_src_iter.io, &src_reg->iomap, - obj->ttm.cached_io_st, + &obj->ttm.cached_io_rsgt->table, src_reg->region.start);ttm_move_memcpy (clear, dst_mem->num_pages, dst_iter, src_iter);@@ -718,7 +740,7 @@ static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict,struct ttm_resource_manager *dst_man =ttm_manager_type (bo->bdev, dst_mem->mem_type);struct ttm_tt *ttm = bo->ttm; -struct sg_table *dst_st; +struct i915_refct_sgt *dst_rsgt;bool clear;int ret;@@ -744,22 +766,24 @@ static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict,return ret; } - dst_st =i915_ttm_resource_get_st (obj, dst_mem); -if (IS_ERR (dst_st)) -return PTR_ERR (dst_st); + dst_rsgt =i915_ttm_resource_get_st (obj, dst_mem); +if (IS_ERR (dst_rsgt)) +return PTR_ERR (dst_rsgt); clear = !cpu_maps_iomem (bo->resource) && (!ttm || !ttm_tt_is_populated (ttm));if (!(clear && ttm && !(ttm->page_flags &TTM_TT_FLAG_ZERO_ALLOC ))) -__i915_ttm_move (bo, clear, dst_mem, bo->ttm, dst_st, true); +__i915_ttm_move (bo, clear, dst_mem, bo->ttm, dst_rsgt, true);ttm_bo_move_sync_cleanup (bo, dst_mem);i915_ttm_adjust_domains_after_move (obj); -i915_ttm_free_cached_io_st (obj); +i915_ttm_free_cached_io_rsgt (obj);if (gpu_binds_iomem (dst_mem) ||cpu_maps_iomem (dst_mem)) { - obj->ttm.cached_io_st = dst_st; - obj->ttm.get_io_page.sg_pos = dst_st->sgl; + obj->ttm.cached_io_rsgt = dst_rsgt; + obj->ttm.get_io_page.sg_pos = dst_rsgt->table.sgl; obj->ttm.get_io_page.sg_idx =0 ; + }else { +i915_refct_sgt_put (dst_rsgt); }i915_ttm_adjust_lru (obj);@@ -825,7 +849,6 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj, .interruptible = true, .no_wait_gpu = false, }; -struct sg_table *st;int real_num_busy;int ret;@@ -862,12 +885,16 @@ static int __i915_ttm_get_pages(struct drm_i915_gem_object *obj, }if (!i915_gem_object_has_pages (obj)) { -/* Object either has a page vector or is an iomem object */ - st = bo->ttm ?i915_ttm_tt_get_st (bo->ttm) : obj->ttm.cached_io_st; -if (IS_ERR (st)) -return PTR_ERR (st); +struct i915_refct_sgt *rsgt = +i915_ttm_resource_get_st (obj, bo->resource); + +if (IS_ERR (rsgt)) +return PTR_ERR (rsgt); -__i915_gem_object_set_pages (obj, st,i915_sg_dma_sizes (st->sgl)); +GEM_BUG_ON (obj->mm.rsgt); + obj->mm.rsgt = rsgt; +__i915_gem_object_set_pages (obj, &rsgt->table, +i915_sg_dma_sizes (rsgt->table.sgl)); }i915_ttm_adjust_lru (obj);@@ -941,6 +968,9 @@ static void i915_ttm_put_pages(struct drm_i915_gem_object *obj,* If the object is not destroyed next, The TTM eviction logic * and shrinkers will move it out if needed. */ + +if (obj->mm.rsgt) +i915_refct_sgt_put (fetch_and_zero (&obj->mm.rsgt)); }static void i915_ttm_adjust_lru (struct drm_i915_gem_object *obj)@@ -1278,7 +1308,7 @@ int i915_gem_obj_copy_ttm(struct drm_i915_gem_object *dst,struct ttm_operation_ctx ctx = { .interruptible = intr, }; -struct sg_table *dst_st; +struct i915_refct_sgt *dst_rsgt;int ret;assert_object_held (dst);@@ -1293,11 +1323,11 @@ int i915_gem_obj_copy_ttm(struct drm_i915_gem_object *dst,if (ret)return ret; - dst_st =gpu_binds_iomem (dst_bo->resource) ? - dst->ttm.cached_io_st :i915_ttm_tt_get_st (dst_bo->ttm); - + dst_rsgt =i915_ttm_resource_get_st (dst, dst_bo->resource);__i915_ttm_move (src_bo, false, dst_bo->resource, dst_bo->ttm, - dst_st, allow_accel); + dst_rsgt, allow_accel); + +i915_refct_sgt_put (dst_rsgt);return 0 ; }drivers/gpu/drm/i915/i915_scatterlist.c +0
-0
drivers/gpu/drm/i915/i915_scatterlist.c bool i915_sg_trim(struct sg_table *orig_st) · line 49
Quoted 9 lines
drivers/gpu/drm/i915/i915_scatterlist.c +6
-0@@ -41,8 +41,32 @@ bool i915_sg_trim(struct sg_table *orig_st)return true; } +static void i915_refct_sgt_release (struct kref *ref) +{ +struct i915_refct_sgt *rsgt = +container_of (ref,typeof (*rsgt), kref); + +sg_free_table (&rsgt->table);
Ok, and sg_free_table seems to gracefully handle NULL sgl.
With the double kfree fixed,