AMD-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: amdgpu_device_recover_vram got NULL of shadow->parent
@ 2019-04-16  7:17 wentalou
       [not found] ` <1555399026-17671-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: wentalou @ 2019-04-16  7:17 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: wentalou

amdgpu_bo_destroy had a bug by calling amdgpu_bo_unref outside mutex_lock.
If amdgpu_device_recover_vram executed between amdgpu_bo_unref and list_del_init,
it would get NULL of shadow->parent, then caused Call Trace and GPU reset failed.

Change-Id: I41d7b54605e613e87ee03c3ad89c191063c19230
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index ec9e450..0df8158 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -88,12 +88,16 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
 	if (bo->gem_base.import_attach)
 		drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg);
 	drm_gem_object_release(&bo->gem_base);
-	amdgpu_bo_unref(&bo->parent);
+	/* in case amdgpu_device_recover_vram got NULL of bo->parent */
 	if (!list_empty(&bo->shadow_list)) {
 		mutex_lock(&adev->shadow_list_lock);
 		list_del_init(&bo->shadow_list);
+		amdgpu_bo_unref(&bo->parent);
 		mutex_unlock(&adev->shadow_list_lock);
 	}
+	else
+		amdgpu_bo_unref(&bo->parent);
+
 	kfree(bo->metadata);
 	kfree(bo);
 }
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: amdgpu_device_recover_vram got NULL of shadow->parent
       [not found] ` <1555399026-17671-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
@ 2019-04-16  9:53   ` Christian König
  0 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2019-04-16  9:53 UTC (permalink / raw)
  To: wentalou, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Am 16.04.19 um 09:17 schrieb wentalou:
> amdgpu_bo_destroy had a bug by calling amdgpu_bo_unref outside mutex_lock.
> If amdgpu_device_recover_vram executed between amdgpu_bo_unref and list_del_init,
> it would get NULL of shadow->parent, then caused Call Trace and GPU reset failed.
>
> Change-Id: I41d7b54605e613e87ee03c3ad89c191063c19230
> Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index ec9e450..0df8158 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -88,12 +88,16 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
>   	if (bo->gem_base.import_attach)
>   		drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg);
>   	drm_gem_object_release(&bo->gem_base);
> -	amdgpu_bo_unref(&bo->parent);
> +	/* in case amdgpu_device_recover_vram got NULL of bo->parent */
>   	if (!list_empty(&bo->shadow_list)) {
>   		mutex_lock(&adev->shadow_list_lock);
>   		list_del_init(&bo->shadow_list);
> +		amdgpu_bo_unref(&bo->parent);
>   		mutex_unlock(&adev->shadow_list_lock);
>   	}
> +	else
> +		amdgpu_bo_unref(&bo->parent);
> +

Please just move amdgpu_bo_unref(&bo->parent); after the "if".

Regards,
Christian.

>   	kfree(bo->metadata);
>   	kfree(bo);
>   }

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] drm/amdgpu: amdgpu_device_recover_vram got NULL of shadow->parent
@ 2019-04-16 10:46 wentalou
       [not found] ` <1555411616-18423-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: wentalou @ 2019-04-16 10:46 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: wentalou

amdgpu_bo_destroy had a bug by calling amdgpu_bo_unref outside mutex_lock.
If amdgpu_device_recover_vram executed between amdgpu_bo_unref and list_del_init,
it would get NULL of shadow->parent, then caused Call Trace and GPU reset failed.

Change-Id: I41d7b54605e613e87ee03c3ad89c191063c19230
Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index ec9e450..93b2c5a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -88,12 +88,14 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
 	if (bo->gem_base.import_attach)
 		drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg);
 	drm_gem_object_release(&bo->gem_base);
-	amdgpu_bo_unref(&bo->parent);
+	/* in case amdgpu_device_recover_vram got NULL of bo->parent */
 	if (!list_empty(&bo->shadow_list)) {
 		mutex_lock(&adev->shadow_list_lock);
 		list_del_init(&bo->shadow_list);
 		mutex_unlock(&adev->shadow_list_lock);
 	}
+	amdgpu_bo_unref(&bo->parent);
+
 	kfree(bo->metadata);
 	kfree(bo);
 }
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: amdgpu_device_recover_vram got NULL of shadow->parent
       [not found] ` <1555411616-18423-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
@ 2019-04-16 10:52   ` Christian König
  0 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2019-04-16 10:52 UTC (permalink / raw)
  To: wentalou, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

Am 16.04.19 um 12:46 schrieb wentalou:
> amdgpu_bo_destroy had a bug by calling amdgpu_bo_unref outside mutex_lock.
> If amdgpu_device_recover_vram executed between amdgpu_bo_unref and list_del_init,
> it would get NULL of shadow->parent, then caused Call Trace and GPU reset failed.
>
> Change-Id: I41d7b54605e613e87ee03c3ad89c191063c19230
> Signed-off-by: Wentao Lou <Wentao.Lou@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> index ec9e450..93b2c5a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
> @@ -88,12 +88,14 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)
>   	if (bo->gem_base.import_attach)
>   		drm_prime_gem_destroy(&bo->gem_base, bo->tbo.sg);
>   	drm_gem_object_release(&bo->gem_base);
> -	amdgpu_bo_unref(&bo->parent);
> +	/* in case amdgpu_device_recover_vram got NULL of bo->parent */
>   	if (!list_empty(&bo->shadow_list)) {
>   		mutex_lock(&adev->shadow_list_lock);
>   		list_del_init(&bo->shadow_list);
>   		mutex_unlock(&adev->shadow_list_lock);
>   	}
> +	amdgpu_bo_unref(&bo->parent);
> +
>   	kfree(bo->metadata);
>   	kfree(bo);
>   }

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-16 10:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-16  7:17 [PATCH] drm/amdgpu: amdgpu_device_recover_vram got NULL of shadow->parent wentalou
     [not found] ` <1555399026-17671-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
2019-04-16  9:53   ` Christian König
  -- strict thread matches above, loose matches on Subject: below --
2019-04-16 10:46 wentalou
     [not found] ` <1555411616-18423-1-git-send-email-Wentao.Lou-5C7GfCeVMHo@public.gmane.org>
2019-04-16 10:52   ` Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox