Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] drm/xe: Fix memory leak on xe_alloc_pf_queue failure
@ 2024-08-26 16:20 Nirmoy Das
  2024-08-26 17:19 ` ✓ CI.Patch_applied: success for drm/xe: Fix memory leak on xe_alloc_pf_queue failure (rev2) Patchwork
                   ` (8 more replies)
  0 siblings, 9 replies; 12+ messages in thread
From: Nirmoy Das @ 2024-08-26 16:20 UTC (permalink / raw)
  To: intel-xe
  Cc: Nirmoy Das, Matthew Auld, Matthew Brost, Rodrigo Vivi,
	Stuart Summers

Simplify memory unwinding on error also fixing current memory
leak that can happen on error.

v2: use devm_kcalloc(Matt A)

Fixes: 3338e4f90c14 ("drm/xe: Use topology to determine page fault queue size")
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/xe/xe_gt_pagefault.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 0be4687bfc20..91810d0a9afc 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -388,7 +388,6 @@ static void pagefault_fini(void *arg)
 {
 	struct xe_gt *gt = arg;
 	struct xe_device *xe = gt_to_xe(gt);
-	int i;
 
 	if (!xe->info.has_usm)
 		return;
@@ -396,12 +395,11 @@ static void pagefault_fini(void *arg)
 	destroy_workqueue(gt->usm.acc_wq);
 	destroy_workqueue(gt->usm.pf_wq);
 
-	for (i = 0; i < NUM_PF_QUEUE; ++i)
-		kfree(gt->usm.pf_queue[i].data);
 }
 
 static int xe_alloc_pf_queue(struct xe_gt *gt, struct pf_queue *pf_queue)
 {
+	struct xe_device *xe = gt_to_xe(gt);
 	xe_dss_mask_t all_dss;
 	int num_dss, num_eus;
 
@@ -417,7 +415,8 @@ static int xe_alloc_pf_queue(struct xe_gt *gt, struct pf_queue *pf_queue)
 		(num_eus + XE_NUM_HW_ENGINES) * PF_MSG_LEN_DW;
 
 	pf_queue->gt = gt;
-	pf_queue->data = kcalloc(pf_queue->num_dw, sizeof(u32), GFP_KERNEL);
+	pf_queue->data = devm_kcalloc(xe->drm.dev, pf_queue->num_dw,
+				      sizeof(u32), GFP_KERNEL);
 	if (!pf_queue->data)
 		return -ENOMEM;
 
-- 
2.42.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-08-30  9:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-26 16:20 [PATCH v2] drm/xe: Fix memory leak on xe_alloc_pf_queue failure Nirmoy Das
2024-08-26 17:19 ` ✓ CI.Patch_applied: success for drm/xe: Fix memory leak on xe_alloc_pf_queue failure (rev2) Patchwork
2024-08-26 17:19 ` ✓ CI.checkpatch: " Patchwork
2024-08-26 17:20 ` ✓ CI.KUnit: " Patchwork
2024-08-26 17:32 ` ✓ CI.Build: " Patchwork
2024-08-26 17:34 ` ✓ CI.Hooks: " Patchwork
2024-08-26 17:35 ` ✓ CI.checksparse: " Patchwork
2024-08-26 17:56 ` ✓ CI.BAT: " Patchwork
2024-08-26 22:15 ` ✗ CI.FULL: failure " Patchwork
2024-08-27  8:48 ` [PATCH v2] drm/xe: Fix memory leak on xe_alloc_pf_queue failure Matthew Auld
2024-08-27  9:48   ` Nirmoy Das
2024-08-30  9:40     ` Nirmoy Das

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox