Skip to content

Commit 84a6e47

Browse files
ahajdagregkh
authored andcommitted
drm/i915: do not clean GT table on error path
[ Upstream commit 0561794 ] The only task of intel_gt_release_all is to zero gt table. Calling it on error path prevents intel_gt_driver_late_release_all (called from i915_driver_late_release) to cleanup GTs, causing leakage. After i915_driver_late_release GT array is not used anymore so it does not need cleaning at all. Sample leak report: BUG i915_request (...): Objects remaining in i915_request on __kmem_cache_shutdown() ... Object 0xffff888113420040 @offset=64 Allocated in __i915_request_create+0x75/0x610 [i915] age=18339 cpu=1 pid=1454 kmem_cache_alloc+0x25b/0x270 __i915_request_create+0x75/0x610 [i915] i915_request_create+0x109/0x290 [i915] __engines_record_defaults+0xca/0x440 [i915] intel_gt_init+0x275/0x430 [i915] i915_gem_init+0x135/0x2c0 [i915] i915_driver_probe+0x8d1/0xdc0 [i915] v2: removed whole intel_gt_release_all Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8489 Fixes: bec68cc ("drm/i915: Prepare for multiple GTs") Signed-off-by: Andrzej Hajda <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Reviewed-by: Nirmoy Das <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit e899505) Signed-off-by: Jani Nikula <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 84c9d30 commit 84a6e47

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

drivers/gpu/drm/i915/gt/intel_gt.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,6 @@ int intel_gt_probe_all(struct drm_i915_private *i915)
903903

904904
err:
905905
i915_probe_error(i915, "Failed to initialize %s! (%d)\n", gtdef->name, ret);
906-
intel_gt_release_all(i915);
907-
908906
return ret;
909907
}
910908

@@ -923,15 +921,6 @@ int intel_gt_tiles_init(struct drm_i915_private *i915)
923921
return 0;
924922
}
925923

926-
void intel_gt_release_all(struct drm_i915_private *i915)
927-
{
928-
struct intel_gt *gt;
929-
unsigned int id;
930-
931-
for_each_gt(gt, i915, id)
932-
i915->gt[id] = NULL;
933-
}
934-
935924
void intel_gt_info_print(const struct intel_gt_info *info,
936925
struct drm_printer *p)
937926
{

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
901901

902902
ret = i915_driver_mmio_probe(i915);
903903
if (ret < 0)
904-
goto out_tiles_cleanup;
904+
goto out_runtime_pm_put;
905905

906906
ret = i915_driver_hw_probe(i915);
907907
if (ret < 0)
@@ -959,8 +959,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
959959
i915_ggtt_driver_late_release(i915);
960960
out_cleanup_mmio:
961961
i915_driver_mmio_release(i915);
962-
out_tiles_cleanup:
963-
intel_gt_release_all(i915);
964962
out_runtime_pm_put:
965963
enable_rpm_wakeref_asserts(&i915->runtime_pm);
966964
i915_driver_late_release(i915);

0 commit comments

Comments
 (0)