Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Message-ID: <b62ded44-4432-4aee-a086-1171b89fd2ae@intel.com>
Date:   Mon, 16 Oct 2023 16:43:27 -0700
User-Agent: Betterbird (Linux)
Subject: Re: [PATCH] cxl/pmu: Ensure put_device on pmu devices
To:     Ira Weiny <ira.weiny@intel.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Jonathan Cameron <jonathan.cameron@huawei.com>,
        Alison Schofield <alison.schofield@intel.com>,
        Vishal Verma <vishal.l.verma@intel.com>,
        "Dan Williams" <dan.j.williams@intel.com>
CC:     <linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>
References: <20231016-pmu-unregister-fix-v1-1-1e2eb2fa3c69@intel.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20231016-pmu-unregister-fix-v1-1-1e2eb2fa3c69@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WFNocmRqOUNYanE5SFRiNlJ3Yzl0dGJ5bGQ3enkwSm9XQi9Rd3VRcU4yVkVQ?=
 =?utf-8?B?S0Nyb0ZBZWFCWkdqMUZRaG9Qc2JON1ZMNWlOUlRpSkVCNWhSamt6Njc0OE5Q?=
 =?utf-8?B?bHZoeFV2RzhYVWc2Yk5taDFCOUl5Wi9uUWZiaGlNaytzcUZQWVRpSk1mSFJl?=
 =?utf-8?B?Q1NDblN5TUUzZjI2cWszODZyajJLdm55VTJIRXdXa1AzemZBVmFZeUVONU8x?=
 =?utf-8?B?QzNFU0JHeFRXSTJzeFpJcEtVMHZoWkhjclpLN2ZPZWx6Y1drV1Yva0h5dUlh?=
 =?utf-8?B?NGJzWUlvSEVSSXYyTk9aeTlHblpwYjRaZkNub1dUNXF3ZjVTK2J5eVkvcTVD?=
 =?utf-8?B?L1RNTW12OVZnenhSbGFETlpqOUR5MFQ0QXFTUkNCVDVhbWk5M2FwTGxuMk1W?=
 =?utf-8?B?aThieWUvU29TNDA4RXQ0c1JMM3dFMkYveTF0RWlnMWZ3bHZocitzMCtzNzZx?=
 =?utf-8?B?Umt2T29ITTgvcUVTc0FFMHNHcWo4NzIxZnpKR0hCeWpTY0d3U01aQXNJOXB0?=
 =?utf-8?B?YmtiSDhoZ3R4L05WaGRHOWdMeXdEMUN2bElWN0EwZ1lFWDg2ZFB2SWJSNUZJ?=
 =?utf-8?B?akxtR3pHUG1UV1FDOW5LVzY4a2VieXcwM1BMUXQ0OE4xRHZZQTBmbldIcXdp?=
 =?utf-8?B?TDU2LzBsTGJYclFtZmVkSnVVN3ZFbjlhU2wwRDExcXRtTFkxemJYemxUOXI2?=
 =?utf-8?B?Ri9YZjdsa1k2ZVVIaE9HU0xFbEVySzhXbC93ZGtWWW15cUlPOVlTRnFndVRn?=
 =?utf-8?B?Mk9zaHdKS21XNnhVRzFsSTVEMHNOeDVlOGdOb3prUEhEUkFnTTA1L29icDNO?=
 =?utf-8?B?RFVZaFlJMzQ3UTFLUFlDTzZGQXZwajN1VHlOU0NsL1ZDdFVFeHdHU29wcDds?=
 =?utf-8?B?Y25kT3JKcEt1eXVJODZ0NzZTYUE4ejNXVzBCSjdsVlZ0cUVrSlJOWVRNd2dJ?=
 =?utf-8?B?UCtkaSszN1A2MDBjbjN4KytVb2lwYWpDVmJLTCtGSFhZMTRYS1FneElLc21N?=
 =?utf-8?B?eS9sOXFjU2JGWnFLRzVTVXh5Y0ZvY3VCZUlkQzFENFdqaVV5eHR1bmZrSWxl?=
 =?utf-8?B?UTlxNGlUTUZ1Tm11ZHR4V3ZmYmEyQ2VyZXZ2Y2lRcnFQcE9ZSlNYbElRMDFy?=
 =?utf-8?B?ckxDUERxQW5NMjAvUmdqWHY4VWQ0dm9meVk3bnRoZEgrcmp2Y1hrRFJ0eFhC?=
 =?utf-8?B?czk4cEI1eHFZVDRlZ1d3RG04cHN3djIzYnRoVlcwOENRSXp6MCtyWHJlM3pa?=
 =?utf-8?B?VlBzbTNSV2pHOFk4Sy9oRXA4UGJtbzhVZS84aGlHMnNwdzJYejlUZ0FDcmoz?=
 =?utf-8?B?emxsS1VSMWhkbGlueTNudWxKREVBUHZKQVJhbTF6d09PWGRmUjJsVy9sdVRB?=
 =?utf-8?B?Q2xYZWloVzdMaG1JZGlBZWFXRUw5R0h3UG1ESG9ualZFY2FEVHdtSmU3WEpt?=
 =?utf-8?B?Zm9ESkpCS3IwVEliclBFMktJYnQ5cWI0K2s3M09LS2xwVlZ2MW1KWXdXc1Z1?=
 =?utf-8?B?U2FhdktjMzNqKzlzeHJCK3FtZ0lyRkFHSXgwZDRrYmk3WGlGSFBTRzNtNm5M?=
 =?utf-8?B?QUkwbkFCR3BtUkxIbFRzT2Y5NUZlenJ4bmhHUWhVMU5VQUVMR1NzMjhESk92?=
 =?utf-8?B?dm5OU1ZzSWVmVytST1BEVzdVc2xHK0ZXTEJPb3VDYkJOYVBzVEVLK2VibDVm?=
 =?utf-8?B?bWVXbkxaZytOOHU1andhc1BnYUpNQStWRW5PVE0zQ1hlNGZzRkIrL0EwV2hR?=
 =?utf-8?B?cDZWcDRMaU5paG9qclRWaXpLYXRDRE9GVGJlcGZEblUxZkRpZk1Wd3UvbndY?=
 =?utf-8?B?cTczdVZHempLT05mKzVHS0NPMTlpTFoxWURkZ0N2Uml3MnJlOUFodEdoMzFt?=
 =?utf-8?B?b09mS2JYOVE1MXlWSGVIdUJiSnQzRGJ5ODIrdEJxdGRhcXE1RUlyY3NtOUQ0?=
 =?utf-8?B?Y2R3ZGhLSkpSSnpmeHFYeG92ZjJiUXlLakY0ZXV0d0ppMXhYRVNndG5yekJa?=
 =?utf-8?B?TnRkR2tmS0RQaEQ3RWdpYWdweG9RS1Z0YTB6UGQ2b2c5Y0ZseWFzVFFzZldU?=
 =?utf-8?B?OWNKMDczckZQb2hmTnREeDVDRDhKclMvL3hWN1RhSTQyV2ZkeE5XSUEza3hk?=
 =?utf-8?Q?Ee+5ijGPXbUy/YIIPwgJtQH6W?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 506115f0-5c9c-4280-a372-08dbcea1b402
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 23:43:31.0623
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: tOWDqUjjFJgyoZoxNKNvU5nkXEecEtcUou9VJb9HaYNWTRntbTwXsbpNO1E9OYXN6oTo7oRyVRtpZu9QZbF0og==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7637
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Mon, 16 Oct 2023 16:43:54 -0700 (PDT)


On 10/16/23 16:25, Ira Weiny wrote:
> 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: 1ad3f701c399 ("cxl/pci: Find and register CXL PMU devices")
> Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Ira Weiny <ira.weiny@intel.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>

Although I wonder if we can just give device_unregister() to devm_add_action_or_reset() directly. 

> ---
>  drivers/cxl/core/pmu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/cxl/core/pmu.c b/drivers/cxl/core/pmu.c
> index 7684c843e5a5..5d8e06b0ba6e 100644
> --- a/drivers/cxl/core/pmu.c
> +++ b/drivers/cxl/core/pmu.c
> @@ -23,7 +23,7 @@ const struct device_type cxl_pmu_type = {
>  
>  static void remove_dev(void *dev)
>  {
> -	device_del(dev);
> +	device_unregister(dev);
>  }
>  
>  int devm_cxl_pmu_add(struct device *parent, struct cxl_pmu_regs *regs,
> 
> ---
> base-commit: 58720809f52779dc0f08e53e54b014209d13eebb
> change-id: 20231016-pmu-unregister-fix-345480926a58
> 
> Best regards,