[PATCH v11 01/10] i915: only initialize struct ref_tracker_dir once
flat view
STALE515d
SUPERSEDED
From: Jeff Layton <jlayton@kernel.org>
Date: 2025-05-28 14:34:50
Also in:
dri-devel, intel-gfx, lkml
Subsystem:
drm drivers, intel drm i915 driver (meteor lake, dg2 and older excluding poulsbo, moorestown and derivative), the rest · Maintainers:
David Airlie, Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, Tvrtko Ursulin, Linus Torvalds
Status: Superseded by v15 (posted 2025-06-18). [go to v15]
Revision v11 (14 revisions archived).
Revisions (14)
- v2
- v3 [diff against previous]
- v4 [diff against previous]
- v5 [diff against previous]
- v6 [diff against previous]
- v7 [diff against previous]
- v8 [diff against previous]
- v9 [diff against previous]
- v10 [diff against previous]
- v11 current [diff against previous]
- v12 [diff against previous]
- v13 [diff against previous]
- v14 [diff against previous]
- v15 [diff against previous]
I got some warnings from the i915 CI with the ref_tracker debugfs patches applied, that indicated that these ref_tracker_dir_init() calls were being called more than once. If references were held on these objects between the initializations, then that could lead to leaked ref tracking objects. Since these objects are zalloc'ed, ensure that they are only initialized once by testing whether the first byte of the name field is 0. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- drivers/gpu/drm/i915/intel_runtime_pm.c | 3 ++- drivers/gpu/drm/i915/intel_wakeref.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 8d9f4c410546e4144d4bc8bbc6696f3bd9498848..1b2ad1e0aef7d317f63a23b39193ea81c90401f0 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c@@ -59,7 +59,8 @@ static struct drm_i915_private *rpm_to_i915(struct intel_runtime_pm *rpm) static void init_intel_runtime_pm_wakeref(struct intel_runtime_pm *rpm) { - ref_tracker_dir_init(&rpm->debug, INTEL_REFTRACK_DEAD_COUNT, dev_name(rpm->kdev)); + if (!rpm->debug.name[0]) + ref_tracker_dir_init(&rpm->debug, INTEL_REFTRACK_DEAD_COUNT, dev_name(rpm->kdev)); } static intel_wakeref_t
diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c
index 07e81be4d3920febece34709c63a63204a41583c..3cfd68c98023fef75faa4dd69eba55e093130dd7 100644
--- a/drivers/gpu/drm/i915/intel_wakeref.c
+++ b/drivers/gpu/drm/i915/intel_wakeref.c@@ -114,7 +114,8 @@ void __intel_wakeref_init(struct intel_wakeref *wf, "wakeref.work", &key->work, 0); #if IS_ENABLED(CONFIG_DRM_I915_DEBUG_WAKEREF) - ref_tracker_dir_init(&wf->debug, INTEL_REFTRACK_DEAD_COUNT, name); + if (!wf->debug.name[0]) + ref_tracker_dir_init(&wf->debug, INTEL_REFTRACK_DEAD_COUNT, name); #endif }
--
2.49.0