| Message ID | 20240125063633.989944-1-xiaoming.wang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/xe/display: Fix memleak in display initialization | expand |
On Thu, 25 Jan 2024, wangxiaoming321 <xiaoming.wang@intel.com> wrote: > In the call stack xe_device_probe -> xe_display_init_nommio -> intel_power_domains_init > Power_domains hasn't been cleaned up if return error, > which has do the clean in i915_driver_late_release call from i915_driver_probe. This has nothing to do with i915_*. If intel_power_domains_init() returns an error, it should have cleaned up after itself, not force its caller to do that. If there's an issue, please fix it in intel_power_domains_init(). BR, Jani. > > unreferenced object 0xffff88811150ee00 (size 512): > comm "systemd-udevd", pid 506, jiffies 4294674198 (age 3605.560s) > hex dump (first 32 bytes): > 10 b4 9d a0 ff ff ff ff ff ff ff ff ff ff ff ff ................ > ff ff ff ff ff ff ff ff 00 00 00 00 00 00 00 00 ................ > backtrace: > [<ffffffff8134b901>] __kmem_cache_alloc_node+0x1c1/0x2b0 > [<ffffffff812c98b2>] __kmalloc+0x52/0x150 > [<ffffffffa08b0033>] __set_power_wells+0xc3/0x360 [xe] > [<ffffffffa08562fc>] xe_display_init_nommio+0x4c/0x70 [xe] > [<ffffffffa07f0d1c>] xe_device_probe+0x3c/0x5a0 [xe] > [<ffffffffa082e48f>] xe_pci_probe+0x33f/0x5a0 [xe] > [<ffffffff817f2187>] local_pci_probe+0x47/0xa0 > [<ffffffff817f3db3>] pci_device_probe+0xc3/0x1f0 > [<ffffffff8192f2a2>] really_probe+0x1a2/0x410 > [<ffffffff8192f598>] __driver_probe_device+0x78/0x160 > [<ffffffff8192f6ae>] driver_probe_device+0x1e/0x90 > [<ffffffff8192f92a>] __driver_attach+0xda/0x1d0 > [<ffffffff8192c95c>] bus_for_each_dev+0x7c/0xd0 > [<ffffffff8192e159>] bus_add_driver+0x119/0x220 > [<ffffffff81930d00>] driver_register+0x60/0x120 > [<ffffffffa05e50a0>] 0xffffffffa05e50a0 > > Signed-off-by: wangxiaoming321 <xiaoming.wang@intel.com> > --- > drivers/gpu/drm/xe/xe_display.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c > index 74391d9b11ae..2725afba4afb 100644 > --- a/drivers/gpu/drm/xe/xe_display.c > +++ b/drivers/gpu/drm/xe/xe_display.c > @@ -146,8 +146,10 @@ int xe_display_init_nommio(struct xe_device *xe) > intel_detect_pch(xe); > > err = intel_power_domains_init(xe); > - if (err) > + if (err) { > + intel_power_domains_cleanup(xe); > return err; > + } > > return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe); > }
diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c index 74391d9b11ae..2725afba4afb 100644 --- a/drivers/gpu/drm/xe/xe_display.c +++ b/drivers/gpu/drm/xe/xe_display.c @@ -146,8 +146,10 @@ int xe_display_init_nommio(struct xe_device *xe) intel_detect_pch(xe); err = intel_power_domains_init(xe); - if (err) + if (err) { + intel_power_domains_cleanup(xe); return err; + } return drmm_add_action_or_reset(&xe->drm, xe_display_fini_nommio, xe); }
In the call stack xe_device_probe -> xe_display_init_nommio -> intel_power_domains_init Power_domains hasn't been cleaned up if return error, which has do the clean in i915_driver_late_release call from i915_driver_probe. unreferenced object 0xffff88811150ee00 (size 512): comm "systemd-udevd", pid 506, jiffies 4294674198 (age 3605.560s) hex dump (first 32 bytes): 10 b4 9d a0 ff ff ff ff ff ff ff ff ff ff ff ff ................ ff ff ff ff ff ff ff ff 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8134b901>] __kmem_cache_alloc_node+0x1c1/0x2b0 [<ffffffff812c98b2>] __kmalloc+0x52/0x150 [<ffffffffa08b0033>] __set_power_wells+0xc3/0x360 [xe] [<ffffffffa08562fc>] xe_display_init_nommio+0x4c/0x70 [xe] [<ffffffffa07f0d1c>] xe_device_probe+0x3c/0x5a0 [xe] [<ffffffffa082e48f>] xe_pci_probe+0x33f/0x5a0 [xe] [<ffffffff817f2187>] local_pci_probe+0x47/0xa0 [<ffffffff817f3db3>] pci_device_probe+0xc3/0x1f0 [<ffffffff8192f2a2>] really_probe+0x1a2/0x410 [<ffffffff8192f598>] __driver_probe_device+0x78/0x160 [<ffffffff8192f6ae>] driver_probe_device+0x1e/0x90 [<ffffffff8192f92a>] __driver_attach+0xda/0x1d0 [<ffffffff8192c95c>] bus_for_each_dev+0x7c/0xd0 [<ffffffff8192e159>] bus_add_driver+0x119/0x220 [<ffffffff81930d00>] driver_register+0x60/0x120 [<ffffffffa05e50a0>] 0xffffffffa05e50a0 Signed-off-by: wangxiaoming321 <xiaoming.wang@intel.com> --- drivers/gpu/drm/xe/xe_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)