Commit 2a1eb1a3 authored by Horatio Zhang's avatar Horatio Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: fix Null pointer dereference error in amdgpu_device_recover_vram 



Use the function of amdgpu_bo_vm_destroy to handle the resource release
of shadow bo. During the amdgpu_mes_self_test, shadow bo released, but
vmbo->shadow_list was not, which caused a null pointer reference error
in amdgpu_device_recover_vram when GPU reset.

Fixes: 6c032c37 ("drm/amdgpu: Fix vram recover doesn't work after whole GPU reset (v2)")
Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Signed-off-by: default avatarHoratio Zhang <Hongkun.Zhang@amd.com>
Acked-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 30c3d3b7

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

+4 −6
Original line number Diff line number Diff line
@@ -79,9 +79,10 @@ static void amdgpu_bo_user_destroy(struct ttm_buffer_object *tbo) 
static void amdgpu_bo_vm_destroy(struct ttm_buffer_object *tbo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);

	struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);

	struct amdgpu_bo *shadow_bo = ttm_to_amdgpu_bo(tbo), *bo;

	struct amdgpu_bo_vm *vmbo;



	bo = shadow_bo->parent;

	vmbo = to_amdgpu_bo_vm(bo);

	/* in case amdgpu_device_recover_vram got NULL of bo->parent */

	if (!list_empty(&vmbo->shadow_list)) {
@@ -694,11 +695,6 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev, 
		return r;



	*vmbo_ptr = to_amdgpu_bo_vm(bo_ptr);

	INIT_LIST_HEAD(&(*vmbo_ptr)->shadow_list);

	/* Set destroy callback to amdgpu_bo_vm_destroy after vmbo->shadow_list

	 * is initialized.

	 */

	bo_ptr->tbo.destroy = &amdgpu_bo_vm_destroy;

	return r;

}
@@ -715,6 +711,8 @@ void amdgpu_bo_add_to_shadow_list(struct amdgpu_bo_vm *vmbo) 


	mutex_lock(&adev->shadow_list_lock);

	list_add_tail(&vmbo->shadow_list, &adev->shadow_list);

	vmbo->shadow->parent = amdgpu_bo_ref(&vmbo->bo);

	vmbo->shadow->tbo.destroy = &amdgpu_bo_vm_destroy;

	mutex_unlock(&adev->shadow_list_lock);

}

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

+0 −1
Original line number Diff line number Diff line
@@ -564,7 +564,6 @@ int amdgpu_vm_pt_create(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
		return r;

	}



	(*vmbo)->shadow->parent = amdgpu_bo_ref(bo);

	amdgpu_bo_add_to_shadow_list(*vmbo);



	return 0;