Commit 667efb34 authored by André Almeida's avatar André Almeida
Browse files

drm/amdgpu: Fix lifetime of struct amdgpu_task_info after ring reset 



When a ring reset happens, amdgpu calls drm_dev_wedged_event() using
struct amdgpu_task_info *ti as one of the arguments. After using *ti, a
call to amdgpu_vm_put_task_info(ti) is required to correctly track its
lifetime.

However, it's called from a place that the ring reset path never reaches
due to a goto after drm_dev_wedged_event() is called. Move
amdgpu_vm_put_task_info() bellow the exit label to make sure that it's
called regardless of the code path.

amdgpu_vm_put_task_info() can only accept a valid address or NULL as
argument, so initialise *ti to make sure we can call this function if
*ti isn't used.

Fixes: a72002cb ("drm/amdgpu: Make use of drm_wedge_task_info")
Reported-by: default avatarDave Airlie <airlied@gmail.com>
Closes: https://lore.kernel.org/dri-devel/CAPM=9tz0rQP8VZWKWyuF8kUMqRScxqoa6aVdwWw9=5yYxyYQ2Q@mail.gmail.com/


Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/20250704030629.1064397-1-andrealmeid@igalia.com


Signed-off-by: default avatarAndré Almeida <andrealmeid@igalia.com>
parent cf590b23

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

+2 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
	struct amdgpu_ring *ring = to_amdgpu_ring(s_job->sched);

	struct amdgpu_job *job = to_amdgpu_job(s_job);

	struct drm_wedge_task_info *info = NULL;

	struct amdgpu_task_info *ti;

	struct amdgpu_task_info *ti = NULL;

	struct amdgpu_device *adev = ring->adev;

	int idx, r;
@@ -148,8 +148,6 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 


	dma_fence_set_error(&s_job->s_fence->finished, -ETIME);



	amdgpu_vm_put_task_info(ti);



	if (amdgpu_device_should_recover_gpu(ring->adev)) {

		struct amdgpu_reset_context reset_context;

		memset(&reset_context, 0, sizeof(reset_context));
@@ -175,6 +173,7 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
	}



exit:

	amdgpu_vm_put_task_info(ti);

	drm_dev_exit(idx);

	return DRM_GPU_SCHED_STAT_NOMINAL;

}