From patchwork Wed Sep 27 03:59:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 13399837 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 5E630E7F157 for ; Wed, 27 Sep 2023 03:26:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEB5A6B01AB; Tue, 26 Sep 2023 23:26:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E73A26B01AE; Tue, 26 Sep 2023 23:26:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D39F76B01B1; Tue, 26 Sep 2023 23:26:54 -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 C0D906B01AB for ; Tue, 26 Sep 2023 23:26:54 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 901681CABE2 for ; Wed, 27 Sep 2023 03:26:54 +0000 (UTC) X-FDA: 81280940748.24.1729266 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf01.hostedemail.com (Postfix) with ESMTP id 92B2F4000B for ; Wed, 27 Sep 2023 03:26:51 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.188 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=1695785212; 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=trUyF+Ex0Dl5lpIZRJiDCRU7Gmwh7YkpGZCM5SkcZkk=; b=WhQaEJWvxuy7cFS22kUwStjZWYVLMGKJsDpbPFM79PUTKviyFcc4SXrmJ8G8rIPlf2T6/n arO+zbAjBjrgGolymx2lAs+e2gew0Yn31mAaPOAikeSHvQdpK181Z8zp2s/YrPYXrEuxMk O/CdkS8iF4MWbN8F8gcnbu4ztbKKvGA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=pass (imf01.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.188 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=1695785212; a=rsa-sha256; cv=none; b=AGK5gnJ8pe0Cvzru3P+PLlO3uRpFbB9kngnNF7cGMpJTYZMd2FoYCoq25QxMr69fkyQewS YHQMxsJ3I4t9ZdG1PPL2NXs2CZbb41O84i9O90O+9gKOi85Y3FifsBrbcZugOU+LEY2RHn njZMjj/oYh8IAvoLaGHIp0tnl6pBAy8= Received: from dggpemm500009.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RwLxn1LJJzNnw3; Wed, 27 Sep 2023 11:02:21 +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 3/3] mm/kmemleak: fix print format of pointer in pr_debug() Date: Wed, 27 Sep 2023 11:59:23 +0800 Message-ID: <20230927035923.1425340-4-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-Queue-Id: 92B2F4000B X-Rspam-User: X-Stat-Signature: rm75txfh9mppryidkkfnx56onru6h9s8 X-Rspamd-Server: rspam01 X-HE-Tag: 1695785211-419914 X-HE-Meta: U2FsdGVkX19e1xMlOxXxOSjUgAxyrpkDVc/4xh48RGZZlfQVZpCHQMhcJRA9Vmff9CASgQeZAE2YBv6JrYrqJdkN3em1PlQjHL1mG/uHSacgjMqBm7LJYixKFNMeXYek5y35umSWKrHXNOX9p6/w1hy6k0Wen8M/tL7NbeKahWxzer4zhVwmSbX0EGWMKTOg1AosKKlyJ6o9KJMY5jS2xsvoCoFwd6+aA+tmu9MncykY5H1HbhCEhbmiwsmWBrRVPP1Dam0Rp4YKroSc935PXfIcu7xtg6Yt5gNbxxvT/smHaDYHTKbn/d2kdIVKhdYSc5CSXuZBzzbzbTxFxKzJrmXlxV/thBF/IrR8CIpVUyoPL4/f8/FeLhHKhC3+UmcMeW3OjOO8yypsK3TEhvzb3BhuHMQsPDfWjBlzl0zS0b+4bn12g8jSPZviMN8PboPs4heAwYU3L8fZnCX5KRoA9wAWljjNchPQLffJZeVxCMN+5RTqHv10IIR1ulmGOboTGbQRcRjBkiNyBe72r7Ijq57cf/qehfKrbOohhEDDnrt6jbidtPOteKP2m4ifg/g9mwwaWNmTBZwi/WHQw4vRlWD9l/1y1GWzP/keXNBt34zbbEZcgOS+gQjIIC2a/+2hXXmnQlUZ1UNi6pRRFfCA4938Fe76cHjByF06Xq6PfuakYKQpfNX8eH8eMMTf09aJAQIvQBrg8VKu6D1sQKGoowx9LiAT4esmVXJEadMSVqP5iD7icu8euUHo9e2z+PTNhPTJQp9dLGuJ0uA/WKnylQ+n7bOrOUj6gJYinxl4bdFNVYSxA+yDUvVaSGsyKzEQCE1Y08H6wOIBlih7g1WDdCCafO+64UUDfOaiZPvOTPCi8wjJN/wbvQHObwDsctf7vbeKvNlo4hqBBpqk+BOfEEB/LAyElNHTsX6ZDwnoDMMJhSNcoioO7jYM+xbUz8/BHVC2Xz54oUIrVSNXjoL 1ZJz0G2x KfjJpndv1JV/2A51D0bCHocbczvoAffRSJ4HGT3xXN+Q/PmhiKvwLTdlPFDTU15EGwC7V87MQWTu71ixPwK0UHWrXU92kc5Ys6pI69KZZvdkwEvbfY6pDHHIqcv+6S2T5NCc5qT8J2S+4zf6CFMUyqFuHrO02WcwaFWMWKd/LJ8S76FMPJytbz9dpLINUdS6FWUsPy9JyJNdfHcVJ1RvwoLxnBvXLPLqTuwH81ouopVBcMh0vZ11ZapPc7UnPyFlRTVUOHRb/BuxW2Zg= 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: With 0x%p, the pointer will be hashed and print (____ptrval____) instead. And with 0x%pa, the pointer can be successfully printed but with duplicate prefixes, which looks like: kmemleak: kmemleak_free(0x(____ptrval____)) kmemleak: kmemleak_free_part_phys(0x0x0000000a1af86000) Use %pa instead of 0x%p or 0x%pa to print the pointer, and use 0x%px for __percpu pointer to prevent crash. Then the print will be like: kmemleak: kmemleak_free(0xffff9111c145b020) kmemleak: kmemleak_free_percpu(0x00000000000333b0) kmemleak: kmemleak_free_part_phys(0x0000000a1af80000) Signed-off-by: Liu Shixin --- mm/kmemleak.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 5a2bbd85df57..c1053db98f55 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -981,7 +981,7 @@ static void object_no_scan(unsigned long ptr) void __ref kmemleak_alloc(const void *ptr, size_t size, int min_count, gfp_t gfp) { - pr_debug("%s(0x%p, %zu, %d)\n", __func__, ptr, size, min_count); + pr_debug("%s(%pa, %zu, %d)\n", __func__, ptr, size, min_count); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) create_object((unsigned long)ptr, size, min_count, gfp); @@ -1002,7 +1002,7 @@ void __ref kmemleak_alloc_percpu(const void __percpu *ptr, size_t size, { unsigned int cpu; - pr_debug("%s(0x%p, %zu)\n", __func__, ptr, size); + pr_debug("%s(0x%px, %zu)\n", __func__, ptr, size); /* * Percpu allocations are only scanned and not reported as leaks @@ -1026,7 +1026,7 @@ EXPORT_SYMBOL_GPL(kmemleak_alloc_percpu); */ void __ref kmemleak_vmalloc(const struct vm_struct *area, size_t size, gfp_t gfp) { - pr_debug("%s(0x%p, %zu)\n", __func__, area, size); + pr_debug("%s(%pa, %zu)\n", __func__, area, size); /* * A min_count = 2 is needed because vm_struct contains a reference to @@ -1049,7 +1049,7 @@ EXPORT_SYMBOL_GPL(kmemleak_vmalloc); */ void __ref kmemleak_free(const void *ptr) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) delete_object_full((unsigned long)ptr); @@ -1067,7 +1067,7 @@ EXPORT_SYMBOL_GPL(kmemleak_free); */ void __ref kmemleak_free_part(const void *ptr, size_t size) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) delete_object_part((unsigned long)ptr, size, false); @@ -1085,7 +1085,7 @@ void __ref kmemleak_free_percpu(const void __percpu *ptr) { unsigned int cpu; - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(0x%px)\n", __func__, ptr); if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) for_each_possible_cpu(cpu) @@ -1106,7 +1106,7 @@ void __ref kmemleak_update_trace(const void *ptr) struct kmemleak_object *object; unsigned long flags; - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (!kmemleak_enabled || IS_ERR_OR_NULL(ptr)) return; @@ -1137,7 +1137,7 @@ EXPORT_SYMBOL(kmemleak_update_trace); */ void __ref kmemleak_not_leak(const void *ptr) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) make_gray_object((unsigned long)ptr); @@ -1155,7 +1155,7 @@ EXPORT_SYMBOL(kmemleak_not_leak); */ void __ref kmemleak_ignore(const void *ptr) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr) ; if (kmemleak_enabled && ptr && !IS_ERR(ptr)) make_black_object((unsigned long)ptr, false); @@ -1175,7 +1175,7 @@ EXPORT_SYMBOL(kmemleak_ignore); */ void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (kmemleak_enabled && ptr && size && !IS_ERR(ptr)) add_scan_area((unsigned long)ptr, size, gfp); @@ -1193,7 +1193,7 @@ EXPORT_SYMBOL(kmemleak_scan_area); */ void __ref kmemleak_no_scan(const void *ptr) { - pr_debug("%s(0x%p)\n", __func__, ptr); + pr_debug("%s(%pa)\n", __func__, ptr); if (kmemleak_enabled && ptr && !IS_ERR(ptr)) object_no_scan((unsigned long)ptr); @@ -1209,7 +1209,7 @@ EXPORT_SYMBOL(kmemleak_no_scan); */ void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp) { - pr_debug("%s(0x%pa, %zu)\n", __func__, &phys, size); + pr_debug("%s(%pa, %zu)\n", __func__, &phys, size); if (kmemleak_enabled) /* @@ -1229,7 +1229,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys); */ void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size) { - pr_debug("%s(0x%pa)\n", __func__, &phys); + pr_debug("%s(%pa)\n", __func__, &phys); if (kmemleak_enabled) delete_object_part((unsigned long)phys, size, true); @@ -1243,7 +1243,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys); */ void __ref kmemleak_ignore_phys(phys_addr_t phys) { - pr_debug("%s(0x%pa)\n", __func__, &phys); + pr_debug("%s(%pa)\n", __func__, &phys); if (kmemleak_enabled) make_black_object((unsigned long)phys, true);