From patchwork Wed Sep 27 03:59:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13399834 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2EDAE7F153 for ; Wed, 27 Sep 2023 03:06:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 256396B01A1; Tue, 26 Sep 2023 23:06:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 207066B01A8; Tue, 26 Sep 2023 23:06:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CE676B01AA; Tue, 26 Sep 2023 23:06:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id F1C446B01A1 for ; Tue, 26 Sep 2023 23:06:18 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B9F0C1A0EB3 for ; Wed, 27 Sep 2023 03:06:18 +0000 (UTC) X-FDA: 81280888836.09.2EB9AF7 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf15.hostedemail.com (Postfix) with ESMTP id 14ECAA002C for ; Wed, 27 Sep 2023 03:06:14 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf15.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695783975; a=rsa-sha256; cv=none; b=agde6dM+f8hGUuwhs1hGdpLb+q/k82pBmi4j6DEMRL8vmrHEGVD+uwsovUyEuCh7BA0xXY Z0734eVWr2dsqZtmqksXA5XJKG0Nkmu7Cm6ntwRLGyQr/cjrg+yq14KnnXJOrmfOPfe3IU tT8CZYNpEkmoVyD0lSpcTL7sb6MWskE= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf15.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695783975; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSq983pFeq00Rb3HA9pv8BxReSVB2oRe+x7EN0FejE0=; b=l7FSOA3aIimVngWQlkmMgRwaz8wmGA93GXSUdDEUrubaTb+ZvF2uQOgfmxH4namfe09UVW wy27Cezr4dgQQBN6is5N6cjhotVijASu9LziUEH1BjO11qAbFFuFo12oPWAHdDfX+BCkpG jQggcEaueOaeJ10SLXl4XRVrHT64zEc= Received: from dggpemm500009.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RwLzZ6TCkzrSnL; Wed, 27 Sep 2023 11:03:54 +0800 (CST) Received: from huawei.com (10.175.113.32) by dggpemm500009.china.huawei.com (7.185.36.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 27 Sep 2023 11:06:10 +0800 From: Liu Shixin To: Catalin Marinas , Patrick Wang , Andrew Morton CC: , , Liu Shixin Subject: [PATCH 2/3] mm/kmemleak: fix partially freeing unknown object warning Date: Wed, 27 Sep 2023 11:59:22 +0800 Message-ID: <20230927035923.1425340-3-liushixin2@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230927035923.1425340-1-liushixin2@huawei.com> References: <20230927035923.1425340-1-liushixin2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500009.china.huawei.com (7.185.36.225) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 14ECAA002C X-Stat-Signature: fh1nm8eoqx95fixftuc75ri4hpk9cwu4 X-Rspam-User: X-HE-Tag: 1695783974-627650 X-HE-Meta: U2FsdGVkX19jLVomaCGh+nZ6JPdG+OgtngrIDEEl5jBwsf4pblZ+a7b5cMvFOwPOkwGbmYehAX1QXdwNJr6O48QWpCe6I1gyxl6WhQPSo9vbXyleaWeQHtPGt/4QnhyJaL6UNnVX/TTmygNcauowzhGWxn/z6aai0xBXxIjlQdm+/n3C6AATEF5l3Qbfk5x/QkAte3aUcYNVE1NWngRGa69HmB1I5ajlmDDt16k22cATNAJ1EYAIFm4SOgUGpbmSQw+CTcMOOboOIhIWYSUoWEMc9yzg78CMJC0JyYcckxwegFmpK/3Vj0Vtxp8TJCQ2jGPjjkxkn4R/sVcbN29BIy1QzNawL398B30+1rWmB/HDE8VJUEX8d9Rb8WpA+bhHazIov4Gl/yvituhi78vSnrTjaqwg0QiTphj4tpH4YXtZenoNVzWYdAhGcnTVkE6Lq1qIcXMIMM4AO7p46RcwtTBWoEKsrz/EXTp1Omhp8o7e7ycQzYMyWchUDlOr7/IFYERiiwbjCNW+6gFD3fsN1FBjhC9dFQ1lqkoYemIVzK2gjfrJGgeM6CUj2Gbp5gpSljOgvs8X7BgYyZDUKWSEmiEVR5K9xVhmNBLIJvdL/d2UdedAC4/o9I9S1WDPrrVYvAvtGR2caG9svbxk+Awt/v0r0lTb85zvDhYd1G5D/SM8N/eDcQUig4yzQOV4j5RBvl/Za0SR/Dq5p4qzjkRcRpO2/kIEe1ehoOW9kDJAQ+HeKLXRBHpI6j5cSpX0FlYQJVMo8jItFAEIW3GbLudugae8iGzEdy84v7sJZButS1igKWkV6V7VBoEDqStX23yyk7nm9yCzOnskmPJKD4R1phyZ2tUnlPfqbj4p4w5Fn/axOk4RgFhwX6YnauWY2hIhlVclM1pfsrvQ7DONndUSovubJPYkdqEr5a1uFufhsAwOsWNpdDhpr+SnR3cTQrAhQI4pffIAPtlqF7YcaSv lDOgi5Y0 QXi3Eo7UW/NfM2w8wYIhf6tSqcMESiE3Wb7Zi7weRHeUObzx75CtfzB8bgDaN2tH5glNd2scpeLNNDmFe1ZBeC2366t6KmPHe4tw5/TcmeZ8mvQtFJA1GwaU+Ur4ENJdupkyrxSlQloW1ZfvVx+DRw+nr0iarEUss3g4yA/bv945zXvj4+cjBjBVCW1zhgA5/rUeKFD7+NWhn2rFw1nNcUI2EZA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: delete_object_part() can be called by multiple callers in the same time. If an object is found and removed by a caller, and then another caller try to find it too, it failed and return directly. The secound part still be recorded by kmemleak even if it has alreadly been freed to buddy. With DEBUG on, kmemleak will report the following warning: kmemleak: Partially freeing unknown object at 0xa1af86000 (size 4096) CPU: 0 PID: 742 Comm: test_huge Not tainted 6.6.0-rc3kmemleak+ #54 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Call Trace: dump_stack_lvl+0x37/0x50 kmemleak_free_part_phys+0x50/0x60 hugetlb_vmemmap_optimize+0x172/0x290 ? __pfx_vmemmap_remap_pte+0x10/0x10 __prep_new_hugetlb_folio+0xe/0x30 prep_new_hugetlb_folio.isra.0+0xe/0x40 alloc_fresh_hugetlb_folio+0xc3/0xd0 alloc_surplus_hugetlb_folio.constprop.0+0x6e/0xd0 hugetlb_acct_memory.part.0+0xe6/0x2a0 hugetlb_reserve_pages+0x110/0x2c0 hugetlbfs_file_mmap+0x11d/0x1b0 mmap_region+0x248/0x9a0 ? hugetlb_get_unmapped_area+0x15c/0x2d0 do_mmap+0x38b/0x580 vm_mmap_pgoff+0xe6/0x190 ksys_mmap_pgoff+0x18a/0x1f0 do_syscall_64+0x3f/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Fixes: 53238a60dd4a ("kmemleak: Allow partial freeing of memory blocks") Signed-off-by: Liu Shixin --- mm/kmemleak.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 54c2c90d3abc..5a2bbd85df57 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -208,6 +208,8 @@ static struct rb_root object_tree_root = RB_ROOT; static struct rb_root object_phys_tree_root = RB_ROOT; /* protecting the access to object_list, object_tree_root (or object_phys_tree_root) */ static DEFINE_RAW_SPINLOCK(kmemleak_lock); +/* Serial delete_object_part() to ensure all objects is deleted correctly */ +static DEFINE_RAW_SPINLOCK(delete_object_part_mutex); /* allocation caches for kmemleak internal data */ static struct kmem_cache *object_cache; @@ -784,13 +786,16 @@ static void delete_object_part(unsigned long ptr, size_t size, bool is_phys) { struct kmemleak_object *object; unsigned long start, end; + unsigned long flags; + raw_spin_lock_irqsave(&delete_object_part_mutex, flags); object = find_and_remove_object(ptr, 1, is_phys); if (!object) { #ifdef DEBUG kmemleak_warn("Partially freeing unknown object at 0x%08lx (size %zu)\n", ptr, size); #endif + raw_spin_unlock_irqrestore(&delete_object_part_mutex, flags); return; } @@ -809,6 +814,7 @@ static void delete_object_part(unsigned long ptr, size_t size, bool is_phys) GFP_KERNEL, is_phys); __delete_object(object); + raw_spin_unlock_irqrestore(&delete_object_part_mutex, flags); } static void __paint_it(struct kmemleak_object *object, int color)