From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 14696C3062E for ; Thu, 17 Aug 2023 14:48:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:References:Cc:To:From:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=K/VIlmLnJlCDmZUt+hgRkxAfL1q0WX7tDlGtBtbg8uI=; b=Xu0AJSekhgZjyy ImHMXRAR5duz1FITgJ6xlk0oWUUXcUP/PnPHLpdZxs3vLc51j6g/G2NgEnTzoU5/q6pXPZq9Kjirn wOlqgJTRWSLo8YgQZcNlO1hp1tjrzDF5nSUZnwD9wEGran70GpcNaT7KgLgdBEIqLi2iIAE3STNXR IvHqL1FDTrxO2Wi6on/GgDewC+Zl92YlOXVG+sw9Vj+pvzVi8SRSkG2bV/BoNpmiZubZMQx8zcFum KCugXMBkIpwpyBZFVAaPYeY8eKZjDg/e8CYCOfEAWEL9RWUUxyrEjgjF+V5C8tdb33trYGPTR3AWZ D1d8ogASnMBy0NjE+Q1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWeI5-006anl-1D; Thu, 17 Aug 2023 14:48:01 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWeI3-006anL-0S for linux-arm-kernel@lists.infradead.org; Thu, 17 Aug 2023 14:48:00 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 52B9E1063; Thu, 17 Aug 2023 07:48:38 -0700 (PDT) Received: from [10.57.34.77] (unknown [10.57.34.77]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D54EF3F6C4; Thu, 17 Aug 2023 07:47:55 -0700 (PDT) Message-ID: Date: Thu, 17 Aug 2023 15:47:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH 2/2] coresight: core: fix memory leak in dict->fwnode_list From: Suzuki K Poulose To: Junhao He , mike.leach@linaro.org, leo.yan@linaro.org, james.clark@arm.com Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, jonathan.cameron@huawei.com, yangyicong@huawei.com, prime.zeng@hisilicon.com References: <20230817085937.55590-1-hejunhao3@huawei.com> <20230817085937.55590-3-hejunhao3@huawei.com> <16d7c933-ef2f-682e-742e-641c6a076ac0@arm.com> In-Reply-To: <16d7c933-ef2f-682e-742e-641c6a076ac0@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230817_074759_271674_ED48CE64 X-CRM114-Status: GOOD ( 21.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMTcvMDgvMjAyMyAxNTozOSwgU3V6dWtpIEsgUG91bG9zZSB3cm90ZToKPiBPbiAxNy8wOC8y MDIzIDA5OjU5LCBKdW5oYW8gSGUgd3JvdGU6Cj4+IFRoZXJlIGFyZSBtZW1vcnkgbGVha3MgcmVw b3J0ZWQgYnkga21lbWxlYWs6Cj4+IC4uLgo+PiB1bnJlZmVyZW5jZWQgb2JqZWN0IDB4ZmZmZjIw MjAxMDNjMzIwMCAoc2l6ZSAyNTYpOgo+PiDCoMKgIGNvbW0gImluc21vZCIsIHBpZCA0NDc2LCBq aWZmaWVzIDQyOTQ5NzgyNTIgKGFnZSA1MDA3Mi41MzZzKQo+PiDCoMKgIGhleCBkdW1wIChmaXJz dCAzMiBieXRlcyk6Cj4+IMKgwqDCoMKgIDEwIDYwIDQwIDA2IDI4IDIwIGZmIGZmIDEwIGMwIDU5 IDA2IDIwIDIwIGZmIGZmwqAgLmBALiggLi4uLlkuwqAgLi4KPj4gwqDCoMKgwqAgMTAgZTAgNDcg MDYgMjggMjAgZmYgZmYgMTAgMDAgNDkgMDYgMjggMjAgZmYgZmbCoCAuLkcuKCAuLi4uSS4oIC4u Cj4+IMKgwqAgYmFja3RyYWNlOgo+PiDCoMKgwqDCoCBbPDAwMDAwMDAwMzRlYzQ3MjQ+XSBfX2tt ZW1fY2FjaGVfYWxsb2Nfbm9kZSsweDJmOC8weDM0OAo+PiDCoMKgwqDCoCBbPDAwMDAwMDAwNTdm YmMxNWQ+XSBfX2ttYWxsb2Nfbm9kZV90cmFja19jYWxsZXIrMHg1Yy8weDExMAo+PiDCoMKgwqDC oCBbPDAwMDAwMDU1ZDVlMzRiPl0ga3JlYWxsb2MrMHg4Yy8weDE3OAo+PiDCoMKgwqDCoCBbPDAw MDAwMDAwYTQ2MzViZWI+XSBjb3Jlc2lnaHRfYWxsb2NfZGV2aWNlX25hbWUrMHgxMjgvMHgxODgg Cj4+IFtjb3Jlc2lnaHRdCj4+IMKgwqDCoMKgIFs8MDAwMDAwMDBhOTJkZGZlZT5dIGZ1bm5lbF9j c19vcHMrMHgxMC8weGZmZmZmZmZmZmZmZWRhYTAgCj4+IFtjb3Jlc2lnaHRfZnVubmVsXQo+PiDC oMKgwqDCoCBbPDAwMDAwMDAwNDQ5ZTIwZjg+XSBkeW5hbWljX2Z1bm5lbF9pZHMrMHg4MC8weGZm ZmZmZmZmZmZmZWQ4NDAgCj4+IFtjb3Jlc2lnaHRfZnVubmVsXQo+PiAuLi4KPj4KPj4gd2hlbiBy ZW1vdmUgZHJpdmVyLCB0aGUgZ29sYWIgdmFyaWFibGVzIGRlZmluZWQgYnkgdGhlIG1hY3JvCj4+ IERFRklORV9DT1JFU0lHSFRfREVWTElTVCB3aWxsIGJlIHJlbGVhc2VkLCBkaWN0LT5ucl9pZHgg YW5kCj4+IGRpY3QtPmZ3bm9kZV9saXN0IGFyZSBjbGVhcmVkIHRvIDAuIFRoZSBsaWZldGltZSBv ZiB0aGUgZ29sYWIKPj4gdmFyaWFibGUgaGFzIGVuZGVkLiBTbyB0aGUgYnVmZmVyIHBvaW50ZXIg aXMgbG9zdC4KPj4KPj4gVXNlIHRoZSBjYWxsYmFjayBvZiBkZXZtX2FkZF9hY3Rpb25fb3JfcmVz ZXQoKSB0byBmcmVlIG1lbW9yeS4KPiAKPiBUaGFua3MgZm9yIHRoZSByZXBvcnQuIEJ1dCBwbGVh c2Ugc2VlIGJlbG93Ogo+IAo+Pgo+PiBGaXhlczogMGY1ZjliNmJhOWUxICgiY29yZXNpZ2h0OiBV c2UgcGxhdGZvcm0gYWdub3N0aWMgbmFtZXMiKQo+PiBTaWduZWQtb2ZmLWJ5OiBKdW5oYW8gSGUg PGhlanVuaGFvM0BodWF3ZWkuY29tPgo+PiAtLS0KPj4gwqAgZHJpdmVycy9od3RyYWNpbmcvY29y ZXNpZ2h0L2NvcmVzaWdodC1jb3JlLmMgfCAyMCArKysrKysrKysrKysrKysrKysrLQo+PiDCoCAx IGZpbGUgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+Pgo+PiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9od3RyYWNpbmcvY29yZXNpZ2h0L2NvcmVzaWdodC1jb3JlLmMgCj4+ IGIvZHJpdmVycy9od3RyYWNpbmcvY29yZXNpZ2h0L2NvcmVzaWdodC1jb3JlLmMKPj4gaW5kZXgg OWZhYmUwMGE0MGQ2Li42ODQ5ZmFhZDY5N2QgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvaHd0cmFj aW5nL2NvcmVzaWdodC9jb3Jlc2lnaHQtY29yZS5jCj4+ICsrKyBiL2RyaXZlcnMvaHd0cmFjaW5n L2NvcmVzaWdodC9jb3Jlc2lnaHQtY29yZS5jCj4+IEBAIC0xNzU2LDYgKzE3NTYsMjAgQEAgYm9v bCBjb3Jlc2lnaHRfbG9zZXNfY29udGV4dF93aXRoX2NwdShzdHJ1Y3QgCj4+IGRldmljZSAqZGV2 KQo+PiDCoCB9Cj4+IMKgIEVYUE9SVF9TWU1CT0xfR1BMKGNvcmVzaWdodF9sb3Nlc19jb250ZXh0 X3dpdGhfY3B1KTsKPj4gK3ZvaWQgY29yZXNpZ2h0X3JlbGVhc2VfZGV2X2xpc3Qodm9pZCAqZGF0 YSkKPj4gK3sKPj4gK8KgwqDCoCBzdHJ1Y3QgY29yZXNpZ2h0X2Rldl9saXN0ICpkaWN0ID0gZGF0 YTsKPj4gKwo+PiArwqDCoMKgIG11dGV4X2xvY2soJmNvcmVzaWdodF9tdXRleCk7Cj4+ICsKPj4g K8KgwqDCoCBpZiAoZGljdC0+bnJfaWR4KSB7Cj4+ICvCoMKgwqDCoMKgwqDCoCBrZnJlZShkaWN0 LT5md25vZGVfbGlzdCk7Cj4+ICvCoMKgwqDCoMKgwqDCoCBkaWN0LT5ucl9pZHggPSAwOwo+PiAr wqDCoMKgIH0KPj4gKwo+PiArwqDCoMKgIG11dGV4X3VubG9jaygmY29yZXNpZ2h0X211dGV4KTsK Pj4gK30KPj4gKwo+PiDCoCAvKgo+PiDCoMKgICogY29yZXNpZ2h0X2FsbG9jX2RldmljZV9uYW1l IC0gR2V0IGFuIGluZGV4IGZvciBhIGdpdmVuIGRldmljZSBpbiB0aGUKPj4gwqDCoCAqIGRldmlj ZSBpbmRleCBsaXN0IHNwZWNpZmljIHRvIGEgZHJpdmVyLiBBbiBpbmRleCBpcyBhbGxvY2F0ZWQg Zm9yIGEKPj4gQEAgLTE3NjYsMTIgKzE3ODAsMTYgQEAgCj4+IEVYUE9SVF9TWU1CT0xfR1BMKGNv cmVzaWdodF9sb3Nlc19jb250ZXh0X3dpdGhfY3B1KTsKPj4gwqAgY2hhciAqY29yZXNpZ2h0X2Fs bG9jX2RldmljZV9uYW1lKHN0cnVjdCBjb3Jlc2lnaHRfZGV2X2xpc3QgKmRpY3QsCj4+IMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHN0cnVjdCBkZXZpY2UgKmRldikKPj4g wqAgewo+PiAtwqDCoMKgIGludCBpZHg7Cj4+ICvCoMKgwqAgaW50IGlkeCwgcmV0Owo+PiDCoMKg wqDCoMKgIGNoYXIgKm5hbWUgPSBOVUxMOwo+PiDCoMKgwqDCoMKgIHN0cnVjdCBmd25vZGVfaGFu ZGxlICoqbGlzdDsKPj4gwqDCoMKgwqDCoCBtdXRleF9sb2NrKCZjb3Jlc2lnaHRfbXV0ZXgpOwo+ PiArwqDCoMKgIHJldCA9IGRldm1fYWRkX2FjdGlvbl9vcl9yZXNldChkZXYsIGNvcmVzaWdodF9y ZWxlYXNlX2Rldl9saXN0LCAKPj4gZGljdCk7Cj4+ICvCoMKgwqAgaWYgKHJldCkKPj4gK8KgwqDC oMKgwqDCoMKgIGdvdG8gZG9uZTsKPiAKPiBUaGlzIGxvb2tzIHdyb25nLiBUaGUgZGV2bGlzdCBz aG91bGQgYmUgb25seSByZWxlYXNlZCBvbiB0aGUgImRyaXZlciIgCj4gdW5sb2FkLCBub3Qgb24g ZXZlcnkgZGV2aWNlIHJlbGVhc2UuIFRoZSBsaXN0IHJldGFpbnMgdGhlIGZ3bm9kZSB0bwo+IGFz c2lnbiB0aGUgc2FtZSBuYW1lIGZvciBhIGRldmljZSwgaWYgaXQgaXMgcmUtcHJvYmVkIChlLmcu LCBkdWUgdG8KPiAtRVBST0JFX0RFRkVSIGVycm9yKS4KClRoZSBiZXN0IHdheSBpcyB0byBmcmVl IGl0IG9uIG1vZHVsZV91bmxvYWQgYW5kIHVuZm9ydHVuYXRlbHkgd2Ugd291bGQKbmVlZCB0byBk byBpdCBmcm9tIGFsbCBtb2R1bGVzIHVzaW5nIHRoZSBERVZMSVNULgoKU3V6dWtpCgoKPiAKPiBT dXp1a2kKPiAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmlu ZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9s aW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F1EAC30630 for ; Thu, 17 Aug 2023 14:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352260AbjHQOsv (ORCPT ); Thu, 17 Aug 2023 10:48:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352288AbjHQOs0 (ORCPT ); Thu, 17 Aug 2023 10:48:26 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 65E413AA0 for ; Thu, 17 Aug 2023 07:48:08 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 52B9E1063; Thu, 17 Aug 2023 07:48:38 -0700 (PDT) Received: from [10.57.34.77] (unknown [10.57.34.77]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D54EF3F6C4; Thu, 17 Aug 2023 07:47:55 -0700 (PDT) Message-ID: Date: Thu, 17 Aug 2023 15:47:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH 2/2] coresight: core: fix memory leak in dict->fwnode_list From: Suzuki K Poulose To: Junhao He , mike.leach@linaro.org, leo.yan@linaro.org, james.clark@arm.com Cc: coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linuxarm@huawei.com, jonathan.cameron@huawei.com, yangyicong@huawei.com, prime.zeng@hisilicon.com References: <20230817085937.55590-1-hejunhao3@huawei.com> <20230817085937.55590-3-hejunhao3@huawei.com> <16d7c933-ef2f-682e-742e-641c6a076ac0@arm.com> In-Reply-To: <16d7c933-ef2f-682e-742e-641c6a076ac0@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 17/08/2023 15:39, Suzuki K Poulose wrote: > On 17/08/2023 09:59, Junhao He wrote: >> There are memory leaks reported by kmemleak: >> ... >> unreferenced object 0xffff2020103c3200 (size 256): >>    comm "insmod", pid 4476, jiffies 4294978252 (age 50072.536s) >>    hex dump (first 32 bytes): >>      10 60 40 06 28 20 ff ff 10 c0 59 06 20 20 ff ff  .`@.( ....Y.  .. >>      10 e0 47 06 28 20 ff ff 10 00 49 06 28 20 ff ff  ..G.( ....I.( .. >>    backtrace: >>      [<0000000034ec4724>] __kmem_cache_alloc_node+0x2f8/0x348 >>      [<0000000057fbc15d>] __kmalloc_node_track_caller+0x5c/0x110 >>      [<00000055d5e34b>] krealloc+0x8c/0x178 >>      [<00000000a4635beb>] coresight_alloc_device_name+0x128/0x188 >> [coresight] >>      [<00000000a92ddfee>] funnel_cs_ops+0x10/0xfffffffffffedaa0 >> [coresight_funnel] >>      [<00000000449e20f8>] dynamic_funnel_ids+0x80/0xfffffffffffed840 >> [coresight_funnel] >> ... >> >> when remove driver, the golab variables defined by the macro >> DEFINE_CORESIGHT_DEVLIST will be released, dict->nr_idx and >> dict->fwnode_list are cleared to 0. The lifetime of the golab >> variable has ended. So the buffer pointer is lost. >> >> Use the callback of devm_add_action_or_reset() to free memory. > > Thanks for the report. But please see below: > >> >> Fixes: 0f5f9b6ba9e1 ("coresight: Use platform agnostic names") >> Signed-off-by: Junhao He >> --- >>   drivers/hwtracing/coresight/coresight-core.c | 20 +++++++++++++++++++- >>   1 file changed, 19 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/hwtracing/coresight/coresight-core.c >> b/drivers/hwtracing/coresight/coresight-core.c >> index 9fabe00a40d6..6849faad697d 100644 >> --- a/drivers/hwtracing/coresight/coresight-core.c >> +++ b/drivers/hwtracing/coresight/coresight-core.c >> @@ -1756,6 +1756,20 @@ bool coresight_loses_context_with_cpu(struct >> device *dev) >>   } >>   EXPORT_SYMBOL_GPL(coresight_loses_context_with_cpu); >> +void coresight_release_dev_list(void *data) >> +{ >> +    struct coresight_dev_list *dict = data; >> + >> +    mutex_lock(&coresight_mutex); >> + >> +    if (dict->nr_idx) { >> +        kfree(dict->fwnode_list); >> +        dict->nr_idx = 0; >> +    } >> + >> +    mutex_unlock(&coresight_mutex); >> +} >> + >>   /* >>    * coresight_alloc_device_name - Get an index for a given device in the >>    * device index list specific to a driver. An index is allocated for a >> @@ -1766,12 +1780,16 @@ >> EXPORT_SYMBOL_GPL(coresight_loses_context_with_cpu); >>   char *coresight_alloc_device_name(struct coresight_dev_list *dict, >>                     struct device *dev) >>   { >> -    int idx; >> +    int idx, ret; >>       char *name = NULL; >>       struct fwnode_handle **list; >>       mutex_lock(&coresight_mutex); >> +    ret = devm_add_action_or_reset(dev, coresight_release_dev_list, >> dict); >> +    if (ret) >> +        goto done; > > This looks wrong. The devlist should be only released on the "driver" > unload, not on every device release. The list retains the fwnode to > assign the same name for a device, if it is re-probed (e.g., due to > -EPROBE_DEFER error). The best way is to free it on module_unload and unfortunately we would need to do it from all modules using the DEVLIST. Suzuki > > Suzuki >