From patchwork Sat Jun 11 03:55:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: patrick wang X-Patchwork-Id: 12878331 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 29289C43334 for ; Sat, 11 Jun 2022 03:57:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D1DC8D0107; Fri, 10 Jun 2022 23:57:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 881A78D00F7; Fri, 10 Jun 2022 23:57:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 722C58D0107; Fri, 10 Jun 2022 23:57:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 633AA8D00F7 for ; Fri, 10 Jun 2022 23:57:50 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2284E188C for ; Sat, 11 Jun 2022 03:57:50 +0000 (UTC) X-FDA: 79564596300.24.71A63BC Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by imf27.hostedemail.com (Postfix) with ESMTP id B589C4007F for ; Sat, 11 Jun 2022 03:57:49 +0000 (UTC) Received: by mail-pj1-f54.google.com with SMTP id gc3-20020a17090b310300b001e33092c737so1077126pjb.3 for ; Fri, 10 Jun 2022 20:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o8/TqUYnqNg8t/CvW6LMFVObKWE28UfvOsyQO7sI0J4=; b=p0tg6a/DgSUkvvHvfQo80tdneeHe9jNuP4jrsIHdzIxYIp++31whZIQa4/6FV4nsui LqZVM73UOCXFXTZteprQJFsihWDM8uG2wbVdm8hYuxs8d7VxtKWVozOnFqAV46vaety3 3Vza9j1yhc1pnsMXaZ60aJGDI7eEKZmsKA70/e33o+uk0BtEwT/aMnIlDGS5eaq/cUZG Fb2RwHFMZw0pRe+nGqP6mvOJt7cugOIddlaeiiS756I8oj+t9W31T4F0ISGmRLkNQg/g 4mw5F9plzlAROpfnhrlwkcgIoGGqoAdqbpDXvJjvfQ9dMwkzOqIBcvejv0XZmdShjMDZ hv0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o8/TqUYnqNg8t/CvW6LMFVObKWE28UfvOsyQO7sI0J4=; b=xZy3zHueB4d2aoohHmPLKN5tgAO0QiX2j01L9LRLmoiTmQe43AqaSz/xRGp6oa4+xb JktMZyBHyjnNUOkh6pO5Nv3QHrNvaIkxX3Sv9Dnrf2RUfsEiiCcUsqlgcGPPsG0XR0xD 8NBna6AbDzYfYscXnJskcs4dYeIFQJ0L0340S4e59cTmE0aj8ohOcF8pKkZhKAJ6jiYL /Fu8bJDxlcp+iB8z0+//bTRb5DrkejJ5JyxYNHtrrz0HB7o1hVenluQ6QbqTg8VHutHm etepjI1qgvc0h2qYxrYWB1k5LEcuXY/sHPCMNehywy2y6MsHvQVsZ+NykxvZldR8/EgS BUsw== X-Gm-Message-State: AOAM531MgsFdDUjzC3H1XaPMZS+W26+MsbMc5NqmQmZpGdCzQOabjYbO zLZ6nZkU8kd97s9VlYTqSBo= X-Google-Smtp-Source: ABdhPJynE51UJe048V/xez49gTko/wcGxVofrqoECSyy2R6y0qqcQiW6nvrNhizLnUez7lPRSlQSsQ== X-Received: by 2002:a17:902:d652:b0:168:bffe:e5fe with SMTP id y18-20020a170902d65200b00168bffee5femr5081930plh.81.1654919868565; Fri, 10 Jun 2022 20:57:48 -0700 (PDT) Received: from localhost ([101.86.206.203]) by smtp.gmail.com with ESMTPSA id jg19-20020a17090326d300b00167729dfe0bsm491809plb.168.2022.06.10.20.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 20:57:47 -0700 (PDT) From: Patrick Wang To: catalin.marinas@arm.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, yee.lee@mediatek.com, patrick.wang.shcn@gmail.com Subject: [PATCH v4 1/4] mm: kmemleak: remove kmemleak_not_leak_phys() and the min_count argument to kmemleak_alloc_phys() Date: Sat, 11 Jun 2022 11:55:48 +0800 Message-Id: <20220611035551.1823303-2-patrick.wang.shcn@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220611035551.1823303-1-patrick.wang.shcn@gmail.com> References: <20220611035551.1823303-1-patrick.wang.shcn@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1654919869; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o8/TqUYnqNg8t/CvW6LMFVObKWE28UfvOsyQO7sI0J4=; b=yWKZpYjQ+b/mixvnCqKZbt9IU8QG1eL5MSNSJcGOMEIh6ILpUHRMn0t35ZBweE1tnRqAnn Tn3wV8v/RCZrhiJXXnrEVaOX57gT/6Fycf6qtVbsYCufceRiOTfHCENO3yTO9WcQImlvKb m5ICCPoz0zAwev7sMzrepYkiVA37Fok= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1654919869; a=rsa-sha256; cv=none; b=Ti3o6J9OzfPaEVXHoUcMDcy2CnBjrbsKsHCC0tPzUF6y9pG4YCHor1Bl3TLfBpgFPMEgjK T9f84QkFhPB3FQFe+Rnll9nW6hfHPsy/dpuQ+r/8AS54GFZb+Y1KadUKyt58Nf7GAo4FE9 3/5L2cqUxSCUbTwKwiIRIzoIgd1WBGs= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="p0tg6a/D"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of patrick.wang.shcn@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=patrick.wang.shcn@gmail.com X-Rspam-User: Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="p0tg6a/D"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf27.hostedemail.com: domain of patrick.wang.shcn@gmail.com designates 209.85.216.54 as permitted sender) smtp.mailfrom=patrick.wang.shcn@gmail.com X-Rspamd-Server: rspam03 X-Stat-Signature: juz8j4ua83bg9c7qjdc6myaa9xwhuq68 X-Rspamd-Queue-Id: B589C4007F X-HE-Tag: 1654919869-705072 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: Remove the unused kmemleak_not_leak_phys() function. And remove the min_count argument to kmemleak_alloc_phys() function, assume it's 0. Suggested-by: Catalin Marinas Signed-off-by: Patrick Wang Reviewed-by: Catalin Marinas --- Documentation/dev-tools/kmemleak.rst | 1 - drivers/of/fdt.c | 2 +- include/linux/kmemleak.h | 8 ++------ mm/kmemleak.c | 20 +++----------------- mm/memblock.c | 14 +++++++------- tools/testing/memblock/linux/kmemleak.h | 2 +- 6 files changed, 14 insertions(+), 33 deletions(-) diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst index 1c935f41cd3a..5483fd39ef29 100644 --- a/Documentation/dev-tools/kmemleak.rst +++ b/Documentation/dev-tools/kmemleak.rst @@ -174,7 +174,6 @@ mapping: - ``kmemleak_alloc_phys`` - ``kmemleak_free_part_phys`` -- ``kmemleak_not_leak_phys`` - ``kmemleak_ignore_phys`` Dealing with false positives/negatives diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a8f5b6532165..2c677e84c3f5 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -529,7 +529,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n", uname, &base, (unsigned long)(size / SZ_1M)); if (!nomap) - kmemleak_alloc_phys(base, size, 0, 0); + kmemleak_alloc_phys(base, size, 0); } else pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n", diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h index 34684b2026ab..6a3cd1bf4680 100644 --- a/include/linux/kmemleak.h +++ b/include/linux/kmemleak.h @@ -29,10 +29,9 @@ extern void kmemleak_not_leak(const void *ptr) __ref; extern void kmemleak_ignore(const void *ptr) __ref; extern void kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) __ref; extern void kmemleak_no_scan(const void *ptr) __ref; -extern void kmemleak_alloc_phys(phys_addr_t phys, size_t size, int min_count, +extern void kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp) __ref; extern void kmemleak_free_part_phys(phys_addr_t phys, size_t size) __ref; -extern void kmemleak_not_leak_phys(phys_addr_t phys) __ref; extern void kmemleak_ignore_phys(phys_addr_t phys) __ref; static inline void kmemleak_alloc_recursive(const void *ptr, size_t size, @@ -107,15 +106,12 @@ static inline void kmemleak_no_scan(const void *ptr) { } static inline void kmemleak_alloc_phys(phys_addr_t phys, size_t size, - int min_count, gfp_t gfp) + gfp_t gfp) { } static inline void kmemleak_free_part_phys(phys_addr_t phys, size_t size) { } -static inline void kmemleak_not_leak_phys(phys_addr_t phys) -{ -} static inline void kmemleak_ignore_phys(phys_addr_t phys) { } diff --git a/mm/kmemleak.c b/mm/kmemleak.c index a182f5ddaf68..156eafafa182 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1125,15 +1125,13 @@ EXPORT_SYMBOL(kmemleak_no_scan); * address argument * @phys: physical address of the object * @size: size of the object - * @min_count: minimum number of references to this object. - * See kmemleak_alloc() * @gfp: kmalloc() flags used for kmemleak internal memory allocations */ -void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, int min_count, - gfp_t gfp) +void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp) { if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) - kmemleak_alloc(__va(phys), size, min_count, gfp); + /* assume min_count 0 */ + kmemleak_alloc(__va(phys), size, 0, gfp); } EXPORT_SYMBOL(kmemleak_alloc_phys); @@ -1151,18 +1149,6 @@ void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size) } EXPORT_SYMBOL(kmemleak_free_part_phys); -/** - * kmemleak_not_leak_phys - similar to kmemleak_not_leak but taking a physical - * address argument - * @phys: physical address of the object - */ -void __ref kmemleak_not_leak_phys(phys_addr_t phys) -{ - if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) - kmemleak_not_leak(__va(phys)); -} -EXPORT_SYMBOL(kmemleak_not_leak_phys); - /** * kmemleak_ignore_phys - similar to kmemleak_ignore but taking a physical * address argument diff --git a/mm/memblock.c b/mm/memblock.c index e4f03a6e8e56..749abd2685c4 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1345,8 +1345,8 @@ __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone, * from the regions with mirroring enabled and then retried from any * memory region. * - * In addition, function sets the min_count to 0 using kmemleak_alloc_phys for - * allocated boot memory block, so that it is never reported as leaks. + * In addition, function using kmemleak_alloc_phys for allocated boot + * memory block, it is never reported as leaks. * * Return: * Physical address of allocated memory block on success, %0 on failure. @@ -1398,12 +1398,12 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, */ if (end != MEMBLOCK_ALLOC_NOLEAKTRACE) /* - * The min_count is set to 0 so that memblock allocated - * blocks are never reported as leaks. This is because many - * of these blocks are only referred via the physical - * address which is not looked up by kmemleak. + * Memblock allocated blocks are never reported as + * leaks. This is because many of these blocks are + * only referred via the physical address which is + * not looked up by kmemleak. */ - kmemleak_alloc_phys(found, size, 0, 0); + kmemleak_alloc_phys(found, size, 0); return found; } diff --git a/tools/testing/memblock/linux/kmemleak.h b/tools/testing/memblock/linux/kmemleak.h index 462f8c5e8aa0..5fed13bb9ec4 100644 --- a/tools/testing/memblock/linux/kmemleak.h +++ b/tools/testing/memblock/linux/kmemleak.h @@ -7,7 +7,7 @@ static inline void kmemleak_free_part_phys(phys_addr_t phys, size_t size) } static inline void kmemleak_alloc_phys(phys_addr_t phys, size_t size, - int min_count, gfp_t gfp) + gfp_t gfp) { }