Commit 967a6639 authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: drop redundant sched job cleanup when cs is aborted 

Once command submission failed due to userptr invalidation in
amdgpu_cs_submit, legacy code will perform cleanup of scheduler
job. However, it's not needed at all, as former commit has integrated
job cleanup stuff into amdgpu_job_free. Otherwise, because of double
free, a NULL pointer dereference will occur in such scenario.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2457


Fixes: f7d66fb2 ("drm/amdgpu: cleanup scheduler job initialization v2")
Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9e690184

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+3 −10
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
		r = drm_sched_job_add_dependency(&leader->base, fence);

		if (r) {

			dma_fence_put(fence);

			goto error_cleanup;

			return r;

		}

	}
@@ -1332,7 +1332,8 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	}

	if (r) {

		r = -EAGAIN;

		goto error_unlock;

		mutex_unlock(&p->adev->notifier_lock);

		return r;

	}



	p->fence = dma_fence_get(&leader->base.s_fence->finished);
@@ -1379,14 +1380,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	mutex_unlock(&p->adev->notifier_lock);

	mutex_unlock(&p->bo_list->bo_list_mutex);

	return 0;



error_unlock:

	mutex_unlock(&p->adev->notifier_lock);



error_cleanup:

	for (i = 0; i < p->gang_size; ++i)

		drm_sched_job_cleanup(&p->jobs[i]->base);

	return r;

}



/* Cleanup the parser structure */