drm/amdgpu:fix gpu recover missing skipping(v2)

if app close CTX right after IB submit, gpu recover
will fail to find out the entity behind this guilty
job thus lead to no job skipping for this guilty job.

to fix this corner case just move the increasement of
job->karma out of the entity iteration.

v2:
only do karma increasment if bad->s_priority != KERNEL
because we always consider KERNEL job be correct and always
want to recover an unfinished kernel job (sometimes kernel
job is interrupted by VF FLR or other GPU hang event)

Signed-off-by: Monk Liu <[email protected]>
Reviewed-by: Christian König <[email protected]>
Reviewed-By: Xiangliang Yu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 941b5920b97b0b4bc794f1a8b8f8d03f5f1aa14a..53ea7e12d219dbed6652d960dda1b0cf8d03a2a7 100644 (file)
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -463,7 +463,8 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched, struct amd_sched_jo
        }
        spin_unlock(&sched->job_list_lock);
 
-       if (bad) {
+       if (bad && bad->s_priority != AMD_SCHED_PRIORITY_KERNEL) {
+               atomic_inc(&bad->karma);
                /* don't increase @bad's karma if it's from KERNEL RQ,
                 * becuase sometimes GPU hang would cause kernel jobs (like VM updating jobs)
                 * corrupt but keep in mind that kernel jobs always considered good.
@@ -474,7 +475,7 @@ void amd_sched_hw_job_reset(struct amd_gpu_scheduler *sched, struct amd_sched_jo
                        spin_lock(&rq->lock);
                        list_for_each_entry_safe(entity, tmp, &rq->entities, list) {
                                if (bad->s_fence->scheduled.context == entity->fence_context) {
-                                   if (atomic_inc_return(&bad->karma) > bad->sched->hang_limit)
+                                   if (atomic_read(&bad->karma) > bad->sched->hang_limit)
                                                if (entity->guilty)
                                                        atomic_set(entity->guilty, 1);
                                        break;