| Message ID | 20210914050956.30685-3-matthew.brost@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Do error capture async, flush G2H processing on reset | expand |
On Mon, Sep 13, 2021 at 10:09:54PM -0700, Matthew Brost wrote: > An error capture allocates memory, memory allocations depend on resets, > and resets need to flush the G2H handlers to seal several races. If the > error capture is done from the G2H handler this creates a circular > dependency. To work around this, do a error capture in a work queue > asynchronously from the G2H handler. This should be fine as (eventually) > all register state is put into a buffer by the GuC so it is safe to > restart the context before the error capture is complete. > > Example of lockdep splat below: Pushing work into a work_struct to fix a lockdep splat does nothing more than hide the lockdep splat. Or it creates a race. So no, let's not make this more of a mess than it already is please. -Daniel > > [ 154.625989] ====================================================== > [ 154.632195] WARNING: possible circular locking dependency detected > [ 154.638393] 5.14.0-rc5-guc+ #50 Tainted: G U > [ 154.643991] ------------------------------------------------------ > [ 154.650196] i915_selftest/1673 is trying to acquire lock: > [ 154.655621] ffff8881079cb918 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}, at: __flush_work+0x350/0x4d0 [ 154.665826] > but task is already holding lock: > [ 154.671682] ffff8881079cbfb8 (>->reset.mutex){+.+.}-{3:3}, at: intel_gt_reset+0xf0/0x300 [i915] [ 154.680659] > which lock already depends on the new lock. > > [ 154.688857] > the existing dependency chain (in reverse order) is: > [ 154.696365] > -> #2 (>->reset.mutex){+.+.}-{3:3}: > [ 154.702571] lock_acquire+0xd2/0x300 > [ 154.706695] i915_gem_shrinker_taints_mutex+0x2d/0x50 [i915] > [ 154.712959] intel_gt_init_reset+0x61/0x80 [i915] > [ 154.718258] intel_gt_init_early+0xe6/0x120 [i915] > [ 154.723648] i915_driver_probe+0x592/0xdc0 [i915] > [ 154.728942] i915_pci_probe+0x43/0x1c0 [i915] > [ 154.733891] pci_device_probe+0x9b/0x110 > [ 154.738362] really_probe+0x1a6/0x3a0 > [ 154.742568] __driver_probe_device+0xf9/0x170 > [ 154.747468] driver_probe_device+0x19/0x90 > [ 154.752114] __driver_attach+0x99/0x170 > [ 154.756492] bus_for_each_dev+0x73/0xc0 > [ 154.760870] bus_add_driver+0x14b/0x1f0 > [ 154.765248] driver_register+0x67/0xb0 > [ 154.769542] i915_init+0x18/0x8c [i915] > [ 154.773964] do_one_initcall+0x53/0x2e0 > [ 154.778343] do_init_module+0x56/0x210 > [ 154.782639] load_module+0x25fc/0x29f0 > [ 154.786934] __do_sys_finit_module+0xae/0x110 > [ 154.791835] do_syscall_64+0x38/0xc0 > [ 154.795958] entry_SYSCALL_64_after_hwframe+0x44/0xae > [ 154.801558] > -> #1 (fs_reclaim){+.+.}-{0:0}: > [ 154.807241] lock_acquire+0xd2/0x300 > [ 154.811361] fs_reclaim_acquire+0x9e/0xd0 > [ 154.815914] kmem_cache_alloc_trace+0x30/0x790 > [ 154.820899] i915_gpu_coredump_alloc+0x53/0x1a0 [i915] > [ 154.826649] i915_gpu_coredump+0x39/0x560 [i915] > [ 154.831866] i915_capture_error_state+0xa/0x70 [i915] > [ 154.837513] intel_guc_context_reset_process_msg+0x174/0x1f0 [i915] > [ 154.844383] ct_incoming_request_worker_func+0x130/0x1b0 [i915] > [ 154.850898] process_one_work+0x264/0x590 > [ 154.855451] worker_thread+0x4b/0x3a0 > [ 154.859655] kthread+0x147/0x170 > [ 154.863428] ret_from_fork+0x1f/0x30 > [ 154.867548] > -> #0 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}: > [ 154.875747] check_prev_add+0x90/0xc30 > [ 154.880042] __lock_acquire+0x1643/0x2110 > [ 154.884595] lock_acquire+0xd2/0x300 > [ 154.888715] __flush_work+0x373/0x4d0 > [ 154.892920] intel_guc_submission_reset_prepare+0xf3/0x340 [i915] > [ 154.899606] intel_uc_reset_prepare+0x40/0x50 [i915] > [ 154.905166] reset_prepare+0x55/0x60 [i915] > [ 154.909946] intel_gt_reset+0x11c/0x300 [i915] > [ 154.914984] do_device_reset+0x13/0x20 [i915] > [ 154.919936] check_whitelist_across_reset+0x166/0x250 [i915] > [ 154.926212] live_reset_whitelist.cold+0x6a/0x7a [i915] > [ 154.932037] __i915_subtests.cold+0x20/0x74 [i915] > [ 154.937428] __run_selftests.cold+0x96/0xee [i915] > [ 154.942816] i915_live_selftests+0x2c/0x60 [i915] > [ 154.948125] i915_pci_probe+0x93/0x1c0 [i915] > [ 154.953076] pci_device_probe+0x9b/0x110 > [ 154.957545] really_probe+0x1a6/0x3a0 > [ 154.961749] __driver_probe_device+0xf9/0x170 > [ 154.966653] driver_probe_device+0x19/0x90 > [ 154.971290] __driver_attach+0x99/0x170 > [ 154.975671] bus_for_each_dev+0x73/0xc0 > [ 154.980053] bus_add_driver+0x14b/0x1f0 > [ 154.984431] driver_register+0x67/0xb0 > [ 154.988725] i915_init+0x18/0x8c [i915] > [ 154.993149] do_one_initcall+0x53/0x2e0 > [ 154.997527] do_init_module+0x56/0x210 > [ 155.001822] load_module+0x25fc/0x29f0 > [ 155.006118] __do_sys_finit_module+0xae/0x110 > [ 155.011019] do_syscall_64+0x38/0xc0 > [ 155.015139] entry_SYSCALL_64_after_hwframe+0x44/0xae > [ 155.020729] > other info that might help us debug this: > > [ 155.028752] Chain exists of: > (work_completion)(&ct->requests.worker) --> fs_reclaim --> >->reset.mutex > > [ 155.041294] Possible unsafe locking scenario: > > [ 155.047240] CPU0 CPU1 > [ 155.051791] ---- ---- > [ 155.056344] lock(>->reset.mutex); > [ 155.060026] lock(fs_reclaim); > [ 155.065706] lock(>->reset.mutex); > [ 155.071912] lock((work_completion)(&ct->requests.worker)); > [ 155.077595] > *** DEADLOCK *** > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_context.c | 2 + > drivers/gpu/drm/i915/gt/intel_context_types.h | 7 +++ > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 10 ++++ > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 47 +++++++++++++++++-- > 4 files changed, 62 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c > index ff637147b1a9..72ad60e9d908 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context.c > +++ b/drivers/gpu/drm/i915/gt/intel_context.c > @@ -399,6 +399,8 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine) > ce->guc_id.id = GUC_INVALID_LRC_ID; > INIT_LIST_HEAD(&ce->guc_id.link); > > + INIT_LIST_HEAD(&ce->guc_capture_link); > + > /* > * Initialize fence to be complete as this is expected to be complete > * unless there is a pending schedule disable outstanding. > diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h > index af43b3c83339..925a06162e8e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h > @@ -206,6 +206,13 @@ struct intel_context { > struct list_head link; > } guc_id; > > + /** > + * @guc_capture_link: in guc->submission_state.capture_list when an > + * error capture is pending on this context, protected by > + * guc->submission_state.lock > + */ > + struct list_head guc_capture_link; > + > #ifdef CONFIG_DRM_I915_SELFTEST > /** > * @drop_schedule_enable: Force drop of schedule enable G2H for selftest > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > index 0e28f490c12d..87ee792eafd4 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > @@ -88,6 +88,16 @@ struct intel_guc { > * refs > */ > struct list_head guc_id_list; > + /** > + * @capture_list: list of intel_context that need to capture > + * error state > + */ > + struct list_head capture_list; > + /** > + * @capture_worker: worker to do error capture when the GuC > + * signals a context has been reset > + */ > + struct work_struct capture_worker; > } submission_state; > > /** > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index 678da915eb9d..ba6838a35a69 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -91,7 +91,8 @@ > * > * guc->submission_state.lock > * Protects guc_id allocation for the given GuC, i.e. only one context can be > - * doing guc_id allocation operations at a time for each GuC in the system. > + * doing guc_id allocation operations at a time for each GuC in the system. Also > + * protects everything else under the guc->submission_state sub-structure. > * > * ce->guc_state.lock > * Protects everything under ce->guc_state. Ensures that a context is in the > @@ -1126,6 +1127,8 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) > intel_gt_unpark_heartbeats(guc_to_gt(guc)); > } > > +static void capture_worker_func(struct work_struct *w); > + > /* > * Set up the memory resources to be shared with the GuC (via the GGTT) > * at firmware loading time. > @@ -1151,6 +1154,8 @@ int intel_guc_submission_init(struct intel_guc *guc) > spin_lock_init(&guc->submission_state.lock); > INIT_LIST_HEAD(&guc->submission_state.guc_id_list); > ida_init(&guc->submission_state.guc_ids); > + INIT_LIST_HEAD(&guc->submission_state.capture_list); > + INIT_WORK(&guc->submission_state.capture_worker, capture_worker_func); > > return 0; > } > @@ -2879,17 +2884,51 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc, > return 0; > } > > -static void capture_error_state(struct intel_guc *guc, > - struct intel_context *ce) > +static void capture_worker_func(struct work_struct *w) > { > + struct intel_guc *guc = container_of(w, struct intel_guc, > + submission_state.capture_worker); > struct intel_gt *gt = guc_to_gt(guc); > struct drm_i915_private *i915 = gt->i915; > + struct intel_context *ce = > + list_first_entry(&guc->submission_state.capture_list, > + struct intel_context, guc_capture_link); > struct intel_engine_cs *engine = __context_to_physical_engine(ce); > + unsigned long flags; > intel_wakeref_t wakeref; > > + spin_lock_irqsave(&guc->submission_state.lock, flags); > + list_del_init(&ce->guc_capture_link); > + spin_unlock_irqrestore(&guc->submission_state.lock, flags); > + > intel_engine_set_hung_context(engine, ce); > with_intel_runtime_pm(&i915->runtime_pm, wakeref) > - i915_capture_error_state(gt, engine->mask); > + i915_capture_error_state(gt, ce->engine->mask); > +} > + > +static void capture_error_state(struct intel_guc *guc, > + struct intel_context *ce) > +{ > + struct intel_gt *gt = guc_to_gt(guc); > + struct drm_i915_private *i915 = gt->i915; > + struct intel_engine_cs *engine = __context_to_physical_engine(ce); > + unsigned long flags; > + > + spin_lock_irqsave(&guc->submission_state.lock, flags); > + list_add_tail(&guc->submission_state.capture_list, > + &ce->guc_capture_link); > + spin_unlock_irqrestore(&guc->submission_state.lock, flags); > + > + /* > + * We do the error capture async as an error capture can allocate > + * memory, the reset path must flush the G2H handler in order to seal > + * several races, and the memory allocations depend on the reset path > + * (circular dependecy if error capture done here in the G2H handler). > + * Doing the error capture async should be ok, as (eventually) all > + * register state is captured in buffer by the GuC (i.e. it ok to > + * restart the context before the error capture is complete). > + */ > + queue_work(system_unbound_wq, &guc->submission_state.capture_worker); > atomic_inc(&i915->gpu_error.reset_engine_count[engine->uabi_class]); > } > > -- > 2.32.0 >
On Tue, Sep 14, 2021 at 04:25:08PM +0200, Daniel Vetter wrote: > On Mon, Sep 13, 2021 at 10:09:54PM -0700, Matthew Brost wrote: > > An error capture allocates memory, memory allocations depend on resets, > > and resets need to flush the G2H handlers to seal several races. If the > > error capture is done from the G2H handler this creates a circular > > dependency. To work around this, do a error capture in a work queue > > asynchronously from the G2H handler. This should be fine as (eventually) > > all register state is put into a buffer by the GuC so it is safe to > > restart the context before the error capture is complete. > > > > Example of lockdep splat below: > We discussed this a bit on IRC / have a Jira for this but still want to respond to the points below. > Pushing work into a work_struct to fix a lockdep splat does nothing more > than hide the lockdep splat. Or it creates a race. > It does neither. In the reset path we care about flushing all outstanding G2H processing (e.g. we care about all context state updates) but we could care less about when (or even if) the error capture is done. The error capture is only thing in the G2H processing that allocates memory and as I said the reset path could care less about outstandind error catpure, thus we make it an async operation compared to the G2H processing. This 100% breaks the circular dependency between resets, flushing the G2H processing, and memory allocation. I also fail to see how this creates a race. > So no, let's not make this more of a mess than it already is please. Not saying there can't be other solutions but this one certainly works and is better than allocating large chunks of memory in a nowait context. Have Jira open to discuss other possible solutions. Matt > -Daniel > > > > > [ 154.625989] ====================================================== > > [ 154.632195] WARNING: possible circular locking dependency detected > > [ 154.638393] 5.14.0-rc5-guc+ #50 Tainted: G U > > [ 154.643991] ------------------------------------------------------ > > [ 154.650196] i915_selftest/1673 is trying to acquire lock: > > [ 154.655621] ffff8881079cb918 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}, at: __flush_work+0x350/0x4d0 [ 154.665826] > > but task is already holding lock: > > [ 154.671682] ffff8881079cbfb8 (>->reset.mutex){+.+.}-{3:3}, at: intel_gt_reset+0xf0/0x300 [i915] [ 154.680659] > > which lock already depends on the new lock. > > > > [ 154.688857] > > the existing dependency chain (in reverse order) is: > > [ 154.696365] > > -> #2 (>->reset.mutex){+.+.}-{3:3}: > > [ 154.702571] lock_acquire+0xd2/0x300 > > [ 154.706695] i915_gem_shrinker_taints_mutex+0x2d/0x50 [i915] > > [ 154.712959] intel_gt_init_reset+0x61/0x80 [i915] > > [ 154.718258] intel_gt_init_early+0xe6/0x120 [i915] > > [ 154.723648] i915_driver_probe+0x592/0xdc0 [i915] > > [ 154.728942] i915_pci_probe+0x43/0x1c0 [i915] > > [ 154.733891] pci_device_probe+0x9b/0x110 > > [ 154.738362] really_probe+0x1a6/0x3a0 > > [ 154.742568] __driver_probe_device+0xf9/0x170 > > [ 154.747468] driver_probe_device+0x19/0x90 > > [ 154.752114] __driver_attach+0x99/0x170 > > [ 154.756492] bus_for_each_dev+0x73/0xc0 > > [ 154.760870] bus_add_driver+0x14b/0x1f0 > > [ 154.765248] driver_register+0x67/0xb0 > > [ 154.769542] i915_init+0x18/0x8c [i915] > > [ 154.773964] do_one_initcall+0x53/0x2e0 > > [ 154.778343] do_init_module+0x56/0x210 > > [ 154.782639] load_module+0x25fc/0x29f0 > > [ 154.786934] __do_sys_finit_module+0xae/0x110 > > [ 154.791835] do_syscall_64+0x38/0xc0 > > [ 154.795958] entry_SYSCALL_64_after_hwframe+0x44/0xae > > [ 154.801558] > > -> #1 (fs_reclaim){+.+.}-{0:0}: > > [ 154.807241] lock_acquire+0xd2/0x300 > > [ 154.811361] fs_reclaim_acquire+0x9e/0xd0 > > [ 154.815914] kmem_cache_alloc_trace+0x30/0x790 > > [ 154.820899] i915_gpu_coredump_alloc+0x53/0x1a0 [i915] > > [ 154.826649] i915_gpu_coredump+0x39/0x560 [i915] > > [ 154.831866] i915_capture_error_state+0xa/0x70 [i915] > > [ 154.837513] intel_guc_context_reset_process_msg+0x174/0x1f0 [i915] > > [ 154.844383] ct_incoming_request_worker_func+0x130/0x1b0 [i915] > > [ 154.850898] process_one_work+0x264/0x590 > > [ 154.855451] worker_thread+0x4b/0x3a0 > > [ 154.859655] kthread+0x147/0x170 > > [ 154.863428] ret_from_fork+0x1f/0x30 > > [ 154.867548] > > -> #0 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}: > > [ 154.875747] check_prev_add+0x90/0xc30 > > [ 154.880042] __lock_acquire+0x1643/0x2110 > > [ 154.884595] lock_acquire+0xd2/0x300 > > [ 154.888715] __flush_work+0x373/0x4d0 > > [ 154.892920] intel_guc_submission_reset_prepare+0xf3/0x340 [i915] > > [ 154.899606] intel_uc_reset_prepare+0x40/0x50 [i915] > > [ 154.905166] reset_prepare+0x55/0x60 [i915] > > [ 154.909946] intel_gt_reset+0x11c/0x300 [i915] > > [ 154.914984] do_device_reset+0x13/0x20 [i915] > > [ 154.919936] check_whitelist_across_reset+0x166/0x250 [i915] > > [ 154.926212] live_reset_whitelist.cold+0x6a/0x7a [i915] > > [ 154.932037] __i915_subtests.cold+0x20/0x74 [i915] > > [ 154.937428] __run_selftests.cold+0x96/0xee [i915] > > [ 154.942816] i915_live_selftests+0x2c/0x60 [i915] > > [ 154.948125] i915_pci_probe+0x93/0x1c0 [i915] > > [ 154.953076] pci_device_probe+0x9b/0x110 > > [ 154.957545] really_probe+0x1a6/0x3a0 > > [ 154.961749] __driver_probe_device+0xf9/0x170 > > [ 154.966653] driver_probe_device+0x19/0x90 > > [ 154.971290] __driver_attach+0x99/0x170 > > [ 154.975671] bus_for_each_dev+0x73/0xc0 > > [ 154.980053] bus_add_driver+0x14b/0x1f0 > > [ 154.984431] driver_register+0x67/0xb0 > > [ 154.988725] i915_init+0x18/0x8c [i915] > > [ 154.993149] do_one_initcall+0x53/0x2e0 > > [ 154.997527] do_init_module+0x56/0x210 > > [ 155.001822] load_module+0x25fc/0x29f0 > > [ 155.006118] __do_sys_finit_module+0xae/0x110 > > [ 155.011019] do_syscall_64+0x38/0xc0 > > [ 155.015139] entry_SYSCALL_64_after_hwframe+0x44/0xae > > [ 155.020729] > > other info that might help us debug this: > > > > [ 155.028752] Chain exists of: > > (work_completion)(&ct->requests.worker) --> fs_reclaim --> >->reset.mutex > > > > [ 155.041294] Possible unsafe locking scenario: > > > > [ 155.047240] CPU0 CPU1 > > [ 155.051791] ---- ---- > > [ 155.056344] lock(>->reset.mutex); > > [ 155.060026] lock(fs_reclaim); > > [ 155.065706] lock(>->reset.mutex); > > [ 155.071912] lock((work_completion)(&ct->requests.worker)); > > [ 155.077595] > > *** DEADLOCK *** > > > > Signed-off-by: Matthew Brost <matthew.brost@intel.com> > > --- > > drivers/gpu/drm/i915/gt/intel_context.c | 2 + > > drivers/gpu/drm/i915/gt/intel_context_types.h | 7 +++ > > drivers/gpu/drm/i915/gt/uc/intel_guc.h | 10 ++++ > > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 47 +++++++++++++++++-- > > 4 files changed, 62 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c > > index ff637147b1a9..72ad60e9d908 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_context.c > > +++ b/drivers/gpu/drm/i915/gt/intel_context.c > > @@ -399,6 +399,8 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine) > > ce->guc_id.id = GUC_INVALID_LRC_ID; > > INIT_LIST_HEAD(&ce->guc_id.link); > > > > + INIT_LIST_HEAD(&ce->guc_capture_link); > > + > > /* > > * Initialize fence to be complete as this is expected to be complete > > * unless there is a pending schedule disable outstanding. > > diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h > > index af43b3c83339..925a06162e8e 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_context_types.h > > +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h > > @@ -206,6 +206,13 @@ struct intel_context { > > struct list_head link; > > } guc_id; > > > > + /** > > + * @guc_capture_link: in guc->submission_state.capture_list when an > > + * error capture is pending on this context, protected by > > + * guc->submission_state.lock > > + */ > > + struct list_head guc_capture_link; > > + > > #ifdef CONFIG_DRM_I915_SELFTEST > > /** > > * @drop_schedule_enable: Force drop of schedule enable G2H for selftest > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > index 0e28f490c12d..87ee792eafd4 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h > > @@ -88,6 +88,16 @@ struct intel_guc { > > * refs > > */ > > struct list_head guc_id_list; > > + /** > > + * @capture_list: list of intel_context that need to capture > > + * error state > > + */ > > + struct list_head capture_list; > > + /** > > + * @capture_worker: worker to do error capture when the GuC > > + * signals a context has been reset > > + */ > > + struct work_struct capture_worker; > > } submission_state; > > > > /** > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > index 678da915eb9d..ba6838a35a69 100644 > > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > > @@ -91,7 +91,8 @@ > > * > > * guc->submission_state.lock > > * Protects guc_id allocation for the given GuC, i.e. only one context can be > > - * doing guc_id allocation operations at a time for each GuC in the system. > > + * doing guc_id allocation operations at a time for each GuC in the system. Also > > + * protects everything else under the guc->submission_state sub-structure. > > * > > * ce->guc_state.lock > > * Protects everything under ce->guc_state. Ensures that a context is in the > > @@ -1126,6 +1127,8 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) > > intel_gt_unpark_heartbeats(guc_to_gt(guc)); > > } > > > > +static void capture_worker_func(struct work_struct *w); > > + > > /* > > * Set up the memory resources to be shared with the GuC (via the GGTT) > > * at firmware loading time. > > @@ -1151,6 +1154,8 @@ int intel_guc_submission_init(struct intel_guc *guc) > > spin_lock_init(&guc->submission_state.lock); > > INIT_LIST_HEAD(&guc->submission_state.guc_id_list); > > ida_init(&guc->submission_state.guc_ids); > > + INIT_LIST_HEAD(&guc->submission_state.capture_list); > > + INIT_WORK(&guc->submission_state.capture_worker, capture_worker_func); > > > > return 0; > > } > > @@ -2879,17 +2884,51 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc, > > return 0; > > } > > > > -static void capture_error_state(struct intel_guc *guc, > > - struct intel_context *ce) > > +static void capture_worker_func(struct work_struct *w) > > { > > + struct intel_guc *guc = container_of(w, struct intel_guc, > > + submission_state.capture_worker); > > struct intel_gt *gt = guc_to_gt(guc); > > struct drm_i915_private *i915 = gt->i915; > > + struct intel_context *ce = > > + list_first_entry(&guc->submission_state.capture_list, > > + struct intel_context, guc_capture_link); > > struct intel_engine_cs *engine = __context_to_physical_engine(ce); > > + unsigned long flags; > > intel_wakeref_t wakeref; > > > > + spin_lock_irqsave(&guc->submission_state.lock, flags); > > + list_del_init(&ce->guc_capture_link); > > + spin_unlock_irqrestore(&guc->submission_state.lock, flags); > > + > > intel_engine_set_hung_context(engine, ce); > > with_intel_runtime_pm(&i915->runtime_pm, wakeref) > > - i915_capture_error_state(gt, engine->mask); > > + i915_capture_error_state(gt, ce->engine->mask); > > +} > > + > > +static void capture_error_state(struct intel_guc *guc, > > + struct intel_context *ce) > > +{ > > + struct intel_gt *gt = guc_to_gt(guc); > > + struct drm_i915_private *i915 = gt->i915; > > + struct intel_engine_cs *engine = __context_to_physical_engine(ce); > > + unsigned long flags; > > + > > + spin_lock_irqsave(&guc->submission_state.lock, flags); > > + list_add_tail(&guc->submission_state.capture_list, > > + &ce->guc_capture_link); > > + spin_unlock_irqrestore(&guc->submission_state.lock, flags); > > + > > + /* > > + * We do the error capture async as an error capture can allocate > > + * memory, the reset path must flush the G2H handler in order to seal > > + * several races, and the memory allocations depend on the reset path > > + * (circular dependecy if error capture done here in the G2H handler). > > + * Doing the error capture async should be ok, as (eventually) all > > + * register state is captured in buffer by the GuC (i.e. it ok to > > + * restart the context before the error capture is complete). > > + */ > > + queue_work(system_unbound_wq, &guc->submission_state.capture_worker); > > atomic_inc(&i915->gpu_error.reset_engine_count[engine->uabi_class]); > > } > > > > -- > > 2.32.0 > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index ff637147b1a9..72ad60e9d908 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -399,6 +399,8 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine) ce->guc_id.id = GUC_INVALID_LRC_ID; INIT_LIST_HEAD(&ce->guc_id.link); + INIT_LIST_HEAD(&ce->guc_capture_link); + /* * Initialize fence to be complete as this is expected to be complete * unless there is a pending schedule disable outstanding. diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h index af43b3c83339..925a06162e8e 100644 --- a/drivers/gpu/drm/i915/gt/intel_context_types.h +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h @@ -206,6 +206,13 @@ struct intel_context { struct list_head link; } guc_id; + /** + * @guc_capture_link: in guc->submission_state.capture_list when an + * error capture is pending on this context, protected by + * guc->submission_state.lock + */ + struct list_head guc_capture_link; + #ifdef CONFIG_DRM_I915_SELFTEST /** * @drop_schedule_enable: Force drop of schedule enable G2H for selftest diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index 0e28f490c12d..87ee792eafd4 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -88,6 +88,16 @@ struct intel_guc { * refs */ struct list_head guc_id_list; + /** + * @capture_list: list of intel_context that need to capture + * error state + */ + struct list_head capture_list; + /** + * @capture_worker: worker to do error capture when the GuC + * signals a context has been reset + */ + struct work_struct capture_worker; } submission_state; /** diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 678da915eb9d..ba6838a35a69 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -91,7 +91,8 @@ * * guc->submission_state.lock * Protects guc_id allocation for the given GuC, i.e. only one context can be - * doing guc_id allocation operations at a time for each GuC in the system. + * doing guc_id allocation operations at a time for each GuC in the system. Also + * protects everything else under the guc->submission_state sub-structure. * * ce->guc_state.lock * Protects everything under ce->guc_state. Ensures that a context is in the @@ -1126,6 +1127,8 @@ void intel_guc_submission_reset_finish(struct intel_guc *guc) intel_gt_unpark_heartbeats(guc_to_gt(guc)); } +static void capture_worker_func(struct work_struct *w); + /* * Set up the memory resources to be shared with the GuC (via the GGTT) * at firmware loading time. @@ -1151,6 +1154,8 @@ int intel_guc_submission_init(struct intel_guc *guc) spin_lock_init(&guc->submission_state.lock); INIT_LIST_HEAD(&guc->submission_state.guc_id_list); ida_init(&guc->submission_state.guc_ids); + INIT_LIST_HEAD(&guc->submission_state.capture_list); + INIT_WORK(&guc->submission_state.capture_worker, capture_worker_func); return 0; } @@ -2879,17 +2884,51 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc, return 0; } -static void capture_error_state(struct intel_guc *guc, - struct intel_context *ce) +static void capture_worker_func(struct work_struct *w) { + struct intel_guc *guc = container_of(w, struct intel_guc, + submission_state.capture_worker); struct intel_gt *gt = guc_to_gt(guc); struct drm_i915_private *i915 = gt->i915; + struct intel_context *ce = + list_first_entry(&guc->submission_state.capture_list, + struct intel_context, guc_capture_link); struct intel_engine_cs *engine = __context_to_physical_engine(ce); + unsigned long flags; intel_wakeref_t wakeref; + spin_lock_irqsave(&guc->submission_state.lock, flags); + list_del_init(&ce->guc_capture_link); + spin_unlock_irqrestore(&guc->submission_state.lock, flags); + intel_engine_set_hung_context(engine, ce); with_intel_runtime_pm(&i915->runtime_pm, wakeref) - i915_capture_error_state(gt, engine->mask); + i915_capture_error_state(gt, ce->engine->mask); +} + +static void capture_error_state(struct intel_guc *guc, + struct intel_context *ce) +{ + struct intel_gt *gt = guc_to_gt(guc); + struct drm_i915_private *i915 = gt->i915; + struct intel_engine_cs *engine = __context_to_physical_engine(ce); + unsigned long flags; + + spin_lock_irqsave(&guc->submission_state.lock, flags); + list_add_tail(&guc->submission_state.capture_list, + &ce->guc_capture_link); + spin_unlock_irqrestore(&guc->submission_state.lock, flags); + + /* + * We do the error capture async as an error capture can allocate + * memory, the reset path must flush the G2H handler in order to seal + * several races, and the memory allocations depend on the reset path + * (circular dependecy if error capture done here in the G2H handler). + * Doing the error capture async should be ok, as (eventually) all + * register state is captured in buffer by the GuC (i.e. it ok to + * restart the context before the error capture is complete). + */ + queue_work(system_unbound_wq, &guc->submission_state.capture_worker); atomic_inc(&i915->gpu_error.reset_engine_count[engine->uabi_class]); }
An error capture allocates memory, memory allocations depend on resets, and resets need to flush the G2H handlers to seal several races. If the error capture is done from the G2H handler this creates a circular dependency. To work around this, do a error capture in a work queue asynchronously from the G2H handler. This should be fine as (eventually) all register state is put into a buffer by the GuC so it is safe to restart the context before the error capture is complete. Example of lockdep splat below: [ 154.625989] ====================================================== [ 154.632195] WARNING: possible circular locking dependency detected [ 154.638393] 5.14.0-rc5-guc+ #50 Tainted: G U [ 154.643991] ------------------------------------------------------ [ 154.650196] i915_selftest/1673 is trying to acquire lock: [ 154.655621] ffff8881079cb918 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}, at: __flush_work+0x350/0x4d0 [ 154.665826] but task is already holding lock: [ 154.671682] ffff8881079cbfb8 (>->reset.mutex){+.+.}-{3:3}, at: intel_gt_reset+0xf0/0x300 [i915] [ 154.680659] which lock already depends on the new lock. [ 154.688857] the existing dependency chain (in reverse order) is: [ 154.696365] -> #2 (>->reset.mutex){+.+.}-{3:3}: [ 154.702571] lock_acquire+0xd2/0x300 [ 154.706695] i915_gem_shrinker_taints_mutex+0x2d/0x50 [i915] [ 154.712959] intel_gt_init_reset+0x61/0x80 [i915] [ 154.718258] intel_gt_init_early+0xe6/0x120 [i915] [ 154.723648] i915_driver_probe+0x592/0xdc0 [i915] [ 154.728942] i915_pci_probe+0x43/0x1c0 [i915] [ 154.733891] pci_device_probe+0x9b/0x110 [ 154.738362] really_probe+0x1a6/0x3a0 [ 154.742568] __driver_probe_device+0xf9/0x170 [ 154.747468] driver_probe_device+0x19/0x90 [ 154.752114] __driver_attach+0x99/0x170 [ 154.756492] bus_for_each_dev+0x73/0xc0 [ 154.760870] bus_add_driver+0x14b/0x1f0 [ 154.765248] driver_register+0x67/0xb0 [ 154.769542] i915_init+0x18/0x8c [i915] [ 154.773964] do_one_initcall+0x53/0x2e0 [ 154.778343] do_init_module+0x56/0x210 [ 154.782639] load_module+0x25fc/0x29f0 [ 154.786934] __do_sys_finit_module+0xae/0x110 [ 154.791835] do_syscall_64+0x38/0xc0 [ 154.795958] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 154.801558] -> #1 (fs_reclaim){+.+.}-{0:0}: [ 154.807241] lock_acquire+0xd2/0x300 [ 154.811361] fs_reclaim_acquire+0x9e/0xd0 [ 154.815914] kmem_cache_alloc_trace+0x30/0x790 [ 154.820899] i915_gpu_coredump_alloc+0x53/0x1a0 [i915] [ 154.826649] i915_gpu_coredump+0x39/0x560 [i915] [ 154.831866] i915_capture_error_state+0xa/0x70 [i915] [ 154.837513] intel_guc_context_reset_process_msg+0x174/0x1f0 [i915] [ 154.844383] ct_incoming_request_worker_func+0x130/0x1b0 [i915] [ 154.850898] process_one_work+0x264/0x590 [ 154.855451] worker_thread+0x4b/0x3a0 [ 154.859655] kthread+0x147/0x170 [ 154.863428] ret_from_fork+0x1f/0x30 [ 154.867548] -> #0 ((work_completion)(&ct->requests.worker)){+.+.}-{0:0}: [ 154.875747] check_prev_add+0x90/0xc30 [ 154.880042] __lock_acquire+0x1643/0x2110 [ 154.884595] lock_acquire+0xd2/0x300 [ 154.888715] __flush_work+0x373/0x4d0 [ 154.892920] intel_guc_submission_reset_prepare+0xf3/0x340 [i915] [ 154.899606] intel_uc_reset_prepare+0x40/0x50 [i915] [ 154.905166] reset_prepare+0x55/0x60 [i915] [ 154.909946] intel_gt_reset+0x11c/0x300 [i915] [ 154.914984] do_device_reset+0x13/0x20 [i915] [ 154.919936] check_whitelist_across_reset+0x166/0x250 [i915] [ 154.926212] live_reset_whitelist.cold+0x6a/0x7a [i915] [ 154.932037] __i915_subtests.cold+0x20/0x74 [i915] [ 154.937428] __run_selftests.cold+0x96/0xee [i915] [ 154.942816] i915_live_selftests+0x2c/0x60 [i915] [ 154.948125] i915_pci_probe+0x93/0x1c0 [i915] [ 154.953076] pci_device_probe+0x9b/0x110 [ 154.957545] really_probe+0x1a6/0x3a0 [ 154.961749] __driver_probe_device+0xf9/0x170 [ 154.966653] driver_probe_device+0x19/0x90 [ 154.971290] __driver_attach+0x99/0x170 [ 154.975671] bus_for_each_dev+0x73/0xc0 [ 154.980053] bus_add_driver+0x14b/0x1f0 [ 154.984431] driver_register+0x67/0xb0 [ 154.988725] i915_init+0x18/0x8c [i915] [ 154.993149] do_one_initcall+0x53/0x2e0 [ 154.997527] do_init_module+0x56/0x210 [ 155.001822] load_module+0x25fc/0x29f0 [ 155.006118] __do_sys_finit_module+0xae/0x110 [ 155.011019] do_syscall_64+0x38/0xc0 [ 155.015139] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 155.020729] other info that might help us debug this: [ 155.028752] Chain exists of: (work_completion)(&ct->requests.worker) --> fs_reclaim --> >->reset.mutex [ 155.041294] Possible unsafe locking scenario: [ 155.047240] CPU0 CPU1 [ 155.051791] ---- ---- [ 155.056344] lock(>->reset.mutex); [ 155.060026] lock(fs_reclaim); [ 155.065706] lock(>->reset.mutex); [ 155.071912] lock((work_completion)(&ct->requests.worker)); [ 155.077595] *** DEADLOCK *** Signed-off-by: Matthew Brost <matthew.brost@intel.com> --- drivers/gpu/drm/i915/gt/intel_context.c | 2 + drivers/gpu/drm/i915/gt/intel_context_types.h | 7 +++ drivers/gpu/drm/i915/gt/uc/intel_guc.h | 10 ++++ .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 47 +++++++++++++++++-- 4 files changed, 62 insertions(+), 4 deletions(-)