Received-SPF: pass (google.com: domain of linux-kernel+bounces-68971-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240213005050.4442-1-W_Armin@gmx.de>
In-Reply-To: <20240213005050.4442-1-W_Armin@gmx.de>
From: Alex Deucher <alexdeucher@gmail.com>
Date: Fri, 16 Feb 2024 11:41:50 -0500
Message-ID: <CADnq5_OYE8g77YOQvN=TKQJtT_JvCDCbWxejW05VsgyqTSHetA@mail.gmail.com>
Subject: Re: [PATCH] drm/amd/display: Fix memory leak in dm_sw_fini()
To: Armin Wolf <W_Armin@gmx.de>
Cc: harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, 
	alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, 
	airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, 
	dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Applied.  Thanks!

On Mon, Feb 12, 2024 at 8:08=E2=80=AFPM Armin Wolf <W_Armin@gmx.de> wrote:
>
> After destroying dmub_srv, the memory associated with it is
> not freed, causing a memory leak:
>
> unreferenced object 0xffff896302b45800 (size 1024):
>   comm "(udev-worker)", pid 222, jiffies 4294894636
>   hex dump (first 32 bytes):
>     00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>     00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>   backtrace (crc 6265fd77):
>     [<ffffffff993495ed>] kmalloc_trace+0x29d/0x340
>     [<ffffffffc0ea4a94>] dm_dmub_sw_init+0xb4/0x450 [amdgpu]
>     [<ffffffffc0ea4e55>] dm_sw_init+0x15/0x2b0 [amdgpu]
>     [<ffffffffc0ba8557>] amdgpu_device_init+0x1417/0x24e0 [amdgpu]
>     [<ffffffffc0bab285>] amdgpu_driver_load_kms+0x15/0x190 [amdgpu]
>     [<ffffffffc0ba09c7>] amdgpu_pci_probe+0x187/0x4e0 [amdgpu]
>     [<ffffffff9968fd1e>] local_pci_probe+0x3e/0x90
>     [<ffffffff996918a3>] pci_device_probe+0xc3/0x230
>     [<ffffffff99805872>] really_probe+0xe2/0x480
>     [<ffffffff99805c98>] __driver_probe_device+0x78/0x160
>     [<ffffffff99805daf>] driver_probe_device+0x1f/0x90
>     [<ffffffff9980601e>] __driver_attach+0xce/0x1c0
>     [<ffffffff99803170>] bus_for_each_dev+0x70/0xc0
>     [<ffffffff99804822>] bus_add_driver+0x112/0x210
>     [<ffffffff99807245>] driver_register+0x55/0x100
>     [<ffffffff990012d1>] do_one_initcall+0x41/0x300
>
> Fix this by freeing dmub_srv after destroying it.
>
> Fixes: 743b9786b14a ("drm/amd/display: Hook up the DMUB service in DM")
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/=
gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 59d2eee72a32..9cbfc8d39dee 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -2287,6 +2287,7 @@ static int dm_sw_fini(void *handle)
>
>         if (adev->dm.dmub_srv) {
>                 dmub_srv_destroy(adev->dm.dmub_srv);
> +               kfree(adev->dm.dmub_srv);
>                 adev->dm.dmub_srv =3D NULL;
>         }
>
> --
> 2.39.2
>