This is a note to let you know that I've just added the patch titled
drm/amdkfd: Fix rescheduling of restore worker
to the 6.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdkfd-fix-rescheduling-of-restore-worker.patch
and it can be found in the queue-6.8 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e26305f369ed0e087a043c2cdc76f3d9a6efb3bd Mon Sep 17 00:00:00 2001
From: Felix Kuehling <felix.kuehling@xxxxxxx>
Date: Fri, 19 Apr 2024 13:25:58 -0400
Subject: drm/amdkfd: Fix rescheduling of restore worker
From: Felix Kuehling <felix.kuehling@xxxxxxx>
commit e26305f369ed0e087a043c2cdc76f3d9a6efb3bd upstream.
Handle the case that the restore worker was already scheduled by another
eviction while the restore was in progress.
Fixes: 9a1c1339abf9 ("drm/amdkfd: Run restore_workers on freezable WQs")
Signed-off-by: Felix Kuehling <felix.kuehling@xxxxxxx>
Reviewed-by: Philip Yang <Philip.Yang@xxxxxxx>
Tested-by: Yunxiang Li <Yunxiang.Li@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -2011,9 +2011,9 @@ static void restore_process_worker(struc
if (ret) {
pr_debug("Failed to restore BOs of pasid 0x%x, retry after %d ms\n",
p->pasid, PROCESS_BACK_OFF_TIME_MS);
- ret = queue_delayed_work(kfd_restore_wq, &p->restore_work,
- msecs_to_jiffies(PROCESS_BACK_OFF_TIME_MS));
- WARN(!ret, "reschedule restore work failed\n");
+ if (mod_delayed_work(kfd_restore_wq, &p->restore_work,
+ msecs_to_jiffies(PROCESS_RESTORE_TIME_MS)))
+ kfd_process_restore_queues(p);
}
}
Patches currently in stable-queue which might be from felix.kuehling@xxxxxxx are
queue-6.8/drm-amdkfd-fix-eviction-fence-handling.patch
queue-6.8/drm-amdkfd-fix-rescheduling-of-restore-worker.patch
