On 10/03/2022 20:24, John Harrison wrote:
On 3/10/2022 01:27, Tvrtko Ursulin wrote:My recollection is that you clearly stated the i915 driver should not be overriding the user's settings. To me, that makes any override an illegal operation.On 09/03/2022 21:16, John Harrison wrote:On 3/8/2022 01:41, Tvrtko Ursulin wrote:You were the one arguing that the driver was illegally overriding the user's explicitly chosen settings, including the compile time configOn 03/03/2022 22:37, John.C.Harrison@xxxxxxxxx wrote:From: John Harrison <John.C.Harrison@xxxxxxxxx> A workaround was added to the driver to allow OpenCL workloads to run 'forever' by disabling pre-emption on the RCS engine for Gen12. It is not totally unbound as the heartbeat will kick in eventually and cause a reset of the hung engine. However, this does not work well in GuC submission mode. In GuC mode, the pre-emption timeout is how GuC detects hung contexts and triggers a per engine reset. Thus, disabling the timeout means also losing all per engine reset ability. A full GT reset will still occur when the heartbeat finally expires, but that is a much more destructive and undesirable mechanism. The purpose of the workaround is actually to give OpenCL tasks longer to reach a pre-emption point after a pre-emption request has been issued. This is necessary because Gen12 does not support mid-thread pre-emption and OpenCL can have long running threads. So, rather than disabling the timeout completely, just set it to a 'long' value. v2: Review feedback from Tvrtko - must hard code the 'long' value instead of determining it algorithmically. So make it an extra CONFIG definition. Also, remove the execlist centric comment from the existing pre-emption timeout CONFIG option given that it applies to more than just execlists. Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx>Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx> (v1)Acked-by: Michal Mrozek <michal.mrozek@xxxxxxxxx> ---drivers/gpu/drm/i915/Kconfig.profile | 26 +++++++++++++++++++----drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 ++++++-- 2 files changed, 29 insertions(+), 6 deletions(-)diff --git a/drivers/gpu/drm/i915/Kconfig.profile b/drivers/gpu/drm/i915/Kconfig.profileindex 39328567c200..7cc38d25ee5c 100644 --- a/drivers/gpu/drm/i915/Kconfig.profile +++ b/drivers/gpu/drm/i915/Kconfig.profile @@ -57,10 +57,28 @@ config DRM_I915_PREEMPT_TIMEOUT default 640 # milliseconds helpHow long to wait (in milliseconds) for a preemption event to occur - when submitting a new context via execlists. If the current context - does not hit an arbitration point and yield to HW before the timer - expires, the HW will be reset to allow the more important context- to execute.+ when submitting a new context. If the current context does not hit + an arbitration point and yield to HW before the timer expires, the + HW will be reset to allow the more important context to execute.+ + This is adjustable via + /sys/class/drm/card?/engine/*/preempt_timeout_ms + + May be 0 to disable the timeout. ++ The compiled in default may get overridden at driver probe time on + certain platforms and certain engines which will be reflected in the+ sysfs control. + +config DRM_I915_PREEMPT_TIMEOUT_COMPUTE + int "Preempt timeout for compute engines (ms, jiffy granularity)" + default 7500 # milliseconds + help+ How long to wait (in milliseconds) for a preemption event to occur + when submitting a new context to a compute capable engine. If the + current context does not hit an arbitration point and yield to HW + before the timer expires, the HW will be reset to allow the more+ important context to execute. This is adjustable via /sys/class/drm/card?/engine/*/preempt_timeout_msdiff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.cindex 4185c7338581..cc0954ad836a 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c@@ -438,9 +438,14 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id,engine->props.timeslice_duration_ms = CONFIG_DRM_I915_TIMESLICE_DURATION; - /* Override to uninterruptible for OpenCL workloads. */ + /*+ * Mid-thread pre-emption is not available in Gen12. Unfortunately, + * some OpenCL workloads run quite long threads. That means they get+ * reset due to not pre-empting in a timely manner. So, bump the+ * pre-emption timeout value to be much higher for compute engines.+ */if (GRAPHICS_VER(i915) == 12 && (engine->flags & I915_ENGINE_HAS_RCS_REG_STATE))- engine->props.preempt_timeout_ms = 0;+ engine->props.preempt_timeout_ms = CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE;I wouldn't go as far as adding a config option since as it is it only applies to Gen12 but Kconfig text says nothing about that. And I am not saying you should add a Gen12 specific config option, that would be weird. So IMO just drop it.This is a bit out of context and illegally don't think used, so misrepresents the earlier discussion. And I certainly did not suggest a kconfig option.You did not suggest a Kconfig option but the settings in question are all coming from existing Kconfig options. Putting an explicit "timeout = 7500;" in the code is the worst of all worlds. It is an override of a user setting and it is an unmodifiable magic number. The first you have stated is not allowed and the second is one of the biggest no-no's of any code review. Magic number randomly splatted in the code? Nack, do it properly.So in this case, I don't see that there is much choice except to add a new Kconfig option for the override.
From memory, I don't think I said override is not allowed. I used the override argument in a different context. But honestly I don't feel like digging that up at this point since this is just going on for too long.
In principle adding kconfig options should be avoided and in this case question is cost vs benefit. What is the benefit? Who will tune it, why, and using what knowledge?
I have asked if we can get compute UMD to give us some numbers relating to typical desktop workloads but did not get anything.
Currently we override to zero, which is what they wanted. Now we are thinking of overriding to 7.5s, which they acked, but it's not very transparent what is the thinking behind it.
It simply looks we said 7.5s because that's what gives similar worst case before reset compared to existing out of the box setup, while allowing GuC engine resets to actually work.
I'd personally go for 2.5s, for the same weak reasons of it being similar to existing timeout, and extension of every heartbeat interval. But you thought 2.5s was too short, I guess, or preferred to view heartbeat as decoupled timeline (barring the last one which *has* to couple). Which is fine by me. So we agreed to compromise on that and moved on.
So meh. What we end up with is not worse than it was and not having a kconfig saves you a complication...
options. Just having a hardcoded magic number in the driver is the absolute worst kind of override there is.>And technically, the config option is not Gen12 specific. It is actually compute specific, hence the name. It just so happens that only Gen12 onwards has compute engines. I can add an extra line to the Kconfig description if you want "NB: compute engines only exist on Gen12 but do include the RCS engine on Gen12".I am not unconditionally against it but it feels it creates more problems than gives solutions.In kconfig help you say "compute *capable* engine". Here you say only Gen12 has compute engines. Well before Gen12 render is compute capable, but then how implemented it does not apply which is not good.Sorry, yes. For some reason I was thinking compute came in with Gen12.So "when submitting a new context to a compute capable engine on Gen12 and later platforms"? And maybe add a _GEN12 suffix to the config name itself?Given the runtime override has the only purpose of working around broken hardware then I'd still say to drop it. But if you can come up with help text which won't be misleading and still not overly complicated I am not opposing it.
..."and later" would be wrong, you'd have to change it at some point. Not least that the patch as proposed does "== 12", not ">= 12". And we can't use the term Gen right? List all the affected platform names? Keep patching up the help text as platforms are added? Or do we know the end point already?
In summary, I will not oppose it if we can have a kconfig text which is accurate, useful and not a maintenance burden.
Regards, Tvrtko
