Commit 69a79ada authored by Karol Wachowski's avatar Karol Wachowski Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Prevent recovery work from being queued during device removal 



Use disable_work_sync() instead of cancel_work_sync() in ivpu_dev_fini()
to ensure that no new recovery work items can be queued after device
removal has started. Previously, recovery work could be scheduled even
after canceling existing work, potentially leading to use-after-free
bugs if recovery accessed freed resources.

Rename ivpu_pm_cancel_recovery() to ivpu_pm_disable_recovery() to better
reflect its new behavior.

Fixes: 58cde80f ("accel/ivpu: Use dedicated work for job timeout detection")
Cc: stable@vger.kernel.org # v6.8+
Signed-off-by: default avatarKarol Wachowski <karol.wachowski@intel.com>
Reviewed-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://lore.kernel.org/r/20250808110939.328366-1-jacek.lawrynowicz@linux.intel.com
parent 2cb66ae6

drivers/accel/ivpu/ivpu_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static void ivpu_bo_unbind_all_user_contexts(struct ivpu_device *vdev) 
static void ivpu_dev_fini(struct ivpu_device *vdev)

{

	ivpu_jobs_abort_all(vdev);

	ivpu_pm_cancel_recovery(vdev);

	ivpu_pm_disable_recovery(vdev);

	ivpu_pm_disable(vdev);

	ivpu_prepare_for_reset(vdev);

	ivpu_shutdown(vdev);

drivers/accel/ivpu/ivpu_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -417,10 +417,10 @@ void ivpu_pm_init(struct ivpu_device *vdev) 
	ivpu_dbg(vdev, PM, "Autosuspend delay = %d\n", delay);

}



void ivpu_pm_cancel_recovery(struct ivpu_device *vdev)

void ivpu_pm_disable_recovery(struct ivpu_device *vdev)

{

	drm_WARN_ON(&vdev->drm, delayed_work_pending(&vdev->pm->job_timeout_work));

	cancel_work_sync(&vdev->pm->recovery_work);

	disable_work_sync(&vdev->pm->recovery_work);

}



void ivpu_pm_enable(struct ivpu_device *vdev)

drivers/accel/ivpu/ivpu_pm.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct ivpu_pm_info { 
void ivpu_pm_init(struct ivpu_device *vdev);

void ivpu_pm_enable(struct ivpu_device *vdev);

void ivpu_pm_disable(struct ivpu_device *vdev);

void ivpu_pm_cancel_recovery(struct ivpu_device *vdev);

void ivpu_pm_disable_recovery(struct ivpu_device *vdev);



int ivpu_pm_suspend_cb(struct device *dev);

int ivpu_pm_resume_cb(struct device *dev);