* [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1
@ 2022-11-10 14:33 Dong Chenchen
2022-11-10 18:07 ` Luben Tuikov
2022-11-11 11:57 ` Christian König
0 siblings, 2 replies; 4+ messages in thread
From: Dong Chenchen @ 2022-11-10 14:33 UTC (permalink / raw)
To: airlied, daniel
Cc: christian.koenig, alexander.deucher, Xinhui.Pan, amd-gfx,
dri-devel, linux-kernel, yuehaibing, Dong Chenchen
When p->gang_size equals 0, amdgpu_cs_pass1() will return directly
without freeing chunk_array, which will cause a memory leak issue,
this patch fixes it.
Fixes: 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 1bbd39b3b0fc..0e24d6b80e0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
}
}
- if (!p->gang_size)
- return -EINVAL;
+ if (!p->gang_size) {
+ ret = -EINVAL;
+ goto free_partial_kdata;
+ }
for (i = 0; i < p->gang_size; ++i) {
ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1
2022-11-10 14:33 [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1 Dong Chenchen
@ 2022-11-10 18:07 ` Luben Tuikov
2022-11-10 19:53 ` Alex Deucher
2022-11-11 11:57 ` Christian König
1 sibling, 1 reply; 4+ messages in thread
From: Luben Tuikov @ 2022-11-10 18:07 UTC (permalink / raw)
To: Dong Chenchen, airlied, daniel
Cc: Xinhui.Pan, yuehaibing, linux-kernel, dri-devel, amd-gfx,
alexander.deucher, christian.koenig
Thanks for fixing this.
Please add a Cc tag to stable, and repost.
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Regards,
Luben
On 2022-11-10 09:33, Dong Chenchen wrote:
> When p->gang_size equals 0, amdgpu_cs_pass1() will return directly
> without freeing chunk_array, which will cause a memory leak issue,
> this patch fixes it.
>
> Fixes: 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
> Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 1bbd39b3b0fc..0e24d6b80e0b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
> }
> }
>
> - if (!p->gang_size)
> - return -EINVAL;
> + if (!p->gang_size) {
> + ret = -EINVAL;
> + goto free_partial_kdata;
> + }
>
> for (i = 0; i < p->gang_size; ++i) {
> ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1
2022-11-10 18:07 ` Luben Tuikov
@ 2022-11-10 19:53 ` Alex Deucher
0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2022-11-10 19:53 UTC (permalink / raw)
To: Luben Tuikov
Cc: Dong Chenchen, airlied, daniel, Xinhui.Pan, yuehaibing,
linux-kernel, amd-gfx, dri-devel, alexander.deucher,
christian.koenig
On Thu, Nov 10, 2022 at 1:08 PM Luben Tuikov <luben.tuikov@amd.com> wrote:
>
> Thanks for fixing this.
>
> Please add a Cc tag to stable, and repost.
No need for stable. This patch just went upstream in 6.1, so I can
include it in my 6.1 fixes pull next week. Applied.
Thanks!
Alex
>
> Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
>
> Regards,
> Luben
>
> On 2022-11-10 09:33, Dong Chenchen wrote:
> > When p->gang_size equals 0, amdgpu_cs_pass1() will return directly
> > without freeing chunk_array, which will cause a memory leak issue,
> > this patch fixes it.
> >
> > Fixes: 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
> > Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > index 1bbd39b3b0fc..0e24d6b80e0b 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> > @@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
> > }
> > }
> >
> > - if (!p->gang_size)
> > - return -EINVAL;
> > + if (!p->gang_size) {
> > + ret = -EINVAL;
> > + goto free_partial_kdata;
> > + }
> >
> > for (i = 0; i < p->gang_size; ++i) {
> > ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1
2022-11-10 14:33 [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1 Dong Chenchen
2022-11-10 18:07 ` Luben Tuikov
@ 2022-11-11 11:57 ` Christian König
1 sibling, 0 replies; 4+ messages in thread
From: Christian König @ 2022-11-11 11:57 UTC (permalink / raw)
To: Dong Chenchen, airlied, daniel
Cc: alexander.deucher, Xinhui.Pan, amd-gfx, dri-devel, linux-kernel,
yuehaibing
Am 10.11.22 um 15:33 schrieb Dong Chenchen:
> When p->gang_size equals 0, amdgpu_cs_pass1() will return directly
> without freeing chunk_array, which will cause a memory leak issue,
> this patch fixes it.
>
> Fixes: 4624459c84d7 ("drm/amdgpu: add gang submit frontend v6")
> Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
Good catch, thanks. Patch is Reviewed-by: Christian König
<christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 1bbd39b3b0fc..0e24d6b80e0b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -287,8 +287,10 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p,
> }
> }
>
> - if (!p->gang_size)
> - return -EINVAL;
> + if (!p->gang_size) {
> + ret = -EINVAL;
> + goto free_partial_kdata;
> + }
>
> for (i = 0; i < p->gang_size; ++i) {
> ret = amdgpu_job_alloc(p->adev, num_ibs[i], &p->jobs[i], vm);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-11 11:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-10 14:33 [PATCH] drm/amdgpu: Fix memory leak in amdgpu_cs_pass1 Dong Chenchen
2022-11-10 18:07 ` Luben Tuikov
2022-11-10 19:53 ` Alex Deucher
2022-11-11 11:57 ` 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
all inboxes | Powered by JetHome®