[PATCH v2] drm/amdgpu: fix the memory corruption on S3

[Deucher, Alexander]

> -----Original Message-----
> From: Christian König [mailto:deathsimple at vodafone.de]
> Sent: Thursday, June 29, 2017 4:17 AM
> To: Huang, Ray; amd-gfx at 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 at 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 at 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 at amd.com>

> 
> Regards,
> Christian.
> 
> > +		kfree(psp->cmd);
> > +		psp->cmd = NULL;
> > +	}
> > +
> >   	return 0;
> >   }
> >
>