[PATCH v2 10/11] drm/panfrost: Soft-stop and resume a job that outlives the timeout
From: Arun Iyengar via B4 Relay
Date: Thu Nov 12 2026 - 04:32:32 EST
From: Arun Iyengar <aiyengar1990@xxxxxxxxx>
JOB_TIMEOUT_MS is 500 ms, and when it fires panfrost resets the GPU and
the job is lost. But a job that runs longer is not necessarily hung:
OpenCL kernels and heavy fragment jobs legitimately take seconds on a
small GPU. On a Mali-G31 (one shader core) that breaks, among others:
- OpenCL CTS Integer Ops quick_long_math and quick_ulong_math (long16
64-bit division, > 500 ms per kernel): each subtest logs
panfrost 1800000.gpu: gpu sched timeout, js=1, config=0x7300, status=0x8, head=0xa0161c0, tail=0xa0161c0
(status 0x8 = ACTIVE) and fails with the work-items after the reset
never written; Thread Dimensions quick_2d/3d lose whole rows the same
way.
- KHR-GLES31.core.blend_equation_advanced.test_coherency.mixedSequence:
a 44-draw fragment job on a 1024x1024 target needs about 0.7 s, and
the tiles it had not reached at 500 ms read back as 0,0,0,0.
- dEQP-VK.spirv_assembly.type.vec4.*_frag cases (a loop over the whole
dataset in every fragment): "Incomplete job or timeout".
The Arm driver time-slices instead: a job is soft-stopped after its
time slice and resumed later, it is hard-stopped only when it has not
stopped after 5 s (JS_HARD_STOP_TICKS_SS = 50 ticks of 100 ms), and the
GPU is reset only when the hard stop has not taken effect 0.5 s after
that (JS_RESET_TICKS_SS = 55). Do the same from the timeout handler:
- a slot whose job is still ACTIVE when the timeout fires is
soft-stopped and its job resumed from JS_TAIL, without a GPU reset and
without raising its karma; a soft-stop takes effect at a task boundary
only, after the tasks already issued have completed, so such a slot
gets JOB_SOFT_STOP_TIMEOUT_MS (5 s) to go idle, idle or faulted slots
keep the 10 ms;
- a slot still active after that is hard-stopped, which ends its job at
once with TERMINATED (-ECANCELED); the stopped jobs on the other slots
are resumed, nothing is reset. The job that did not stop is hung, so
it gets its karma raised and a devcoredump, as a hung job did before;
- the GPU is reset when the hard stop has not taken effect after
JOB_HARD_STOP_TIMEOUT_MS (0.5 s); the job that did not stop is then
failed with -ECANCELED instead of being restarted from scratch, where
it would only time out again. Jobs that were only given the 10 ms of a
reset for another reason are restarted, as before;
- a reset that is asked for while the slots are being stopped (a job
fault that needs one, the MMU) is not lost: the timeout only marks
reset.pending for a stop (PANFROST_RESET_STOP_ONLY), a request for a
reset overrides that, and the GPU is then reset;
- a job that completes between the timeout handler's fence check and its
JS_STATUS read is not taken for a hung job: with its DONE interrupt
pending or being handled, the timeout is spurious;
- without a reset, the address space references of the jobs cancelled
from _NEXT are released (a reset has panfrost_mmu_reset() drop them),
and a runtime PM reference is held across the stop and the
resubmission, so that an autosuspend cannot power the GPU off between
the two.
The timeout of a job that is merely long is now a dev_dbg(); faults,
jobs that do not stop and the other reset paths are reported as before,
with the status of every slot.
With this, on the Mali-G31 the Integer Ops, Thread Dimensions and
mixedSequence cases pass, and the two vec4 i8/u64 bit_field_insert
count64 fragment cases, which need several seconds to reach a task
boundary, pass in 4-6 s.
Signed-off-by: Arun Iyengar <aiyengar1990@xxxxxxxxx>
---
drivers/gpu/drm/panfrost/panfrost_job.c | 239 +++++++++++++++++++++++++++-----
1 file changed, 207 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index 28842c572..a920d112a 100644
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -27,6 +27,25 @@
#define MAX_JM_CTX_PER_FILE 64
#define JOB_TIMEOUT_MS 500
+/* How long a soft-stopped slot gets to reach a task boundary before its job is
+ * hard-stopped, and how long the hard stop gets before the GPU is reset. These
+ * follow the Arm driver's job slot policy (mali_kbase_config_defaults.h): a job
+ * is soft-stopped after its 100 ms time slice (JS_SOFT_STOP_TICKS = 1 tick),
+ * hard-stopped when it has not stopped by tick 50 (JS_HARD_STOP_TICKS_SS, 5 s)
+ * and the GPU is reset at tick 55 (JS_RESET_TICKS_SS, 5.5 s). A soft-stop
+ * takes effect at a task boundary only, after the tasks already issued (a
+ * compute job's work-groups, a fragment job's tiles) have run to completion,
+ * and a heavy shader needs seconds for that.
+ */
+#define JOB_SOFT_STOP_TIMEOUT_MS 5000
+#define JOB_HARD_STOP_TIMEOUT_MS 500
+
+/* reset.pending while panfrost_reset() is only to stop the slots, to resume
+ * the jobs of a timeout that found its job still running. A request for a
+ * real reset (1) that comes in meanwhile overrides it.
+ */
+#define PANFROST_RESET_STOP_ONLY 2
+
#define job_write(dev, reg, data) writel(data, dev->iomem + (reg))
#define job_read(dev, reg) readl(dev->iomem + (reg))
@@ -165,8 +184,9 @@ panfrost_dequeue_job(struct panfrost_device *pfdev, int slot)
{
struct panfrost_job *job = pfdev->jobs[slot][0];
- /* An event for a slot we have no job on. Not fatal, as every caller
- * copes with a NULL job; a WARN, not an Oops.
+ /* An event for a slot we have no job on: a resubmission raced with
+ * the first run of the job (see panfrost_reset()). Not fatal, as
+ * every caller copes with a NULL job; a WARN, not an Oops.
*/
if (WARN_ON(!job))
return NULL;
@@ -660,18 +680,39 @@ static bool panfrost_slots_idle(struct panfrost_device *pfdev)
return true;
}
+/* The job running on a slot: the one in _NEXT once the first has completed,
+ * with its interrupt not handled yet.
+ */
+static struct panfrost_job *
+panfrost_running_job(struct panfrost_device *pfdev, unsigned int slot)
+{
+ if (pfdev->jobs[slot][1] &&
+ (job_read(pfdev, JOB_INT_RAWSTAT) & JOB_INT_MASK_DONE(slot)))
+ return pfdev->jobs[slot][1];
+
+ return pfdev->jobs[slot][0];
+}
+
static void
panfrost_reset(struct panfrost_device *pfdev,
- struct drm_sched_job *bad)
+ struct drm_sched_job *bad, bool job_active)
{
struct panfrost_job *evicted[NUM_JOB_SLOTS] = {};
+ struct panfrost_job *hung[NUM_JOB_SLOTS] = {};
+ bool cookie, idle, stop_failed = false, reset_gpu;
unsigned int i, j;
- bool cookie, idle;
int ret;
if (!atomic_read(&pfdev->reset.pending))
return;
+ /* The jobs we stop drop their runtime PM references before we submit
+ * them again. Keep the GPU powered in between: once they have, nothing
+ * else keeps it from being runtime suspended under the rest of this
+ * function.
+ */
+ pm_runtime_get_noresume(pfdev->base.dev);
+
/* Stop the schedulers.
*
* FIXME: We temporarily get out of the dma_fence_signalling section
@@ -690,7 +731,8 @@ panfrost_reset(struct panfrost_device *pfdev,
cookie = dma_fence_begin_signalling();
- if (bad)
+ /* A job that is merely long is not guilty of anything. */
+ if (bad && !job_active)
drm_sched_increase_karma(bad);
/* Mask job interrupts and synchronize to make sure we won't be
@@ -722,26 +764,90 @@ panfrost_reset(struct panfrost_device *pfdev,
}
spin_unlock(&pfdev->js->job_lock);
- /* Wait at most 10ms for soft-stops to complete. Every slot must have
- * gone idle before we touch the queues: a job that is still stopping
- * (or finishing) raises its interrupt later, when its entry in
- * pfdev->jobs[] is gone or belongs to its own resubmission.
+ /* Every slot must have gone idle before we touch the queues: a job
+ * that is still stopping (or finishing) raises its interrupt later,
+ * when its entry in pfdev->jobs[] is gone or belongs to its own
+ * resubmission, and the second start of that job then runs on a slot
+ * we have no job for.
+ *
+ * A slot that was idle or faulted gets 10 ms. A job that was still
+ * active gets the time the Arm driver gives it to reach a task
+ * boundary (JOB_SOFT_STOP_TIMEOUT_MS). If it has not stopped by then
+ * it is hard-stopped, which terminates it at once and fails it
+ * (TERMINATED, see panfrost_job_handle_err()), instead of resetting
+ * the GPU under every job on it; the GPU is reset only when the hard
+ * stop does not take effect either.
*/
- ret = read_poll_timeout(panfrost_slots_idle, idle, idle, 10, 10000,
+ ret = read_poll_timeout(panfrost_slots_idle, idle, idle,
+ job_active ? 200 : 10,
+ job_active ? JOB_SOFT_STOP_TIMEOUT_MS * 1000 : 10000,
false, pfdev);
+ if (ret && job_active) {
+ dev_err(pfdev->base.dev,
+ "Soft-stop failed after %u ms (js status 0x%x 0x%x 0x%x), hard-stopping the active slots\n",
+ JOB_SOFT_STOP_TIMEOUT_MS,
+ job_read(pfdev, JS_STATUS(0)), job_read(pfdev, JS_STATUS(1)),
+ job_read(pfdev, JS_STATUS(2)));
+
+ /* A job that has not reached a task boundary in all that time
+ * is hung, not long: count it against its context and dump
+ * it, as a timeout that resets the GPU does.
+ */
+ for (i = 0; i < NUM_JOB_SLOTS; i++) {
+ if (job_read(pfdev, JS_STATUS(i)) ==
+ DRM_PANFROST_EXCEPTION_ACTIVE)
+ hung[i] = panfrost_running_job(pfdev, i);
+ if (hung[i])
+ drm_sched_increase_karma(&hung[i]->base);
+ }
+
+ /* The dump allocates memory, which the fence signalling
+ * section does not allow (see the resubmission below).
+ */
+ dma_fence_end_signalling(cookie);
+ for (i = 0; i < NUM_JOB_SLOTS; i++) {
+ if (hung[i])
+ panfrost_core_dump(hung[i]);
+ }
+ cookie = dma_fence_begin_signalling();
+
+ for (i = 0; i < NUM_JOB_SLOTS; i++) {
+ if (job_read(pfdev, JS_STATUS(i)) ==
+ DRM_PANFROST_EXCEPTION_ACTIVE)
+ job_write(pfdev, JS_COMMAND(i), JS_COMMAND_HARD_STOP);
+ }
+
+ ret = read_poll_timeout(panfrost_slots_idle, idle, idle, 200,
+ JOB_HARD_STOP_TIMEOUT_MS * 1000, false,
+ pfdev);
+ stop_failed = ret;
+ }
+
if (ret)
- dev_err(pfdev->base.dev, "Soft-stop failed\n");
+ dev_err(pfdev->base.dev,
+ "%s failed (js status 0x%x 0x%x 0x%x), resetting the GPU\n",
+ job_active ? "Hard-stop" : "Soft-stop",
+ job_read(pfdev, JS_STATUS(0)), job_read(pfdev, JS_STATUS(1)),
+ job_read(pfdev, JS_STATUS(2)));
/* Handle the remaining interrupts before we reset. */
panfrost_jm_handle_irqs(pfdev);
+ /* Reset the GPU unless the slots only had to be stopped and did stop,
+ * and nobody asked for a reset meanwhile: a job fault that needs one
+ * (in the interrupts just handled) or the MMU.
+ */
+ reset_gpu = !job_active || stop_failed ||
+ atomic_read(&pfdev->reset.pending) != PANFROST_RESET_STOP_ONLY;
+
/* Remaining interrupts have been handled, but we might still have
- * stuck jobs. Let's make sure the PM counters stay balanced by
+ * stuck jobs, and jobs that were waiting in _NEXT when it was
+ * cancelled. Let's make sure the PM counters stay balanced by
* manually calling pm_runtime_put_noidle() and
- * panfrost_devfreq_record_idle() for each stuck job.
+ * panfrost_devfreq_record_idle() for each of them.
* Let's also make sure the cycle counting register's refcnt is
- * kept balanced to prevent it from running forever
+ * kept balanced to prevent it from running forever.
*/
spin_lock(&pfdev->js->job_lock);
for (i = 0; i < NUM_JOB_SLOTS; i++) {
@@ -752,21 +858,53 @@ panfrost_reset(struct panfrost_device *pfdev,
pfdev->jobs[i][pfdev->jobs[i][0] ? 1 : 0] = evicted[i];
for (j = 0; j < ARRAY_SIZE(pfdev->jobs[0]) && pfdev->jobs[i][j]; j++) {
- if (pfdev->jobs[i][j]->requirements & PANFROST_JD_REQ_CYCLE_COUNT ||
- pfdev->jobs[i][j]->is_profiled)
- panfrost_cycle_counter_put(pfdev->jobs[i][j]->pfdev);
+ struct panfrost_job *job = pfdev->jobs[i][j];
+
+ if (job->requirements & PANFROST_JD_REQ_CYCLE_COUNT ||
+ job->is_profiled)
+ panfrost_cycle_counter_put(job->pfdev);
pm_runtime_put_noidle(pfdev->base.dev);
panfrost_devfreq_record_idle(&pfdev->pfdevfreq);
+
+ /* The GPU reset wipes the address space assignments;
+ * without one, release the reference the submission
+ * took, or the address space can never be reassigned.
+ */
+ if (!reset_gpu)
+ panfrost_mmu_as_put(pfdev, job->mmu);
+
+ /* The job still running on a slot that neither stop
+ * took effect on is what forces the reset. Fail it,
+ * as the Arm driver fails every atom on the hardware
+ * at a reset: restarted from scratch it would hit the
+ * timeout and the reset again. A job that was only
+ * given the 10 ms is restarted, as before.
+ */
+ if (stop_failed && job == hung[i])
+ dma_fence_set_error(&job->base.s_fence->finished,
+ -ECANCELED);
}
}
memset(pfdev->jobs, 0, sizeof(pfdev->jobs));
spin_unlock(&pfdev->js->job_lock);
- /* Proceed with reset now. */
- panfrost_device_reset(pfdev, false);
+ /* Proceed with reset now, unless the slots were simply busy with long
+ * jobs that stopped at a task boundary (or a hard stop ended the one
+ * that did not). The stopped jobs will be resumed from JS_TAIL (see
+ * panfrost_job_handle_err()).
+ */
+ if (reset_gpu) {
+ panfrost_device_reset(pfdev, false);
- /* GPU has been reset, we can clear the reset pending bit. */
- atomic_set(&pfdev->reset.pending, 0);
+ /* GPU has been reset, we can clear the reset pending bit. */
+ atomic_set(&pfdev->reset.pending, 0);
+ } else {
+ /* Leave a reset that was asked for since we looked to the
+ * reset work or timeout handler that asked for it.
+ */
+ atomic_cmpxchg(&pfdev->reset.pending,
+ PANFROST_RESET_STOP_ONLY, 0);
+ }
/* Now resubmit jobs that were previously queued but didn't have a
* chance to finish.
@@ -788,6 +926,8 @@ panfrost_reset(struct panfrost_device *pfdev,
panfrost_jm_enable_interrupts(pfdev);
dma_fence_end_signalling(cookie);
+
+ pm_runtime_put_autosuspend(pfdev->base.dev);
}
static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_job
@@ -796,6 +936,8 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_job
struct panfrost_job *job = to_panfrost_job(sched_job);
struct panfrost_device *pfdev = job->pfdev;
int js = panfrost_job_get_slot(job);
+ bool job_active;
+ u32 js_status;
/*
* If the GPU managed to complete this jobs fence, the timeout has
@@ -820,18 +962,51 @@ static enum drm_gpu_sched_stat panfrost_job_timedout(struct drm_sched_job
return DRM_GPU_SCHED_STAT_NO_HANG;
}
- dev_err(pfdev->base.dev, "gpu sched timeout, js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p",
- js,
- job_read(pfdev, JS_CONFIG(js)),
- job_read(pfdev, JS_STATUS(js)),
- job_read(pfdev, JS_HEAD_LO(js)),
- job_read(pfdev, JS_TAIL_LO(js)),
- sched_job);
+ /*
+ * A slot that is still ACTIVE is not hung, it is running a job that
+ * takes longer than JOB_TIMEOUT_MS. Compute kernels legitimately do.
+ * Soft-stop such a job and resume it, the way the Arm driver
+ * time-slices jobs, instead of resetting the GPU under it; the reset
+ * stays for faults and for jobs that do not stop.
+ */
+ js_status = job_read(pfdev, JS_STATUS(js));
+ job_active = js_status == DRM_PANFROST_EXCEPTION_ACTIVE;
+
+ /* A job that completed after the checks above is not active either:
+ * its interrupt is then pending, or being handled.
+ */
+ if (!job_active) {
+ if (job_read(pfdev, JOB_INT_RAWSTAT) & JOB_INT_MASK_DONE(js))
+ return DRM_GPU_SCHED_STAT_NO_HANG;
+
+ synchronize_irq(pfdev->js->irq);
+ if (dma_fence_is_signaled(job->done_fence))
+ return DRM_GPU_SCHED_STAT_NO_HANG;
+ }
+
+ if (job_active) {
+ dev_dbg(pfdev->base.dev, "job still active after %u ms, js=%d, head=0x%x, sched_job=%p: soft-stopping it to resume",
+ JOB_TIMEOUT_MS, js, job_read(pfdev, JS_HEAD_LO(js)),
+ sched_job);
+ } else {
+ dev_err(pfdev->base.dev, "gpu sched timeout, js=%d, config=0x%x, status=0x%x, head=0x%x, tail=0x%x, sched_job=%p",
+ js,
+ job_read(pfdev, JS_CONFIG(js)),
+ js_status,
+ job_read(pfdev, JS_HEAD_LO(js)),
+ job_read(pfdev, JS_TAIL_LO(js)),
+ sched_job);
- panfrost_core_dump(job);
+ panfrost_core_dump(job);
+ }
- atomic_set(&pfdev->reset.pending, 1);
- panfrost_reset(pfdev, sched_job);
+ /* Ask for a reset, or only for the stop if no reset is pending. */
+ if (job_active)
+ atomic_cmpxchg(&pfdev->reset.pending, 0,
+ PANFROST_RESET_STOP_ONLY);
+ else
+ atomic_set(&pfdev->reset.pending, 1);
+ panfrost_reset(pfdev, sched_job, job_active);
return DRM_GPU_SCHED_STAT_RESET;
}
@@ -854,7 +1029,7 @@ static void panfrost_reset_work(struct work_struct *work)
return;
}
- panfrost_reset(pfdev, NULL);
+ panfrost_reset(pfdev, NULL, false);
pm_runtime_put_autosuspend(pfdev->base.dev);
}
--
2.55.0