<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> <p style="font-family:Arial;font-size:10pt;color:#0078D7;margin:15pt;" align="Left"> [AMD Official Use Only - Internal Distribution Only]<br> </p> <br> <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> before this patch, the driver has same code logic at "drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c"</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> related patch: drm/amdgpu: fix sdma3 ucode mem leak<br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <br> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <span></span><span>commit 14d83e78c578a6c45163fb399ee760fe0d314bad<br> </span> <div>Author: Monk Liu <Monk.Liu@amd.com><br> </div> <div>Date: Mon May 30 15:15:32 2016 +0800<br> </div> <div><br> </div> <div> drm/amdgpu: fix sdma3 ucode mem leak<br> </div> <div><br> </div> <div> Signed-off-by: Monk Liu <Monk.Liu@amd.com><br> </div> <div> Reviewed-by: Christian König <christian.koenig@amd.com><br> </div> <div> Signed-off-by: Alex Deucher <alexander.deucher@amd.com><br> </div> <div><br> </div> <div>diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c<br> </div> <div>index 33605d4ac2d9..532ea88da66a 100644<br> </div> <div>--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c<br> </div> <div>+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c<br> </div> <div>@@ -236,6 +236,15 @@ static void sdma_v3_0_init_golden_registers(struct amdgpu_device *adev)<br> </div> <div> }<br> </div> <div> }<br> </div> <div><br> </div> <div>+static void sdma_v3_0_free_microcode(struct amdgpu_device *adev)<br> </div> <div>+{<br> </div> <div>+ int i;<br> </div> <div>+ for (i = 0; i < adev->sdma.num_instances; i++) {<br> </div> <div>+ release_firmware(adev->sdma.instance[i].fw);<br> </div> <div>+ adev->sdma.instance[i].fw = NULL;<br> </div> <div>+ }<br> </div> <div>+}<br> </div> <div>+<br> </div> <div> /**<br> </div> <div> * sdma_v3_0_init_microcode - load ucode images from disk<br> </div> <div> *<br> </div> <div>@@ -1256,6 +1265,7 @@ static int sdma_v3_0_sw_fini(void *handle)<br> </div> <div> for (i = 0; i < adev->sdma.num_instances; i++)<br> </div> <div> amdgpu_ring_fini(&adev->sdma.instance[i].ring);<br> </div> <div><br> </div> <div>+ sdma_v3_0_free_microcode(adev);<br> </div> <div> return 0;<br> </div> <div> }<br> </div> <div><br> </div> <span></span></div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> <div>Best Regards,</div> <div>Kevin</div> </div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> Sheng, Wenhui <Wenhui.Sheng@amd.com><br> <b>Sent:</b> Thursday, June 18, 2020 5:21 PM<br> <b>To:</b> Wang, Kevin(Yang) <Kevin1.Wang@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org><br> <b>Subject:</b> RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0</font> <div> </div> </div> <div lang="EN-US"> <p align="Left" style="font-family:Arial; font-size:10pt; color:#0078D7; margin:15pt"> [AMD Official Use Only - Internal Distribution Only]<br> </p> <br> <div> <div class="x_WordSection1"> <p class="x_msipheadera92e061b" style="margin-right: 0in; margin-left: 0in; font-size: 11pt; font-family: Calibri, sans-serif;margin:0in; margin-bottom:.0001pt"> <span style="font-size:10.0pt; font-family:"Arial",sans-serif; color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span></p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> Hmmmm…. </p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <ol start="1" type="1" style="margin-bottom: 0in;margin-top:0in"> <li class="x_MsoListParagraph" style="margin: 0in 0in 0.0001pt 0.5in; font-size: 11pt; font-family: Calibri, sans-serif;margin-left:0in; mso-list:l0 level1 lfo3"> There are some places in amdgpu driver using release_firmware like this way</li><li class="x_MsoListParagraph" style="margin: 0in 0in 0.0001pt 0.5in; font-size: 11pt; font-family: Calibri, sans-serif;margin-left:0in; mso-list:l0 level1 lfo3"> 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</li></ol> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> Brs</p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> Wenhui</p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <div> <div style="border:none; border-top:solid #E1E1E1 1.0pt; padding:3.0pt 0in 0in 0in"> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <b>From:</b> Wang, Kevin(Yang) <Kevin1.Wang@amd.com> <br> <b>Sent:</b> Thursday, June 18, 2020 4:48 PM<br> <b>To:</b> Sheng, Wenhui <Wenhui.Sheng@amd.com>; amd-gfx@lists.freedesktop.org<br> <b>Subject:</b> Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0</p> </div> </div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p style="margin:15.0pt"><span style="font-size:10.0pt; font-family:"Arial",sans-serif; color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span></p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">afte the API <b><i>firmware_realease </i> </b>created, the api logic never changed. (the first commit by Linus)</span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">and you can use below command to reference the api usage case in our drm driver.</span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black"> </span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <i><span style="font-size:12.0pt; color:black">$ grep -nR "release_firmware" -A 5 -B 5 drivers/gpu/drm/ | vim -</span></i><span style="font-size:12.0pt; color:black"></span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black"> </span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">Best Regards,</span></p> </div> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">Kevin</span></p> </div> <div class="x_MsoNormal" align="center" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="x_divRplyFwdMsg"> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <b><span style="color:black">From:</span></b><span style="color:black"> Sheng, Wenhui <</span><a href="mailto:Wenhui.Sheng@amd.com">Wenhui.Sheng@amd.com</a><span style="color:black">><br> <b>Sent:</b> Thursday, June 18, 2020 4:31 PM<br> <b>To:</b> Wang, Kevin(Yang) <</span><a href="mailto:Kevin1.Wang@amd.com">Kevin1.Wang@amd.com</a><span style="color:black">>; </span><a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><span style="color:black"> <</span><a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><span style="color:black">><br> <b>Subject:</b> RE: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0</span> </p> <div> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> </div> </div> <div> <p style="margin:15.0pt"><span style="font-size:10.0pt; font-family:"Arial",sans-serif; color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span></p> <p class="x_MsoNormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <div> <div> <p class="x_xmsipheadera92e061b" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:10.0pt; font-family:"Arial",sans-serif; color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span></p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> 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.</p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> Brs</p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> Wenhui</p> <div> <div style="border:none; border-top:solid #E1E1E1 1.0pt; padding:3.0pt 0in 0in 0in"> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <b>From:</b> Wang, Kevin(Yang) <<a href="mailto:Kevin1.Wang@amd.com">Kevin1.Wang@amd.com</a>> <br> <b>Sent:</b> Thursday, June 18, 2020 4:25 PM<br> <b>To:</b> Sheng, Wenhui <<a href="mailto:Wenhui.Sheng@amd.com">Wenhui.Sheng@amd.com</a>>; <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br> <b>Subject:</b> Re: [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0</p> </div> </div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <p style="margin:15.0pt"><span style="font-size:10.0pt; font-family:"Arial",sans-serif; color:#0078D7">[AMD Official Use Only - Internal Distribution Only]</span></p> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> <div> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black"> </span></p> </div> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black"> </span></p> </div> <div class="x_MsoNormal" align="center" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="x_x_divRplyFwdMsg"> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <b><span style="color:black">From:</span></b><span style="color:black"> amd-gfx <</span><a href="mailto:amd-gfx-bounces@lists.freedesktop.org">amd-gfx-bounces@lists.freedesktop.org</a><span style="color:black">> on behalf of Wenhui Sheng <</span><a href="mailto:Wenhui.Sheng@amd.com">Wenhui.Sheng@amd.com</a><span style="color:black">><br> <b>Sent:</b> Thursday, June 18, 2020 3:53 PM<br> <b>To:</b> </span><a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><span style="color:black"> <</span><a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><span style="color:black">><br> <b>Cc:</b> Sheng, Wenhui <</span><a href="mailto:Wenhui.Sheng@amd.com">Wenhui.Sheng@amd.com</a><span style="color:black">><br> <b>Subject:</b> [PATCH 2/2] drm/amdgpu: add fw release for sdma v5_0</span> </p> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> </p> </div> </div> <div> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> sdma v5_0 fw isn't released when module exit<br> <br> Signed-off-by: Wenhui Sheng <<a href="mailto:Wenhui.Sheng@amd.com">Wenhui.Sheng@amd.com</a>><br> ---<br> drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 6 +++++-<br> 1 file changed, 5 insertions(+), 1 deletion(-)<br> <br> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c<br> index 58d2a80af450..6751ad69ed90 100644<br> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c<br> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c<br> @@ -1299,8 +1299,12 @@ static int sdma_v5_0_sw_fini(void *handle)<br> struct amdgpu_device *adev = (struct amdgpu_device *)handle;<br> int i;<br> <br> - for (i = 0; i < adev->sdma.num_instances; i++)<br> + for (i = 0; i < adev->sdma.num_instances; i++) {<br> + if (adev->sdma.instance[i].fw != NULL)<br> + release_firmware(adev->sdma.instance[i].fw);</p> </div> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">[kevin]:</span></p> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">the kernel api "release_firmware()" will check argument (is NULL pointer).</span></p> </div> <div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> <span style="font-size:12.0pt; color:black">i think the patch don't need to double check it.</span></p> </div> <p class="x_xmsonormal" style="margin: 0in 0in 0.0001pt; font-size: 11pt; font-family: Calibri, sans-serif;"> +<br> amdgpu_ring_fini(&adev->sdma.instance[i].ring);<br> + }<br> <br> return 0;<br> }<br> -- <br> 2.17.1<br> <br> _______________________________________________<br> amd-gfx mailing list<br> <a href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a><br> <a href="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">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</a></p> </div> </div> </div> </div> </div> </div> </div> </div> </div> </div> </div> </body> </html>