drm/amdgpu: sdma v5_2 ring bo mem leak
Subsystems (2)
PATCH 1/2 drm/amdgpu: sdma v5_2 ring bo mem leak
invoke amdgpu_ring_fini for each sdma instance
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +4 -0
@@ -1244,6 +1244,10 @@ static int sdma_v5_2_sw_init(void *handle)static int sdma_v5_2_sw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int i; + +for (i =0 ; i < adev->sdma.num_instances; i++) +amdgpu_ring_fini (&adev->sdma.instance[i].ring);sdma_v5_2_destroy_inst_ctx (adev);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw); +amdgpu_ring_fini (&adev->sdma.instance[i].ring); + }return 0 ; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]> on behalf of Wenhui Sheng <[email protected]>
Sent: Thursday, June 18, 2020 3:53 PM
To: [email protected] <[email protected]>
Cc: Sheng, Wenhui <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
[kevin]:
the kernel api "release_firmware()" will check argument (is NULL pointer). i think the patch don't need to double check it.
+
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
+ }
return 0;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKevin1.Wang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636699912801&sdata=HrKVAmRO0HKFZBRG6oWq3thNlGBd0T9bMramDU1ijys%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Although we know that release_firmware has null check, but the code is not maintained by ourselves, so I think it's much more safe to add null check before invoke release_firmware.
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]>
Sent: Thursday, June 18, 2020 4:25 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Wenhui Sheng <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 3:53 PM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
[kevin]:
the kernel api "release_firmware()" will check argument (is NULL pointer). i think the patch don't need to double check it.
+
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
+ }
return 0;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKevin1.Wang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636699912801&sdata=HrKVAmRO0HKFZBRG6oWq3thNlGBd0T9bMramDU1ijys%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
afte the API firmware_realease created, the api logic never changed. (the first commit by Linus) and you can use below command to reference the api usage case in our drm driver.
$ grep -nR "release_firmware" -A 5 -B 5 drivers/gpu/drm/ | vim -
Best Regards,
Kevin
________________________________
From: Sheng, Wenhui <[email protected]>
Sent: Thursday, June 18, 2020 4:31 PM
To: Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>
Subject: RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Although we know that release_firmware has null check, but the code is not maintained by ourselves, so I think it’s much more safe to add null check before invoke release_firmware.
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]>
Sent: Thursday, June 18, 2020 4:25 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Wenhui Sheng <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 3:53 PM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
[kevin]:
the kernel api "release_firmware()" will check argument (is NULL pointer).
i think the patch don't need to double check it.
+
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
+ }
return 0;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKevin1.Wang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636699912801&sdata=HrKVAmRO0HKFZBRG6oWq3thNlGBd0T9bMramDU1ijys%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Hmmmm....
1. There are some places in amdgpu driver using release_firmware like this way
2. This case is a little different, we use it in loop and maybe not all sdma instances' fw is initialized, just like we did in v5_2
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]>
Sent: Thursday, June 18, 2020 4:48 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
afte the API firmware_realease created, the api logic never changed. (the first commit by Linus) and you can use below command to reference the api usage case in our drm driver.
$ grep -nR "release_firmware" -A 5 -B 5 drivers/gpu/drm/ | vim -
Best Regards,
Kevin
________________________________
From: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 4:31 PM
To: Wang, Kevin(Yang) <[email protected]<mailto:[email protected]>>; [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Subject: RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Although we know that release_firmware has null check, but the code is not maintained by ourselves, so I think it's much more safe to add null check before invoke release_firmware.
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 4:25 PM
To: Sheng, Wenhui <[email protected]<mailto:[email protected]>>; [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Wenhui Sheng <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 3:53 PM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
[kevin]:
the kernel api "release_firmware()" will check argument (is NULL pointer).
i think the patch don't need to double check it.
+
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
+ }
return 0;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKevin1.Wang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636699912801&sdata=HrKVAmRO0HKFZBRG6oWq3thNlGBd0T9bMramDU1ijys%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Wang, Kevin(Yang)
Reviewed-by Christian KönigRe: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
before this patch, the driver has same code logic at "drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c" related patch: drm/amdgpu: fix sdma3 ucode mem leak
commit 14d83e78c578a6c45163fb399ee760fe0d314bad
Author: Monk Liu <[email protected]> Date: Mon May 30 15:15:32 2016 +0800
drm/amdgpu: fix sdma3 ucode mem leak
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +10 -0
@@ -236,6 +236,15 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev) } } +static void sdma_v3_0_free_microcode (struct amdgpu_device *adev) +{ +int i; +for (i =0 ; i < adev->sdma.num_instances; i++) { +release_firmware (adev->sdma.instance[i].fw); + adev->sdma.instance[i].fw =NULL ; + } +} +/** * sdma_v3_0_init_microcode - load ucode images from disk *
@@ -1256,6 +1265,7 @@ static int sdma_v3_0_sw_fini(void *handle)for (i =0 ; i < adev->sdma.num_instances; i++)amdgpu_ring_fini (&adev->sdma.instance[i].ring); +sdma_v3_0_free_microcode (adev);return 0 ; }
Best Regards,
Kevin
________________________________
From: Sheng, Wenhui <[email protected]>
Sent: Thursday, June 18, 2020 5:21 PM
To: Wang, Kevin(Yang) <[email protected]>; [email protected] <[email protected]>
Subject: RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Hmmmm….
1. There are some places in amdgpu driver using release_firmware like this way
2. This case is a little different, we use it in loop and maybe not all sdma instances’ fw is initialized, just like we did in v5_2
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]>
Sent: Thursday, June 18, 2020 4:48 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
afte the API firmware_realease created, the api logic never changed. (the first commit by Linus)
and you can use below command to reference the api usage case in our drm driver.
$ grep -nR "release_firmware" -A 5 -B 5 drivers/gpu/drm/ | vim -
Best Regards,
Kevin
________________________________
From: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 4:31 PM
To: Wang, Kevin(Yang) <[email protected]<mailto:[email protected]>>; [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Subject: RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
[AMD Official Use Only - Internal Distribution Only]
Although we know that release_firmware has null check, but the code is not maintained by ourselves, so I think it’s much more safe to add null check before invoke release_firmware.
Brs
Wenhui
From: Wang, Kevin(Yang) <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 4:25 PM
To: Sheng, Wenhui <[email protected]<mailto:[email protected]>>; [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
[AMD Official Use Only - Internal Distribution Only]
________________________________
From: amd-gfx <[email protected]<mailto:[email protected]>> on behalf of Wenhui Sheng <[email protected]<mailto:[email protected]>>
Sent: Thursday, June 18, 2020 3:53 PM
To: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>>
Cc: Sheng, Wenhui <[email protected]<mailto:[email protected]>>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
[kevin]:
the kernel api "release_firmware()" will check argument (is NULL pointer).
i think the patch don't need to double check it.
+
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
+ }
return 0;
}
--
2.17.1
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKevin1.Wang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636699912801&sdata=HrKVAmRO0HKFZBRG6oWq3thNlGBd0T9bMramDU1ijys%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
In reply to Wenhui Sheng[AMD Public Use]
Series is:
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Wenhui Sheng
Sent: Thursday, June 18, 2020 15:53
To: [email protected]
Cc: Sheng, Wenhui <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
sdma v5_0 fw isn't released when module exit
--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +5 -1
@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw); +amdgpu_ring_fini (&adev->sdma.instance[i].ring); + }return 0 ; }
Signature · 10 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Chawking.zhang%40amd.com%7Cd0b8b72e0be443a7343d08d8135cb093%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637280636689938431&sdata=2g%2BOLo5Hg6gxO2pF%2B2uDnshodSAmLaSh9RZQsKrnFUI%3D&reserved=0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0
In reply to Wenhui ShengAm 18.06.20 um 09:53 schrieb Wenhui Sheng:
Quoted 12 lines
sdma
v5_0fw isn't released when module exitSigned-off-by Wenhui Sheng <[email protected]>--- drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static int sdma_v5_0_sw_fini(void *handle) · line 1304
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +3
-1@@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;int i; -for (i =0 ; i < adev->sdma.num_instances; i++) +for (i =0 ; i < adev->sdma.num_instances; i++) { +if (adev->sdma.instance[i].fw !=NULL ) +release_firmware (adev->sdma.instance[i].fw);
Please drop the extra NULL check here.
Kernel APIs like kfree() etc.. are usually NULL tolerant and we have automated scripts complaining about this as bad coding style if you duplicate the check in the driver.
Apart from that the series looks good to me.
Regards,
Christian.
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c static int sdma_v5_0_sw_fini(void *handle) · line 1310
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c +2
-0+amdgpu_ring_fini (&adev->sdma.instance[i].ring); + }return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx