From patchwork Wed Sep 27 03:59:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13399835 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 C69B8E7F153 for ; Wed, 27 Sep 2023 03:06:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64ED16B01AB; Tue, 26 Sep 2023 23:06:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5FDDA6B01AE; Tue, 26 Sep 2023 23:06:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4EE306B01B1; Tue, 26 Sep 2023 23:06:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3D7FE6B01AB for ; Tue, 26 Sep 2023 23:06:32 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0EB97120E45 for ; Wed, 27 Sep 2023 03:06:32 +0000 (UTC) X-FDA: 81280889424.28.7236738 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf17.hostedemail.com (Postfix) with ESMTP id 6F6A740002 for ; Wed, 27 Sep 2023 03:06:29 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695783990; a=rsa-sha256; cv=none; b=bofcL7B9J0SYfcLAucYm+i/+vMuF3gQ7IQEspNJatmbjXp51XCiGxKMcMmy6FZZs/U3623 GRhU57ApVJkSTqreTJ97P1+KsykXirY/vUgx9ZBdCbODVOchlbjrse+LSCXpMW0Q1/w4gj ou0qzVDCcQi7IUuOVOiSkKUq4j7b5DQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695783990; 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=n1N9i43KjaQcM7U65E1qxlfgcMuJTj9qK6/8Je6mn8k=; b=eMnz4Tt+nr4FsH9/EdSoR6uJqzguDupOPK5F2gO7u76y9UanUU6RzvXMi40cTTETj8CiWx JfaZiBdfHrxM/+o7N2bPGxIgDLruj1PfosVurRc7KXK/tHQt4cc3gNnLWw6aNqGYvq9ZjC KZ8JhdXWsqDBXqUAzDIdsVjc3jBLzEw= Received: from dggpemm500009.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4RwLx82PY8ztT3Y; Wed, 27 Sep 2023 11:01:48 +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:09 +0800 From: Liu Shixin To: Catalin Marinas , Patrick Wang , Andrew Morton CC: , , Liu Shixin Subject: [PATCH 1/3] bootmem: use kmemleak_free_part_phys in free_bootmem_page/put_page_bootmem Date: Wed, 27 Sep 2023 11:59:21 +0800 Message-ID: <20230927035923.1425340-2-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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6F6A740002 X-Stat-Signature: 7xsxazug6d65f4hkr9i99yxhu7k46jse X-HE-Tag: 1695783989-262826 X-HE-Meta: U2FsdGVkX1/FkQ1b2ZkWPOR8WcuBqPuJ4AjemdeSatZ8l5DsSszILNALQQGLHCm2SmA8hY0kSdPpoM1ECSlsiEf5td88eiT/4GrOO1Dzt4nR9OvvUEeLTS06y47ueUmxnw8hTqJvQzq/mLDWdQKqhJhcGbsZjLRT1HlypNJe5N2fGRuaUTO/ny5BZ3uqGroOOQ7jFKDe43JcIiEPmvmLs0X4Kqk84tef8yhRLtl5osaRa1NEi+5o+MyanmA8JiiaoOQTm9UZrsS6IhdNInYs5k1zKxCyNbXI7Cf/KwOXyf1IJkliRfa/LlXv7kHBA6ZUTDOFzdhdyupM8mQUm/qaGxMPtFfrWNYIojZAfX/tU3C7hcuaRF9k0cBsLwTZYXERmJAYp+eDzoAn8avRl26st9MYKFBAkPAOwXAPtiX8rEt+SQJXfmjdPHZXGOmDhPN1vKIOfX3MTyfNpwFh0/aGZDsxZAWOy4LxkLlG1ZZCWpEtVQ0WiByEGq2aROepbV/ZqAkrSqEx4ZCXU8lraVR4VFoOittsx/ahny0vBu3XcQVEtV0CzhdeH5rb1X+VzliFeMQSgvrb/Bckh3CK0OJq9Vn4KCi/06LyleGJtPZOrFbLy6lIx1Yln8i2uUWm2fDAhmjrYU115C4Ck3fuCOdWav90mjQaMtxiIAOZG1AnA1r55n6SZWWbEuEJnP2IIwWkt1uQc/zZc2HMthaKyVZXonW7j4vorK5uOCJKDYbu9Ia7YsckUG8TNGJbufSjGREjrpmSvyzJukgrCiyB59jN/TSD6sLoqd0ynu80h1ndbsnniiUwiW3mRL5kygGbW4Kg8RXs5OWWbFmWVXXA3t98zUe+Ndh0axw9sFZRmeWjdVetdme9R6rGsaSbfF53SkoXns6UlwmzGwzRqKoZ1p78XFOLdsftP3gfzJtj4lBLgheHukZQiN4CWFCmHhe8/aSE0tiavZa8FDyn7tS9EG1 6edajcde MN+6H40kDvj63Qb54lgNkraBYBLAdoleKzgc4YU4PATb01+kcMfjqE+9MCrL4bV/qb6wjVAfJ6p29qqVFWroQYLOucYt8ZGHaidC9tUExYcQptas/uwJonyavbPjjS6ZtmIwM67I2sQa9MFNGCN4RVork67hRLUmvuECspKCxiDcgHDAMknIiuVAbUA4/xqasaTfILPvlQEU3iyJwMEz0Yvg73/0GUIaKVDMri3NhOy09LlBPoWAjmDUvvVxQoZpZpSJ0FJ+nXIiVPlY= 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: Since kmemleak_alloc_phys() rather than kmemleak_alloc() was called from memblock_alloc_range_nid(), kmemleak_free_part_phys() should be used to delete kmemleak object in free_bootmem_page() and put_page_bootmem(). Fixes: 028725e73375 ("bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page") Fixes: dd0ff4d12dd2 ("bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem") Signed-off-by: Liu Shixin Acked-by: Catalin Marinas --- include/linux/bootmem_info.h | 2 +- mm/bootmem_info.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h index e1a3c9c9754c..cffa38a73618 100644 --- a/include/linux/bootmem_info.h +++ b/include/linux/bootmem_info.h @@ -60,7 +60,7 @@ static inline void get_page_bootmem(unsigned long info, struct page *page, static inline void free_bootmem_page(struct page *page) { - kmemleak_free_part(page_to_virt(page), PAGE_SIZE); + kmemleak_free_part_phys(PFN_PHYS(page_to_pfn(page)), PAGE_SIZE); free_reserved_page(page); } #endif diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c index b1efebfcf94b..fa7cb0c87c03 100644 --- a/mm/bootmem_info.c +++ b/mm/bootmem_info.c @@ -34,7 +34,7 @@ void put_page_bootmem(struct page *page) ClearPagePrivate(page); set_page_private(page, 0); INIT_LIST_HEAD(&page->lru); - kmemleak_free_part(page_to_virt(page), PAGE_SIZE); + kmemleak_free_part_phys(PFN_PHYS(page_to_pfn(page)), PAGE_SIZE); free_reserved_page(page); } }