| Message ID | 20200701084053.6086-2-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/33] drm/i915/gt: Harden the heartbeat against a stuck driver | expand |
Chris Wilson <chris@chris-wilson.co.uk> writes: > As we ensure that the heartbeat is reasonably fast (and should not > block), move the heartbeat work into the system_highprio_wq to avoid > having this essential task be blocked behind other slow work, such as > our own retire_work_handler. > > References: https://gitlab.freedesktop.org/drm/intel/-/issues/2119 > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c > index 1663ab5c68a5..3699fa8a79e8 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c > @@ -32,7 +32,7 @@ static bool next_heartbeat(struct intel_engine_cs *engine) > delay = msecs_to_jiffies_timeout(delay); > if (delay >= HZ) > delay = round_jiffies_up_relative(delay); > - mod_delayed_work(system_wq, &engine->heartbeat.work, delay); > + mod_delayed_work(system_highpri_wq, &engine->heartbeat.work, delay); > > return true; > } > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c index 1663ab5c68a5..3699fa8a79e8 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c @@ -32,7 +32,7 @@ static bool next_heartbeat(struct intel_engine_cs *engine) delay = msecs_to_jiffies_timeout(delay); if (delay >= HZ) delay = round_jiffies_up_relative(delay); - mod_delayed_work(system_wq, &engine->heartbeat.work, delay); + mod_delayed_work(system_highpri_wq, &engine->heartbeat.work, delay); return true; }
As we ensure that the heartbeat is reasonably fast (and should not block), move the heartbeat work into the system_highprio_wq to avoid having this essential task be blocked behind other slow work, such as our own retire_work_handler. References: https://gitlab.freedesktop.org/drm/intel/-/issues/2119 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)