Re: [PATCH] drm/amd/pm: Fix a memory leak on an error path

2023-10-10 Thread Alex Deucher 
Applied.  Thanks!

Alex

On Tue, Oct 10, 2023 at 2:32 AM Wang, Yang(Kevin)
 wrote:
>
> [AMD Official Use Only - General]
>
> Reviewed-by: Yang Wang 
>
> Best Regards,
> Kevin
>
> -Original Message-
> From: Kunwu.Chan 
> Sent: Tuesday, October 10, 2023 2:11 PM
> To: Wang, Yang(Kevin) 
> Cc: Deucher, Alexander ; Kamal, Asad 
> ; Koenig, Christian ; Zhang, 
> Hawking ; Ma, Le ; Lazar, Lijo 
> ; Pan, Xinhui ; airl...@gmail.com; 
> amd-gfx@lists.freedesktop.org; chen...@kylinos.cn; dan.carpen...@linaro.org; 
> dan...@ffwll.ch; dri-de...@lists.freedesktop.org; evan.q...@amd.com; 
> kunwu.c...@hotmail.com; linux-ker...@vger.kernel.org
> Subject: [PATCH] drm/amd/pm: Fix a memory leak on an error path
>
> Add missing free on an error path.
>
> Fixes: 511a95552ec8 ("drm/amd/pm: Add SMU 13.0.6 support")
> Signed-off-by: Kunwu.Chan 
> ---
>  drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c 
> b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> index ce971a93d28b..c26e12ff532c 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
> @@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct 
> smu_context *smu, void **table
>
> metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
> ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
> -   if (ret)
> +   if (ret) {
> +   kfree(metrics);
> return ret;
> +   }
>
> smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
>
> --
> 2.25.1
>

RE: [PATCH] drm/amd/pm: Fix a memory leak on an error path

2023-10-10 Thread Wang, Yang(Kevin) 
[AMD Official Use Only - General]

Reviewed-by: Yang Wang 

Best Regards,
Kevin

-Original Message-
From: Kunwu.Chan 
Sent: Tuesday, October 10, 2023 2:11 PM
To: Wang, Yang(Kevin) 
Cc: Deucher, Alexander ; Kamal, Asad 
; Koenig, Christian ; Zhang, 
Hawking ; Ma, Le ; Lazar, Lijo 
; Pan, Xinhui ; airl...@gmail.com; 
amd-gfx@lists.freedesktop.org; chen...@kylinos.cn; dan.carpen...@linaro.org; 
dan...@ffwll.ch; dri-de...@lists.freedesktop.org; evan.q...@amd.com; 
kunwu.c...@hotmail.com; linux-ker...@vger.kernel.org
Subject: [PATCH] drm/amd/pm: Fix a memory leak on an error path

Add missing free on an error path.

Fixes: 511a95552ec8 ("drm/amd/pm: Add SMU 13.0.6 support")
Signed-off-by: Kunwu.Chan 
---
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index ce971a93d28b..c26e12ff532c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct 
smu_context *smu, void **table

metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
-   if (ret)
+   if (ret) {
+   kfree(metrics);
return ret;
+   }

smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);

--
2.25.1

RE: [PATCH] drm/amd/pm: Fix a memory leak on an error path

2023-10-09 Thread Wang, Yang(Kevin) 
Fixes: 511a95552ec8 ("drm/amd/pm: Add SMU 13.0.6 support")

Please add above information into your patch commit message.

Reviewed-by: Yang Wang 

Best Regards,
Kevin

-Original Message-
From: Kunwu.Chan  
Sent: Tuesday, October 10, 2023 10:19 AM
To: evan.q...@amd.com; Deucher, Alexander ; Koenig, 
Christian ; Pan, Xinhui ; 
airl...@gmail.com; dan...@ffwll.ch; Lazar, Lijo ; Kamal, 
Asad ; Zhang, Hawking ; Wang, 
Yang(Kevin) ; Ma, Le ; 
dan.carpen...@linaro.org
Cc: amd-gfx@lists.freedesktop.org; dri-de...@lists.freedesktop.org; 
linux-ker...@vger.kernel.org; kunwu.c...@hotmail.com; Kunwu.Chan 

Subject: [PATCH] drm/amd/pm: Fix a memory leak on an error path

Add missing free on an error path.

Signed-off-by: Kunwu.Chan 
---
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index ce971a93d28b..c26e12ff532c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -1981,8 +1981,10 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct 
smu_context *smu, void **table
 
metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
ret = smu_v13_0_6_get_metrics_table(smu, metrics, true);
-   if (ret)
+   if (ret) {
+   kfree(metrics);
return ret;
+   }
 
smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);
 
-- 
2.25.1