Commit 37865e02 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher

drm/amdkfd: Fix eviction fence handling

Handle case that dma_fence_get_rcu_safe returns NULL.

If restore work is already scheduled, only update its timer. The same
work item cannot be queued twice, so undo the extra queue eviction.

Fixes: 9a1c1339 ("drm/amdkfd: Run restore_workers on freezable WQs")
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Tested-by: default avatarGang BA <Gang.Ba@amd.com>
Reviewed-by: default avatarGang BA <Gang.Ba@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 2eb9dd49
...@@ -1922,6 +1922,8 @@ static int signal_eviction_fence(struct kfd_process *p) ...@@ -1922,6 +1922,8 @@ static int signal_eviction_fence(struct kfd_process *p)
rcu_read_lock(); rcu_read_lock();
ef = dma_fence_get_rcu_safe(&p->ef); ef = dma_fence_get_rcu_safe(&p->ef);
rcu_read_unlock(); rcu_read_unlock();
if (!ef)
return -EINVAL;
ret = dma_fence_signal(ef); ret = dma_fence_signal(ef);
dma_fence_put(ef); dma_fence_put(ef);
...@@ -1949,10 +1951,9 @@ static void evict_process_worker(struct work_struct *work) ...@@ -1949,10 +1951,9 @@ static void evict_process_worker(struct work_struct *work)
* they are responsible stopping the queues and scheduling * they are responsible stopping the queues and scheduling
* the restore work. * the restore work.
*/ */
if (!signal_eviction_fence(p)) if (signal_eviction_fence(p) ||
queue_delayed_work(kfd_restore_wq, &p->restore_work, mod_delayed_work(kfd_restore_wq, &p->restore_work,
msecs_to_jiffies(PROCESS_RESTORE_TIME_MS)); msecs_to_jiffies(PROCESS_RESTORE_TIME_MS)))
else
kfd_process_restore_queues(p); kfd_process_restore_queues(p);
pr_debug("Finished evicting pasid 0x%x\n", p->pasid); pr_debug("Finished evicting pasid 0x%x\n", p->pasid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment