• Ira Weiny's avatar
    cxl/pmu: Ensure put_device on pmu devices · ef3d5cf9
    Ira Weiny authored
    The following kmemleaks were detected when removing the cxl module
    stack:
    
    unreferenced object 0xffff88822616b800 (size 1024):
    ...
      backtrace:
        [<00000000bedc6f83>] kmalloc_trace+0x26/0x90
        [<00000000448d1afc>] devm_cxl_pmu_add+0x3a/0x110 [cxl_core]
        [<00000000ca3bfe16>] 0xffffffffa105213b
        [<00000000ba7f78dc>] local_pci_probe+0x41/0x90
        [<000000005bb027ac>] pci_device_probe+0xb0/0x1c0
    ...
    unreferenced object 0xffff8882260abcc0 (size 16):
    ...
      hex dump (first 16 bytes):
        70 6d 75 5f 6d 65 6d 30 2e 30 00 26 82 88 ff ff  pmu_mem0.0.&....
      backtrace:
    ...
        [<00000000152b5e98>] dev_set_name+0x43/0x50
        [<00000000c228798b>] devm_cxl_pmu_add+0x102/0x110 [cxl_core]
        [<00000000ca3bfe16>] 0xffffffffa105213b
        [<00000000ba7f78dc>] local_pci_probe+0x41/0x90
        [<000000005bb027ac>] pci_device_probe+0xb0/0x1c0
    ...
    unreferenced object 0xffff8882272af200 (size 256):
    ...
      backtrace:
        [<00000000bedc6f83>] kmalloc_trace+0x26/0x90
        [<00000000a14d1813>] device_add+0x4ea/0x890
        [<00000000a3f07b47>] devm_cxl_pmu_add+0xbe/0x110 [cxl_core]
        [<00000000ca3bfe16>] 0xffffffffa105213b
        [<00000000ba7f78dc>] local_pci_probe+0x41/0x90
        [<000000005bb027ac>] pci_device_probe+0xb0/0x1c0
    ...
    
    devm_cxl_pmu_add() correctly registers a device remove function but it
    only calls device_del() which is only part of device unregistration.
    
    Properly call device_unregister() to free up the memory associated with
    the device.
    
    Fixes: 1ad3f701 ("cxl/pci: Find and register CXL PMU devices")
    Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
    Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
    Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
    Link: https://lore.kernel.org/r/20231016-pmu-unregister-fix-v1-1-1e2eb2fa3c69@intel.comSigned-off-by: default avatarDan Williams <dan.j.williams@intel.com>
    ef3d5cf9
pmu.c 1.31 KB