Thank you for your contribution! Sashiko AI review found 3 potential issues to consider: - [High] accel/rocket: raw IRQ status can re-latch before reset in rocket_reset() - [High] accel/rocket: race with pm_runtime_force_suspend() in rocket_reset() - [Low] accel/rocket: missing Fixes trailer for IRQ race fix in rocket_reset() --
commit 5d8718b3fc39bea11cdb502012dd2c8cf6f0e560 Author: Jiaxing Hu <[email protected]> > accel/rocket: wait for a running IRQ handler before resetting a core > > drm_sched_stop() does not wait for a threaded IRQ handler that is already > running, so call synchronize_irq() after it to make sure the handler has > finished before the reset. > > Before synchronize_irq(), mask the interrupt and clear the raw status, so > that the NPU core cannot report a completion afterwards. > > Do this under job_lock, because the submit path sets the interrupt mask > under the same lock. > > Only touch these registers when the device is powered: check with > pm_runtime_get_if_active(), so that a register access with the power > domain off cannot raise an SError. > > Suggested-by: Igor Paunovic <[email protected]> > Signed-off-by: Jiaxing Hu <[email protected]> > Tested-by: Igor Paunovic <[email protected]> # RK3588, three cores, > induced reset, JOB_TIMEOUT_MS=2 [Severity: Low] This fixes a race in rocket_reset() introduced with job submission. Should this include: Fixes: 0810d5ad88a1 ("accel/rocket: Add job submission IOCTL") > diff --git a/drivers/accel/rocket/rocket_job.c > b/drivers/accel/rocket/rocket_job.c > index 03e5f094f60bf..abef12b86d481 100644 > --- a/drivers/accel/rocket/rocket_job.c > +++ b/drivers/accel/rocket/rocket_job.c > @@ -400,6 +400,16 @@ rocket_reset(struct rocket_core *core, struct > drm_sched_job *bad) > > drm_sched_stop(&core->sched, bad); > > + scoped_guard(mutex, &core->job_lock) { > + if (pm_runtime_get_if_active(core->dev) > 0) { > + rocket_pc_writel(core, INTERRUPT_MASK, 0x0); > + rocket_pc_writel(core, INTERRUPT_CLEAR, 0x1ffff); > + pm_runtime_put_autosuspend(core->dev); > + } > + } [Severity: High] Can pm_runtime_force_suspend() disable the core clocks while rocket_reset() is writing INTERRUPT_MASK and INTERRUPT_CLEAR? core->reset.wq is created without WQ_FREEZABLE, so rocket_reset() can run concurrently with system suspend. drm_sched_stop() subtracts pending job credits from core->sched.credit_count, which makes rocket_job_is_idle() return true while rocket_reset() is still running: CPU0 (core->reset.wq) CPU1 (system suspend) rocket_reset() drm_sched_stop(&core->sched, bad) // credit_count drops to 0 mutex_lock(&core->job_lock) pm_runtime_get_if_active(core->dev) pm_runtime_force_suspend(core->dev) rocket_device_runtime_suspend() rocket_job_is_idle() -> true clk_bulk_disable_unprepare(...) rocket_pc_writel(core, ...) <-- SError / bus hang with clocks off pm_runtime_force_suspend() ignores dev->power.usage_count and rocket_device_runtime_suspend() does not take core->job_lock. In addition, in rocket_core_fini(), an in-flight job holds a runtime PM reference so pm_runtime_dont_use_autosuspend() does not suspend the core, and pm_runtime_disable() sets disable_depth > 0 before rocket_job_fini() cancels the timeout work. pm_runtime_get_if_active() then returns -EINVAL and skips masking and clearing interrupts on the still-active core before synchronize_irq(). > + > + synchronize_irq(core->irq); [Severity: High] Can an in-flight NPU task finish after INTERRUPT_CLEAR is written and re-latch INTERRUPT_RAW_STATUS before rocket_core_reset() stops the core? Unlike rocket_job_handle_irq(), rocket_reset() does not clear OPERATION_ENABLE before writing INTERRUPT_CLEAR, and rocket_core_reset() is only called after synchronize_irq() and iommu_detach_group(). Because rocket_job_irq_handler() checks the unmasked INTERRUPT_RAW_STATUS register on a shared IRQ line (shared with the IOMMU), a task completion together with a shared IRQ can wake the IRQ thread after synchronize_irq() has already returned: CPU0 CPU1 rocket_reset() rocket_pc_writel(..., INTERRUPT_MASK, 0x0) rocket_pc_writel(..., INTERRUPT_CLEAR, 0x1ffff) synchronize_irq(core->irq) // DPU task finishes, hardware sets // PC_INTERRUPT_RAW_STATUS_DPU_0 <shared IOMMU hardirq> rocket_job_irq_handler() rocket_pc_readl(..., INTERRUPT_RAW_STATUS) return IRQ_WAKE_THREAD iommu_detach_group(...) rocket_core_reset(core) rocket_job_irq_handler_thread() rocket_job_handle_irq(core) <-- runs during/after reset rocket_job_handle_irq() can then access registers while the reset lines are asserted or after runtime suspend, or race with a new job started by drm_sched_start(). Also, iommu_detach_group() detaches the IOMMU domain before rocket_core_reset() has stopped the still-running NPU core. Clearing OPERATION_ENABLE under core->job_lock before clearing INTERRUPT_CLEAR, as rocket_job_handle_irq() does, would stop the core before synchronize_irq() and iommu_detach_group(). -- Sashiko AI review ยท https://sashiko.dev/#/patchset/[email protected]?part=3
