* [PATCH v2] drm/amdgpu: fix the memory corruption on S3
@ 2017-06-29 8:09 Huang Rui
[not found] ` <1498723761-6723-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Huang Rui @ 2017-06-29 8:09 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Alex Deucher,
Christian König
Cc: Alvin Huan, Joe Qiao, Sonny Jiang, Huang Rui, Ken Wang, Xiaojie Yuan
psp->cmd will be used on resume phase, so we can not free it on hw_init.
Otherwise, a memory corruption will be triggered.
Signed-off-by: Huang Rui <ray.huang@amd.com>
---
V1 -> V2:
- remove "cmd" variable.
- fix typo of check.
Alex, Christian,
This is the final fix for vega10 S3. The random memory corruption issue is root
caused.
Thanks,
Ray
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 5bed483..711476792 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -330,14 +330,11 @@ static int psp_load_fw(struct amdgpu_device *adev)
{
int ret;
struct psp_context *psp = &adev->psp;
- struct psp_gfx_cmd_resp *cmd;
- cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
- if (!cmd)
+ psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
+ if (!psp->cmd)
return -ENOMEM;
- psp->cmd = cmd;
-
ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
AMDGPU_GEM_DOMAIN_GTT,
&psp->fw_pri_bo,
@@ -376,8 +373,6 @@ static int psp_load_fw(struct amdgpu_device *adev)
if (ret)
goto failed_mem;
- kfree(cmd);
-
return 0;
failed_mem:
@@ -387,7 +382,8 @@ static int psp_load_fw(struct amdgpu_device *adev)
amdgpu_bo_free_kernel(&psp->fw_pri_bo,
&psp->fw_pri_mc_addr, &psp->fw_pri_buf);
failed:
- kfree(cmd);
+ kfree(psp->cmd);
+ psp->cmd = NULL;
return ret;
}
@@ -447,6 +443,11 @@ static int psp_hw_fini(void *handle)
amdgpu_bo_free_kernel(&psp->fence_buf_bo,
&psp->fence_buf_mc_addr, &psp->fence_buf);
+ if (psp->cmd) {
+ kfree(psp->cmd);
+ psp->cmd = NULL;
+ }
+
return 0;
}
--
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] 5+ messages in thread
* Re: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
[not found] ` <1498723761-6723-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
@ 2017-06-29 8:16 ` Christian König
[not found] ` <84d11f06-9c82-01a3-04f3-b3a4428b043b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-06-29 8:27 ` Yuan, Xiaojie
1 sibling, 1 reply; 5+ messages in thread
From: Christian König @ 2017-06-29 8:16 UTC (permalink / raw)
To: Huang Rui, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
Alex Deucher, Christian König
Cc: Sonny Jiang, Alvin Huan, Xiaojie Yuan, Joe Qiao, Ken Wang
Am 29.06.2017 um 10:09 schrieb Huang Rui:
> psp->cmd will be used on resume phase, so we can not free it on hw_init.
> Otherwise, a memory corruption will be triggered.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>
> V1 -> V2:
> - remove "cmd" variable.
> - fix typo of check.
>
> Alex, Christian,
>
> This is the final fix for vega10 S3. The random memory corruption issue is root
> caused.
>
> Thanks,
> Ray
>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 5bed483..711476792 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -330,14 +330,11 @@ static int psp_load_fw(struct amdgpu_device *adev)
> {
> int ret;
> struct psp_context *psp = &adev->psp;
> - struct psp_gfx_cmd_resp *cmd;
>
> - cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> - if (!cmd)
> + psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> + if (!psp->cmd)
> return -ENOMEM;
>
> - psp->cmd = cmd;
> -
> ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
> AMDGPU_GEM_DOMAIN_GTT,
> &psp->fw_pri_bo,
> @@ -376,8 +373,6 @@ static int psp_load_fw(struct amdgpu_device *adev)
> if (ret)
> goto failed_mem;
>
> - kfree(cmd);
> -
> return 0;
>
> failed_mem:
> @@ -387,7 +382,8 @@ static int psp_load_fw(struct amdgpu_device *adev)
> amdgpu_bo_free_kernel(&psp->fw_pri_bo,
> &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
> failed:
> - kfree(cmd);
> + kfree(psp->cmd);
> + psp->cmd = NULL;
> return ret;
> }
>
> @@ -447,6 +443,11 @@ static int psp_hw_fini(void *handle)
> amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> &psp->fence_buf_mc_addr, &psp->fence_buf);
>
> + if (psp->cmd) {
As Michel noted as well please drop this extra check, kfree(NULL) is
perfectly save.
With that fixed the patch is Reviewed-by: Christian König
<christian.koenig@amd.com> for now, but I still think we could do better
by only allocating the temporary command buffer when it is needed.
Regards,
Christian.
> + kfree(psp->cmd);
> + psp->cmd = NULL;
> + }
> +
> return 0;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
[not found] ` <1498723761-6723-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-06-29 8:16 ` Christian König
@ 2017-06-29 8:27 ` Yuan, Xiaojie
1 sibling, 0 replies; 5+ messages in thread
From: Yuan, Xiaojie @ 2017-06-29 8:27 UTC (permalink / raw)
To: Huang, Ray, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Deucher,
Alexander, Koenig, Christian
Cc: Jiang, Sonny, Huan, Alvin, Wang, Ken, Qiao, Joe(Markham)
[-- Attachment #1.1: Type: text/plain, Size: 2690 bytes --]
Tested-by: Xiaojie Yuan <Xiaojie.Yuan-5C7GfCeVMHo@public.gmane.org>
Regards,
Xiaojie
________________________________
From: Huang Rui <ray.huang-5C7GfCeVMHo@public.gmane.org>
Sent: Thursday, June 29, 2017 4:09:21 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; Deucher, Alexander; Koenig, Christian
Cc: Wang, Ken; Qiao, Joe(Markham); Jiang, Sonny; Huan, Alvin; Yuan, Xiaojie; Huang, Ray
Subject: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
psp->cmd will be used on resume phase, so we can not free it on hw_init.
Otherwise, a memory corruption will be triggered.
Signed-off-by: Huang Rui <ray.huang-5C7GfCeVMHo@public.gmane.org>
---
V1 -> V2:
- remove "cmd" variable.
- fix typo of check.
Alex, Christian,
This is the final fix for vega10 S3. The random memory corruption issue is root
caused.
Thanks,
Ray
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 5bed483..711476792 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -330,14 +330,11 @@ static int psp_load_fw(struct amdgpu_device *adev)
{
int ret;
struct psp_context *psp = &adev->psp;
- struct psp_gfx_cmd_resp *cmd;
- cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
- if (!cmd)
+ psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
+ if (!psp->cmd)
return -ENOMEM;
- psp->cmd = cmd;
-
ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
AMDGPU_GEM_DOMAIN_GTT,
&psp->fw_pri_bo,
@@ -376,8 +373,6 @@ static int psp_load_fw(struct amdgpu_device *adev)
if (ret)
goto failed_mem;
- kfree(cmd);
-
return 0;
failed_mem:
@@ -387,7 +382,8 @@ static int psp_load_fw(struct amdgpu_device *adev)
amdgpu_bo_free_kernel(&psp->fw_pri_bo,
&psp->fw_pri_mc_addr, &psp->fw_pri_buf);
failed:
- kfree(cmd);
+ kfree(psp->cmd);
+ psp->cmd = NULL;
return ret;
}
@@ -447,6 +443,11 @@ static int psp_hw_fini(void *handle)
amdgpu_bo_free_kernel(&psp->fence_buf_bo,
&psp->fence_buf_mc_addr, &psp->fence_buf);
+ if (psp->cmd) {
+ kfree(psp->cmd);
+ psp->cmd = NULL;
+ }
+
return 0;
}
--
2.7.4
[-- Attachment #1.2: Type: text/html, Size: 6125 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
[not found] ` <84d11f06-9c82-01a3-04f3-b3a4428b043b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
@ 2017-06-29 8:47 ` Huang Rui
2017-06-29 13:34 ` Deucher, Alexander
1 sibling, 0 replies; 5+ messages in thread
From: Huang Rui @ 2017-06-29 8:47 UTC (permalink / raw)
To: Christian König
Cc: Huan, Alvin, Qiao, Joe(Markham),
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Jiang, Sonny, Deucher,
Alexander, Wang, Ken, Koenig, Christian, Yuan, Xiaojie
On Thu, Jun 29, 2017 at 04:16:53PM +0800, Christian König wrote:
> Am 29.06.2017 um 10:09 schrieb Huang Rui:
> > psp->cmd will be used on resume phase, so we can not free it on hw_init.
> > Otherwise, a memory corruption will be triggered.
> >
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > ---
> >
> > V1 -> V2:
> > - remove "cmd" variable.
> > - fix typo of check.
> >
> > Alex, Christian,
> >
> > This is the final fix for vega10 S3. The random memory corruption issue is
> root
> > caused.
> >
> > Thanks,
> > Ray
> >
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +++++++++--------
> > 1 file changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/
> amdgpu/amdgpu_psp.c
> > index 5bed483..711476792 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > @@ -330,14 +330,11 @@ static int psp_load_fw(struct amdgpu_device *adev)
> > {
> > int ret;
> > struct psp_context *psp = &adev->psp;
> > - struct psp_gfx_cmd_resp *cmd;
> >
> > - cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> > - if (!cmd)
> > + psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> > + if (!psp->cmd)
> > return -ENOMEM;
> >
> > - psp->cmd = cmd;
> > -
> > ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
> > AMDGPU_GEM_DOMAIN_GTT,
> > &psp->fw_pri_bo,
> > @@ -376,8 +373,6 @@ static int psp_load_fw(struct amdgpu_device *adev)
> > if (ret)
> > goto failed_mem;
> >
> > - kfree(cmd);
> > -
> > return 0;
> >
> > failed_mem:
> > @@ -387,7 +382,8 @@ static int psp_load_fw(struct amdgpu_device *adev)
> > amdgpu_bo_free_kernel(&psp->fw_pri_bo,
> > &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
> > failed:
> > - kfree(cmd);
> > + kfree(psp->cmd);
> > + psp->cmd = NULL;
> > return ret;
> > }
> >
> > @@ -447,6 +443,11 @@ static int psp_hw_fini(void *handle)
> > amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> > &psp->fence_buf_mc_addr, &psp->
> fence_buf);
> >
> > + if (psp->cmd) {
>
> As Michel noted as well please drop this extra check, kfree(NULL) is
> perfectly save.
>
> With that fixed the patch is Reviewed-by: Christian König
> <christian.koenig@amd.com> for now, but I still think we could do better
> by only allocating the temporary command buffer when it is needed.
>
Thanks. This is the quick fix for release. You know, it was a tragedy till
I found the root cause for S3 suspend/resume and make it stable, now it's
able to enter S3 more than 30+ cycles and never crash.
I am planning to refine the psp codes, any suggestions are warm for me. I
will refer the comments such as fence and "temporary command buffter" to
modify it in following days. :-)
Thanks,
Ray
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
[not found] ` <84d11f06-9c82-01a3-04f3-b3a4428b043b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-06-29 8:47 ` Huang Rui
@ 2017-06-29 13:34 ` Deucher, Alexander
1 sibling, 0 replies; 5+ messages in thread
From: Deucher, Alexander @ 2017-06-29 13:34 UTC (permalink / raw)
To: 'Christian König',
Huang, Ray, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Koenig,
Christian
Cc: Jiang, Sonny, Huan, Alvin, Wang, Ken, Qiao, Joe(Markham), Yuan, Xiaojie
> -----Original Message-----
> From: Christian König [mailto:deathsimple@vodafone.de]
> Sent: Thursday, June 29, 2017 4:17 AM
> To: Huang, Ray; amd-gfx@lists.freedesktop.org; Deucher, Alexander; Koenig,
> Christian
> Cc: Huan, Alvin; Qiao, Joe(Markham); Jiang, Sonny; Wang, Ken; Yuan, Xiaojie
> Subject: Re: [PATCH v2] drm/amdgpu: fix the memory corruption on S3
>
> Am 29.06.2017 um 10:09 schrieb Huang Rui:
> > psp->cmd will be used on resume phase, so we can not free it on hw_init.
> > Otherwise, a memory corruption will be triggered.
> >
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > ---
> >
> > V1 -> V2:
> > - remove "cmd" variable.
> > - fix typo of check.
> >
> > Alex, Christian,
> >
> > This is the final fix for vega10 S3. The random memory corruption issue is
> root
> > caused.
> >
> > Thanks,
> > Ray
> >
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +++++++++--------
> > 1 file changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > index 5bed483..711476792 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> > @@ -330,14 +330,11 @@ static int psp_load_fw(struct amdgpu_device
> *adev)
> > {
> > int ret;
> > struct psp_context *psp = &adev->psp;
> > - struct psp_gfx_cmd_resp *cmd;
> >
> > - cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> > - if (!cmd)
> > + psp->cmd = kzalloc(sizeof(struct psp_gfx_cmd_resp), GFP_KERNEL);
> > + if (!psp->cmd)
> > return -ENOMEM;
> >
> > - psp->cmd = cmd;
> > -
> > ret = amdgpu_bo_create_kernel(adev, PSP_1_MEG, PSP_1_MEG,
> > AMDGPU_GEM_DOMAIN_GTT,
> > &psp->fw_pri_bo,
> > @@ -376,8 +373,6 @@ static int psp_load_fw(struct amdgpu_device
> *adev)
> > if (ret)
> > goto failed_mem;
> >
> > - kfree(cmd);
> > -
> > return 0;
> >
> > failed_mem:
> > @@ -387,7 +382,8 @@ static int psp_load_fw(struct amdgpu_device
> *adev)
> > amdgpu_bo_free_kernel(&psp->fw_pri_bo,
> > &psp->fw_pri_mc_addr, &psp->fw_pri_buf);
> > failed:
> > - kfree(cmd);
> > + kfree(psp->cmd);
> > + psp->cmd = NULL;
> > return ret;
> > }
> >
> > @@ -447,6 +443,11 @@ static int psp_hw_fini(void *handle)
> > amdgpu_bo_free_kernel(&psp->fence_buf_bo,
> > &psp->fence_buf_mc_addr, &psp-
> >fence_buf);
> >
> > + if (psp->cmd) {
>
> As Michel noted as well please drop this extra check, kfree(NULL) is
> perfectly save.
>
> With that fixed the patch is Reviewed-by: Christian König
> <christian.koenig@amd.com> for now, but I still think we could do better
> by only allocating the temporary command buffer when it is needed.
Yes, nice find Ray! Glad to finally have this one solved! With the extra check fixed:
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
> Regards,
> Christian.
>
> > + kfree(psp->cmd);
> > + psp->cmd = NULL;
> > + }
> > +
> > return 0;
> > }
> >
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-29 13:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-29 8:09 [PATCH v2] drm/amdgpu: fix the memory corruption on S3 Huang Rui
[not found] ` <1498723761-6723-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org>
2017-06-29 8:16 ` Christian König
[not found] ` <84d11f06-9c82-01a3-04f3-b3a4428b043b-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
2017-06-29 8:47 ` Huang Rui
2017-06-29 13:34 ` Deucher, Alexander
2017-06-29 8:27 ` Yuan, Xiaojie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.