drm/amdgpu:make ctx_add_fence interruptible(v2)

otherwise a gpu hang will make application couldn't be killed
under timedout=0 mode

v2:
Fix memoryleak job/job->s_fence issue
unlock mn
remove the ERROR msg after waiting being interrupted

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 9f1202a4182f..c6a214f1e991 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -1129,6 +1129,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
         struct amd_sched_entity *entity = &p->ctx->rings[ring->idx].entity;
         struct amdgpu_job *job;
         unsigned i;
+        uint64_t seq;
+
         int r;
 
         amdgpu_mn_lock(p->mn);
@@ -1158,10 +1160,20 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
         job->fence_ctx = entity->fence_context;
         p->fence = dma_fence_get(&job->base.s_fence->finished);
 
+        r = amdgpu_ctx_add_fence(p->ctx, ring, p->fence, &seq);
+        if (r) {
+                dma_fence_put(p->fence);
+                dma_fence_put(&job->base.s_fence->finished);
+                amdgpu_job_free(job);
+                amdgpu_mn_unlock(p->mn);
+                return r;
+        }
+
         amdgpu_cs_post_dependencies(p);
 
-        cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence);
-        job->uf_sequence = cs->out.handle;
+        cs->out.handle = seq;
+        job->uf_sequence = seq;
+
         amdgpu_job_free_resources(job);
 
         trace_amdgpu_cs_ioctl(job);