Gen8+ engine-reset
Subsystems (3)
v7 cover Gen8+ engine-reset
These patches add the reset-engine feature from Gen8. This is also referred to as Timeout detection and recovery (TDR). This complements to the full gpu reset feature available in i915 but it only allows to reset a particular engine instead of all engines thus providing a light weight engine reset and recovery mechanism.
Thanks to recent changes merged, this implementation is now not only for execlists, but for GuC based submission too; it is still limited from Gen8 onwards. I have also included the changes for watchdog timeout detection. The GuC related patches are functional, but can be seen as RFC.
Timeout detection relies on the existing hangcheck, which remains the same; main changes are to the recovery mechanism. Once we detect a hang on a particular engine we identify the request that caused the hang, skip the request and adjust head pointers to allow the execution to proceed normally. After some cleanup, submissions are restarted to process remaining work queued to that engine.
If engine reset fails to recover engine correctly then we fallback to full gpu reset.
We can argue about the effectiveness of reset-engine vs full reset when more than one ring is hung, but the benefits of just resetting one engine are reduced when the driver has to do it multiple times.
v2: ELSP queue request tracking and reset path changes to handle incomplete requests during reset. Thanks to Chris Wilson for providing these patches.
v3: Let the waiter keep handling the full gpu reset if it already has the lock; point out that GuC submission needs a different method to restart workloads after the engine reset completes.
v4: Handle reset as 2 level resets, by first going to engine only and fall backing to full/chip reset as needed, i.e. reset_engine will need the struct_mutex.
v5: Rebased after reset flag split in 2, add GuC support, include watchdog detection patches, addressing comments from prev RFC.
v6: Mutex-less reset engine. Updates in watchdog abi and guc whitelist & register-restore fixes (including an old patch from Daniele).
v7: Removed leftovers from v5; review comments; ability to cancel the reset if there's no active request.
Arun Siluvery (7):
drm/i915: Update i915.reset to handle engine resets drm/i915: Modify error handler for per engine hang recovery drm/i915: Add support for per engine reset recovery drm/i915: Add engine reset count to error state
drm/i915: Export per-engine reset count info to debugfs drm/i915: Enable Engine reset and recovery support drm/i915/guc: Provide register list to be saved/restored during engine
reset
Daniele Ceraolo Spurio (1):
drm/i915/guc: fix mmio whitelist mmio_start offset and add reminder
Michel Thierry (11):
drm/i915: Cancel reset-engine if we couldn't find an active request drm/i915: Add engine reset count in get-reset-stats ioctl drm/i915/selftests: reset engine self tests drm/i915/guc: Rename the function that resets the GuC drm/i915/guc: Add support for reset engine using GuC commands drm/i915: Watchdog timeout: Pass GuC shared data structure during
param load
drm/i915: Watchdog timeout: IRQ handler for gen8+ drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+ drm/i915: Watchdog timeout: DRM kernel interface to set the timeout drm/i915: Watchdog timeout: Include threshold value in error state drm/i915: Watchdog timeout: Export media reset count from GuC to
debugfs
Mika Kuoppala (1):
drm/i915: Skip reset request if there is one already
drivers/gpu/drm/i915/i915_debugfs.c | 43 +++++++ drivers/gpu/drm/i915/i915_drv.c | 109 +++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 67 +++++++++- drivers/gpu/drm/i915/i915_gem.c | 116 ++++++++++------- drivers/gpu/drm/i915/i915_gem_context.c | 109 +++++++++++++++- drivers/gpu/drm/i915/i915_gem_context.h | 4 + drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 14 +- drivers/gpu/drm/i915/i915_guc_submission.c | 136 ++++++++++++++++++-- drivers/gpu/drm/i915/i915_irq.c | 45 ++++++- drivers/gpu/drm/i915/i915_params.c | 6 +- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/i915_pci.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/intel_engine_cs.c | 65 +++++++--- drivers/gpu/drm/i915/intel_guc_fwif.h | 27 +++- drivers/gpu/drm/i915/intel_guc_loader.c | 11 ++ drivers/gpu/drm/i915/intel_hangcheck.c | 13 +- drivers/gpu/drm/i915/intel_lrc.c | 155 ++++++++++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.h | 8 ++ drivers/gpu/drm/i915/intel_uc.c | 4 +- drivers/gpu/drm/i915/intel_uc.h | 3 + drivers/gpu/drm/i915/intel_uncore.c | 37 +++++- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 147 +++++++++++++++++++++ include/uapi/drm/i915_drm.h | 7 +- 25 files changed, 1023 insertions(+), 118 deletions(-)
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 1/20 drm/i915: Update i915.reset to handle engine resets
From: Arun Siluvery <[email protected]>
In preparation for engine reset work update this parameter to handle more than one type of reset. Default at the moment is still full gpu reset.
--- drivers/gpu/drm/i915/i915_params.c | 6 +++--- drivers/gpu/drm/i915/i915_params.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -3
@@ -46,7 +46,7 @@ struct i915_params i915 __read_mostly = { .prefault_disable = 0, .load_detect_test = 0, .force_reset_modeset_test = 0, - .reset = true, + .reset = 1, .error_capture = true, .invert_brightness = 0, .disable_display = 0,
@@ -115,8 +115,8 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type,"Override/Ignore selection of SDVO panel mode in the VBT " "(-2=ignore, -1=auto [default], index in VBT BIOS table)"); -module_param_named_unsafe (reset, i915.reset, bool,0600 ); -MODULE_PARM_DESC (reset,"Attempt GPU resets (default: true)" ); +module_param_named_unsafe (reset, i915.reset, int,0600 ); +MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset [default], 2=engine reset)" );#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR )module_param_named (error_capture, i915.error_capture, bool,0600 );
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -51,6 +51,7 @@func (int, use_mmio_flip); \func (int, mmio_debug); \func (int, edp_vswing); \ +func (int, reset); \ func(unsigned int, inject_load_failure); \/* leave bools at the end to not create holes */ \func (bool, alpha_support); \
@@ -60,7 +61,6 @@func (bool, prefault_disable); \func (bool, load_detect_test); \func (bool, force_reset_modeset_test); \ -func (bool, reset); \func (bool, error_capture); \func (bool, disable_display); \func (bool, verbose_state_checks); \
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/20 drm/i915: Modify error handler for per engine hang recovery
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
This is a preparatory patch which modifies error handler to do per engine hang recovery. The actual patch which implements this sequence follows later in the series. The aim is to prepare existing recovery function to adapt to this new function where applicable (which fails at this point because core implementation is lacking) and continue recovery using legacy full gpu reset.
A helper function is also added to query the availability of engine reset.
The error events behaviour that are used to notify user of reset are adapted to engine reset such that it doesn't break users listening to these events. In legacy we report an error event, a reset event before resetting the gpu and a reset done event marking the completion of reset. The same behaviour is adapted but reset event is only dispatched once even when multiple engines are hung. Finally once reset is complete we send reset done event as usual.
Note that this implementation of engine reset is for i915 directly submitting to the ELSP, where the driver manages the hang detection, recovery and resubmission. With GuC submission these tasks are shared between driver and firmware; i915 will still responsible for detecting a hang, and when it does it will have to request GuC to reset that Engine and remind the firmware about the outstanding submissions. This will be added in different patch.
v2: rebase, advertise engine reset availability in platform definition, add note about GuC submission.
v3: s/*engine_reset*/*reset_engine*/. (Chris)
Handle reset as 2 level resets, by first going to engine only and fall backing to full/chip reset as needed, i.e. reset_engine will need the struct_mutex.
v4: Pass the engine mask to i915_reset. (Chris)
v5: Rebase, update selftests.
v6: Rebase, prepare for mutex-less reset engine.
v7: Pass reset_engine mask as a function parameter, and iterate over the engine mask for reset_engine. (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 33 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_pci.c | 5 ++++- drivers/gpu/drm/i915/intel_uncore.c | 11 +++++++++++ 5 files changed, 63 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +15 -0
@@ -1800,6 +1800,8 @@ void i915_reset(struct drm_i915_private *dev_priv)if (!test_bit (I915_RESET_HANDOFF , &error->flags))return ; +DRM_DEBUG_DRIVER ("resetting chip\n" ); +/* Clear any previous failed attempts at recovery. Time to try again. */ if (!i915_gem_unset_wedged (dev_priv)) goto wakeup;
@@ -1863,6 +1865,19 @@ void i915_reset(struct drm_i915_private *dev_priv) goto finish; } +/** +* i915_reset_engine - reset GPU engine to recover from a hang +* @engine: engine to reset +* +* Reset a specific GPU engine. Useful if a hang is detected. +* Returns zero on successful reset or otherwise an error code. +*/ +int i915_reset_engine (struct intel_engine_cs *engine) +{ +/* FIXME: replace me with engine reset sequence */ +return -ENODEV ; +} +static int i915_pm_suspend (struct device *kdev) {struct pci_dev *pdev =to_pci_dev (kdev);
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -814,6 +814,7 @@ struct intel_csr {func (has_ddi); \func (has_decoupled_mmio); \func (has_dp_mst); \ +func (has_reset_engine); \func (has_fbc); \func (has_fpga_dbg); \func (has_full_ppgtt); \
@@ -3019,6 +3020,8 @@ extern void i915_driver_unload(struct drm_device *dev);extern int intel_gpu_reset (struct drm_i915_private *dev_priv,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv); +extern int i915_reset_engine (struct intel_engine_cs *engine); +extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_irq.c +30 -3
@@ -2635,11 +2635,13 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)/** * i915_reset_and_wakeup - do process context error handling work * @dev_priv: i915 device private +* @engine_mask: engine(s) hung - for reset-engine only. * * Fire an error uevent so userspace can see that a hang or error * was detected. */ -static void i915_reset_and_wakeup (struct drm_i915_private *dev_priv) +static void +i915_reset_and_wakeup (struct drm_i915_private *dev_priv,u32 engine_mask) {struct kobject *kobj = &dev_priv->drm.primary->kdev->kobj;char *error_event[] = {I915_ERROR_UEVENT "=1" ,NULL };
@@ -2648,9 +2650,33 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , error_event); -DRM_DEBUG_DRIVER ("resetting chip\n" ); +/* +* This event needs to be sent before performing gpu reset. When +* engine resets are supported we iterate through all engines and +* reset hung engines individually. To keep the event dispatch +* mechanism consistent with full gpu reset, this is only sent once +* even when multiple engines are hung. It is also safe to move this +* here because when we are in this function, we will definitely +* perform gpu reset. +*/ kobject_uevent_env (kobj,KOBJ_CHANGE , reset_event); +/* try engine reset first, and continue if fails; look mom, no mutex! */ +if (intel_has_reset_engine (dev_priv)) { +struct intel_engine_cs *engine; +unsigned int tmp; + +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +if (i915_reset_engine (engine) ==0 ) + engine_mask &= ~intel_engine_flag (engine); + } + +if (engine_mask) +DRM_WARN ("per-engine reset failed, promoting to full gpu reset\n" ); +else + goto finish; + } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);
@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , reset_done_event); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the dev_priv->gpu_error.
@@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out; -i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask); out:intel_runtime_pm_put (dev_priv);
drivers/gpu/drm/i915/i915_pci.c +4 -1
@@ -313,7 +313,8 @@ static const struct intel_device_info intel_haswell_info = { BDW_COLORS, \ .has_logical_ring_contexts = 1, \ .has_full_48bit_ppgtt = 1, \ - .has_64bit_reloc = 1 + .has_64bit_reloc = 1, \ + .has_reset_engine = 1static const struct intel_device_info intel_broadwell_info = {BDW_FEATURES ,
@@ -345,6 +346,7 @@ static const struct intel_device_info intel_cherryview_info = { .has_gmch_display = 1, .has_aliasing_ppgtt = 1, .has_full_ppgtt = 1, + .has_reset_engine = 1, .display_mmio_offset =VLV_DISPLAY_BASE ,GEN_CHV_PIPEOFFSETS , CURSOR_OFFSETS,
@@ -394,6 +396,7 @@ static const struct intel_device_info intel_skylake_gt3_info = { .has_aliasing_ppgtt = 1, \ .has_full_ppgtt = 1, \ .has_full_48bit_ppgtt = 1, \ + .has_reset_engine =1 , \GEN_DEFAULT_PIPEOFFSETS , \IVB_CURSOR_OFFSETS , \BDW_COLORS
drivers/gpu/drm/i915/intel_uncore.c +11 -0
@@ -1776,6 +1776,17 @@ bool intel_has_gpu_reset(struct drm_i915_private *dev_priv)return intel_get_gpu_reset (dev_priv) !=NULL ; } +/* +* When GuC submission is enabled, GuC manages ELSP and can initiate the +* engine reset too. For now, fall back to full GPU reset if it is enabled. +*/ +bool intel_has_reset_engine (struct drm_i915_private *dev_priv) +{ +return (dev_priv->info.has_reset_engine && + !dev_priv->guc.execbuf_client && + i915.reset ==2 ); +} +int intel_guc_reset (struct drm_i915_private *dev_priv) {int ret;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 02/20] drm/i915: Modify error handler for per engine hang recovery
Quoted 59 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
This is a preparatory patch which modifies error handler to do per engine hang recovery. The actual patch which implements this sequence follows later in the series. The aim is to prepare existing recovery function to adapt to this new function where applicable (which fails at this point because core implementation is lacking) and continue recovery using legacy full gpu reset.
A helper function is also added to query the availability of engine reset.
The error events behaviour that are used to notify user of reset are adapted to engine reset such that it doesn't break users listening to these events. In legacy we report an error event, a reset event before resetting the gpu and a reset done event marking the completion of reset. The same behaviour is adapted but reset event is only dispatched once even when multiple engines are hung. Finally once reset is complete we send reset done event as usual.
Note that this implementation of engine reset is for i915 directly submitting to the ELSP, where the driver manages the hang detection, recovery and resubmission. With GuC submission these tasks are shared between driver and firmware; i915 will still responsible for detecting a hang, and when it does it will have to request GuC to reset that Engine and remind the firmware about the outstanding submissions. This will be added in different patch.
v2: rebase, advertise engine reset availability in platform definition, add note about GuC submission.
v3: s/*engine_reset*/*reset_engine*/. (Chris)
Handle reset as 2 level resets, by first going to engine only and fall backing to full/chip reset as needed, i.e.reset_enginewill need thestruct_mutex.
v4: Pass the engine mask toi915_reset. (Chris)
v5: Rebase, update selftests.
v6: Rebase, prepare for mutex-less reset engine.
v7: Passreset_enginemask as a function parameter, and iterate over the engine mask forreset_engine. (Chris)Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Ian Lister <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 33 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_pci.c | 5 ++++- drivers/gpu/drm/i915/intel_uncore.c | 11 +++++++++++ 5 files changed, 63 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_drv.c +0
-0
drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1803
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0@@ -1800,6 +1800,8 @@ void i915_reset(struct drm_i915_private *dev_priv)if (!test_bit (I915_RESET_HANDOFF , &error->flags))return ; +DRM_DEBUG_DRIVER ("resetting chip\n" );
This is redundant since we have a "Resetting chip" already here. Just kill it.
Quoted 84 lines
drivers/gpu/drm/i915/i915_drv.c +14
-0+/* Clear any previous failed attempts at recovery. Time to try again. */ if (!i915_gem_unset_wedged (dev_priv)) goto wakeup;@@ -1863,6 +1865,19 @@ void i915_reset(struct drm_i915_private *dev_priv) goto finish; } +/** +* i915_reset_engine - reset GPU engine to recover from a hang +* @engine: engine to reset +* +* Reset a specific GPU engine. Useful if a hang is detected. +* Returns zero on successful reset or otherwise an error code. +*/ +int i915_reset_engine (struct intel_engine_cs *engine) +{ +/* FIXME: replace me with engine reset sequence */ +return -ENODEV ; +} +static int i915_pm_suspend (struct device *kdev) {struct pci_dev *pdev =to_pci_dev (kdev);drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -814,6 +814,7 @@ struct intel_csr {func (has_ddi); \func (has_decoupled_mmio); \func (has_dp_mst); \ +func (has_reset_engine); \func (has_fbc); \func (has_fpga_dbg); \func (has_full_ppgtt); \@@ -3019,6 +3020,8 @@ extern void i915_driver_unload(struct drm_device *dev);extern int intel_gpu_reset (struct drm_i915_private *dev_priv,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv); +extern int i915_reset_engine (struct intel_engine_cs *engine); +extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_irq.c +16
-2@@ -2635,11 +2635,13 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)/** * i915_reset_and_wakeup - do process context error handling work * @dev_priv: i915 device private +* @engine_mask: engine(s) hung - for reset-engine only. * * Fire an error uevent so userspace can see that a hang or error * was detected. */ -static void i915_reset_and_wakeup (struct drm_i915_private *dev_priv) +static void +i915_reset_and_wakeup (struct drm_i915_private *dev_priv,u32 engine_mask) {struct kobject *kobj = &dev_priv->drm.primary->kdev->kobj;char *error_event[] = {I915_ERROR_UEVENT "=1" ,NULL };@@ -2648,9 +2650,33 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , error_event); -DRM_DEBUG_DRIVER ("resetting chip\n" ); +/* +* This event needs to be sent before performing gpu reset. When +* engine resets are supported we iterate through all engines and +* reset hung engines individually. To keep the event dispatch +* mechanism consistent with full gpu reset, this is only sent once +* even when multiple engines are hung. It is also safe to move this +* here because when we are in this function, we will definitely +* perform gpu reset. +*/ kobject_uevent_env (kobj,KOBJ_CHANGE , reset_event); +/* try engine reset first, and continue if fails; look mom, no mutex! */ +if (intel_has_reset_engine (dev_priv)) { +struct intel_engine_cs *engine; +unsigned int tmp;
drivers/gpu/drm/i915/i915_irq.c static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv) · line 2677
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +10
-0+ +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +if (i915_reset_engine (engine) ==0 ) + engine_mask &= ~intel_engine_flag (engine); + } + +if (engine_mask) +DRM_WARN ("per-engine reset failed, promoting to full gpu reset\n" ); +else + goto finish;
This will look nicer if we did just try per-engine reset and then quitely promote (it's not that quiet as we do get logging) to global.
for_each_engine_masked() {}
if (!engine_mask)
Quoted 14 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , reset_done_event); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the dev_priv->gpu_error.
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2811
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out; -i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask);
? You don't need to wakeup the struct_mutex so we don't need this after per-engine resets. Time to split up i915_reset_and_wakeup(), because we certainly shouldn't be calling intel_finish_reset() without first calling intel_prepare_reset(). Which is right here in my tree...
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv,
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c +9
-0+/* +* When GuC submission is enabled, GuC manages ELSP and can initiate the +* engine reset too. For now, fall back to full GPU reset if it is enabled. +*/ +bool intel_has_reset_engine (struct drm_i915_private *dev_priv) +{ +return (dev_priv->info.has_reset_engine && + !dev_priv->guc.execbuf_client && + i915.reset ==2 );
i915.reset >= 2
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 02/20] drm/i915: Modify error handler for per engine hang recovery
Quoted 187 lines · Chris Wilson
Quoted 59 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
This is a preparatory patch which modifies error handler to do per engine hang recovery. The actual patch which implements this sequence follows later in the series. The aim is to prepare existing recovery function to adapt to this new function where applicable (which fails at this point because core implementation is lacking) and continue recovery using legacy full gpu reset.
A helper function is also added to query the availability of engine reset.
The error events behaviour that are used to notify user of reset are adapted to engine reset such that it doesn't break users listening to these events. In legacy we report an error event, a reset event before resetting the gpu and a reset done event marking the completion of reset. The same behaviour is adapted but reset event is only dispatched once even when multiple engines are hung. Finally once reset is complete we send reset done event as usual.
Note that this implementation of engine reset is for i915 directly submitting to the ELSP, where the driver manages the hang detection, recovery and resubmission. With GuC submission these tasks are shared between driver and firmware; i915 will still responsible for detecting a hang, and when it does it will have to request GuC to reset that Engine and remind the firmware about the outstanding submissions. This will be added in different patch.
v2: rebase, advertise engine reset availability in platform definition, add note about GuC submission.
v3: s/*engine_reset*/*reset_engine*/. (Chris)
Handle reset as 2 level resets, by first going to engine only and fall backing to full/chip reset as needed, i.e.reset_enginewill need thestruct_mutex.
v4: Pass the engine mask toi915_reset. (Chris)
v5: Rebase, update selftests.
v6: Rebase, prepare for mutex-less reset engine.
v7: Passreset_enginemask as a function parameter, and iterate over the engine mask forreset_engine. (Chris)Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Ian Lister <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 15 +++++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_irq.c | 33 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/i915_pci.c | 5 ++++- drivers/gpu/drm/i915/intel_uncore.c | 11 +++++++++++ 5 files changed, 63 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_drv.c +0
-0drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1803
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0@@ -1800,6 +1800,8 @@ void i915_reset(struct drm_i915_private *dev_priv)if (!test_bit (I915_RESET_HANDOFF , &error->flags))return ; +DRM_DEBUG_DRIVER ("resetting chip\n" );This is redundant since we have a "Resetting chip" already here. Just kill it.
Quoted 84 lines
drivers/gpu/drm/i915/i915_drv.c +14
-0+/* Clear any previous failed attempts at recovery. Time to try again. */ if (!i915_gem_unset_wedged (dev_priv)) goto wakeup;@@ -1863,6 +1865,19 @@ void i915_reset(struct drm_i915_private *dev_priv) goto finish; } +/** +* i915_reset_engine - reset GPU engine to recover from a hang +* @engine: engine to reset +* +* Reset a specific GPU engine. Useful if a hang is detected. +* Returns zero on successful reset or otherwise an error code. +*/ +int i915_reset_engine (struct intel_engine_cs *engine) +{ +/* FIXME: replace me with engine reset sequence */ +return -ENODEV ; +} +static int i915_pm_suspend (struct device *kdev) {struct pci_dev *pdev =to_pci_dev (kdev);drivers/gpu/drm/i915/i915_drv.h +3
-0@@ -814,6 +814,7 @@ struct intel_csr {func (has_ddi); \func (has_decoupled_mmio); \func (has_dp_mst); \ +func (has_reset_engine); \func (has_fbc); \func (has_fpga_dbg); \func (has_full_ppgtt); \@@ -3019,6 +3020,8 @@ extern void i915_driver_unload(struct drm_device *dev);extern int intel_gpu_reset (struct drm_i915_private *dev_priv,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv); +extern int i915_reset_engine (struct intel_engine_cs *engine); +extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_irq.c +16
-2@@ -2635,11 +2635,13 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)/** * i915_reset_and_wakeup - do process context error handling work * @dev_priv: i915 device private +* @engine_mask: engine(s) hung - for reset-engine only. * * Fire an error uevent so userspace can see that a hang or error * was detected. */ -static void i915_reset_and_wakeup (struct drm_i915_private *dev_priv) +static void +i915_reset_and_wakeup (struct drm_i915_private *dev_priv,u32 engine_mask) {struct kobject *kobj = &dev_priv->drm.primary->kdev->kobj;char *error_event[] = {I915_ERROR_UEVENT "=1" ,NULL };@@ -2648,9 +2650,33 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , error_event); -DRM_DEBUG_DRIVER ("resetting chip\n" ); +/* +* This event needs to be sent before performing gpu reset. When +* engine resets are supported we iterate through all engines and +* reset hung engines individually. To keep the event dispatch +* mechanism consistent with full gpu reset, this is only sent once +* even when multiple engines are hung. It is also safe to move this +* here because when we are in this function, we will definitely +* perform gpu reset. +*/ kobject_uevent_env (kobj,KOBJ_CHANGE , reset_event); +/* try engine reset first, and continue if fails; look mom, no mutex! */ +if (intel_has_reset_engine (dev_priv)) { +struct intel_engine_cs *engine; +unsigned int tmp;drivers/gpu/drm/i915/i915_irq.c static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv) · line 2677
Quoted 10 lines
drivers/gpu/drm/i915/i915_irq.c +10
-0+ +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +if (i915_reset_engine (engine) ==0 ) + engine_mask &= ~intel_engine_flag (engine); + } + +if (engine_mask) +DRM_WARN ("per-engine reset failed, promoting to full gpu reset\n" ); +else + goto finish;This will look nicer if we did just try per-engine reset and then quitely promote (it's not that quiet as we do get logging) to global.
for_each_engine_masked(){}
if (!engine_mask)Quoted 17 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj,KOBJ_CHANGE , reset_done_event); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the dev_priv->gpu_error. @@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out;
Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2811
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1-i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask);? You don't need to wakeup the
struct_mutexso we don't need this after per-engine resets. Time to split upi915_reset_and_wakeup(), because we certainly shouldn't be callingintel_finish_reset()without first callingintel_prepare_reset(). Which is right here in my tree...
Looking at your tree, it wouldn't call finish_reset there either, only these two are called after a successful reset:
finish:
clear_bit(I915_RESET_BACKOFF, &dev_priv->gpu_error.flags); wake_up_all(&dev_priv->gpu_error.reset_queue);
But you're right, we only need to clear the error flag, no need to call wake_up_all.
Should I move the per-engine reset to i915_handle_error, and then leave i915_reset_and_wakeup just for full resets? That would also make the promotion from per-engine to global look a bit 'clearer'.
Thanks,
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +4
-0+/* +* When GuC submission is enabled, GuC manages ELSP and can initiate the +* engine reset too. For now, fall back to full GPU reset if it is enabled. +*/
Quoted 9 lines
drivers/gpu/drm/i915/i915_irq.c
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +5
-0+bool intel_has_reset_engine (struct drm_i915_private *dev_priv) +{ +return (dev_priv->info.has_reset_engine && + !dev_priv->guc.execbuf_client && + i915.reset ==2 );i915.reset >= 2
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 02/20] drm/i915: Modify error handler for per engine hang recovery
Quoted 4 lines · Michel Thierry
Quoted 3 lines · Chris Wilson
Quoted 2 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
...
Quoted 35 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj ,KOBJ_CHANGE ,reset_done_event ); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the
dev_priv->gpu_error.drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out;Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2811
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1-i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask);? You don't need to wakeup the
struct_mutexso we don't need this after per-engine resets. Time to split upi915_reset_and_wakeup(), because we certainly shouldn't be callingintel_finish_reset()without first callingintel_prepare_reset(). Which is right here in my tree...Looking at your tree, it wouldn't call
finish_resetthere either, only these two are called after a successful reset:finish:
clear_bit(I915_RESET_BACKOFF, &dev_priv->gpu_error.flags); wake_up_all(&dev_priv->gpu_error.reset_queue);
Quoted 8 lines
But you're right, we only need to clear the error flag, no need to call
wake_up_all.Should I move the per-engine reset to
i915_handle_error, and then leavei915_reset_and_wakeupjust for full resets?
That would also make the promotion from per-engine to global look a bit 'clearer'.
I just noticed an issue if I don't call wake_up_all. There can be someone else waiting for the reset to complete (i915_mutex_lock_interruptible -> i915_gem_wait_for_error).
I915_RESET_BACKOFF has/had 2 roles, stop any other user to grab the struct mutex (which we won't need in reset-engine) and prevent two concurrent reset attempts (which we still want). Time to add a new flag for the later? (I915_RESET_ENGINE_IN_PROGRESS?)
Here's an example without calling wake_up_all (10s timeout):
[ 126.816054] [drm:i915_reset_engine [i915]] resetting rcs0 ... [ 137.499910] [IGT] gem_ringfill: exiting, ret=0
Compared to the one that does,
[ 69.799519] [drm:i915_reset_engine [i915]] resetting rcs0 ... [ 69.801335] [IGT] gem_tdr: exiting, ret=0
Thanks,
-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 02/20] drm/i915: Modify error handler for per engine hang recovery
Quoted 50 lines · Michel Thierry
Quoted 4 lines · Michel Thierry
Quoted 3 lines · Chris Wilson
Quoted 2 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
...
Quoted 35 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj ,KOBJ_CHANGE ,reset_done_event ); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the
dev_priv->gpu_error.drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out;Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2811
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1-i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask);? You don't need to wakeup the
struct_mutexso we don't need this after per-engine resets. Time to split upi915_reset_and_wakeup(), because we certainly shouldn't be callingintel_finish_reset()without first callingintel_prepare_reset(). Which is right here in my tree...Looking at your tree, it wouldn't call
finish_resetthere either, only these two are called after a successful reset:finish:
clear_bit(I915_RESET_BACKOFF, &dev_priv->gpu_error.flags); wake_up_all(&dev_priv->gpu_error.reset_queue);Quoted 8 lines
But you're right, we only need to clear the error flag, no need to call
wake_up_all.Should I move the per-engine reset to
i915_handle_error, and then leavei915_reset_and_wakeupjust for full resets?
That would also make the promotion from per-engine to global look a bit 'clearer'.
Quoted 8 lines
I just noticed an issue if I don't call
wake_up_all. There can be someone else waiting for the reset to complete (i915_mutex_lock_interruptible->i915_gem_wait_for_error).
I915_RESET_BACKOFFhas/had 2 roles, stop any other user to grab the struct mutex (which we won't need in reset-engine) and prevent two concurrent reset attempts (which we still want). Time to add a new flag for the later? (I915_RESET_ENGINE_IN_PROGRESS?)
Yes, that would be a good idea to avoid dual purposing the bits. Now that we do direct resets along the wait path, we can completely drop the i915_mutex_interruptible(). (No one else should be holding the mutex indefinitely.) I think that's a better approach -- I think we've already moved all the EIO magic aware to the ABI points where we deemed it necessary.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 02/20] drm/i915: Modify error handler for per engine hang recovery
Quoted 60 lines · Chris Wilson
Quoted 50 lines · Michel Thierry
Quoted 4 lines · Michel Thierry
Quoted 3 lines · Chris Wilson
Quoted 2 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
...
Quoted 35 lines
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/i915/i915_irq.c +3
-0+ } +intel_prepare_reset (dev_priv);set_bit (I915_RESET_HANDOFF , &dev_priv->gpu_error.flags);@@ -2680,6 +2706,7 @@ static void i915_reset_and_wakeup(struct drm_i915_private *dev_priv)kobject_uevent_env (kobj ,KOBJ_CHANGE ,reset_done_event ); +finish:/* * Note: The wake_up also serves as a memory barrier so that * waiters see the updated value of the
dev_priv->gpu_error.drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -2781,7 +2808,7 @@ void i915_handle_error(struct drm_i915_private *dev_priv, &dev_priv->gpu_error.flags)) goto out;Quoted 8 lines
drivers/gpu/drm/i915/i915_irq.c void i915_handle_error(struct drm_i915_private *dev_priv, · line 2811
Quoted 2 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1-i915_reset_and_wakeup (dev_priv); +i915_reset_and_wakeup (dev_priv, engine_mask);? You don't need to wakeup the
struct_mutexso we don't need this after per-engine resets. Time to split upi915_reset_and_wakeup(), because we certainly shouldn't be callingintel_finish_reset()without first callingintel_prepare_reset(). Which is right here in my tree...Looking at your tree, it wouldn't call
finish_resetthere either, only these two are called after a successful reset:finish:
clear_bit(I915_RESET_BACKOFF, &dev_priv->gpu_error.flags); wake_up_all(&dev_priv->gpu_error.reset_queue);Quoted 8 lines
But you're right, we only need to clear the error flag, no need to call
wake_up_all.Should I move the per-engine reset to
i915_handle_error, and then leavei915_reset_and_wakeupjust for full resets?
That would also make the promotion from per-engine to global look a bit 'clearer'.Quoted 8 lines
I just noticed an issue if I don't call
wake_up_all. There can be someone else waiting for the reset to complete (i915_mutex_lock_interruptible->i915_gem_wait_for_error).
I915_RESET_BACKOFFhas/had 2 roles, stop any other user to grab the struct mutex (which we won't need in reset-engine) and prevent two concurrent reset attempts (which we still want). Time to add a new flag for the later? (I915_RESET_ENGINE_IN_PROGRESS?)
Quoted 6 lines
Yes, that would be a good idea to avoid dual purposing the bits. Now that we do direct resets along the wait path, we can completely drop the
i915_mutex_interruptible(). (No one else should be holding the mutex indefinitely.) I think that's a better approach -- I think we've already moved all the EIO magic aware to the ABI points where we deemed it necessary.
And it seems to work ok with the new flag and no wake_up. I'll run more tests.
Thanks
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/20 drm/i915: Modify error handler for per engine hang recovery
In reply to Michel ThierryThis is a preparatory patch which modifies error handler to do per engine hang recovery. The actual patch which implements this sequence follows later in the series. The aim is to prepare existing recovery function to adapt to this new function where applicable (which fails at this point because core implementation is lacking) and continue recovery using legacy full gpu reset.
A helper function is also added to query the availability of engine reset.
<OPEN>
The error events that are used to notify user of reset are currently ommited in case of engine reset. In legacy we report an error event, a reset event before resetting the gpu and a reset done event marking the completion of reset. The same behaviour can be adapted but reset event will only dispatched once even when multiple engines are hung, and there needs to be some control to prevent multiple events in case the reset-engine fails and the driver fall backs to full chip reset.
</OPEN>
Note that this implementation of engine reset is for i915 directly submitting to the ELSP, where the driver manages the hang detection, recovery and resubmission. With GuC submission these tasks are shared between driver and firmware; i915 will still responsible for detecting a hang, and when it does it will have to request GuC to reset that Engine and remind the firmware about the outstanding submissions. This will be added in different patch.
v2: rebase, advertise engine reset availability in platform definition, add note about GuC submission.
v3: s/*engine_reset*/*reset_engine*/. (Chris)
Handle reset as 2 level resets, by first going to engine only and fall backing to full/chip reset as needed, i.e. reset_engine will need the struct_mutex.
v4: Pass the engine mask to i915_reset. (Chris)
v5: Rebase, update selftests.
v6: Rebase, prepare for mutex-less reset engine.
v7: Pass reset_engine mask as a function parameter, and iterate over the engine mask for reset_engine. (Chris)
v8: Use i915.reset >=2 in has_reset_engine; remove redundant reset logging; add a reset-engine-in-progress flag to prevent concurrent resets, and avoid dual purposing of reset-backoff. (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 13 +++++++++++++ drivers/gpu/drm/i915/i915_drv.h | 8 ++++++++ drivers/gpu/drm/i915/i915_irq.c | 24 ++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_pci.c | 5 ++++- drivers/gpu/drm/i915/intel_uncore.c | 11 +++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +13 -0
@@ -1877,6 +1877,19 @@ void i915_reset(struct drm_i915_private *dev_priv) goto finish; } +/** +* i915_reset_engine - reset GPU engine to recover from a hang +* @engine: engine to reset +* +* Reset a specific GPU engine. Useful if a hang is detected. +* Returns zero on successful reset or otherwise an error code. +*/ +int i915_reset_engine (struct intel_engine_cs *engine) +{ +/* FIXME: replace me with engine reset sequence */ +return -ENODEV ; +} +static int i915_pm_suspend (struct device *kdev) {struct pci_dev *pdev =to_pci_dev (kdev);
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -705,6 +705,7 @@ struct intel_csr {func (has_ddi); \func (has_decoupled_mmio); \func (has_dp_mst); \ +func (has_reset_engine); \func (has_fbc); \func (has_fpga_dbg); \func (has_full_ppgtt); \
@@ -1498,6 +1499,10 @@ struct i915_gpu_error {* inspect the bit and do the reset directly, otherwise the worker * waits for the struct_mutex. * +* #I915_RESET_ENGINE_IN_PROGRESS - Since the driver doesn't need to +* acquire the struct_mutex to reset an engine, we need an explicit +* flag to prevent two concurrent reset-engine attempts. +* * #I915_WEDGED - If reset fails and we can no longer use the GPU, * we set the #I915_WEDGED bit. Prior to command submission, e.g. * i915_gem_request_alloc(), this bit is checked and the sequence
@@ -1506,6 +1511,7 @@ struct i915_gpu_error {unsigned long flags;#define I915_RESET_BACKOFF 0#define I915_RESET_HANDOFF 1 +#define I915_RESET_ENGINE_IN_PROGRESS 2#define I915_WEDGED (BITS_PER_LONG - 1)/**
@@ -2989,6 +2995,8 @@ extern void i915_driver_unload(struct drm_device *dev);extern int intel_gpu_reset (struct drm_i915_private *dev_priv,u32 engine_mask);extern bool intel_has_gpu_reset (struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv); +extern int i915_reset_engine (struct intel_engine_cs *engine); +extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_irq.c +24 -0
@@ -2741,6 +2741,30 @@ void i915_handle_error(struct drm_i915_private *dev_priv,if (!engine_mask) goto out; +/* try engine reset first, and continue if fails */ +if (intel_has_reset_engine (dev_priv)) { +struct intel_engine_cs *engine; +unsigned int tmp; + +/* protect against concurrent reset attempts */ +if (test_and_set_bit (I915_RESET_ENGINE_IN_PROGRESS , + &dev_priv->gpu_error.flags)) + goto out; + +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +if (i915_reset_engine (engine) ==0 ) + engine_mask &= ~intel_engine_flag (engine); + } + +/* clear unconditionally, full reset won't care about it */ +clear_bit (I915_RESET_ENGINE_IN_PROGRESS , + &dev_priv->gpu_error.flags); + +if (!engine_mask) + goto out; + } + +/* full reset needs the mutex, stop any other user trying to do so */ if (test_and_set_bit (I915_RESET_BACKOFF , &dev_priv->gpu_error.flags)) goto out;
drivers/gpu/drm/i915/i915_pci.c +4 -1
@@ -310,7 +310,8 @@ static const struct intel_device_info intel_haswell_info = { BDW_COLORS, \ .has_logical_ring_contexts = 1, \ .has_full_48bit_ppgtt = 1, \ - .has_64bit_reloc = 1 + .has_64bit_reloc = 1, \ + .has_reset_engine = 1static const struct intel_device_info intel_broadwell_info = {BDW_FEATURES ,
@@ -341,6 +342,7 @@ static const struct intel_device_info intel_cherryview_info = { .has_gmch_display = 1, .has_aliasing_ppgtt = 1, .has_full_ppgtt = 1, + .has_reset_engine = 1, .display_mmio_offset =VLV_DISPLAY_BASE ,GEN_CHV_PIPEOFFSETS , CURSOR_OFFSETS,
@@ -389,6 +391,7 @@ static const struct intel_device_info intel_skylake_gt3_info = { .has_aliasing_ppgtt = 1, \ .has_full_ppgtt = 1, \ .has_full_48bit_ppgtt = 1, \ + .has_reset_engine =1 , \GEN_DEFAULT_PIPEOFFSETS , \IVB_CURSOR_OFFSETS , \BDW_COLORS
drivers/gpu/drm/i915/intel_uncore.c +11 -0
@@ -1776,6 +1776,17 @@ bool intel_has_gpu_reset(struct drm_i915_private *dev_priv)return intel_get_gpu_reset (dev_priv) !=NULL ; } +/* +* When GuC submission is enabled, GuC manages ELSP and can initiate the +* engine reset too. For now, fall back to full GPU reset if it is enabled. +*/ +bool intel_has_reset_engine (struct drm_i915_private *dev_priv) +{ +return (dev_priv->info.has_reset_engine && + !dev_priv->guc.execbuf_client && + i915.reset >=2 ); +} +int intel_guc_reset (struct drm_i915_private *dev_priv) {int ret;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/20 drm/i915: Add support for per engine reset recovery
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
This change implements support for per-engine reset as an initial, less intrusive hang recovery option to be attempted before falling back to the legacy full GPU reset recovery mode if necessary. This is only supported from Gen8 onwards.
Hangchecker determines which engines are hung and invokes error handler to recover from it. Error handler schedules recovery for each of those engines that are hung. The recovery procedure is as follows,
- identifies the request that caused the hang and it is dropped
- force engine to idle: this is done by issuing a reset request
- reset and re-init engine
- restart submissions to the engine
If engine reset fails then we fall back to heavy weight full gpu reset which resets all engines and reinitiazes complete state of HW and SW.
v2: Rebase.
v3: s/*engine_reset*/*reset_engine*/; freeze engine and irqs before calling i915_gem_reset_engine (Chris).
v4: Rebase, modify i915_gem_reset_prepare to use a ring mask and reuse the function for reset_engine.
v5: intel_reset_engine_start/cancel instead of request/unrequest_reset.
v6: Clean up reset_engine function to not require mutex, i.e. no need to call revoke/restore_fences and _retire_requests (Chris).
v7: Remove leftovers from v5, i.e. no need to disable irq, hold forcewake or wakeup the handoff bit (Chris).
--- drivers/gpu/drm/i915/i915_drv.c | 60 ++++++++++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 12 +++- drivers/gpu/drm/i915/i915_gem.c | 97 +++++++++++++++++++-------------- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 20 +++++++ 5 files changed, 142 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +56 -4
@@ -1810,7 +1810,7 @@ void i915_reset(struct drm_i915_private *dev_priv)pr_notice ("drm/i915: Resetting chip after gpu hang\n" );disable_irq (dev_priv->drm.irq); - ret =i915_gem_reset_prepare (dev_priv); + ret =i915_gem_reset_prepare (dev_priv,ALL_ENGINES );if (ret) {DRM_ERROR ("GPU recovery failed\n" );intel_gpu_reset (dev_priv,ALL_ENGINES );
@@ -1852,7 +1852,7 @@ void i915_reset(struct drm_i915_private *dev_priv)i915_queue_hangcheck (dev_priv); finish: -i915_gem_reset_finish (dev_priv); +i915_gem_reset_finish (dev_priv,ALL_ENGINES );enable_irq (dev_priv->drm.irq); wakeup:
@@ -1871,11 +1871,63 @@ void i915_reset(struct drm_i915_private *dev_priv)* * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code. +* +* Procedure is: +* - identifies the request that caused the hang and it is dropped +* - force engine to idle: this is done by issuing a reset request +* - reset engine +* - restart submissions to the engine */ int i915_reset_engine (struct intel_engine_cs *engine) { -/* FIXME: replace me with engine reset sequence */ -return -ENODEV ; +int ret; +struct drm_i915_private *dev_priv = engine->i915; +struct i915_gpu_error *error = &dev_priv->gpu_error; + +GEM_BUG_ON (!test_bit (I915_RESET_BACKOFF , &error->flags)); + +DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); + + ret =i915_gem_reset_prepare_engine (engine); +if (ret) { +DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + goto out; + } + +/* +* the request that caused the hang is stuck on elsp, identify the +* active request and drop it, adjust head to skip the offending +* request to resume executing remaining requests in the queue. +*/ +i915_gem_reset_engine (engine); + +/* forcing engine to idle */ + ret =intel_reset_engine_start (engine); +if (ret) { +DRM_ERROR ("Failed to disable %s\n" , engine->name); + goto out; + } + +/* finally, reset engine */ + ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); +if (ret) { +DRM_ERROR ("Failed to reset %s, ret=%d\n" , engine->name, ret); +intel_reset_engine_cancel (engine); + goto out; + } + +/* be sure the request reset bit gets cleared */ +intel_reset_engine_cancel (engine); + +i915_gem_reset_finish_engine (engine); + +/* replay remaining requests in the queue */ + ret = engine->init_hw (engine); +if (ret) + goto out;//XXX: ignore this line for now + +out: +return ret; }static int i915_pm_suspend (struct device *kdev)
drivers/gpu/drm/i915/i915_drv.h +9 -3
@@ -3022,6 +3022,8 @@ extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv);extern int i915_reset_engine (struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv); +extern int intel_reset_engine_start (struct intel_engine_cs *engine); +extern void intel_reset_engine_cancel (struct intel_engine_cs *engine);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);
@@ -3410,7 +3412,6 @@ int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno);struct drm_i915_gem_request *i915_gem_find_active_request (struct intel_engine_cs *engine); -void i915_gem_retire_requests (struct drm_i915_private *dev_priv);static inline bool i915_reset_backoff (struct i915_gpu_error *error)
@@ -3438,11 +3439,16 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare (struct drm_i915_private *dev_priv); +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +int i915_gem_reset_prepare (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_reset (struct drm_i915_private *dev_priv); -void i915_gem_reset_finish (struct drm_i915_private *dev_priv); +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine); +void i915_gem_reset_finish (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); +void i915_gem_reset_engine (struct intel_engine_cs *engine);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +56 -41
127 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_request.c +1 -1
@@ -1216,7 +1216,7 @@ long i915_wait_request(struct drm_i915_gem_request *req,return timeout; } -static void engine_retire_requests (struct intel_engine_cs *engine) +void engine_retire_requests (struct intel_engine_cs *engine) {struct drm_i915_gem_request *request, *next;u32 seqno =intel_engine_get_seqno (engine);
drivers/gpu/drm/i915/intel_uncore.c +20 -0
@@ -1801,6 +1801,26 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)return ret; } +/* +* On gen8+ a reset request has to be issued via the reset control register +* before a GPU engine can be reset in order to stop the command streamer +* and idle the engine. This replaces the legacy way of stopping an engine +* by writing to the stop ring bit in the MI_MODE register. +*/ +int intel_reset_engine_start (struct intel_engine_cs *engine) +{ +return gen8_reset_engine_start (engine); +} + +/* +* It is possible to back off from a previously issued reset request by simply +* clearing the reset request bit in the reset control register. +*/ +void intel_reset_engine_cancel (struct intel_engine_cs *engine) +{ +gen8_reset_engine_cancel (engine); +} +bool intel_uncore_unclaimed_mmio (struct drm_i915_private *dev_priv) {return check_for_unclaimed_mmio (dev_priv);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 03/20] drm/i915: Add support for per engine reset recovery
Quoted 65 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
This change implements support for per-engine reset as an initial, less intrusive hang recovery option to be attempted before falling back to the legacy full GPU reset recovery mode if necessary. This is only supported from Gen8 onwards.
Hangchecker determines which engines are hung and invokes error handler to recover from it. Error handler schedules recovery for each of those engines that are hung. The recovery procedure is as follows,
- identifies the request that caused the hang and it is dropped
- force engine to idle: this is done by issuing a reset request
- reset and re-init engine
- restart submissions to the engineIf engine reset fails then we fall back to heavy weight full gpu reset which resets all engines and reinitiazes complete state of HW and SW.
v2: Rebase.
v3: s/*engine_reset*/*reset_engine*/; freeze engine and irqs before callingi915_gem_reset_engine(Chris).
v4: Rebase, modifyi915_gem_reset_prepareto use a ring mask and reuse the function forreset_engine.
v5: intel_reset_engine_start/cancel instead of request/unrequest_reset.
v6: Clean upreset_enginefunction to not require mutex, i.e. no need to call revoke/restore_fences and_retire_requests(Chris).
v7: Remove leftovers from v5, i.e. no need to disable irq, hold forcewake or wakeup the handoff bit (Chris).Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 60 ++++++++++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 12 +++- drivers/gpu/drm/i915/i915_gem.c | 97 +++++++++++++++++++-------------- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 20 +++++++ 5 files changed, 142 insertions(+), 49 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-2@@ -1810,7 +1810,7 @@ void i915_reset(struct drm_i915_private *dev_priv)pr_notice ("drm/i915: Resetting chip after gpu hang\n" );disable_irq (dev_priv->drm.irq); - ret =i915_gem_reset_prepare (dev_priv); + ret =i915_gem_reset_prepare (dev_priv,ALL_ENGINES );if (ret) {DRM_ERROR ("GPU recovery failed\n" );intel_gpu_reset (dev_priv,ALL_ENGINES );@@ -1852,7 +1852,7 @@ void i915_reset(struct drm_i915_private *dev_priv)i915_queue_hangcheck (dev_priv); finish: -i915_gem_reset_finish (dev_priv); +i915_gem_reset_finish (dev_priv,ALL_ENGINES );enable_irq (dev_priv->drm.irq); wakeup:
drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1879
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -1871,11 +1871,63 @@ void i915_reset(struct drm_i915_private *dev_priv)* * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code. +* +* Procedure is: +* - identifies the request that caused the hang and it is dropped +* - force engine to idle: this is done by issuing a reset request +* - reset engine +* - restart submissions to the engine
Why does the prospective caller need to know this?
Quoted 40 lines
drivers/gpu/drm/i915/i915_drv.c +35
-2*/ int i915_reset_engine (struct intel_engine_cs *engine) { -/* FIXME: replace me with engine reset sequence */ -return -ENODEV ; +int ret; +struct drm_i915_private *dev_priv = engine->i915; +struct i915_gpu_error *error = &dev_priv->gpu_error; + +GEM_BUG_ON (!test_bit (I915_RESET_BACKOFF , &error->flags)); + +DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); + + ret =i915_gem_reset_prepare_engine (engine); +if (ret) { +DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + goto out; + } + +/* +* the request that caused the hang is stuck on elsp, identify the +* active request and drop it, adjust head to skip the offending +* request to resume executing remaining requests in the queue. +*/ +i915_gem_reset_engine (engine); + +/* forcing engine to idle */ + ret =intel_reset_engine_start (engine); +if (ret) { +DRM_ERROR ("Failed to disable %s\n" , engine->name); + goto out; + } + +/* finally, reset engine */ + ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); +if (ret) { +DRM_ERROR ("Failed to reset %s, ret=%d\n" , engine->name, ret); +intel_reset_engine_cancel (engine); + goto out; + }
drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1927
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10
-0+ +/* be sure the request reset bit gets cleared */ +intel_reset_engine_cancel (engine); + +i915_gem_reset_finish_engine (engine); + +/* replay remaining requests in the queue */ + ret = engine->init_hw (engine); +if (ret) + goto out;//XXX: ignore this line for now
Please give the comments here some tlc. Focus on the why, you are telling me what the code does.
Quoted 20 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0+ +out: +return ret; }static int i915_pm_suspend (struct device *kdev)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -3022,6 +3022,8 @@ extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv);extern int i915_reset_engine (struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv); +extern int intel_reset_engine_start (struct intel_engine_cs *engine); +extern void intel_reset_engine_cancel (struct intel_engine_cs *engine);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_drv.h int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno); · line 3413
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -3410,7 +3412,6 @@ int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno);struct drm_i915_gem_request *i915_gem_find_active_request (struct intel_engine_cs *engine); -
Nope. (find_active_request is not in the same group of operations as retire_requests.)
Quoted 105 lines
drivers/gpu/drm/i915/i915_drv.h +7
-2void i915_gem_retire_requests (struct drm_i915_private *dev_priv);static inline bool i915_reset_backoff (struct i915_gpu_error *error)@@ -3438,11 +3439,16 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare (struct drm_i915_private *dev_priv); +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +int i915_gem_reset_prepare (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_reset (struct drm_i915_private *dev_priv); -void i915_gem_reset_finish (struct drm_i915_private *dev_priv); +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine); +void i915_gem_reset_finish (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); +void i915_gem_reset_engine (struct intel_engine_cs *engine);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_gem.c +33
-35@@ -2793,48 +2793,57 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -int i915_gem_reset_prepare (struct drm_i915_private *dev_priv) +/* Ensure irq handler finishes, and not run again. */ +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct intel_engine_cs *engine; -enum intel_engine_id id; +struct drm_i915_gem_request *request;int err =0 ; -/* Ensure irq handler finishes, and not run again. */ -for_each_engine (engine, dev_priv, id) { -struct drm_i915_gem_request *request; - -/* Prevent the signaler thread from updating the request -* state (by calling dma_fence_signal) as we are processing -* the reset. The write from the GPU of the seqno is -* asynchronous and the signaler thread may see a different -* value to us and declare the request complete, even though -* the reset routine have picked that request as the active -* (incomplete) request. This conflict is not handled -* gracefully! -*/ -kthread_park (engine->breadcrumbs.signaler); - -/* Prevent request submission to the hardware until we have -* completed the reset in i915_gem_reset_finish(). If a request -* is completed by one engine, it may then queue a request -* to a second via its engine->irq_tasklet *just* as we are -* calling engine->init_hw() and also writing the ELSP. -* Turning off the engine->irq_tasklet until the reset is over -* prevents the race. -*/ -tasklet_kill (&engine->irq_tasklet); -tasklet_disable (&engine->irq_tasklet); -if (engine->irq_seqno_barrier) - engine->irq_seqno_barrier (engine); +/* Prevent the signaler thread from updating the request +* state (by calling dma_fence_signal) as we are processing +* the reset. The write from the GPU of the seqno is +* asynchronous and the signaler thread may see a different +* value to us and declare the request complete, even though +* the reset routine have picked that request as the active +* (incomplete) request. This conflict is not handled +* gracefully! +*/ +kthread_park (engine->breadcrumbs.signaler); + +/* Prevent request submission to the hardware until we have +* completed the reset in i915_gem_reset_finish(). If a request +* is completed by one engine, it may then queue a request +* to a second via its engine->irq_tasklet *just* as we are +* calling engine->init_hw() and also writing the ELSP. +* Turning off the engine->irq_tasklet until the reset is over +* prevents the race. +*/ +tasklet_kill (&engine->irq_tasklet); +tasklet_disable (&engine->irq_tasklet); -if (engine_stalled (engine)) { - request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ - } +if (engine->irq_seqno_barrier) + engine->irq_seqno_barrier (engine); + +if (engine_stalled (engine)) { + request =i915_gem_find_active_request (engine); +if (request && request->fence.error == -EIO ) + err = -EIO ;/* Previous reset failed! */ } +return err; +}
drivers/gpu/drm/i915/i915_gem.c static bool engine_stalled(struct intel_engine_cs *engine) · line 2845
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +10
-0+ +int i915_gem_reset_prepare (struct drm_i915_private *dev_priv, +unsigned int engine_mask) +{ +struct intel_engine_cs *engine; +unsigned int tmp; +int err =0 ; + +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) + err =i915_gem_reset_prepare_engine (engine);
You are losing any earlier err.
Quoted 46 lines
drivers/gpu/drm/i915/i915_gem.c +13
-6+i915_gem_revoke_fences (dev_priv);return err;@@ -2920,7 +2929,7 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)return guilty; } -static void i915_gem_reset_engine (struct intel_engine_cs *engine) +void i915_gem_reset_engine (struct intel_engine_cs *engine) {struct drm_i915_gem_request *request;@@ -2966,16 +2975,22 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) } } -void i915_gem_reset_finish (struct drm_i915_private *dev_priv) +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine) +{ +tasklet_enable (&engine->irq_tasklet); +kthread_unpark (engine->breadcrumbs.signaler); +} + +void i915_gem_reset_finish (struct drm_i915_private *dev_priv, +unsigned int engine_mask) {struct intel_engine_cs *engine; -enum intel_engine_id id; +unsigned int tmp;lockdep_assert_held (&dev_priv->drm.struct_mutex); -for_each_engine (engine, dev_priv, id) { -tasklet_enable (&engine->irq_tasklet); -kthread_unpark (engine->breadcrumbs.signaler); +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +i915_gem_reset_finish_engine (engine); } }drivers/gpu/drm/i915/i915_gem_request.c +0
-0
drivers/gpu/drm/i915/i915_gem_request.c long i915_wait_request(struct drm_i915_gem_request *req, · line 1219
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_request.c +1
-1@@ -1216,7 +1216,7 @@ long i915_wait_request(struct drm_i915_gem_request *req,return timeout; } -static void engine_retire_requests (struct intel_engine_cs *engine) +void engine_retire_requests (struct intel_engine_cs *engine)
Fortunately stray chunk. I was about to scream.
Quoted 37 lines
drivers/gpu/drm/i915/i915_gem_request.c +0
-0{struct drm_i915_gem_request *request, *next;u32 seqno =intel_engine_get_seqno (engine);drivers/gpu/drm/i915/intel_uncore.c +20
-0@@ -1801,6 +1801,26 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)return ret; } +/* +* On gen8+ a reset request has to be issued via the reset control register +* before a GPU engine can be reset in order to stop the command streamer +* and idle the engine. This replaces the legacy way of stopping an engine +* by writing to the stop ring bit in the MI_MODE register. +*/ +int intel_reset_engine_start (struct intel_engine_cs *engine) +{ +return gen8_reset_engine_start (engine); +} + +/* +* It is possible to back off from a previously issued reset request by simply +* clearing the reset request bit in the reset control register. +*/ +void intel_reset_engine_cancel (struct intel_engine_cs *engine) +{ +gen8_reset_engine_cancel (engine); +} +bool intel_uncore_unclaimed_mmio (struct drm_i915_private *dev_priv) {return check_for_unclaimed_mmio (dev_priv);Signature · 1 line
2.11.0
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 03/20] drm/i915: Add support for per engine reset recovery
Quoted 4 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem_request.c long i915_wait_request(struct drm_i915_gem_request *req, · line 1219
Quoted 2 lines
drivers/gpu/drm/i915/i915_gem_request.c +1
-1-static void engine_retire_requests (struct intel_engine_cs *engine) +void engine_retire_requests (struct intel_engine_cs *engine)Fortunately stray chunk. I was about to scream.
This chunk has been there for quite a long time, at least since v4... thanks for spotting it (I'm the one that should be screaming).
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 03/20] drm/i915: Add support for per engine reset recovery
In reply to Chris WilsonQuoted 123 lines · Chris Wilson
Quoted 65 lines · Michel Thierry
From: Arun Siluvery <[email protected]>
This change implements support for per-engine reset as an initial, less intrusive hang recovery option to be attempted before falling back to the legacy full GPU reset recovery mode if necessary. This is only supported from Gen8 onwards.
Hangchecker determines which engines are hung and invokes error handler to recover from it. Error handler schedules recovery for each of those engines that are hung. The recovery procedure is as follows,
- identifies the request that caused the hang and it is dropped
- force engine to idle: this is done by issuing a reset request
- reset and re-init engine
- restart submissions to the engineIf engine reset fails then we fall back to heavy weight full gpu reset which resets all engines and reinitiazes complete state of HW and SW.
v2: Rebase.
v3: s/*engine_reset*/*reset_engine*/; freeze engine and irqs before callingi915_gem_reset_engine(Chris).
v4: Rebase, modifyi915_gem_reset_prepareto use a ring mask and reuse the function forreset_engine.
v5: intel_reset_engine_start/cancel instead of request/unrequest_reset.
v6: Clean upreset_enginefunction to not require mutex, i.e. no need to call revoke/restore_fences and_retire_requests(Chris).
v7: Remove leftovers from v5, i.e. no need to disable irq, hold forcewake or wakeup the handoff bit (Chris).Cc Chris Wilson <[email protected]>Cc Mika Kuoppala <[email protected]>Signed-off-by Tomas Elf <[email protected]>Signed-off-by Arun Siluvery <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 60 ++++++++++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 12 +++- drivers/gpu/drm/i915/i915_gem.c | 97 +++++++++++++++++++-------------- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 20 +++++++ 5 files changed, 142 insertions(+), 49 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-2@@ -1810,7 +1810,7 @@ void i915_reset(struct drm_i915_private *dev_priv)pr_notice ("drm/i915: Resetting chip after gpu hang\n" );disable_irq (dev_priv->drm.irq); - ret =i915_gem_reset_prepare (dev_priv); + ret =i915_gem_reset_prepare (dev_priv,ALL_ENGINES );if (ret) {DRM_ERROR ("GPU recovery failed\n" );intel_gpu_reset (dev_priv,ALL_ENGINES );@@ -1852,7 +1852,7 @@ void i915_reset(struct drm_i915_private *dev_priv)i915_queue_hangcheck (dev_priv); finish: -i915_gem_reset_finish (dev_priv); +i915_gem_reset_finish (dev_priv,ALL_ENGINES );enable_irq (dev_priv->drm.irq); wakeup:drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1879
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +6
-0@@ -1871,11 +1871,63 @@ void i915_reset(struct drm_i915_private *dev_priv)* * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code. +* +* Procedure is: +* - identifies the request that caused the hang and it is dropped +* - force engine to idle: this is done by issuing a reset request +* - reset engine +* - restart submissions to the engine Why does the prospective caller need to know this?
Quoted 45 lines
drivers/gpu/drm/i915/i915_drv.c +40
-2*/ int i915_reset_engine (struct intel_engine_cs *engine) { -/* FIXME: replace me with engine reset sequence */ -return -ENODEV ; +int ret; +struct drm_i915_private *dev_priv = engine->i915; +struct i915_gpu_error *error = &dev_priv->gpu_error; + +GEM_BUG_ON (!test_bit (I915_RESET_BACKOFF , &error->flags)); + +DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); + + ret =i915_gem_reset_prepare_engine (engine); +if (ret) { +DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + goto out; + } + +/* +* the request that caused the hang is stuck on elsp, identify the +* active request and drop it, adjust head to skip the offending +* request to resume executing remaining requests in the queue. +*/ +i915_gem_reset_engine (engine); + +/* forcing engine to idle */ + ret =intel_reset_engine_start (engine); +if (ret) { +DRM_ERROR ("Failed to disable %s\n" , engine->name); + goto out; + } + +/* finally, reset engine */ + ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); +if (ret) { +DRM_ERROR ("Failed to reset %s, ret=%d\n" , engine->name, ret); +intel_reset_engine_cancel (engine); + goto out; + } + +/* be sure the request reset bit gets cleared */ +intel_reset_engine_cancel (engine); + +i915_gem_reset_finish_engine (engine);
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c void i915_reset(struct drm_i915_private *dev_priv) · line 1927
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +5
-0+ +/* replay remaining requests in the queue */ + ret = engine->init_hw (engine); +if (ret) + goto out;//XXX: ignore this line for now Please give the comments here some tlc. Focus on the why, you are telling me what the code does.
Hi, sorry about the delay.
True, and that's not the whole story; after the engine is reset, we have to program the RING_MODE & RING_HWS_PGA registers again... so really the important thing is to call gen8_init_common_ring (which is part of engine->init_hw).
Then we also have workarounds that we don't want to loose after the reset.
So it's better if the comment says that we have to re-init the engine and program settings that were lost after the reset-engine.
Quoted 229 lines
Quoted 20 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0+ +out: +return ret; }static int i915_pm_suspend (struct device *kdev)drivers/gpu/drm/i915/i915_drv.h +2
-0@@ -3022,6 +3022,8 @@ extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv);extern int i915_reset_engine (struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv); +extern int intel_reset_engine_start (struct intel_engine_cs *engine); +extern void intel_reset_engine_cancel (struct intel_engine_cs *engine);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_drv.h int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno); · line 3413
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -3410,7 +3412,6 @@ int __must_check i915_gem_set_global_seqno(struct drm_device *dev, u32 seqno);struct drm_i915_gem_request *i915_gem_find_active_request (struct intel_engine_cs *engine); -Nope. (
find_active_requestis not in the same group of operations asretire_requests.)Quoted 105 lines
drivers/gpu/drm/i915/i915_drv.h +7
-2void i915_gem_retire_requests (struct drm_i915_private *dev_priv);static inline bool i915_reset_backoff (struct i915_gpu_error *error)@@ -3438,11 +3439,16 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare (struct drm_i915_private *dev_priv); +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +int i915_gem_reset_prepare (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_reset (struct drm_i915_private *dev_priv); -void i915_gem_reset_finish (struct drm_i915_private *dev_priv); +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine); +void i915_gem_reset_finish (struct drm_i915_private *dev_priv, +unsigned int engine_mask);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); +void i915_gem_reset_engine (struct intel_engine_cs *engine);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_gem.c +33
-35@@ -2793,48 +2793,57 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -int i915_gem_reset_prepare (struct drm_i915_private *dev_priv) +/* Ensure irq handler finishes, and not run again. */ +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct intel_engine_cs *engine; -enum intel_engine_id id; +struct drm_i915_gem_request *request;int err =0 ; -/* Ensure irq handler finishes, and not run again. */ -for_each_engine (engine, dev_priv, id) { -struct drm_i915_gem_request *request; - -/* Prevent the signaler thread from updating the request -* state (by calling dma_fence_signal) as we are processing -* the reset. The write from the GPU of the seqno is -* asynchronous and the signaler thread may see a different -* value to us and declare the request complete, even though -* the reset routine have picked that request as the active -* (incomplete) request. This conflict is not handled -* gracefully! -*/ -kthread_park (engine->breadcrumbs.signaler); - -/* Prevent request submission to the hardware until we have -* completed the reset in i915_gem_reset_finish(). If a request -* is completed by one engine, it may then queue a request -* to a second via its engine->irq_tasklet *just* as we are -* calling engine->init_hw() and also writing the ELSP. -* Turning off the engine->irq_tasklet until the reset is over -* prevents the race. -*/ -tasklet_kill (&engine->irq_tasklet); -tasklet_disable (&engine->irq_tasklet); -if (engine->irq_seqno_barrier) - engine->irq_seqno_barrier (engine); +/* Prevent the signaler thread from updating the request +* state (by calling dma_fence_signal) as we are processing +* the reset. The write from the GPU of the seqno is +* asynchronous and the signaler thread may see a different +* value to us and declare the request complete, even though +* the reset routine have picked that request as the active +* (incomplete) request. This conflict is not handled +* gracefully! +*/ +kthread_park (engine->breadcrumbs.signaler); + +/* Prevent request submission to the hardware until we have +* completed the reset in i915_gem_reset_finish(). If a request +* is completed by one engine, it may then queue a request +* to a second via its engine->irq_tasklet *just* as we are +* calling engine->init_hw() and also writing the ELSP. +* Turning off the engine->irq_tasklet until the reset is over +* prevents the race. +*/ +tasklet_kill (&engine->irq_tasklet); +tasklet_disable (&engine->irq_tasklet); -if (engine_stalled (engine)) { - request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ - } +if (engine->irq_seqno_barrier) + engine->irq_seqno_barrier (engine); + +if (engine_stalled (engine)) { + request =i915_gem_find_active_request (engine); +if (request && request->fence.error == -EIO ) + err = -EIO ;/* Previous reset failed! */ } +return err; +}drivers/gpu/drm/i915/i915_gem.c static bool engine_stalled(struct intel_engine_cs *engine) · line 2845
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +10
-0+ +int i915_gem_reset_prepare (struct drm_i915_private *dev_priv, +unsigned int engine_mask) +{ +struct intel_engine_cs *engine; +unsigned int tmp; +int err =0 ; + +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) + err =i915_gem_reset_prepare_engine (engine);You are losing any earlier err.
Quoted 46 lines
drivers/gpu/drm/i915/i915_gem.c +13
-6+i915_gem_revoke_fences (dev_priv);return err;@@ -2920,7 +2929,7 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)return guilty; } -static void i915_gem_reset_engine (struct intel_engine_cs *engine) +void i915_gem_reset_engine (struct intel_engine_cs *engine) {struct drm_i915_gem_request *request;@@ -2966,16 +2975,22 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) } } -void i915_gem_reset_finish (struct drm_i915_private *dev_priv) +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine) +{ +tasklet_enable (&engine->irq_tasklet); +kthread_unpark (engine->breadcrumbs.signaler); +} + +void i915_gem_reset_finish (struct drm_i915_private *dev_priv, +unsigned int engine_mask) {struct intel_engine_cs *engine; -enum intel_engine_id id; +unsigned int tmp;lockdep_assert_held (&dev_priv->drm.struct_mutex); -for_each_engine (engine, dev_priv, id) { -tasklet_enable (&engine->irq_tasklet); -kthread_unpark (engine->breadcrumbs.signaler); +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +i915_gem_reset_finish_engine (engine); } }drivers/gpu/drm/i915/i915_gem_request.c +0
-0drivers/gpu/drm/i915/i915_gem_request.c long i915_wait_request(struct drm_i915_gem_request *req, · line 1219
Quoted 5 lines
drivers/gpu/drm/i915/i915_gem_request.c +1
-1@@ -1216,7 +1216,7 @@ long i915_wait_request(struct drm_i915_gem_request *req,return timeout; } -static void engine_retire_requests (struct intel_engine_cs *engine) +void engine_retire_requests (struct intel_engine_cs *engine)Fortunately stray chunk. I was about to scream.
Quoted 29 lines
drivers/gpu/drm/i915/i915_gem_request.c +0
-0{struct drm_i915_gem_request *request, *next;u32 seqno =intel_engine_get_seqno (engine);drivers/gpu/drm/i915/intel_uncore.c +18
-0@@ -1801,6 +1801,26 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)return ret; } +/* +* On gen8+ a reset request has to be issued via the reset control register +* before a GPU engine can be reset in order to stop the command streamer +* and idle the engine. This replaces the legacy way of stopping an engine +* by writing to the stop ring bit in the MI_MODE register. +*/ +int intel_reset_engine_start (struct intel_engine_cs *engine) +{ +return gen8_reset_engine_start (engine); +} + +/* +* It is possible to back off from a previously issued reset request by simply +* clearing the reset request bit in the reset control register. +*/ +void intel_reset_engine_cancel (struct intel_engine_cs *engine) +{ +gen8_reset_engine_cancel (engine);
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c +2
-1+} +bool intel_uncore_unclaimed_mmio (struct drm_i915_private *dev_priv) {return check_for_unclaimed_mmio (dev_priv); --2.11.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/20 drm/i915: Add support for per engine reset recovery
In reply to Michel ThierryThis change implements support for per-engine reset as an initial, less intrusive hang recovery option to be attempted before falling back to the legacy full GPU reset recovery mode if necessary. This is only supported from Gen8 onwards.
Hangchecker determines which engines are hung and invokes error handler to recover from it. Error handler schedules recovery for each of those engines that are hung. The recovery procedure is as follows,
- identifies the request that caused the hang and it is dropped
- force engine to idle: this is done by issuing a reset request
- reset the engine
- re-init the engine to resume submissions.
If engine reset fails then we fall back to heavy weight full gpu reset which resets all engines and reinitiazes complete state of HW and SW.
v2: Rebase.
v3: s/*engine_reset*/*reset_engine*/; freeze engine and irqs before calling i915_gem_reset_engine (Chris).
v4: Rebase, modify i915_gem_reset_prepare to use a ring mask and reuse the function for reset_engine.
v5: intel_reset_engine_start/cancel instead of request/unrequest_reset.
v6: Clean up reset_engine function to not require mutex, i.e. no need to call revoke/restore_fences and _retire_requests (Chris).
v7: Remove leftovers from v5, i.e. no need to disable irq, hold forcewake or wakeup the handoff bit (Chris).
v8: engine_retire_requests should be (and it was) static; explain that we have to re-init the engine after reset, which is why the init_hw call is needed; check reset-in-progress flag (Chris).
--- drivers/gpu/drm/i915/i915_drv.c | 58 ++++++++++++++++++++++- drivers/gpu/drm/i915/i915_drv.h | 5 ++ drivers/gpu/drm/i915/i915_gem.c | 92 +++++++++++++++++++++---------------- drivers/gpu/drm/i915/intel_uncore.c | 20 ++++++++ 4 files changed, 133 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +56 -2
@@ -1883,11 +1883,65 @@ void i915_reset(struct drm_i915_private *dev_priv)* * Reset a specific GPU engine. Useful if a hang is detected. * Returns zero on successful reset or otherwise an error code. +* +* Procedure is: +* - identifies the request that caused the hang and it is dropped +* - force engine to idle: this is done by issuing a reset request +* - reset engine +* - re-init/configure engine */ int i915_reset_engine (struct intel_engine_cs *engine) { -/* FIXME: replace me with engine reset sequence */ -return -ENODEV ; +int ret; +struct drm_i915_private *dev_priv = engine->i915; +struct i915_gpu_error *error = &dev_priv->gpu_error; + +GEM_BUG_ON (!test_bit (I915_RESET_ENGINE_IN_PROGRESS , &error->flags)); + +DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); + + ret =i915_gem_reset_prepare_engine (engine); +if (ret) { +DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + goto out; + } + +/* +* the request that caused the hang is stuck on elsp, identify the +* active request and drop it, adjust head to skip the offending +* request to resume executing remaining requests in the queue. +*/ +i915_gem_reset_engine (engine); + +/* forcing engine to idle */ + ret =intel_reset_engine_start (engine); +if (ret) { +DRM_ERROR ("Failed to disable %s\n" , engine->name); + goto out; + } + +/* finally, reset engine */ + ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); +if (ret) { +DRM_ERROR ("Failed to reset %s, ret=%d\n" , engine->name, ret); +intel_reset_engine_cancel (engine); + goto out; + } + +/* be sure the request reset bit gets cleared */ +intel_reset_engine_cancel (engine); + +i915_gem_reset_finish_engine (engine); + +/* +* The engine and its registers (and workarounds in case of render) +* have been reset to their default values. Follow the init_ring +* process to program RING_MODE, HWSP and re-enable submission. +*/ + ret = engine->init_hw (engine); + +out: +return ret; }static int i915_pm_suspend (struct device *kdev)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -2997,6 +2997,8 @@ extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);extern void i915_reset (struct drm_i915_private *dev_priv);extern int i915_reset_engine (struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv); +extern int intel_reset_engine_start (struct intel_engine_cs *engine); +extern void intel_reset_engine_cancel (struct intel_engine_cs *engine);extern int intel_guc_reset (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);
@@ -3368,11 +3370,14 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } +int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv);void i915_gem_reset (struct drm_i915_private *dev_priv); +void i915_gem_reset_finish_engine (struct intel_engine_cs *engine);void i915_gem_reset_finish (struct drm_i915_private *dev_priv);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); +void i915_gem_reset_engine (struct intel_engine_cs *engine);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +52 -40
123 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +20 -0
@@ -1801,6 +1801,26 @@ int intel_guc_reset(struct drm_i915_private *dev_priv)return ret; } +/* +* On gen8+ a reset request has to be issued via the reset control register +* before a GPU engine can be reset in order to stop the command streamer +* and idle the engine. This replaces the legacy way of stopping an engine +* by writing to the stop ring bit in the MI_MODE register. +*/ +int intel_reset_engine_start (struct intel_engine_cs *engine) +{ +return gen8_reset_engine_start (engine); +} + +/* +* It is possible to back off from a previously issued reset request by simply +* clearing the reset request bit in the reset control register. +*/ +void intel_reset_engine_cancel (struct intel_engine_cs *engine) +{ +gen8_reset_engine_cancel (engine); +} +bool intel_uncore_unclaimed_mmio (struct drm_i915_private *dev_priv) {return check_for_unclaimed_mmio (dev_priv);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/20 drm/i915: Skip reset request if there is one already
In reply to Michel ThierryFrom: Mika Kuoppala <[email protected]>
To perform engine reset we first disable engine to capture its state. This is done by issuing a reset request. Because we are reusing existing infrastructure, again when we actually reset an engine, reset function checks engine mask and issues reset request again which is unnecessary. To avoid this we check if the engine is already prepared, if so we just exit from that point.
--- drivers/gpu/drm/i915/intel_uncore.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +7 -2
@@ -1686,10 +1686,15 @@ int intel_wait_for_register(struct drm_i915_private *dev_priv,static int gen8_reset_engine_start (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; +const i915_reg_t reset_ctrl =RING_RESET_CTL (engine->mmio_base); +const u32 ready =RESET_CTL_REQUEST_RESET |RESET_CTL_READY_TO_RESET ;int ret; -I915_WRITE_FW (RING_RESET_CTL (engine->mmio_base), -_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET )); +/* If engine has been already prepared, we can shortcut here */ +if ((I915_READ_FW (reset_ctrl) & ready) == ready) +return 0 ; + +I915_WRITE_FW (reset_ctrl,_MASKED_BIT_ENABLE (RESET_CTL_REQUEST_RESET )); ret = intel_wait_for_register_fw(dev_priv, RING_RESET_CTL(engine->mmio_base),
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 04/20] drm/i915: Skip reset request if there is one already
Quoted 8 lines · Michel Thierry
From: Mika Kuoppala <[email protected]>
To perform engine reset we first disable engine to capture its state. This is done by issuing a reset request. Because we are reusing existing infrastructure, again when we actually reset an engine, reset function checks engine mask and issues reset request again which is unnecessary. To avoid this we check if the engine is already prepared, if so we just exit from that point.
Do we still need this? I am a bit dubious because it implies we have no idea what we are doing, recursively calling resets.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 04/20] drm/i915: Skip reset request if there is one already
Quoted 10 lines · Chris Wilson
Quoted 8 lines · Michel Thierry
From: Mika Kuoppala <[email protected]>
To perform engine reset we first disable engine to capture its state. This is done by issuing a reset request. Because we are reusing existing infrastructure, again when we actually reset an engine, reset function checks engine mask and issues reset request again which is unnecessary. To avoid this we check if the engine is already prepared, if so we just exit from that point.
Quoted 4 lines
Do we still need this? I am a bit dubious because it implies we have no idea what we are doing, recursively calling resets.
-Chris
I can drop this one. It isn't really needed (the 'shortcut' it refers is because we already set the bit in intel_reset_engine_start).
btw here it's only setting/querying "Ready-ness for Reset", and I've heard rumours that the register may not clear itself sometimes (but I haven't seen that behaviour myself).
-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/20 drm/i915: Cancel reset-engine if we couldn't find an active request
In reply to Michel ThierryBefore reseting an engine, check if there is an active request, and if the _hung_ request has completed. In these two cases, the seqno has moved after hang declaration and we can skip the reset.
Also store the active request so that we only search for it once.
--- drivers/gpu/drm/i915/i915_drv.c | 37 +++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- drivers/gpu/drm/i915/i915_gem.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +29 -8
@@ -1811,7 +1811,7 @@ void i915_reset(struct drm_i915_private *dev_priv)pr_notice ("drm/i915: Resetting chip after gpu hang\n" );disable_irq (dev_priv->drm.irq); ret =i915_gem_reset_prepare (dev_priv,ALL_ENGINES ); -if (ret) { +if (ret == -EIO ) {DRM_ERROR ("GPU recovery failed\n" );intel_gpu_reset (dev_priv,ALL_ENGINES ); goto error;
@@ -1883,23 +1883,40 @@ int i915_reset_engine(struct intel_engine_cs *engine)int ret;struct drm_i915_private *dev_priv = engine->i915;struct i915_gpu_error *error = &dev_priv->gpu_error; +struct drm_i915_gem_request *active_request;GEM_BUG_ON (!test_bit (I915_RESET_BACKOFF , &error->flags));DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); - goto out; + active_request =i915_gem_reset_prepare_engine (engine); +if (!active_request) { +DRM_DEBUG_DRIVER ("seqno moved after hang declaration, pardoned\n" ); + goto canceled; + } +if (IS_ERR (active_request)) { + ret =PTR_ERR (active_request); +if (ret == -ECANCELED ) { +DRM_DEBUG_DRIVER ("no active request found, skip reset\n" ); + goto canceled; + }else if (ret) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + goto out; + } } +if (__i915_gem_request_completed (active_request, engine->hangcheck.seqno)) { +DRM_DEBUG_DRIVER ("request completed, skip the reset\n" ); + goto canceled; + } + +/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine, active_request);/* forcing engine to idle */ ret =intel_reset_engine_start (engine);
@@ -1928,6 +1945,10 @@ int i915_reset_engine(struct intel_engine_cs *engine) out:return ret; + +canceled: +i915_gem_reset_finish_engine (engine); +return 0 ; }static int i915_pm_suspend (struct device *kdev)
drivers/gpu/drm/i915/i915_drv.h +4 -2
@@ -3439,7 +3439,8 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv,unsigned int engine_mask);void i915_gem_reset (struct drm_i915_private *dev_priv);
@@ -3448,7 +3449,8 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv, unsigned int engine_mask);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); -void i915_gem_reset_engine (struct intel_engine_cs *engine); +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +24 -13
@@ -2793,12 +2793,15 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -/* Ensure irq handler finishes, and not run again. */ -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) +/* +* Ensure irq handler finishes, and not run again. +* For reset-engine we also store the active request so that we only search +* for it once. +*/ +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; -int err =0 ; - +struct drm_i915_gem_request *request =NULL ;/* Prevent the signaler thread from updating the request * state (by calling dma_fence_signal) as we are processing
@@ -2827,22 +2830,29 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); +if (!request) +return ERR_PTR (-ECANCELED );/* Can't find a request, abort! */ +if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ +return ERR_PTR (-EIO );/* Previous reset failed! */ } -return err; +return request; }int i915_gem_reset_prepare (struct drm_i915_private *dev_priv,unsigned int engine_mask) {struct intel_engine_cs *engine; +struct drm_i915_gem_request *request;unsigned int tmp;int err =0 ; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) - err =i915_gem_reset_prepare_engine (engine); +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { + request =i915_gem_reset_prepare_engine (engine); +if (request &&IS_ERR (request)) + err =PTR_ERR (request); + }i915_gem_revoke_fences (dev_priv);
@@ -2929,11 +2939,12 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)return guilty; } -void i915_gem_reset_engine (struct intel_engine_cs *engine) +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request) { -struct drm_i915_gem_request *request; +if (!request) + request =i915_gem_find_active_request (engine); - request =i915_gem_find_active_request (engine);if (request &&i915_gem_reset_request (request)) {DRM_DEBUG_DRIVER ("resetting %s to restart from tail of request 0x%x\n" , engine->name, request->global_seqno);
@@ -2959,7 +2970,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)for_each_engine (engine, dev_priv, id) {struct i915_gem_context *ctx; -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine,NULL ); ctx =fetch_and_zero (&engine->last_retired_context);if (ctx) engine->context_unpin (engine, ctx);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 41 lines · Michel Thierry
Before reseting an engine, check if there is an active request, and if the _hung_ request has completed. In these two cases, the seqno has moved after hang declaration and we can skip the reset.
Also store the active request so that we only search for it once.
Suggested-by Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 37 +++++++++++++++++++++++++++++-------- drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- drivers/gpu/drm/i915/i915_gem.c | 37 ++++++++++++++++++++++++------------- 3 files changed, 57 insertions(+), 23 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-5@@ -1811,7 +1811,7 @@ void i915_reset(struct drm_i915_private *dev_priv)pr_notice ("drm/i915: Resetting chip after gpu hang\n" );disable_irq (dev_priv->drm.irq); ret =i915_gem_reset_prepare (dev_priv,ALL_ENGINES ); -if (ret) { +if (ret == -EIO ) {DRM_ERROR ("GPU recovery failed\n" );intel_gpu_reset (dev_priv,ALL_ENGINES ); goto error;@@ -1883,23 +1883,40 @@ int i915_reset_engine(struct intel_engine_cs *engine)int ret;struct drm_i915_private *dev_priv = engine->i915;struct i915_gpu_error *error = &dev_priv->gpu_error; +struct drm_i915_gem_request *active_request;GEM_BUG_ON (!test_bit (I915_RESET_BACKOFF , &error->flags));DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); - goto out;
drivers/gpu/drm/i915/i915_drv.c int i915_reset_engine(struct intel_engine_cs *engine) · line 1901
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +10
-0+ active_request =i915_gem_reset_prepare_engine (engine); +if (!active_request) { +DRM_DEBUG_DRIVER ("seqno moved after hang declaration, pardoned\n" ); + goto canceled; + } +if (IS_ERR (active_request)) { + ret =PTR_ERR (active_request); +if (ret == -ECANCELED ) { +DRM_DEBUG_DRIVER ("no active request found, skip reset\n" ); + goto canceled;
-ECANCELED is just NULL. Make it so.
drivers/gpu/drm/i915/i915_drv.c int i915_reset_engine(struct intel_engine_cs *engine) · line 1908
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +5
-0+ }else if (ret) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + goto out; + } } +if (__i915_gem_request_completed (active_request, engine->hangcheck.seqno)) {
Hmm, this is very incorrect. (Do it correctly as part of prepare_engine.)
drivers/gpu/drm/i915/i915_drv.c int i915_reset_engine(struct intel_engine_cs *engine) · line 1911
Quoted 3 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0+DRM_DEBUG_DRIVER ("request completed, skip the reset\n" ); + goto canceled; + }
This is part of the pardon check above. My comment was if we store the active_request under engine->hangcheck for the global reset case, then we would need to double check it wasn't completed after the delays of setting up the global reset. Here, the check that the seqno is still active is sufficient.
Quoted 93 lines
drivers/gpu/drm/i915/i915_drv.c +9
-3+ +/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine, active_request);/* forcing engine to idle */ ret =intel_reset_engine_start (engine);@@ -1928,6 +1945,10 @@ int i915_reset_engine(struct intel_engine_cs *engine) out:return ret; + +canceled: +i915_gem_reset_finish_engine (engine); +return 0 ; }static int i915_pm_suspend (struct device *kdev)drivers/gpu/drm/i915/i915_drv.h +4
-2@@ -3439,7 +3439,8 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv,unsigned int engine_mask);void i915_gem_reset (struct drm_i915_private *dev_priv);@@ -3448,7 +3449,8 @@ void i915_gem_reset_finish(struct drm_i915_private *dev_priv, unsigned int engine_mask);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); -void i915_gem_reset_engine (struct intel_engine_cs *engine); +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/i915_gem.c +13
-7@@ -2793,12 +2793,15 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -/* Ensure irq handler finishes, and not run again. */ -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) +/* +* Ensure irq handler finishes, and not run again. +* For reset-engine we also store the active request so that we only search +* for it once. +*/ +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; -int err =0 ; - +struct drm_i915_gem_request *request =NULL ;/* Prevent the signaler thread from updating the request * state (by calling dma_fence_signal) as we are processing @@ -2827,22 +2830,29 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); +if (!request) +return ERR_PTR (-ECANCELED );/* Can't find a request, abort! */ +if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ +return ERR_PTR (-EIO );/* Previous reset failed! */ } -return err; +return request; }int i915_gem_reset_prepare (struct drm_i915_private *dev_priv,unsigned int engine_mask) {
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2853
Quoted 10 lines
drivers/gpu/drm/i915/i915_gem.c +4
-2struct intel_engine_cs *engine; +struct drm_i915_gem_request *request;unsigned int tmp;int err =0 ; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) - err =i915_gem_reset_prepare_engine (engine); +for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { + request =i915_gem_reset_prepare_engine (engine); +if (request &&IS_ERR (request))
Can just be IS_ERR(). And this doesn't want to report -ECANCELED!
Quoted 37 lines
drivers/gpu/drm/i915/i915_gem.c +7
-4+ err =PTR_ERR (request); + }i915_gem_revoke_fences (dev_priv);@@ -2929,11 +2939,12 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)return guilty; } -void i915_gem_reset_engine (struct intel_engine_cs *engine) +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request) { -struct drm_i915_gem_request *request; +if (!request) + request =i915_gem_find_active_request (engine); - request =i915_gem_find_active_request (engine);if (request &&i915_gem_reset_request (request)) {DRM_DEBUG_DRIVER ("resetting %s to restart from tail of request 0x%x\n" , engine->name, request->global_seqno);@@ -2959,7 +2970,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)for_each_engine (engine, dev_priv, id) {struct i915_gem_context *ctx; -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine,NULL ); ctx =fetch_and_zero (&engine->last_retired_context);if (ctx) engine->context_unpin (engine, ctx);Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/20 drm/i915: Cancel reset-engine if we couldn't find an active request
In reply to Michel ThierryBefore reseting an engine, check if there is an active request, and if the _hung_ request has completed. In these two cases, the seqno has moved after hang declaration and we can skip the reset.
Also store the active request so that we only search for it once.
v2: Check for request completion inside _prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).
--- drivers/gpu/drm/i915/i915_drv.c | 21 +++++++++++++------ drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- drivers/gpu/drm/i915/i915_gem.c | 45 ++++++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +15 -6
@@ -1895,23 +1895,28 @@ int i915_reset_engine(struct intel_engine_cs *engine)int ret;struct drm_i915_private *dev_priv = engine->i915;struct i915_gpu_error *error = &dev_priv->gpu_error; +struct drm_i915_gem_request *active_request;GEM_BUG_ON (!test_bit (I915_RESET_ENGINE_IN_PROGRESS , &error->flags));DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + active_request =i915_gem_reset_prepare_engine (engine); +if (!active_request) { +DRM_DEBUG_DRIVER ("seqno moved after hang declaration, pardoned\n" ); + goto canceled; + }else if (IS_ERR (active_request)) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + ret =PTR_ERR (active_request); goto out; }/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine, active_request);/* forcing engine to idle */ ret =intel_reset_engine_start (engine);
@@ -1942,6 +1947,10 @@ int i915_reset_engine(struct intel_engine_cs *engine) out:return ret; + +canceled: +i915_gem_reset_finish_engine (engine); +return 0 ; }static int i915_pm_suspend (struct device *kdev)
drivers/gpu/drm/i915/i915_drv.h +4 -2
@@ -3370,14 +3370,16 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv);void i915_gem_reset (struct drm_i915_private *dev_priv);void i915_gem_reset_finish_engine (struct intel_engine_cs *engine);void i915_gem_reset_finish (struct drm_i915_private *dev_priv);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); -void i915_gem_reset_engine (struct intel_engine_cs *engine); +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +31 -14
82 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))
This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn request->global_seqno) and so conclude that the request was never completed.
You just want if (i915_gem_request_completed(request)) -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 20 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn
request->global_seqno) and so conclude that the request was never completed.
Quoted 1 line
You just want if (
i915_gem_request_completed(request))
Also not here. This pardon check should be deferred to the caller just before commiting to thre reset. In the case of global reset, we want to gather up all the engines' active requests first, complete our preparations and then double check the engine was hung. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 21 lines · Chris Wilson
Quoted 20 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn
request->global_seqno) and so conclude that the request was never completed.
Quoted 1 line
Quoted 1 line
You just want if (
i915_gem_request_completed(request))
Thanks, I'll change the function.
Quoted 5 lines
Also not here. This pardon check should be deferred to the caller just before commiting to thre reset. In the case of global reset, we want to gather up all the engines' active requests first, complete our preparations and then double check the engine was hung.
i915_reset_engine calls this directly, but 'full reset' [from i915_gem_reset_prepare()] would not be affected and it won't pardon anything... i915_gem_reset_engine is doing the double check you mention.
-Michel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 32 lines · Michel Thierry
Quoted 21 lines · Chris Wilson
Quoted 20 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn
request->global_seqno) and so conclude that the request was never completed.Quoted 1 line
Quoted 1 line
You just want if (
i915_gem_request_completed(request))Thanks, I'll change the function.
Quoted 5 lines
Also not here. This pardon check should be deferred to the caller just before commiting to thre reset. In the case of global reset, we want to gather up all the engines' active requests first, complete our preparations and then double check the engine was hung.
Quoted 4 lines
i915_reset_enginecalls this directly, but 'full reset' [fromi915_gem_reset_prepare()] would not be affected and it won't pardon anything...i915_gem_reset_engineis doing the double check you mention.
Aye, but in the long run I was thinking of capturing this request in engine->hangcheck.active_request and then we reuse that info in the later phases.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 33 lines · Chris Wilson
Quoted 32 lines · Michel Thierry
Quoted 21 lines · Chris Wilson
Quoted 20 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn
request->global_seqno) and so conclude that the request was never completed.Quoted 1 line
Quoted 1 line
You just want if (
i915_gem_request_completed(request))Thanks, I'll change the function.
Quoted 5 lines
Also not here. This pardon check should be deferred to the caller just before commiting to thre reset. In the case of global reset, we want to gather up all the engines' active requests first, complete our preparations and then double check the engine was hung.
Quoted 8 lines
Quoted 4 lines
i915_reset_enginecalls this directly, but 'full reset' [fromi915_gem_reset_prepare()] would not be affected and it won't pardon anything...i915_gem_reset_engineis doing the double check you mention.Aye, but in the long run I was thinking of capturing this request in
engine->hangcheck.active_requestand then we reuse that info in the later phases.
Capture hangcheck.active_request during hangcheck_declare_hang? Or still here in reset_prepare?
Thanks
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/20] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 39 lines · Michel Thierry
Quoted 38 lines · Chris Wilson
Quoted 36 lines · Michel Thierry
Quoted 21 lines · Chris Wilson
Quoted 20 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2839
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2830,34 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (__i915_gem_request_completed (request, + engine->hangcheck.seqno))This is not the seqno for the request, so this is incorrect. It will judge that the request was preempted (as hangcheck.seqno must be less thn
request->global_seqno) and so conclude that the request was never completed.Quoted 1 line
Quoted 1 line
You just want if (
i915_gem_request_completed(request))Thanks, I'll change the function.
Quoted 5 lines
Also not here. This pardon check should be deferred to the caller just before commiting to thre reset. In the case of global reset, we want to gather up all the engines' active requests first, complete our preparations and then double check the engine was hung.
i915_reset_enginecalls this directly, but 'full reset' [fromi915_gem_reset_prepare()] would not be affected and it won't pardon anything...i915_gem_reset_engineis doing the double check you mention.
Quoted 6 lines
Quoted 3 lines
Aye, but in the long run I was thinking of capturing this request in
engine->hangcheck.active_requestand then we reuse that info in the later phases.Capture hangcheck.active_request during
hangcheck_declare_hang? Or still here inreset_prepare?
Not in the hangcheck worker itself since we want that to be as lockless as we can make it and since putting it inside the reset works just as well, we should.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Cancel reset-engine if we couldn't find an active request
In reply to Michel ThierryBefore reseting an engine, check if there is an active request, and if the _hung_ request has completed. In these two cases, the seqno has moved after hang declaration and we can skip the reset.
Also store the active request so that we only search for it once, this applies for reset-engine and full reset.
v2: Check for request completion inside _prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).
v3: Capture active requests during reset_prepare and store it the engine hangcheck obj (Chris).
--- drivers/gpu/drm/i915/i915_drv.c | 18 ++++++++++---- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 42 +++++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 4 files changed, 46 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +13 -5
@@ -1900,15 +1900,19 @@ int i915_reset_engine(struct intel_engine_cs *engine)DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + engine->hangcheck.active_request =i915_gem_reset_prepare_engine (engine); +if (!engine->hangcheck.active_request) { +DRM_DEBUG_DRIVER ("seqno moved after hang declaration, pardoned\n" ); + goto canceled; + }else if (IS_ERR (engine->hangcheck.active_request)) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + ret =PTR_ERR (engine->hangcheck.active_request); goto out; }/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ i915_gem_reset_engine (engine);
@@ -1942,6 +1946,10 @@ int i915_reset_engine(struct intel_engine_cs *engine) out:return ret; + +canceled: +i915_gem_reset_finish_engine (engine); +return 0 ; }static int i915_pm_suspend (struct device *kdev)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -3370,7 +3370,8 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv);void i915_gem_reset (struct drm_i915_private *dev_priv);void i915_gem_reset_finish_engine (struct intel_engine_cs *engine);
drivers/gpu/drm/i915/i915_gem.c +30 -12
72 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -121,6 +121,7 @@ struct intel_engine_hangcheck {unsigned long action_timestamp;int deadlock;struct intel_instdone instdone; +struct drm_i915_gem_request *active_request;bool stalled; };
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Cancel reset-engine if we couldn't find an active request
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2838
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2829,35 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (i915_gem_request_completed (request)) +return NULL ;/* request completed, skip it */
This check is pointless here. We are just a few cycles since it was known to be true. Both paths should be doing it just before the actual reset for symmetry.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 18 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2838
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2829,35 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (i915_gem_request_completed (request)) +return NULL ;/* request completed, skip it */ This check is pointless here. We are just a few cycles since it was known to be true. Both paths should be doing it just before the actual reset for symmetry.
As you said, in gem_reset_request, 'guilty' should check for i915_gem_request_completed instead of engine_stalled... but at that point it's too late to cancel the reset (intel_gpu_reset has already been called).
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 20 lines · Michel Thierry
Quoted 18 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2838
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2829,35 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (i915_gem_request_completed (request)) +return NULL ;/* request completed, skip it */ This check is pointless here. We are just a few cycles since it was known to be true. Both paths should be doing it just before the actual reset for symmetry.
Quoted 4 lines
As you said, in
gem_reset_request, 'guilty' should check fori915_gem_request_completedinstead ofengine_stalled... but at that point it's too late to cancel the reset (intel_gpu_resethas already been called).
Ok. At that point we are just deciding between skipping the request or replaying it. The motivation behind carrying forward the active_request was to avoid the repeated searches + engine_stalled() checks (since any future check can then just confirm the active_request is still incomplete).
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Cancel reset-engine if we couldn't find an active request
Quoted 26 lines · Chris Wilson
Quoted 20 lines · Michel Thierry
Quoted 18 lines · Chris Wilson
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2838
Quoted 13 lines · Michel Thierry
drivers/gpu/drm/i915/i915_gem.c +7
-2@@ -2827,21 +2829,35 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); -if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + +if (request) { +if (request->fence.error == -EIO ) +return ERR_PTR (-EIO );/* Previous reset failed! */ + +if (i915_gem_request_completed (request)) +return NULL ;/* request completed, skip it */ This check is pointless here. We are just a few cycles since it was known to be true. Both paths should be doing it just before the actual reset for symmetry.
Quoted 4 lines
As you said, in
gem_reset_request, 'guilty' should check fori915_gem_request_completedinstead ofengine_stalled... but at that point it's too late to cancel the reset (intel_gpu_resethas already been called).
Quoted 5 lines
Ok. At that point we are just deciding between skipping the request or replaying it. The motivation behind carrying forward the
active_requestwas to avoid the repeated searches +engine_stalled()checks (since any future check can then just confirm theactive_requestis still incomplete).
Agreed, we'll still avoid the repeated searches + engine_stalled. Let me send that.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Look for active requests earlier in the reset path
In reply to Michel ThierryAnd store the active request so that we only search for it once; this applies for reset-engine and full reset.
v2: Check for request completion inside _prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).
v3: Capture active requests during reset_prepare and store it the engine hangcheck obj.
v4: Rename commit, change i915_gem_reset_request to just confirm the active_request is still incomplete, instead of engine_stalled (Chris).
fixes
--- drivers/gpu/drm/i915/i915_drv.c | 11 ++++++----- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 34 +++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +6 -5
@@ -1900,15 +1900,16 @@ int i915_reset_engine(struct intel_engine_cs *engine)DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + engine->hangcheck.active_request =i915_gem_reset_prepare_engine (engine); +if (IS_ERR (engine->hangcheck.active_request)) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + ret =PTR_ERR (engine->hangcheck.active_request); goto out; }/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ i915_gem_reset_engine (engine);
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -3370,7 +3370,8 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv);void i915_gem_reset (struct drm_i915_private *dev_priv);void i915_gem_reset_finish_engine (struct intel_engine_cs *engine);
drivers/gpu/drm/i915/i915_gem.c +22 -12
@@ -2793,12 +2793,14 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -/* Ensure irq handler finishes, and not run again. */ -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) +/* +* Ensure irq handler finishes, and not run again. +* Also store the active request so that we only search for it once. +*/ +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; -int err =0 ; - +struct drm_i915_gem_request *request =NULL ;/* Prevent the signaler thread from updating the request * state (by calling dma_fence_signal) as we are processing
@@ -2827,21 +2829,30 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); +if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ +return ERR_PTR (-EIO );/* Previous reset failed! */ } -return err; +return request; }int i915_gem_reset_prepare (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine; +struct drm_i915_gem_request *request;enum intel_engine_id id;int err =0 ; -for_each_engine (engine, dev_priv, id) - err =i915_gem_reset_prepare_engine (engine); +for_each_engine (engine, dev_priv, id) { + request =i915_gem_reset_prepare_engine (engine); +if (IS_ERR (request)) { + err =PTR_ERR (request); +break ; + } + + engine->hangcheck.active_request = request; + }i915_gem_revoke_fences (dev_priv);
@@ -2894,7 +2905,7 @@ static void engine_skip_context(struct drm_i915_gem_request *request)static bool i915_gem_reset_request (struct drm_i915_gem_request *request) {/* Read once and return the resolution */ -const bool guilty =engine_stalled (request->engine); +const bool guilty = !i915_gem_request_completed (request);/* The guilty request will get skipped on a hung engine. *
@@ -2930,9 +2941,8 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)void i915_gem_reset_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; +struct drm_i915_gem_request *request = engine->hangcheck.active_request; - request =i915_gem_find_active_request (engine);if (request &&i915_gem_reset_request (request)) {DRM_DEBUG_DRIVER ("resetting %s to restart from tail of request 0x%x\n" , engine->name, request->global_seqno);
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -121,6 +121,7 @@ struct intel_engine_hangcheck {unsigned long action_timestamp;int deadlock;struct intel_instdone instdone; +struct drm_i915_gem_request *active_request;bool stalled; };
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Look for active requests earlier in the reset path
Quoted 3 lines · Michel Thierry
fixes
Signed-off-by Michel Thierry <[email protected]>
rebase mistake
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Look for active requests earlier in the reset path
In reply to Michel ThierryQuoted 30 lines · Michel Thierry
And store the active request so that we only search for it once; this applies for reset-engine and full reset.
v2: Check for request completion inside
_prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).v3: Capture active requests during
reset_prepareand store it the engine hangcheck obj.v4: Rename commit, change
i915_gem_reset_requestto just confirm theactive_requestis still incomplete, instead ofengine_stalled(Chris).Suggested-by Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>fixes
Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 11 ++++++----- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gem.c | 34 +++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 4 files changed, 31 insertions(+), 18 deletions(-)drivers/gpu/drm/i915/i915_drv.c +0
-0
drivers/gpu/drm/i915/i915_drv.c int i915_reset_engine(struct intel_engine_cs *engine) · line 1903
Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.c +1
-3@@ -1900,15 +1900,16 @@ int i915_reset_engine(struct intel_engine_cs *engine)DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + engine->hangcheck.active_request =i915_gem_reset_prepare_engine (engine);
Whilst this is not wrong (since we are serialising the per-engine and global resets), I would suggest we avoid storing the request in the hangcheck here and just pass the request along to i915_gem_request_engine.
No strong reason, just less magic state passing between functions.
Quoted 30 lines
drivers/gpu/drm/i915/i915_drv.c +3
-0+if (IS_ERR (engine->hangcheck.active_request)) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + ret =PTR_ERR (engine->hangcheck.active_request); goto out; }index
b5dc073a5ddc..c9f139b322d2100644drivers/gpu/drm/i915/i915_gem.c +7
-5@@ -2793,12 +2793,14 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -/* Ensure irq handler finishes, and not run again. */ -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) +/* +* Ensure irq handler finishes, and not run again. +* Also store the active request so that we only search for it once. +*/ +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; -int err =0 ; - +struct drm_i915_gem_request *request =NULL ;/* Prevent the signaler thread from updating the request * state (by calling dma_fence_signal) as we are processing
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2832
Quoted 4 lines
drivers/gpu/drm/i915/i915_gem.c +1
-0@@ -2827,21 +2829,30 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine); +
If we neuter the return beneath the if, this blank line can also go.
drivers/gpu/drm/i915/i915_gem.c int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine) · line 2834
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem.c +1
-1if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ +return ERR_PTR (-EIO );/* Previous reset failed! */
request = ERR_PTR(-EIO); and then keep the single return. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Look for active requests earlier in the reset path
In reply to Michel ThierryAnd store the active request so that we only search for it once; this applies for reset-engine and full reset.
v2: Check for request completion inside _prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).
v3: Capture active requests during reset_prepare and store it the engine hangcheck obj.
v4: Rename commit, change i915_gem_reset_request to just confirm the active_request is still incomplete, instead of engine_stalled (Chris).
v5: With style; pass the active request to gem_reset_engine, keep single return in reset_prepare_engine (Chris).
--- drivers/gpu/drm/i915/i915_drv.c | 14 ++++++------ drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- drivers/gpu/drm/i915/i915_gem.c | 38 ++++++++++++++++++++------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 1 + 4 files changed, 36 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +8 -6
@@ -1895,23 +1895,25 @@ int i915_reset_engine(struct intel_engine_cs *engine)int ret;struct drm_i915_private *dev_priv = engine->i915;struct i915_gpu_error *error = &dev_priv->gpu_error; +struct drm_i915_gem_request *active_request;GEM_BUG_ON (!test_bit (I915_RESET_ENGINE_IN_PROGRESS , &error->flags));DRM_DEBUG_DRIVER ("resetting %s\n" , engine->name); - ret =i915_gem_reset_prepare_engine (engine); -if (ret) { -DRM_ERROR ("Previous reset failed - promote to full reset\n" ); + active_request =i915_gem_reset_prepare_engine (engine); +if (IS_ERR (active_request)) { +DRM_DEBUG_DRIVER ("Previous reset failed, promote to full reset\n" ); + ret =PTR_ERR (active_request); goto out; }/* -* the request that caused the hang is stuck on elsp, identify the -* active request and drop it, adjust head to skip the offending +* the request that caused the hang is stuck on elsp, we know the +* active request and can drop it, adjust head to skip the offending * request to resume executing remaining requests in the queue. */ -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine, active_request);/* forcing engine to idle */ ret =intel_reset_engine_start (engine);
drivers/gpu/drm/i915/i915_drv.h +4 -2
@@ -3370,14 +3370,16 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine);int i915_gem_reset_prepare (struct drm_i915_private *dev_priv);void i915_gem_reset (struct drm_i915_private *dev_priv);void i915_gem_reset_finish_engine (struct intel_engine_cs *engine);void i915_gem_reset_finish (struct drm_i915_private *dev_priv);void i915_gem_set_wedged (struct drm_i915_private *dev_priv);bool i915_gem_unset_wedged (struct drm_i915_private *dev_priv); -void i915_gem_reset_engine (struct intel_engine_cs *engine); +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request);void i915_gem_init_mmio (struct drm_i915_private *i915);int __must_check i915_gem_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_gem.c +23 -15
@@ -2793,12 +2793,14 @@ static bool engine_stalled(struct intel_engine_cs *engine)return true; } -/* Ensure irq handler finishes, and not run again. */ -int i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) +/* +* Ensure irq handler finishes, and not run again. +* Also store the active request so that we only search for it once. +*/ +struct drm_i915_gem_request * +i915_gem_reset_prepare_engine (struct intel_engine_cs *engine) { -struct drm_i915_gem_request *request; -int err =0 ; - +struct drm_i915_gem_request *request =NULL ;/* Prevent the signaler thread from updating the request * state (by calling dma_fence_signal) as we are processing
@@ -2828,20 +2830,28 @@ int i915_gem_reset_prepare_engine(struct intel_engine_cs *engine)if (engine_stalled (engine)) { request =i915_gem_find_active_request (engine);if (request && request->fence.error == -EIO ) - err = -EIO ;/* Previous reset failed! */ + request =ERR_PTR (-EIO );/* Previous reset failed! */ } -return err; +return request; }int i915_gem_reset_prepare (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine; +struct drm_i915_gem_request *request;enum intel_engine_id id;int err =0 ; -for_each_engine (engine, dev_priv, id) - err =i915_gem_reset_prepare_engine (engine); +for_each_engine (engine, dev_priv, id) { + request =i915_gem_reset_prepare_engine (engine); +if (IS_ERR (request)) { + err =PTR_ERR (request); +break ; + } + + engine->hangcheck.active_request = request; + }i915_gem_revoke_fences (dev_priv);
@@ -2894,7 +2904,7 @@ static void engine_skip_context(struct drm_i915_gem_request *request)static bool i915_gem_reset_request (struct drm_i915_gem_request *request) {/* Read once and return the resolution */ -const bool guilty =engine_stalled (request->engine); +const bool guilty = !i915_gem_request_completed (request);/* The guilty request will get skipped on a hung engine. *
@@ -2928,11 +2938,9 @@ static bool i915_gem_reset_request(struct drm_i915_gem_request *request)return guilty; } -void i915_gem_reset_engine (struct intel_engine_cs *engine) +void i915_gem_reset_engine (struct intel_engine_cs *engine, +struct drm_i915_gem_request *request) { -struct drm_i915_gem_request *request; - - request =i915_gem_find_active_request (engine);if (request &&i915_gem_reset_request (request)) {DRM_DEBUG_DRIVER ("resetting %s to restart from tail of request 0x%x\n" , engine->name, request->global_seqno);
@@ -2958,7 +2966,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv)for_each_engine (engine, dev_priv, id) {struct i915_gem_context *ctx; -i915_gem_reset_engine (engine); +i915_gem_reset_engine (engine, engine->hangcheck.active_request); ctx =fetch_and_zero (&engine->last_retired_context);if (ctx) engine->context_unpin (engine, ctx);
drivers/gpu/drm/i915/intel_ringbuffer.h +1 -0
@@ -121,6 +121,7 @@ struct intel_engine_hangcheck {unsigned long action_timestamp;int deadlock;struct intel_instdone instdone; +struct drm_i915_gem_request *active_request;bool stalled; };
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Look for active requests earlier in the reset path
Quoted 9 lines · Michel Thierry
And store the active request so that we only search for it once; this applies for reset-engine and full reset.
v2: Check for request completion inside
_prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).v3: Capture active requests during
reset_prepareand store it the engine hangcheck obj.
Quoted 8 lines
v4: Rename commit, change
i915_gem_reset_requestto just confirm theactive_requestis still incomplete, instead ofengine_stalled(Chris).v5: With style; pass the active request to
gem_reset_engine, keep single return inreset_prepare_engine(Chris).Suggested-by Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>
I would order this earlier in the series, i.e. make the change to store the active_request and pass the request onwards in the global reset handler first.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Look for active requests earlier in the reset path
Quoted 16 lines · Chris Wilson
Quoted 15 lines · Michel Thierry
And store the active request so that we only search for it once; this applies for reset-engine and full reset.
v2: Check for request completion inside
_prepare_engine, don't use ECANCELED, remove unnecessary null checks (Chris).v3: Capture active requests during
reset_prepareand store it the engine hangcheck obj.v4: Rename commit, change
i915_gem_reset_requestto just confirm theactive_requestis still incomplete, instead ofengine_stalled(Chris).v5: With style; pass the active request to
gem_reset_engine, keep single return inreset_prepare_engine(Chris).
Quoted 9 lines
Quoted 2 lines
Suggested-by Chris Wilson <[email protected]>Signed-off-by Michel Thierry <[email protected]>Reviewed-by Chris Wilson <[email protected]>I would order this earlier in the series, i.e. make the change to store the
active_requestand pass the request onwards in the global reset handler first.
-Chris
ok, I'll move it to the beginning of the reset-engine series (which I plan to resend soon).
Thanks for the review.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 6/20 drm/i915: Add engine reset count to error state
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
Driver maintains count of how many times a given engine is reset, useful to capture this in error state also. It gives an idea of how engine is coping up with the workloads it is executing before this error state.
A follow-up patch will provide this information in debugfs.
v2: s/engine_reset/reset_engine/ (Chris)
Define count as unsigned int (Tvrtko)
--- drivers/gpu/drm/i915/i915_drv.c | 3 ++- drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++++ drivers/gpu/drm/i915/i915_gpu_error.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +2 -1
@@ -1941,8 +1941,9 @@ int i915_reset_engine(struct intel_engine_cs *engine)/* replay remaining requests in the queue */ ret = engine->init_hw (engine);if (ret) - goto out;//XXX: ignore this line for now + goto out; + error->reset_engine_count[engine->id]++; out:return ret;
drivers/gpu/drm/i915/i915_drv.h +10 -0
@@ -982,6 +982,7 @@ struct i915_gpu_state {enum intel_engine_hangcheck_action hangcheck_action;struct i915_address_space *vm;int num_requests; +u32 reset_count;/* position of active request inside the ring */ u32 rq_head, rq_post, rq_tail;
@@ -1617,6 +1618,9 @@ struct i915_gpu_error {#define I915_RESET_HANDOFF 1#define I915_WEDGED (BITS_PER_LONG - 1) +/** Number of times an engine has been reset */ +u32 reset_engine_count[I915_NUM_ENGINES ]; +/** * Waitqueue to signal when a hang is detected. Used to for waiters * to release the struct_mutex for the reset to procede.
@@ -3439,6 +3443,12 @@ static inline u32 i915_reset_count(struct i915_gpu_error *error)return READ_ONCE (error->reset_count); } +static inline u32 i915_reset_engine_count (struct i915_gpu_error *error, +struct intel_engine_cs *engine) +{ +return READ_ONCE (error->reset_engine_count[engine->id]); +} +struct drm_i915_gem_request *i915_gem_reset_prepare_engine (struct intel_engine_cs *engine); int i915_gem_reset_prepare(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/i915_gpu_error.c +3 -0
@@ -463,6 +463,7 @@ static void error_print_engine(struct drm_i915_error_state_buf *m,err_printf (m," hangcheck action timestamp: %lu, %u ms ago\n" , ee->hangcheck_timestamp,jiffies_to_msecs (jiffies - ee->hangcheck_timestamp)); +err_printf (m," engine reset count: %u\n" , ee->reset_count);error_print_request (m," ELSP[0]: " , &ee->execlist[0 ]);error_print_request (m," ELSP[1]: " , &ee->execlist[1 ]);
@@ -1244,6 +1245,8 @@ static void error_record_engine_registers(struct i915_gpu_state *error, ee->hangcheck_timestamp = engine->hangcheck.action_timestamp; ee->hangcheck_action = engine->hangcheck.action; ee->hangcheck_stalled = engine->hangcheck.stalled; + ee->reset_count =i915_reset_engine_count (&dev_priv->gpu_error, + engine);if (USES_PPGTT (dev_priv)) {int i;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 7/20 drm/i915: Export per-engine reset count info to debugfs
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
A new variable is added to export the reset counts to debugfs, this includes full gpu reset and engine reset count. This is useful for tests where they are expected to trigger reset; these counts are checked before and after the test to ensure the same.
v2: Include reset engine count in i915_engine_info too (Chris).
--- drivers/gpu/drm/i915/i915_debugfs.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +21 -0
@@ -1403,6 +1403,23 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)return 0 ; } +static int i915_reset_info (struct seq_file *m,void *unused) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct i915_gpu_error *error = &dev_priv->gpu_error; +struct intel_engine_cs *engine; +enum intel_engine_id id; + +seq_printf (m,"full gpu reset = %u\n" ,i915_reset_count (error)); + +for_each_engine (engine, dev_priv, id) { +seq_printf (m,"%s = %u\n" , engine->name, +i915_reset_engine_count (error, engine)); + } + +return 0 ; +} +static int ironlake_drpc_info (struct seq_file *m) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -3242,6 +3259,7 @@ static int i915_display_info(struct seq_file *m, void *unused)static int i915_engine_info (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct i915_gpu_error *error = &dev_priv->gpu_error;struct intel_engine_cs *engine;enum intel_engine_id id;
@@ -3265,6 +3283,8 @@ static int i915_engine_info(struct seq_file *m, void *unused) engine->hangcheck.seqno,jiffies_to_msecs (jiffies - engine->hangcheck.action_timestamp), engine->timeline->inflight_seqnos); +seq_printf (m,"\tReset count: %d\n" , +i915_reset_engine_count (error, engine));rcu_read_lock ();
@@ -4777,6 +4797,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_huc_load_status", i915_huc_load_status_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0}, + {"i915_reset_info", i915_reset_info, 0}, {"i915_drpc_info", i915_drpc_info, 0}, {"i915_emon_status", i915_emon_status, 0}, {"i915_ring_freq_table", i915_ring_freq_table, 0},
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 8/20 drm/i915: Enable Engine reset and recovery support
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
This feature is made available only from Gen8, for previous gen devices driver uses legacy full gpu reset.
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -46,7 +46,7 @@ struct i915_params i915 __read_mostly = { .prefault_disable = 0, .load_detect_test = 0, .force_reset_modeset_test = 0, - .reset = 1, + .reset = 2, .error_capture = true, .invert_brightness = 0, .disable_display = 0,
@@ -116,7 +116,7 @@ MODULE_PARM_DESC(vbt_sdvo_panel_type, "(-2=ignore, -1=auto [default], index in VBT BIOS table)");module_param_named_unsafe (reset, i915.reset, int,0600 ); -MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset [default], 2=engine reset)" ); +MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" );#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR )module_param_named (error_capture, i915.error_capture, bool,0600 );
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 9/20 drm/i915: Add engine reset count in get-reset-stats ioctl
In reply to Michel ThierryUsers/tests relying on the total reset count will start seeing a smaller number since most of the hangs can be handled by engine reset. Note that if reset engine x, context a running on engine y will be unaware and unaffected.
To start the discussion, include just a total engine reset count. If it is deemed useful, it can be extended to report each engine separately.
v2: s/engine_reset/reset_engine/, use union in uapi to not break compatibility.
--- drivers/gpu/drm/i915/i915_gem_context.c | 14 +++++++++++--- include/uapi/drm/i915_drm.h | 6 +++++- 2 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.c +11 -3
@@ -1074,9 +1074,11 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,struct drm_i915_private *dev_priv =to_i915 (dev);struct drm_i915_reset_stats *args = data;struct i915_gem_context *ctx; +struct intel_engine_cs *engine; +enum intel_engine_id id;int ret; -if (args->flags || args->pad) +if (args->flags)return -EINVAL ;if (args->ctx_id ==DEFAULT_CONTEXT_HANDLE && !capable (CAP_SYS_ADMIN ))
@@ -1092,10 +1094,16 @@ int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,return PTR_ERR (ctx); } -if (capable (CAP_SYS_ADMIN )) +if (capable (CAP_SYS_ADMIN )) { args->reset_count =i915_reset_count (&dev_priv->gpu_error); -else +for_each_engine (engine, dev_priv, id) + args->reset_engine_count += +i915_reset_engine_count (&dev_priv->gpu_error, + engine); + }else { args->reset_count =0 ; + args->reset_engine_count =0 ; + } args->batch_active = ctx->guilty_count; args->batch_pending = ctx->active_count;
include/uapi/drm/i915_drm.h +5 -1
@@ -1278,7 +1278,11 @@ struct drm_i915_reset_stats {/* Number of batches lost pending for execution, for this context */ __u32 batch_pending; -__u32 pad; +union { +__u32 pad; +/* Engine resets since boot/module reload, for all contexts */ +__u32 reset_engine_count; + }; };struct drm_i915_gem_userptr {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 10/20 drm/i915/selftests: reset engine self tests
In reply to Michel ThierryCheck that we can reset specific engines, also check the fallback to full reset if something didn't work.
v2: rebase.
--- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 147 +++++++++++++++++++++++ 1 file changed, 147 insertions(+)
drivers/gpu/drm/i915/selftests/intel_hangcheck.c +147 -0
@@ -322,6 +322,56 @@ static int igt_global_reset(void *arg)return err; } +static int igt_reset_engine (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_engine_cs *engine; +enum intel_engine_id id; +unsigned int reset_count, reset_engine_count; +int err =0 ; + +/* Check that we can issue a global GPU and engine reset */ + +if (!intel_has_gpu_reset (i915)) +return 0 ; + +if (!intel_has_reset_engine (i915)) +return 0 ; + +set_bit (I915_RESET_BACKOFF , &i915->gpu_error.flags); + +for_each_engine (engine, i915, id) { + reset_count =i915_reset_count (&i915->gpu_error); + reset_engine_count =i915_reset_engine_count (&i915->gpu_error, + engine); + + err =i915_reset_engine (engine); +if (err) { +pr_err ("i915_reset_engine failed\n" ); +break ; + } + +if (i915_reset_count (&i915->gpu_error) != reset_count) { +pr_err ("Full GPU reset recorded! (engine reset expected)\n" ); + err = -EINVAL ; +break ; + } + +if (i915_reset_engine_count (&i915->gpu_error, engine) == + reset_engine_count) { +pr_err ("No %s engine reset recorded!\n" , engine->name); + err = -EINVAL ; +break ; + } + } + +clear_bit (I915_RESET_BACKOFF , &i915->gpu_error.flags); +if (i915_terminally_wedged (&i915->gpu_error)) + err = -EIO ; + +return err; +} +static u32 fake_hangcheck (struct drm_i915_gem_request *rq) {u32 reset_count;
@@ -526,13 +576,110 @@ static int igt_reset_queue(void *arg)return err; } +static int igt_render_engine_reset_fallback (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_engine_cs *engine = i915->engine[RCS ]; +struct hang h; +struct drm_i915_gem_request *rq; +unsigned int reset_count, reset_engine_count; +int err =0 ; + +/* Check that we can issue a global GPU and engine reset */ + +if (!intel_has_gpu_reset (i915)) +return 0 ; + +if (!intel_has_reset_engine (i915)) +return 0 ; + +set_bit (I915_RESET_BACKOFF , &i915->gpu_error.flags); +mutex_lock (&i915->drm.struct_mutex); + + err =hang_init (&h, i915); +if (err) + goto unlock; + + rq =hang_create_request (&h, engine, i915->kernel_context); +if (IS_ERR (rq)) { + err =PTR_ERR (rq); + goto fini; + } + +i915_gem_request_get (rq); +__i915_add_request (rq, true); + +/* make reset engine fail */ + rq->fence.error = -EIO ; + +if (!wait_for_hang (&h, rq)) { +pr_err ("Failed to start request %x\n" , rq->fence.seqno); + err = -EIO ; + goto fini; + } + + reset_engine_count =i915_reset_engine_count (&i915->gpu_error, engine); + reset_count =fake_hangcheck (rq); + + err =i915_reset_engine (engine); +if (err) { +pr_err ("i915_reset_engine failed\n" ); + goto fini; + } + +if (i915_reset_engine_count (&i915->gpu_error, engine) != + reset_engine_count) { +pr_err ("render engine reset recorded! (full reset expected)\n" ); + err = -EINVAL ; + goto fini; + } + +if (i915_reset_count (&i915->gpu_error) == reset_count) { +pr_err ("No full GPU reset recorded!\n" ); + err = -EINVAL ; + goto fini; + } + +/* +* by using fence.error = -EIO, full reset sets the wedged flag, do one +* more full reset to re-enable the hw. +*/ +if (i915_terminally_wedged (&i915->gpu_error)) { + rq->fence.error =0 ; + +set_bit (I915_RESET_HANDOFF , &i915->gpu_error.flags); +i915_reset (i915); +GEM_BUG_ON (test_bit (I915_RESET_HANDOFF , + &i915->gpu_error.flags)); + +if (i915_reset_count (&i915->gpu_error) == reset_count) { +pr_err ("No full GPU reset recorded!\n" ); + err = -EINVAL ; + goto fini; + } + } + +fini: +hang_fini (&h); +unlock: +mutex_unlock (&i915->drm.struct_mutex); +clear_bit (I915_RESET_BACKOFF , &i915->gpu_error.flags); + +if (i915_terminally_wedged (&i915->gpu_error)) +return -EIO ; + +return err; +} +int intel_hangcheck_live_selftests (struct drm_i915_private *i915) {static const struct i915_subtest tests[] = {SUBTEST (igt_hang_sanitycheck),SUBTEST (igt_global_reset), +SUBTEST (igt_reset_engine),SUBTEST (igt_wait_reset),SUBTEST (igt_reset_queue), +SUBTEST (igt_render_engine_reset_fallback), };if (!intel_has_gpu_reset (i915))
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 11/20 drm/i915/guc: fix mmio whitelist mmio_start offset and add reminder
In reply to Michel ThierryFrom: Daniele Ceraolo Spurio <[email protected]>
The mmio_start offset for the whitelist is the first FORCE_TO_NONPRIV register the GuC can use to restore the provided whitelist when an engine reset via GuC (which we still don't support) is triggered.
We're currently adding the mmio_base of the engine to the absolute address of the RCS version of the register, which results in the wrong offset. Fix it by using the definition we already have instead of re-defining it in the GuC FW header.
Also add a comment to avoid future issues with FORCE_TO_NONPRIV registers, which are also used by the workaround framework.
v2: improve comment (Michal), move comment about save/restore because it
is not related to the mmio_white_list field.
v3: rebase/resurrect.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 11 +++++++++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 1 - 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +9 -2
@@ -1034,10 +1034,17 @@ static int guc_ads_create(struct intel_guc *guc)/* MMIO reg state */ for_each_engine (engine, dev_priv, id) { blob->reg_state.white_list[engine->guc_id].mmio_start = - engine->mmio_base +GUC_MMIO_WHITE_LIST_START ; +i915_mmio_reg_offset (RING_FORCE_TO_NONPRIV (engine->mmio_base,0 )); -/* Nothing to be saved or restored for now. */ +/* +* Note: if the GuC whitelist management is enabled, the values +* should be filled using the workaround framework to avoid +* inconsistencies with the handling of FORCE_TO_NONPRIV +* registers. +*/ blob->reg_state.white_list[engine->guc_id].count =0 ; + +/* Nothing to be saved or restored for now. */ }/*
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -1
@@ -394,7 +394,6 @@ struct guc_policies {#define GUC_REGSET_SAVE_CURRENT_VALUE 0x10#define GUC_REGSET_MAX_REGISTERS 25 -#define GUC_MMIO_WHITE_LIST_START 0x24d0#define GUC_MMIO_WHITE_LIST_MAX 12#define GUC_S3_SAVE_SPACE_PAGES 10
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 12/20 drm/i915/guc: Provide register list to be saved/restored during engine reset
In reply to Michel ThierryFrom: Arun Siluvery <[email protected]>
GuC expects a list of registers from the driver which are saved/restored during engine reset. The type of value to be saved is controlled by flags. We provide a minimal set of registers that we want GuC to save and restore. This is not an issue in case of engine reset as driver initializes most of them following an engine reset, but in case of media reset (aka watchdog reset) which is completely internal to GuC (including resubmission of hung workload), it is necessary to provide this list, otherwise GuC won't be able to schedule further workloads after a reset. This is the minimal set of registers identified for things to work as expected but if we see any new issues, this register list can be expanded.
In order to not loose any existing workarounds, we have to let GuC know the registers and its values. These will be reapplied after the reset. Note that we can't just read the current value because most of these registers are masked (so we have a workaround for a workaround for a workaround).
v2: REGSET_MASKED is too difficult for GuC, use REGSET_SAVE_DEFAULT_VALUE and current value from RING_MODE reg instead; no need to preserve head/tail either, be extra paranoid and save whitelisted registers (Daniele).
v3: Workarounds added only once during _init_workarounds also have to been restored, or we risk loosing them after internal GuC reset (Daniele).
v4: Rename macro used to keep track the workaround registers we will have to restore after reset (s/I915_GUC_REG_WRITE/WA_REG_WR_GUC_RESTORE).
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++ drivers/gpu/drm/i915/i915_guc_submission.c | 68 +++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_engine_cs.c | 65 +++++++++++++++++++--------- 3 files changed, 114 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -1913,7 +1913,10 @@ struct i915_wa_reg {struct i915_workarounds {struct i915_wa_reg reg[I915_MAX_WA_REGS ]; +/* list of registers (and their values) that GuC will have to restore */ +struct i915_wa_reg guc_reg[GUC_REGSET_MAX_REGISTERS ];u32 count; +u32 guc_count;u32 hw_whitelist_count[I915_NUM_ENGINES ]; };
drivers/gpu/drm/i915/i915_guc_submission.c +66 -2
93 lines not on this page · raw message
drivers/gpu/drm/i915/intel_engine_cs.c +45 -20
128 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 12/20] drm/i915/guc: Provide register list to be saved/restored during engine reset
drivers/gpu/drm/i915/intel_engine_cs.c static int wa_ring_whitelist_reg(struct intel_engine_cs *engine, · line 647
Quoted 5 lines · Michel Thierry
drivers/gpu/drm/i915/intel_engine_cs.c +5
-0+#define WA_REG_WR_GUC_RESTORE (addr, val) do { \ + const int r = guc_wa_add(dev_priv, (addr), (val)); \ + if (r) \ + return r; \ + } while (0)
Try to avoid burying returns inside macros. Does this macro help code readability? Would perhaps just a table of registers + values be easier? -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 12/20] drm/i915/guc: Provide register list to be saved/restored during engine reset
Quoted 11 lines · Chris Wilson
drivers/gpu/drm/i915/intel_engine_cs.c static int wa_ring_whitelist_reg(struct intel_engine_cs *engine, · line 647
Quoted 5 lines · Michel Thierry
drivers/gpu/drm/i915/intel_engine_cs.c +5
-0+#define WA_REG_WR_GUC_RESTORE (addr, val) do { \ + const int r = guc_wa_add(dev_priv, (addr), (val)); \ + if (r) \ + return r; \ + } while (0)Try to avoid burying returns inside macros. Does this macro help code readability? Would perhaps just a table of registers + values be easier? -Chris
Sure, I can change it to something else.
I only replicated what the other WA_* macros (the ones we need in ctx switch) were doing.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 13/20 drm/i915/guc: Rename the function that resets the GuC
In reply to Michel Thierryintel_guc_reset sounds more like the microcontroller is the one performing a reset, while in this case is the opposite. intel_reset_guc not only makes it clearer, it follows the other intel_reset functions available.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -3031,7 +3031,7 @@ extern int i915_reset_engine(struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_reset_engine_start (struct intel_engine_cs *engine);extern void intel_reset_engine_cancel (struct intel_engine_cs *engine); -extern int intel_guc_reset (struct drm_i915_private *dev_priv); +extern int intel_reset_guc (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);extern unsigned long i915_chipset_val (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_uc.c +2 -2
@@ -46,9 +46,9 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)int ret;u32 guc_status; - ret =intel_guc_reset (dev_priv); + ret =intel_reset_guc (dev_priv);if (ret) { -DRM_ERROR ("GuC reset failed, ret = %d\n" , ret); +DRM_ERROR ("Reset GuC failed, ret = %d\n" , ret);return ret; }
drivers/gpu/drm/i915/intel_uncore.c +1 -1
@@ -1792,7 +1792,7 @@ bool intel_has_reset_engine(struct drm_i915_private *dev_priv) i915.reset == 2); } -int intel_guc_reset (struct drm_i915_private *dev_priv) +int intel_reset_guc (struct drm_i915_private *dev_priv) {int ret;
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 13/20] drm/i915/guc: Rename the function that resets the GuC
Quoted 30 lines · Michel Thierry
intel_guc_resetsounds more like the microcontroller is the one performing a reset, while in this case is the opposite.intel_reset_gucnot only makes it clearer, it follows the otherintel_resetfunctions available.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -3031,7 +3031,7 @@ extern int i915_reset_engine(struct intel_engine_cs *engine);extern bool intel_has_reset_engine (struct drm_i915_private *dev_priv);extern int intel_reset_engine_start (struct intel_engine_cs *engine);extern void intel_reset_engine_cancel (struct intel_engine_cs *engine); -extern int intel_guc_reset (struct drm_i915_private *dev_priv); +extern int intel_reset_guc (struct drm_i915_private *dev_priv);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);extern unsigned long i915_chipset_val (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_uc.c +0
-0
drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 51
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c +2
-2@@ -46,9 +46,9 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)int ret;u32 guc_status; - ret =intel_guc_reset (dev_priv); + ret =intel_reset_guc (dev_priv);if (ret) { -DRM_ERROR ("GuC reset failed, ret = %d\n" , ret); +DRM_ERROR ("Reset GuC failed, ret = %d\n" , ret);
As a non-native speaker I might be wrong, but was thinking something like "Failed to reset GuC", "Resetting GuC failed", "Reset of GuC failed" would be clearer? I leave it for someone more competent to decide.
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0return ret; }drivers/gpu/drm/i915/intel_uncore.c +0
-0
drivers/gpu/drm/i915/intel_uncore.c bool intel_has_reset_engine(struct drm_i915_private *dev_priv) · line 1798
Quoted 8 lines
drivers/gpu/drm/i915/intel_uncore.c +1
-1@@ -1792,7 +1792,7 @@ bool intel_has_reset_engine(struct drm_i915_private *dev_priv) i915.reset == 2); } -int intel_guc_reset (struct drm_i915_private *dev_priv) +int intel_reset_guc (struct drm_i915_private *dev_priv) {int ret;
Potential message bikeshed aside:
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v7 13/20] drm/i915/guc: Rename the function that resets the GuC
Quoted 7 lines · Tvrtko Ursulin
Quoted 7 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0@@ -46,9 +46,9 @@ static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv)int ret;u32 guc_status;
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c static int __intel_uc_reset_hw(struct drm_i915_private *dev_priv) · line 51
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +2
-2- ret =intel_guc_reset (dev_priv); + ret =intel_reset_guc (dev_priv);if (ret) { -DRM_ERROR ("GuC reset failed, ret = %d\n" , ret); +DRM_ERROR ("Reset GuC failed, ret = %d\n" , ret);As a non-native speaker I might be wrong, but was thinking something like "Failed to reset GuC", "Resetting GuC failed", "Reset of GuC failed" would be clearer? I leave it for someone more competent to decide.
"Failed to reset GuC" sounds good to me.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 14/20 drm/i915/guc: Add support for reset engine using GuC commands
In reply to Michel ThierryThis patch adds per engine reset and recovery (TDR) support when GuC is used to submit workloads to GPU.
In the case of i915 directly submission to ELSP, driver manages hang detection, recovery and resubmission. With GuC submission these tasks are shared between driver and GuC. i915 is still responsible for detecting a hang, and when it does it only requests GuC to reset that Engine. GuC internally manages acquiring forcewake and idling the engine before actually resetting it.
Once the reset is successful, i915 takes over again and handles resubmission. The scheduler in i915 knows which requests are pending so after resetting a engine, pending workloads/requests are resubmitted again.
v2: s/i915_guc_request_engine_reset/i915_guc_reset_engine/ to match the non-guc funtion names.
v3: Removed debug message about engine restarting from which request, since the new baseline do it regardless of submission mode. (Chris)
--- drivers/gpu/drm/i915/i915_drv.c | 42 +++++++++++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_guc_submission.c | 48 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 6 ++++ drivers/gpu/drm/i915/intel_uc.h | 1 + drivers/gpu/drm/i915/intel_uncore.c | 5 ---- 6 files changed, 84 insertions(+), 19 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +28 -14
@@ -1918,24 +1918,34 @@ int i915_reset_engine(struct intel_engine_cs *engine)*/ i915_gem_reset_engine (engine, active_request); -/* forcing engine to idle */ - ret =intel_reset_engine_start (engine); -if (ret) { -DRM_ERROR ("Failed to disable %s\n" , engine->name); - goto out; - } +if (!dev_priv->guc.execbuf_client) { +/* forcing engine to idle */ + ret =intel_reset_engine_start (engine); +if (ret) { +DRM_ERROR ("Failed to disable %s\n" , engine->name); + goto out; + } -/* finally, reset engine */ - ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); -if (ret) { -DRM_ERROR ("Failed to reset %s, ret=%d\n" , engine->name, ret); +/* finally, reset engine */ + ret =intel_gpu_reset (dev_priv,intel_engine_flag (engine)); +if (ret) { +DRM_ERROR ("Failed to reset %s, ret=%d\n" , + engine->name, ret); +intel_reset_engine_cancel (engine); + goto out; + } + +/* be sure the request reset bit gets cleared */ intel_reset_engine_cancel (engine); - goto out; + }else { + ret =i915_guc_reset_engine (engine); +if (ret) { +DRM_ERROR ("GuC failed to reset %s, ret=%d\n" , + engine->name, ret); + goto out; + } } -/* be sure the request reset bit gets cleared */ -intel_reset_engine_cancel (engine); -i915_gem_reset_finish_engine (engine);/* replay remaining requests in the queue */
@@ -1943,6 +1953,10 @@ int i915_reset_engine(struct intel_engine_cs *engine)if (ret) goto out; +/* for guc too */ +if (dev_priv->guc.execbuf_client) +i915_guc_submission_reenable_engine (engine); + error->reset_engine_count[engine->id]++; out:return ret;
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3032,6 +3032,7 @@ extern bool intel_has_reset_engine(struct drm_i915_private *dev_priv);extern int intel_reset_engine_start (struct intel_engine_cs *engine);extern void intel_reset_engine_cancel (struct intel_engine_cs *engine);extern int intel_reset_guc (struct drm_i915_private *dev_priv); +extern int i915_guc_reset_engine (struct intel_engine_cs *engine);extern void intel_engine_init_hangcheck (struct intel_engine_cs *engine);extern void intel_hangcheck_init (struct drm_i915_private *dev_priv);extern unsigned long i915_chipset_val (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_guc_submission.c +48 -0
57 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_fwif.h +6 -0
@@ -505,6 +505,7 @@ union guc_log_control {/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum intel_guc_action {INTEL_GUC_ACTION_DEFAULT =0x0 , +INTEL_GUC_ACTION_REQUEST_ENGINE_RESET =0x3 ,INTEL_GUC_ACTION_SAMPLE_FORCEWAKE =0x6 ,INTEL_GUC_ACTION_ALLOCATE_DOORBELL =0x10 ,INTEL_GUC_ACTION_DEALLOCATE_DOORBELL =0x20 ,
@@ -518,6 +519,11 @@ enum intel_guc_action { INTEL_GUC_ACTION_LIMIT }; +/* Reset engine options */ +enum action_engine_reset_options { +INTEL_GUC_RESET_OPTION_REPORT_AFFECTED_CONTEXTS =0x10 , +}; +/* * The GuC sends its response to a command by overwriting the * command in SS0. The response is distinguishable from a command
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -247,6 +247,7 @@ int i915_guc_wq_reserve(struct drm_i915_gem_request *rq);void i915_guc_wq_unreserve (struct drm_i915_gem_request *request);void i915_guc_submission_disable (struct drm_i915_private *dev_priv);void i915_guc_submission_fini (struct drm_i915_private *dev_priv); +void i915_guc_submission_reenable_engine (struct intel_engine_cs *engine);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);/* intel_guc_log.c */
drivers/gpu/drm/i915/intel_uncore.c +0 -5
@@ -1781,14 +1781,9 @@ bool intel_has_gpu_reset(struct drm_i915_private *dev_priv)return intel_get_gpu_reset (dev_priv) !=NULL ; } -/* -* When GuC submission is enabled, GuC manages ELSP and can initiate the -* engine reset too. For now, fall back to full GPU reset if it is enabled. -*/ bool intel_has_reset_engine (struct drm_i915_private *dev_priv) {return (dev_priv->info.has_reset_engine && - !dev_priv->guc.execbuf_client && i915.reset ==2 ); }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 15/20 drm/i915: Watchdog timeout: Pass GuC shared data structure during param load
In reply to Michel ThierryFor watchdog / media reset, the firmware must know the address of the shared data page (the first page of the default context).
This information should be in DWORD 9 of the GUC_CTL structure.
v2: Use guc_ggtt_offset (Chris).
Store the ggtt offset of the default ctx as we needed for suspend/resume/reset (Daniele).
--- drivers/gpu/drm/i915/i915_guc_submission.c | 21 ++++++--------------- drivers/gpu/drm/i915/intel_guc_fwif.h | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 11 +++++++++++ drivers/gpu/drm/i915/intel_uc.h | 2 ++ 4 files changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +6 -15
@@ -1370,7 +1370,6 @@ void i915_guc_submission_reenable_engine(struct intel_engine_cs *engine)int intel_guc_suspend (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc; -struct i915_gem_context *ctx;u32 data[3 ];if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )
@@ -1378,13 +1377,11 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)gen9_disable_guc_interrupts (dev_priv); - ctx = dev_priv->kernel_context; - data[0 ] =INTEL_GUC_ACTION_ENTER_S_STATE ;/* any value greater than GUC_POWER_D0 */ data[1 ] =GUC_POWER_D1 ; -/* first page is shared data with GuC */ - data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state); +/* first page of default ctx is shared data with GuC */ + data[2 ] = guc->shared_data_offset;return intel_guc_send (guc, data,ARRAY_SIZE (data)); }
@@ -1396,7 +1393,6 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)int intel_guc_resume (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc; -struct i915_gem_context *ctx;u32 data[3 ];if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )
@@ -1405,12 +1401,10 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv); - ctx = dev_priv->kernel_context; - data[0 ] =INTEL_GUC_ACTION_EXIT_S_STATE ; data[1 ] =GUC_POWER_D0 ; -/* first page is shared data with GuC */ - data[2 ] =guc_ggtt_offset (ctx->engine[RCS ].state); +/* first page of default ctx is shared data with GuC */ + data[2 ] = guc->shared_data_offset;return intel_guc_send (guc, data,ARRAY_SIZE (data)); }
@@ -1419,14 +1413,11 @@ int i915_guc_reset_engine(struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915;struct intel_guc *guc = &dev_priv->guc; -struct i915_gem_context *ctx;u32 data[7 ];if (!i915.enable_guc_submission)return 0 ; - ctx = dev_priv->kernel_context; -/* * The affected context report is populated by GuC and is provided * to the driver using the shared page. We request for it but don't
@@ -1438,8 +1429,8 @@ int i915_guc_reset_engine(struct intel_engine_cs *engine) data[3 ] =0 ; data[4 ] =0 ; data[5 ] = guc->execbuf_client->stage_id; -/* first page is shared data with GuC */ - data[6 ] =guc_ggtt_offset (ctx->engine[RCS ].state); +/* first page of default ctx is shared data with GuC */ + data[6 ] = guc->shared_data_offset;return intel_guc_send (guc, data,ARRAY_SIZE (data)); }
drivers/gpu/drm/i915/intel_guc_fwif.h +1 -1
@@ -135,7 +135,7 @@#define GUC_ADS_ADDR_SHIFT 11#define GUC_ADS_ADDR_MASK 0xfffff800 -#define GUC_CTL_RSRVD 9 +#define GUC_CTL_SHARED_DATA 9#define GUC_CTL_MAX_DWORDS (SOFT_SCRATCH_COUNT - 2)/* [1..14] */
drivers/gpu/drm/i915/intel_guc_loader.c +11 -0
@@ -108,6 +108,7 @@ static void guc_params_init(struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;u32 params[GUC_CTL_MAX_DWORDS ]; +struct i915_gem_context *ctx;int i;memset (¶ms,0 ,sizeof (params));
@@ -156,6 +157,16 @@ static void guc_params_init(struct drm_i915_private *dev_priv) params[GUC_CTL_FEATURE ] &= ~GUC_CTL_DISABLE_SCHEDULER ; } +/* +* For watchdog / media reset, GuC must know the address of the shared +* data page, which is the first page of the default context. +* We will also use this page in several places (suspend/resume/reset), +* so save the ggtt offset. +*/ + ctx = dev_priv->kernel_context; + guc->shared_data_offset =guc_ggtt_offset (ctx->engine[RCS ].state); + params[GUC_CTL_SHARED_DATA ] = guc->shared_data_offset; +I915_WRITE (SOFT_SCRATCH (0 ),0 );for (i =0 ; i <GUC_CTL_MAX_DWORDS ; i++)
drivers/gpu/drm/i915/intel_uc.h +2 -0
@@ -195,6 +195,8 @@ struct intel_guc {DECLARE_BITMAP (doorbell_bitmap,GUC_NUM_DOORBELLS );uint32_t db_cacheline;/* Cyclic counter mod pagesize */ +uint32_t shared_data_offset;/* First page of default ctx */ +/* Action status & statistics */ uint64_t action_count;/* Total commands issued */ uint32_t action_cmd;/* Last command word */
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 16/20 drm/i915: Watchdog timeout: IRQ handler for gen8+
In reply to Michel Thierry*** General ***
Watchdog timeout (or "media engine reset") is a feature that allows userland applications to enable hang detection on individual batch buffers. The detection mechanism itself is mostly bound to the hardware and the only thing that the driver needs to do to support this form of hang detection is to implement the interrupt handling support as well as watchdog command emission before and after the emitted batch buffer start instruction in the ring buffer.
The principle of the hang detection mechanism is as follows:
1. Once the decision has been made to enable watchdog timeout for a particular batch buffer and the driver is in the process of emitting the batch buffer start instruction into the ring buffer it also emits a watchdog timer start instruction before and a watchdog timer cancellation instruction after the batch buffer start instruction in the ring buffer.
2. Once the GPU execution reaches the watchdog timer start instruction the hardware watchdog counter is started by the hardware. The counter keeps counting until either reaching a previously configured threshold value or the timer cancellation instruction is executed.
2a. If the counter reaches the threshold value the hardware fires a watchdog interrupt that is picked up by the watchdog interrupt handler. This means that a hang has been detected and the driver needs to deal with it the same way it would deal with a engine hang detected by the periodic hang checker. The only difference between the two is that we already blamed the active request (to ensure an engine reset).
2b. If the batch buffer completes and the execution reaches the watchdog cancellation instruction before the watchdog counter reaches its threshold value the watchdog is cancelled and nothing more comes of it. No hang is detected.
Note about future interaction with preemption: Preemption could happen in a command sequence prior to watchdog counter getting disabled, resulting in watchdog being triggered following preemption (e.g. when watchdog had been enabled in the low priority batch). The driver will need to explicitly disable the watchdog counter as part of the preemption sequence.
*** This patch introduces: ***
1. IRQ handler code for watchdog timeout allowing direct hang recovery based on hardware-driven hang detection, which then integrates directly with the hang recovery path. This is independent of having per-engine reset or just full gpu reset.
2. Watchdog specific register information.
Currently the render engine and all available media engines support watchdog timeout (VECS is only supported in GEN9). The specifications elude to the BCS engine being supported but that is currently not supported by this commit.
Note that the value to stop the counter is different between render and non-render engines in GEN8; GEN9 onwards it's the same.
v2: Move irq handler to tasklet, arm watchdog for a 2nd time to check against false-positives.
v3: Don't use high priority tasklet, use engine_last_submit while checking for false-positives. From GEN9 onwards, the stop counter bit is the same for all engines.
v4: Remove unnecessary brackets, use current_seqno to mark the request as guilty in the hangcheck/capture code.
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++ drivers/gpu/drm/i915/i915_irq.c | 12 +++++- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_hangcheck.c | 13 +++++-- drivers/gpu/drm/i915/intel_lrc.c | 69 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++ 6 files changed, 103 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1608,6 +1608,9 @@ struct i915_gpu_error {* inspect the bit and do the reset directly, otherwise the worker * waits for the struct_mutex. * +* #I915_RESET_WATCHDOG - When hw detects a hang before us, we can use +* I915_RESET_WATCHDOG to report the hang detection cause accurately. +* * #I915_WEDGED - If reset fails and we can no longer use the GPU, * we set the #I915_WEDGED bit. Prior to command submission, e.g. * i915_gem_request_alloc(), this bit is checked and the sequence
@@ -1616,6 +1619,7 @@ struct i915_gpu_error {unsigned long flags;#define I915_RESET_BACKOFF 0#define I915_RESET_HANDOFF 1 +#define I915_RESET_WATCHDOG 2#define I915_WEDGED (BITS_PER_LONG - 1)/** Number of times an engine has been reset */
drivers/gpu/drm/i915/i915_irq.c +11 -1
@@ -1370,6 +1370,9 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)if (tasklet)tasklet_hi_schedule (&engine->irq_tasklet); + +if (iir & (GT_GEN8_WATCHDOG_INTERRUPT << test_shift)) +tasklet_schedule (&engine->watchdog_tasklet); } static irqreturn_t gen8_gt_irq_ack(struct drm_i915_private *dev_priv,
@@ -3455,12 +3458,15 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)uint32_t gt_interrupts[] = {GT_RENDER_USER_INTERRUPT <<GEN8_RCS_IRQ_SHIFT |GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_RCS_IRQ_SHIFT | +GT_GEN8_WATCHDOG_INTERRUPT <<GEN8_RCS_IRQ_SHIFT |GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT |GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ,GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT |GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT | +GT_GEN8_WATCHDOG_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT |GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT | -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT , +GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT | +GT_GEN8_WATCHDOG_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ,0 ,GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT |GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT
@@ -3469,6 +3475,10 @@ static void gen8_gt_irq_postinstall(struct drm_i915_private *dev_priv)if (HAS_L3_DPF (dev_priv)) gt_interrupts[0 ] |=GT_RENDER_L3_PARITY_ERROR_INTERRUPT ; +/* VECS watchdog is only available in skl+ */ +if (INTEL_GEN (dev_priv) >=9 ) + gt_interrupts[3 ] |=GT_GEN8_WATCHDOG_INTERRUPT ; + dev_priv->pm_ier =0x0 ; dev_priv->pm_imr = ~dev_priv->pm_ier;GEN8_IRQ_INIT_NDX (GT ,0 , ~gt_interrupts[0 ], gt_interrupts[0 ]);
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -1908,6 +1908,11 @@ enum skl_disp_power_wells {#define RING_START (base) _MMIO((base)+0x38)#define RING_CTL (base) _MMIO((base)+0x3c)#define RING_CTL_SIZE (size) ((size) - PAGE_SIZE)/* in bytes -> pages */ +#define RING_CNTR (base) _MMIO((base) + 0x178) +#define GEN8_WATCHDOG_ENABLE 0 +#define GEN8_WATCHDOG_DISABLE 1 +#define GEN8_XCS_WATCHDOG_DISABLE 0xFFFFFFFF/* GEN8 & non-render only */ +#define RING_THRESH (base) _MMIO((base) + 0x17C)#define RING_SYNC_0 (base) _MMIO((base)+0x40)#define RING_SYNC_1 (base) _MMIO((base)+0x44)#define RING_SYNC_2 (base) _MMIO((base)+0x48)
@@ -2386,6 +2391,7 @@ enum skl_disp_power_wells {#define GT_BSD_USER_INTERRUPT (1 << 12)#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT_S1 (1 << 11)/* hsw+; rsvd on snb, ivb, vlv */ #define GT_CONTEXT_SWITCH_INTERRUPT (1 << 8) +#define GT_GEN8_WATCHDOG_INTERRUPT (1 << 6)/* gen8+ */ #define GT_RENDER_L3_PARITY_ERROR_INTERRUPT (1 << 5)/* !snb */ #define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT (1 << 4)#define GT_RENDER_CS_MASTER_ERROR_INTERRUPT (1 << 3)
drivers/gpu/drm/i915/intel_hangcheck.c +9 -4
@@ -388,7 +388,8 @@ static void hangcheck_accumulate_sample(struct intel_engine_cs *engine,static void hangcheck_declare_hang (struct drm_i915_private *i915,unsigned int hung, -unsigned int stuck) +unsigned int stuck, +unsigned int watchdog) {struct intel_engine_cs *engine;char msg[80 ];
@@ -401,7 +402,8 @@ static void hangcheck_declare_hang(struct drm_i915_private *i915,if (stuck != hung) hung &= ~stuck; len =scnprintf (msg,sizeof (msg), -"%s on " , stuck == hung ?"No progress" :"Hang" ); +"%s on " , watchdog ?"Watchdog timeout" : + stuck == hung ?"No progress" :"Hang" );for_each_engine_masked (engine, i915, hung, tmp) len +=scnprintf (msg + len,sizeof (msg) - len,"%s, " , engine->name);
@@ -425,7 +427,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work) gpu_error.hangcheck_work.work);struct intel_engine_cs *engine;enum intel_engine_id id; -unsigned int hung =0 , stuck =0 ; +unsigned int hung =0 , stuck =0 , watchdog =0 ;int busy_count =0 ;if (!i915.enable_hangcheck)
@@ -437,6 +439,9 @@ static void i915_hangcheck_elapsed(struct work_struct *work)if (i915_terminally_wedged (&dev_priv->gpu_error))return ; +if (test_and_clear_bit (I915_RESET_WATCHDOG , &dev_priv->gpu_error.flags)) + watchdog =1 ; +/* As enabling the GPU requires fairly extensive mmio access, * periodically arm the mmio checker to see if we are triggering * any invalid access.
@@ -463,7 +468,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work) }if (hung) -hangcheck_declare_hang (dev_priv, hung, stuck); +hangcheck_declare_hang (dev_priv, hung, stuck, watchdog);/* Reset timer in case GPU hangs without another request being added */ if (busy_count)
drivers/gpu/drm/i915/intel_lrc.c +69 -0
93 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -0
@@ -128,6 +128,7 @@ struct intel_instdone {struct intel_engine_hangcheck {u64 acthd;u32 seqno; +u32 watchdog;enum intel_engine_hangcheck_action action;unsigned long action_timestamp;int deadlock;
@@ -410,6 +411,9 @@ struct intel_engine_cs {struct intel_engine_hangcheck hangcheck; +/* watchdog_tasklet: stop counter and re-schedule hangcheck_work asap */ +struct tasklet_struct watchdog_tasklet; +bool needs_cmd_parser;/*
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 17/20 drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+
In reply to Michel ThierryEmit the required commands into the ring buffer for starting and stopping the watchdog timer before/after batch buffer start during batch buffer submission.
v2: Support watchdog threshold per context engine, merge lri commands, and move watchdog commands emission to emit_bb_start. Request space of combined start_watchdog, bb_start and stop_watchdog to avoid any error after emitting bb_start.
v3: There were too many req->engine in emit_bb_start.
Use GEM_BUG_ON instead of returning a very late EINVAL in the remote case of watchdog misprogramming; set correct LRI cmd size in emit_stop_watchdog. (Chris)
--- drivers/gpu/drm/i915/i915_gem_context.h | 4 ++ drivers/gpu/drm/i915/intel_lrc.c | 85 +++++++++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++ 3 files changed, 89 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_gem_context.h +4 -0
@@ -150,6 +150,10 @@ struct i915_gem_context {u32 *lrc_reg_state;u64 lrc_desc;int pin_count; +/** watchdog_threshold: hw watchdog threshold value, +* in clock counts +*/ +u32 watchdog_threshold;bool initialised; } engine[I915_NUM_ENGINES ];
drivers/gpu/drm/i915/intel_lrc.c +81 -4
134 lines not on this page · raw message
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -0
@@ -280,6 +280,10 @@ struct intel_engine_cs {int (*emit_flush)(struct drm_i915_gem_request *request,u32 mode); +u32 * (*emit_start_watchdog)(struct drm_i915_gem_request *req, +u32 *cs); +u32 * (*emit_stop_watchdog)(struct drm_i915_gem_request *req, +u32 *cs);#define EMIT_INVALIDATE BIT(0)#define EMIT_FLUSH BIT(1)#define EMIT_BARRIER (EMIT_INVALIDATE | EMIT_FLUSH)
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 18/20 drm/i915: Watchdog timeout: DRM kernel interface to set the timeout
In reply to Michel ThierryFinal enablement patch for GPU hang detection using watchdog timeout. Using the gem_context_setparam ioctl, users can specify the desired timeout value in microseconds, and the driver will do the conversion to 'timestamps'.
The recommended default watchdog threshold for video engines is 60000 us, since this has been _empirically determined_ to be a good compromise for low-latency requirements and low rate of false positives. The default register value is ~106000us and the theoretical max value (all 1s) is 353 seconds.
Note, UABI engine ids and i915 engine ids are different, and this patch uses the i915 ones. Some kind of mapping table [1] is required if we decide to use the UABI engine ids.
[1] http://patchwork.freedesktop.org/patch/msgid/[email protected]
v2: Fixed get api to return values in microseconds. Threshold updated to be per context engine. Check for u32 overflow. Capture ctx threshold value in error state.
v3: Add a way to get array size, short-cut to disable all thresholds, return EFAULT / EINVAL as needed. Move the capture of the threshold value in the error state into a new patch. BXT has a different timestamp base (because why not?).
v4: Checking if watchdog is available should be the first thing to do, instead of giving false hopes to abi users; remove unnecessary & in set_watchdog; ignore args->size in getparam.
--- drivers/gpu/drm/i915/i915_drv.h | 29 ++++++++++ drivers/gpu/drm/i915/i915_gem_context.c | 95 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_lrc.c | 5 +- include/uapi/drm/i915_drm.h | 1 + 4 files changed, 128 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +29 -0
@@ -3578,6 +3578,35 @@ i915_gem_context_lookup_timeline(struct i915_gem_context *ctx,return &vm->timeline.engine[engine->id]; } +/* +* BDW & SKL+ Timestamp timer resolution = 0.080 uSec, +* or 12500000 counts per second, or ~12 counts per microsecond. +* +* But Broxton Timestamp timer resolution is different, 0.052 uSec, +* or 19200000 counts per second, or ~19 counts per microsecond. +*/ +#define SKL_TIMESTAMP_CNTS_PER_USEC 12 +#define BXT_TIMESTAMP_CNTS_PER_USEC 19 +#define TIMESTAMP_CNTS_PER_USEC (dev_priv) (IS_BROXTON(dev_priv) ? \ + BXT_TIMESTAMP_CNTS_PER_USEC : \ + SKL_TIMESTAMP_CNTS_PER_USEC) +static inline u32 +watchdog_to_us (struct drm_i915_private *dev_priv,u32 value_in_clock_counts) +{ +return value_in_clock_counts /TIMESTAMP_CNTS_PER_USEC (dev_priv); +} + +static inline u32 +watchdog_to_clock_counts (struct drm_i915_private *dev_priv,u64 value_in_us) +{ +u64 threshold = value_in_us *TIMESTAMP_CNTS_PER_USEC (dev_priv); + +if (overflows_type (threshold, u32)) +return -EINVAL ; + +return threshold; +} +int i915_perf_open_ioctl (struct drm_device *dev,void *data,struct drm_file *file);
drivers/gpu/drm/i915/i915_gem_context.c +95 -0
113 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +3 -2
@@ -1497,7 +1497,7 @@ static inline u32 get_watchdog_disable(struct intel_engine_cs *engine)return GEN8_XCS_WATCHDOG_DISABLE ; } -#define GEN8_WATCHDOG_1000US 0x2ee0 //XXX: Temp, replace with helper function +#define GEN8_WATCHDOG_1000US (dev_priv) watchdog_to_clock_counts(dev_priv, 1000)static void gen8_watchdog_irq_handler (unsigned long data) {struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
@@ -1527,7 +1527,8 @@ static void gen8_watchdog_irq_handler(unsigned long data) }else { engine->hangcheck.watchdog = current_seqno;/* Re-start the counter, if really hung, it will expire again */ -I915_WRITE_FW (RING_THRESH (engine->mmio_base),GEN8_WATCHDOG_1000US ); +I915_WRITE_FW (RING_THRESH (engine->mmio_base), +GEN8_WATCHDOG_1000US (dev_priv));I915_WRITE_FW (RING_CNTR (engine->mmio_base),GEN8_WATCHDOG_ENABLE ); }
include/uapi/drm/i915_drm.h +1 -0
@@ -1308,6 +1308,7 @@ struct drm_i915_gem_context_param {#define I915_CONTEXT_PARAM_GTT_SIZE 0x3#define I915_CONTEXT_PARAM_NO_ERROR_CAPTURE 0x4#define I915_CONTEXT_PARAM_BANNABLE 0x5 +#define I915_CONTEXT_PARAM_WATCHDOG 0x6__u64 value; };
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 19/20 drm/i915: Watchdog timeout: Include threshold value in error state
In reply to Michel ThierrySave the watchdog threshold (in us) as part of the engine state.
--- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gpu_error.c | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -1022,6 +1022,7 @@ struct i915_gpu_state {int ban_score;int active;int guilty; +int watchdog_threshold; } context;struct drm_i915_error_object {
drivers/gpu/drm/i915/i915_gpu_error.c +7 -4
@@ -388,9 +388,10 @@ static void error_print_context(struct drm_i915_error_state_buf *m, const char *header, const struct drm_i915_error_context *ctx) { - err_printf(m, "%s%s[%d] user_handle %d hw_id %d, ban score %d guilty %d active %d\n", + err_printf(m, "%s%s[%d] user_handle %d hw_id %d, ban score %d guilty %d active %d, watchdog %dus\n", header, ctx->comm, ctx->pid, ctx->handle, ctx->hw_id, - ctx->ban_score, ctx->guilty, ctx->active); + ctx->ban_score, ctx->guilty, ctx->active, + watchdog_to_us(m->i915, ctx->watchdog_threshold)); } static void error_print_engine(struct drm_i915_error_state_buf *m,
@@ -1344,7 +1345,8 @@ static void error_record_engine_execlists(struct intel_engine_cs *engine, }static void record_context (struct drm_i915_error_context *e, -struct i915_gem_context *ctx) +struct i915_gem_context *ctx, +u32 engine_id) {if (ctx->pid) {struct task_struct *task;
@@ -1363,6 +1365,7 @@ static void record_context(struct drm_i915_error_context *e, e->ban_score = ctx->ban_score; e->guilty = ctx->guilty_count; e->active = ctx->active_count; + e->watchdog_threshold = ctx->engine[engine_id].watchdog_threshold; } static void request_record_user_bo(struct drm_i915_gem_request *request,
@@ -1426,7 +1429,7 @@ static void i915_gem_record_rings(struct drm_i915_private *dev_priv, ee->vm = request->ctx->ppgtt ? &request->ctx->ppgtt->base : &ggtt->base; -record_context (&ee->context, request->ctx); +record_context (&ee->context, request->ctx, engine->id);/* We need to copy these to an anonymous buffer * as the simplest method to avoid being overwritten
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 20/20 drm/i915: Watchdog timeout: Export media reset count from GuC to debugfs
In reply to Michel ThierryFrom firmware v8.8, GuC provides the count of media engine resets (watchdog timeout). This information is available in the GuC shared context data struct, which resides in the first page of the default (kernel) lrc context.
Since GuC handled engine resets are transparent for kernel and user, provide a simple debugfs entry to see the number of times media reset has happened.
v2: Remove unnecessary struct_mutex, _get_dirty_page and kmap_atomic; use READ_ONCE. (Chris)
--- drivers/gpu/drm/i915/i915_debugfs.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 18 ++++++++++++++++++ 2 files changed, 40 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +22 -0
@@ -1403,6 +1403,26 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)return 0 ; } +static u32 i915_watchdog_reset_count (struct drm_i915_private *dev_priv) +{ +struct i915_gem_context *ctx; +struct page *page; +struct guc_shared_ctx_data *guc_shared_data; +u32 guc_media_reset_count; + +if (!i915.enable_guc_submission) +return 0 ; + + ctx = dev_priv->kernel_context; + page =i915_gem_object_get_page (ctx->engine[RCS ].state->obj, +LRC_GUCSHR_PN ); + guc_shared_data =kmap (page); + guc_media_reset_count =READ_ONCE (guc_shared_data->media_reset_count); +kunmap (page); + +return guc_media_reset_count; +} +static int i915_reset_info (struct seq_file *m,void *unused) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -1411,6 +1431,8 @@ static int i915_reset_info(struct seq_file *m, void *unused)enum intel_engine_id id;seq_printf (m,"full gpu reset = %u\n" ,i915_reset_count (error)); +seq_printf (m,"GuC watchdog/media reset = %u\n" , +i915_watchdog_reset_count (dev_priv));for_each_engine (engine, dev_priv, id) { seq_printf(m, "%s = %u\n", engine->name,
drivers/gpu/drm/i915/intel_guc_fwif.h +18 -0
@@ -502,6 +502,24 @@ union guc_log_control {u32 value; } __packed; +/* GuC Shared Context Data Struct */ +struct guc_shared_ctx_data { +u32 addr_of_last_preempted_data_low; +u32 addr_of_last_preempted_data_high; +u32 addr_of_last_preempted_data_high_tmp; +u32 padding; +u32 is_mapped_to_proxy; +u32 proxy_ctx_id; +u32 engine_reset_ctx_id; +u32 media_reset_count; +u32 reserved[8 ]; +u32 uk_last_ctx_switch_reason; +u32 was_reset; +u32 lrca_gpu_addr; +u32 execlist_ctx; +u32 reserved1[32 ]; +} __packed; +/* This Action will be programmed in C180 - SOFT_SCRATCH_O_REG */ enum intel_guc_action {INTEL_GUC_ACTION_DEFAULT =0x0 ,
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev4)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev4)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v4 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/4/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:431s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:424s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:575s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:510s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:541s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:485s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:485s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:410s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:407s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:425s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:496s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:457s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:566s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:456s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:571s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:463s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:490s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:434s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:533s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:401s
d73272105f5bcd79f25c57bd5b28b72d41153cdb drm-tip: 2017y-04m-27d-21h-26m-48s UTC integration manifest 966284c drm/i915: Watchdog timeout: Export media reset count from GuC to debugfs 5b29010 drm/i915: Watchdog timeout: Include threshold value in error state
06fad5f drm/i915: Watchdog timeout: DRM kernel interface to set the timeout
02813be drm/i915: Watchdog timeout: Ringbuffer command emission for gen8+
9856155 drm/i915: Watchdog timeout: IRQ handler for gen8+
00b9bb5 drm/i915: Watchdog timeout: Pass GuC shared data structure during param load 5a9c8f85 drm/i915/guc: Add support for reset engine using GuC commands
27455f1 drm/i915/guc: Rename the function that resets the GuC
1baa734 drm/i915/guc: Provide register list to be saved/restored during engine reset d4776dd drm/i915/guc: fix mmio whitelist mmio_start offset and add reminder
2d8aef8 drm/i915/selftests: reset engine self tests506713ad drm/i915: Add engine reset count in get-reset-stats ioctl
6da8513 drm/i915: Enable Engine reset and recovery support
929be53 drm/i915: Export per-engine reset count info to debugfs
7e340b7 drm/i915: Add engine reset count to error state
e08d4b6 drm/i915: Cancel reset-engine if we couldn't find an active request
ed3259b drm/i915: Skip reset request if there is one already
4a68c8b drm/i915: Add support for per engine reset recovery
4c53f6a drm/i915: Modify error handler for per engine hang recovery
d30dbab drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4571/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev5)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev5)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v5 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/5/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:446s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:430s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:595s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:513s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:496s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:491s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:420s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:410s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:423s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:489s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:473s fi-kbl-7560u total:278 pass:263 dwarn:5 dfail:0 fail:0 skip:10 time:578s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:468s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:588s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:461s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:498s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:439s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:545s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:417s
9b25870f9fa4548ec2bb40e42fa28f35db2189e1 drm-tip: 2017y-05m-15d-15h-47m-31s UTC integration manifest 8001816 drm/i915: Cancel reset-engine if we couldn't find an active request
7430985 drm/i915: Skip reset request if there is one already
3297c86 drm/i915: Add support for per engine reset recovery
47d3cf1 drm/i915: Modify error handler for per engine hang recovery
3a9b15f drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4701/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev7)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev7)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v7 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/7/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:448s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:432s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:587s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:510s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:498s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:486s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:423s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:418s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:420s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:502s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:465s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:278 pass:263 dwarn:5 dfail:0 fail:0 skip:10 time:573s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:457s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:584s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:464s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:499s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:439s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:405s
9b25870f9fa4548ec2bb40e42fa28f35db2189e1 drm-tip: 2017y-05m-15d-15h-47m-31s UTC integration manifest 568b6eb drm/i915: Cancel reset-engine if we couldn't find an active request
a581675 drm/i915: Skip reset request if there is one already
ce0b6a2 drm/i915: Add support for per engine reset recovery
dbc521d drm/i915: Modify error handler for per engine hang recovery
a421731 drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4702/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev8)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev8)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v8 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/8/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:444s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:585s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:516s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:493s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:483s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:418s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:408s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:416s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:498s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:464s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:467s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:460s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:578s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:468s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:510s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:529s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time:397s
eb3549d312620118dec3a69200894ac8a8fff358 drm-tip: 2017y-05m-17d-13h-53m-40s UTC integration manifest efa35f9 drm/i915: Cancel reset-engine if we couldn't find an active request
67b883b drm/i915: Skip reset request if there is one already
2fe8d13 drm/i915: Add support for per engine reset recovery
a60dcd2 drm/i915: Modify error handler for per engine hang recovery
eb1aebb drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4731/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev9)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev9)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v9 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/9/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:443s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:437s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:583s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:516s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:495s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:490s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:425s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:409s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:418s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:500s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:461s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:459s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:578s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:460s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:500s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:442s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:532s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:405s
ab08cb2750e769d074b2f147c8298ccd0cd08340 drm-tip: 2017y-05m-18d-15h-36m-17s UTC integration manifest e1b2c9d drm/i915: Look for active requests earlier in the reset path
6a89f35 drm/i915: Skip reset request if there is one already
7b53b92 drm/i915: Add support for per engine reset recovery
16115e1 drm/i915: Modify error handler for per engine hang recovery
aef6c1a drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4747/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Gen8+ engine-reset (rev10)
In reply to Michel Thierry== Series Details ==
== Series Details ==
Series: Gen8+ engine-reset (rev10)
URL : https://patchwork.freedesktop.org/series/21868/
State : success
== Summary ==
Series 21868v10 Gen8+ engine-reset
https://patchwork.freedesktop.org/api/1.0/series/21868/revisions/10/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:450s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:443s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:601s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:514s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:496s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:420s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:415s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:416s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:500s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:465s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:459s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:473s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:580s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:461s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:500s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:439s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:539s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:408s
ab08cb2750e769d074b2f147c8298ccd0cd08340 drm-tip: 2017y-05m-18d-15h-36m-17s UTC integration manifest 8a637b4 drm/i915: Look for active requests earlier in the reset path
3fddaa3 drm/i915: Skip reset request if there is one already
b2ce28a drm/i915: Add support for per engine reset recovery
093b0d1 drm/i915: Modify error handler for per engine hang recovery
a3a49b9 drm/i915: Update i915.reset to handle engine resets
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4750/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx