Closing a file only dropped ivpu_postclose()'s own reference on file_priv; the context and command queue teardown happened later in file_priv_release(), once every in-flight job completed and dropped its own reference. Since nothing explicitly canceled a context's command queues or jobs on close, any job still in flight kept running in the background after its owning process exited, until it completed on its own or the device's own TDR intervened. Make ivpu_postclose() explicitly abort the context's command queues and signal and destroy all of its pending jobs via the new ivpu_context_abort_all_jobs().
Signed-off-by: Karol Wachowski <[email protected]> --- drivers/accel/ivpu/ivpu_drv.c | 11 +++++++++++ drivers/accel/ivpu/ivpu_job.c | 11 +++++++++++ drivers/accel/ivpu/ivpu_job.h | 1 + 3 files changed, 23 insertions(+) diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c index 647684219e9d..d7faabe0f676 100644 --- a/drivers/accel/ivpu/ivpu_drv.c +++ b/drivers/accel/ivpu/ivpu_drv.c @@ -393,6 +393,17 @@ static void ivpu_postclose(struct drm_device *dev, struct drm_file *file) ivpu_dbg(vdev, FILE, "file_priv close: ctx %u process %s pid %d\n", file_priv->ctx.id, current->comm, task_pid_nr(current)); + if (pm_runtime_get_if_active(vdev->drm.dev) > 0) { + mutex_lock(&file_priv->lock); + if (file_priv->bound && !file_priv->aborted) + ivpu_context_abort_locked(file_priv); + mutex_unlock(&file_priv->lock); + + ivpu_context_abort_all_jobs(vdev, file_priv->ctx.id); + + ivpu_rpm_put(vdev); + } + ivpu_ms_cleanup(file_priv); ivpu_file_priv_put(&file_priv); } diff --git a/drivers/accel/ivpu/ivpu_job.c b/drivers/accel/ivpu/ivpu_job.c index 084d825f744d..fa04f79e8f7b 100644 --- a/drivers/accel/ivpu/ivpu_job.c +++ b/drivers/accel/ivpu/ivpu_job.c @@ -725,6 +725,17 @@ void ivpu_cmdq_abort_all_jobs(struct ivpu_device *vdev, u32 ctx_id, u32 cmdq_id) mutex_unlock(&vdev->submitted_jobs_lock); } +void ivpu_context_abort_all_jobs(struct ivpu_device *vdev, u32 ctx_id) +{ + struct ivpu_job *job; + unsigned long id; + + guard(mutex)(&vdev->submitted_jobs_lock); + xa_for_each(&vdev->submitted_jobs_xa, id, job) + if (job->file_priv->ctx.id == ctx_id) + ivpu_job_signal_and_destroy(vdev, id, DRM_IVPU_JOB_STATUS_ABORTED); +} + static int ivpu_job_submit(struct ivpu_job *job, u8 priority, u32 cmdq_id) { struct ivpu_file_priv *file_priv = job->file_priv; diff --git a/drivers/accel/ivpu/ivpu_job.h b/drivers/accel/ivpu/ivpu_job.h index 6e32fea1eb62..f8b27e9a803f 100644 --- a/drivers/accel/ivpu/ivpu_job.h +++ b/drivers/accel/ivpu/ivpu_job.h @@ -89,6 +89,7 @@ void ivpu_context_abort_locked(struct ivpu_file_priv *file_priv); void ivpu_cmdq_release_all_locked(struct ivpu_file_priv *file_priv); void ivpu_cmdq_reset_all_contexts(struct ivpu_device *vdev); void ivpu_cmdq_abort_all_jobs(struct ivpu_device *vdev, u32 ctx_id, u32 cmdq_id); +void ivpu_context_abort_all_jobs(struct ivpu_device *vdev, u32 ctx_id); void ivpu_job_done_consumer_init(struct ivpu_device *vdev); void ivpu_job_done_consumer_fini(struct ivpu_device *vdev); -- 2.43.0
