drm/amdgpu: defer cmd/fence/fw buffers destroy on hw_init failure
Subsystems (2)
PATCH 1/1 drm/amdgpu: defer cmd/fence/fw buffers destroy on hw_init failure
As the cleanup jobs performed in pre_fini may still need these buffers. NULL pointer dereference will be triggered without them.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +12 -19
@@ -890,59 +890,52 @@ static int psp_load_fw(struct amdgpu_device *adev) &psp->fence_buf_mc_addr, &psp->fence_buf);if (ret) - goto failed_mem2; + goto failed; ret =amdgpu_bo_create_kernel (adev,PSP_CMD_BUFFER_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &psp->cmd_buf_bo, &psp->cmd_buf_mc_addr, (void **)&psp->cmd_buf_mem);if (ret) - goto failed_mem1; + goto failed;memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE ); ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) {DRM_ERROR ("PSP ring init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_tmr_init (psp);if (ret) {DRM_ERROR ("PSP tmr init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_asd_init (psp);if (ret) {DRM_ERROR ("PSP asd init failed!\n" ); - goto failed_mem; + goto failed; } skip_memalloc: ret =psp_hw_start (psp);if (ret) - goto failed_mem; + goto failed; ret =psp_np_fw_load (psp);if (ret) - goto failed_mem; + goto failed;return 0 ; -failed_mem: -amdgpu_bo_free_kernel (&psp->cmd_buf_bo, - &psp->cmd_buf_mc_addr, - (void **)&psp->cmd_buf_mem); -failed_mem1: -amdgpu_bo_free_kernel (&psp->fence_buf_bo, - &psp->fence_buf_mc_addr, &psp->fence_buf); -failed_mem2: -amdgpu_bo_free_kernel (&psp->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); failed: -kfree (psp->cmd); - psp->cmd =NULL ; +/* +* all cleanup jobs (xgmi terminate, ras terminate, +* ring destroy, cmd/fence/fw buffers destory, +* psp->cmd destory) are delayed to psp_hw_fini +*/ return ret; }
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ping..
Quoted 98 lines
-----Original Message-----
From: Evan Quan <[email protected]>
Sent: 2019年3月18日 10:42
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amdgpu: defer cmd/fence/fw buffers destroy onhw_initfailureAs the cleanup jobs performed in
pre_finimay still need these buffers. NULL pointer dereference will be triggered without them.Change-Id I398efd652584e022debf237950207199a4ea78fcSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++++++++--------------(quoted diff) +0
-1- 1 file changed, 12 insertions(+), 19 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +12
-19@@ -890,59 +890,52 @@ static int psp_load_fw(struct amdgpu_device *adev) &psp->fence_buf_mc_addr, &psp->fence_buf);if (ret) - goto failed_mem2; + goto failed; ret =amdgpu_bo_create_kernel (adev,PSP_CMD_BUFFER_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &psp->cmd_buf_bo, &psp- >cmd_buf_mc_addr, (void **)&psp->cmd_buf_mem);if (ret) - goto failed_mem1; + goto failed;memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE ); ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) {DRM_ERROR ("PSP ring init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_tmr_init (psp);if (ret) {DRM_ERROR ("PSP tmr init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_asd_init (psp);if (ret) {DRM_ERROR ("PSP asd init failed!\n" ); - goto failed_mem; + goto failed; } skip_memalloc: ret =psp_hw_start (psp);if (ret) - goto failed_mem; + goto failed; ret =psp_np_fw_load (psp);if (ret) - goto failed_mem; + goto failed;return 0 ; -failed_mem: -amdgpu_bo_free_kernel (&psp->cmd_buf_bo, - &psp->cmd_buf_mc_addr, - (void **)&psp->cmd_buf_mem); -failed_mem1: -amdgpu_bo_free_kernel (&psp->fence_buf_bo, - &psp->fence_buf_mc_addr, &psp->fence_buf); -failed_mem2: -amdgpu_bo_free_kernel (&psp->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); failed: -kfree (psp->cmd); - psp->cmd =NULL ; +/* +* all cleanup jobs (xgmi terminate, ras terminate, +* ring destroy, cmd/fence/fw buffers destory, +* psp->cmd destory) are delayed to psp_hw_fini +*/ return ret;
}
Quoted 2 lines
--
2.21.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Have you tested in S3 and gpu_recovery?
If yes. Reviewed-by: Feifei Xu <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Monday, March 18, 2019 10:42 AM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amdgpu: defer cmd/fence/fw buffers destroy on hw_init failure
As the cleanup jobs performed in pre_fini may still need these buffers. NULL pointer dereference will be triggered without them.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++++++++--------------- 1 file changed, 12 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +12 -19
@@ -890,59 +890,52 @@ static int psp_load_fw(struct amdgpu_device *adev) &psp->fence_buf_mc_addr, &psp->fence_buf);if (ret) - goto failed_mem2; + goto failed; ret =amdgpu_bo_create_kernel (adev,PSP_CMD_BUFFER_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &psp->cmd_buf_bo, &psp->cmd_buf_mc_addr, (void **)&psp->cmd_buf_mem);if (ret) - goto failed_mem1; + goto failed;memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE ); ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) {DRM_ERROR ("PSP ring init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_tmr_init (psp);if (ret) {DRM_ERROR ("PSP tmr init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_asd_init (psp);if (ret) {DRM_ERROR ("PSP asd init failed!\n" ); - goto failed_mem; + goto failed; } skip_memalloc: ret =psp_hw_start (psp);if (ret) - goto failed_mem; + goto failed; ret =psp_np_fw_load (psp);if (ret) - goto failed_mem; + goto failed;return 0 ; -failed_mem: -amdgpu_bo_free_kernel (&psp->cmd_buf_bo, - &psp->cmd_buf_mc_addr, - (void **)&psp->cmd_buf_mem); -failed_mem1: -amdgpu_bo_free_kernel (&psp->fence_buf_bo, - &psp->fence_buf_mc_addr, &psp->fence_buf); -failed_mem2: -amdgpu_bo_free_kernel (&psp->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); failed: -kfree (psp->cmd); - psp->cmd =NULL ; +/* +* all cleanup jobs (xgmi terminate, ras terminate, +* ring destroy, cmd/fence/fw buffers destory, +* psp->cmd destory) are delayed to psp_hw_fini +*/ return ret; }
--
2.21.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): BYAPR12MB3048705E0C7567603C1D804AFE430-ZGDeBxoHBPnONjofGsFOUAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
This affects hw_init only. It's not on the path of S3/resume and gpu_recovery/resume. So, they are not affected.
Regards,
Evan
Quoted 111 lines
-----Original Message-----
From: Xu, Feifei
Sent: 2019年3月22日 16:56
To: Quan, Evan <[email protected]>; [email protected]
Cc: Quan, Evan <[email protected]>
Subject: RE: [PATCH] drm/amdgpu: defer cmd/fence/fw buffers destroy onhw_initfailureHave you tested in S3 and
gpu_recovery?If yes. Reviewed-by: Feifei Xu <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Monday, March 18, 2019 10:42 AM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amdgpu: defer cmd/fence/fw buffers destroy onhw_initfailureAs the cleanup jobs performed in
pre_finimay still need these buffers. NULL pointer dereference will be triggered without them.Change-Id I398efd652584e022debf237950207199a4ea78fcSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++++++++++--------------(quoted diff) +0
-1- 1 file changed, 12 insertions(+), 19 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +12
-19@@ -890,59 +890,52 @@ static int psp_load_fw(struct amdgpu_device *adev) &psp->fence_buf_mc_addr, &psp->fence_buf);if (ret) - goto failed_mem2; + goto failed; ret =amdgpu_bo_create_kernel (adev,PSP_CMD_BUFFER_SIZE ,PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &psp->cmd_buf_bo, &psp- >cmd_buf_mc_addr, (void **)&psp->cmd_buf_mem);if (ret) - goto failed_mem1; + goto failed;memset (psp->fence_buf,0 ,PSP_FENCE_BUFFER_SIZE ); ret =psp_ring_init (psp,PSP_RING_TYPE__KM );if (ret) {DRM_ERROR ("PSP ring init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_tmr_init (psp);if (ret) {DRM_ERROR ("PSP tmr init failed!\n" ); - goto failed_mem; + goto failed; } ret =psp_asd_init (psp);if (ret) {DRM_ERROR ("PSP asd init failed!\n" ); - goto failed_mem; + goto failed; } skip_memalloc: ret =psp_hw_start (psp);if (ret) - goto failed_mem; + goto failed; ret =psp_np_fw_load (psp);if (ret) - goto failed_mem; + goto failed;return 0 ; -failed_mem: -amdgpu_bo_free_kernel (&psp->cmd_buf_bo, - &psp->cmd_buf_mc_addr, - (void **)&psp->cmd_buf_mem); -failed_mem1: -amdgpu_bo_free_kernel (&psp->fence_buf_bo, - &psp->fence_buf_mc_addr, &psp->fence_buf); -failed_mem2: -amdgpu_bo_free_kernel (&psp->fw_pri_bo, - &psp->fw_pri_mc_addr, &psp->fw_pri_buf); failed: -kfree (psp->cmd); - psp->cmd =NULL ; +/* +* all cleanup jobs (xgmi terminate, ras terminate, +* ring destroy, cmd/fence/fw buffers destory, +* psp->cmd destory) are delayed to psp_hw_fini +*/ return ret;
}
Quoted 7 lines
--
2.21.0_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx