From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9E38ED2ECF7 for ; Tue, 20 Jan 2026 10:40:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BA9710E5B9; Tue, 20 Jan 2026 10:40:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="j6fwBIIV"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71D8310E5B4; Tue, 20 Jan 2026 10:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768905611; x=1800441611; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=19HpFk7+oEye/qKpJBdwosPV0832nvoY+MY8VcJ+HTI=; b=j6fwBIIVQ92yOAsHkJrqY5rDXvUE4TzBz5tz/E0cnYrIGhPHGMSlZyXg cZHf11CzYODOFN37539kqOUtVzZVXA2YufNq2SPpuTn3BNZbR1qb/o8pt 4YCQ1zXnPZGvqeav4TAAl4X0MCMBfAer8NR4uDp2WLKvqwC5MbTH9RcEj GhBOGYh1LDTgf3RgKAC7dwR40Gca/Uqfebi7KD9ZSpau53za4qrWIWYH+ F2j9TKQLR9BqLfNwkdiIlR5e1FezLSMy6QHOgPawdLc2w/TnC9NeIE04x egdYT+9gc3HFSaMMWHFb4Z72aAwHE6BqTz1rrAcI7MLnjPhjSNAQuY6Vg g==; X-CSE-ConnectionGUID: S57sy8DHRCKAMGqyLtqmVQ== X-CSE-MsgGUID: Ps7ObqiJTMq7y3qiTjIEQA== X-IronPort-AV: E=McAfee;i="6800,10657,11676"; a="70164364" X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="70164364" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2026 02:40:11 -0800 X-CSE-ConnectionGUID: WGBjyGQpRHODR5WRhf9njw== X-CSE-MsgGUID: pUBOr/hGRb67HCtykSjq3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="205889431" Received: from amilburn-desk.amilburn-desk (HELO [10.245.244.235]) ([10.245.244.235]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2026 02:40:09 -0800 Message-ID: Date: Tue, 20 Jan 2026 10:40:06 +0000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RESEND 1/1] drm/buddy: release free_trees array on buddy mm teardown To: Arunpravin Paneer Selvam , =?UTF-8?Q?Micha=C5=82_Grzelak?= , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: matthew.brost@intel.com, thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, Lucas De Marchi , =?UTF-8?Q?Christian_K=C3=B6nig?= References: <20251219193237.1454565-1-michal.grzelak@intel.com> <8c553c8d-2b09-4c2b-a744-dd789e5a1f64@intel.com> <3ffbe456-17c1-46b4-83e1-e26792aa5248@amd.com> Content-Language: en-GB From: Matthew Auld In-Reply-To: <3ffbe456-17c1-46b4-83e1-e26792aa5248@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 20/01/2026 05:27, Arunpravin Paneer Selvam wrote: > > On 19/01/26 21:55, Matthew Auld wrote: >> On 19/12/2025 19:32, Michał Grzelak wrote: >>> During initialization of DRM buddy memory manager at drm_buddy_init, >>> mm->free_trees array is allocated for both clear and dirty RB trees. >>> During cleanup happening at drm_buddy_fini it is never freed, leading to >>> following memory leaks observed on xe module load & unload cycles: >>> >>>      kmemleak_alloc+0x4a/0x90 >>>      __kmalloc_cache_noprof+0x488/0x800 >>>      drm_buddy_init+0xc2/0x330 [drm_buddy] >>>      __xe_ttm_vram_mgr_init+0xc3/0x190 [xe] >>>      xe_ttm_stolen_mgr_init+0xf5/0x9d0 [xe] >>>      xe_device_probe+0x326/0x9e0 [xe] >>>      xe_pci_probe+0x39a/0x610 [xe] >>>      local_pci_probe+0x47/0xb0 >>>      pci_device_probe+0xf3/0x260 >>>      really_probe+0xf1/0x3c0 >>>      __driver_probe_device+0x8c/0x180 >>>      driver_probe_device+0x24/0xd0 >>>      __driver_attach+0x10f/0x220 >>>      bus_for_each_dev+0x7f/0xe0 >>>      driver_attach+0x1e/0x30 >>>      bus_add_driver+0x151/0x290 >>> >>> Deallocate array for free trees when cleaning up buddy memory manager >>> in the same way as if going through out_free_tree label. >>> >>> Fixes: d4cd665c98c1 ("drm/buddy: Separate clear and dirty free block >>> trees") >>> Signed-off-by: Michał Grzelak >>> Reviewed-by: Lucas De Marchi >>> Reviewed-by: Matthew Auld >> >> Arun/Christian, can you merge this one? > > Sure, I have merged this patch. Thanks. > > Regards, > > Arun. > >> >>> --- >>>   drivers/gpu/drm/drm_buddy.c | 1 + >>>   1 file changed, 1 insertion(+) >>> >>> diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c >>> index 2f279b46bd2c..8308116058cc 100644 >>> --- a/drivers/gpu/drm/drm_buddy.c >>> +++ b/drivers/gpu/drm/drm_buddy.c >>> @@ -420,6 +420,7 @@ void drm_buddy_fini(struct drm_buddy *mm) >>>         for_each_free_tree(i) >>>           kfree(mm->free_trees[i]); >>> +    kfree(mm->free_trees); >>>       kfree(mm->roots); >>>   } >>>   EXPORT_SYMBOL(drm_buddy_fini); >>