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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FAEEE7718B for ; Thu, 2 Jan 2025 17:15:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E5F7D6B00DB; Thu, 2 Jan 2025 12:15:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E0EB86B00DC; Thu, 2 Jan 2025 12:15:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFDDE6B00DD; Thu, 2 Jan 2025 12:15:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B13F06B00DB for ; Thu, 2 Jan 2025 12:15:50 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 37BCD1C680F for ; Thu, 2 Jan 2025 17:15:50 +0000 (UTC) X-FDA: 82963161708.08.068DD2A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id E1B9640028 for ; Thu, 2 Jan 2025 17:15:01 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf11.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735838110; 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: in-reply-to:in-reply-to:references:references; bh=2Qv7y+QRgsgCdwEXrb84tGi3LrK2XU8Rcgp6lTsky/8=; b=x8XKO4ykgiPx7F+/cN761xpLpxHgq7IRWBUeGMKo/d64BycbunRLkoDVNoadXZ5UjeeRkU kdh0RulOaDM1FBqxUFxLLX5uHGa3twNEFD1UcqsQD/4rX8bEDH4OrEZC6c+ycEEWEnaTcP 1l+7LYtRk6IeeGKxf4fW/9gYglVz0aQ= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none); spf=pass (imf11.hostedemail.com: domain of cmarinas@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=cmarinas@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735838110; a=rsa-sha256; cv=none; b=YKoE43a6sN37QXIoRWm6K+NpD3HVSV5BFDmm3QY6Izu2agLV+bcYhcP3kOy42EeZFzhLis ZaGLLxY3DpfQXi+tY4oDxt5Uci5KVMJ2sa1zOuL1PakgT7ZW7tvadUFP2AXUs0/1Jtgoaf vzIJPaEBzNWDy4tKkdI+zFOGg7gVRzA= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 130625C61A4; Thu, 2 Jan 2025 17:15:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3AE8C4CED0; Thu, 2 Jan 2025 17:15:45 +0000 (UTC) Date: Thu, 2 Jan 2025 17:15:43 +0000 From: Catalin Marinas To: Guo Weikang Cc: Mike Rapoport , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm/memmap: Prevent double scanning of memmap by kmemleak Message-ID: References: <20250102065704.647693-1-guoweikang.kernel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250102065704.647693-1-guoweikang.kernel@gmail.com> X-Rspamd-Queue-Id: E1B9640028 X-Rspamd-Server: rspam12 X-Stat-Signature: dnyf3adu4ng9qcfi89rowg3kqgtrmncj X-Rspam-User: X-HE-Tag: 1735838101-698763 X-HE-Meta: U2FsdGVkX18XyeiLwOQmldDuHq/LGTM8jXX8ymk3njj9YzO7+v+wHVNCtpxqj/1/jxEX03WzWSYIXINQLUoOb34Zh/4GXErogIWedJitWQPAKZCMV52zOyglVL16VMkmXjKAEnzwjZydMYUQHMDjzkF8yerTJNjYjyVhHin4LyE/+BDIsoeTVLTF9MTeleZMipazsUNASZNcKGrsJjqVLjQbq5Zfmk4YU5l8IU/SwpUqm58Klq4ayaZsYFLg7cehL2xa9AuYwryNNNsFfWTupHz9vW8SmjVzITXncEyODJWJoQ+gU1U3/nLOXCl+WaKDEvWQRxT+9J16X0jYCj8PhB/WbDGe6xQZf2TLQ5viDlaa5oi1uj+4PlPJWwa2/bkPSwyQn92GHvcbdFsu7AM1iQAZycECRJBzgET86ysah7URYFqCbge/RlIRr7VVaL1dsyfiRIXJgFnxTCAMzyXmFxpeGXFITr+mCu6V5LV8MNXxv2ImnQoE0kTGC565BVTIz14cJ9CscA0I1yVjCxUA9EAhHcs3HcN4MJ9E5D6n6U4P629Rnd34TQq5TvqlQ1X5S10kbBGcJNdGDJKJBXQpZbu2I8EFH5xLmyEKCYpZ8oKQ0LAS2Bqrbbtl9BTCSaPttkm3PlDWyjaByX898vWtwUz50mERlOgzLvgERWpRjmVcL0wtaSpp5iYqPWJQDhTbj+HLDWiHrkISt3Cc/BWOhkjS/pt1AD0PJXBt/8hQfeUf70QKoXc0ljMoYjgCU1AED3wtcwl9bnXDO2wo/WElSJc7Q4xscKGpFkbJoSigCGkzMrapxNQVupeH3rOudZCz817dDjoaW7k5Uu/j7JCqSl5DZRAn3nbRz0ERCCenddMO5Y4OpLbpQbhTsAXxa7qALAyxjNXBOxDpfbZjIPl3bgvKRBfGGstu+CDTIiD7xGVTzshzIdgQKogQTsUyISE/m+L9ztZOjEZ1t/cPxPF mGaMB92u 9tzMn9t+d3WY27x4qtW/OOkBG1JFiuTcM8KHB3KsU3jydiBLAgqDMGhlTjCBRqFvUIhD5klIHrZb/s9HWVcZXzCtU1XTxrla8NC5DMiXi3bVBjYqWWcSkffeJbFl2oDRr7jo8p6LcIWO2J/Tphtw/KyjVszp2K7a+XAHbvxgVJ3oIPefBz5ccAxXhd7bkqVgi1UWGT2lh95bFHHZtp2AG2X3pg8+3324uOsqUg220LRXd/jNS0m7DJBRTLrclMeoDSZvnKDGY8BRDsJi1fzSwdOoJvzeA0u1GhGI6+xO7ARPZi8qsVo3cVmkdcrqw7cGp0u4FPwygpjbZD27kDnnrM/5hbsMSj89sAIxq3NLLaeCjhnKlHIHY2m4j26sty78MpZDwoyehyrxJcYFvGE1o+6FMYmHIvHQB7rpf 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: List-Subscribe: List-Unsubscribe: On Thu, Jan 02, 2025 at 02:57:03PM +0800, Guo Weikang wrote: > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index 673d5cae7c81..b0483c534ef7 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -375,7 +375,13 @@ static inline int memblock_get_region_node(const struct memblock_region *r) > } > #endif /* CONFIG_NUMA */ > > -/* Flags for memblock allocation APIs */ > +/* > + * Flags for memblock allocation APIs > + * MEMBLOCK_ALLOC_ANYWHERE and MEMBLOCK_ALLOC_ACCESSIBLE > + * indicates wheather the allocation is limited by memblock.current_limit. > + * MEMBLOCK_ALLOC_NOLEAKTRACE not only indicates that it does not need to > + * be scanned by kmemleak, but also implies MEMBLOCK_ALLOC_ACCESSIBLE > + */ I'd keep the comment short here, something like: /* * MEMBLOCK_ALLOC_NOLEAKTRACE avoids kmemleak tracing. It implies * MEMBLOCK_ALLOC_ACCESSIBLE. */ > #define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0) > #define MEMBLOCK_ALLOC_ACCESSIBLE 0 > #define MEMBLOCK_ALLOC_NOLEAKTRACE 1 > diff --git a/mm/mm_init.c b/mm/mm_init.c > index 24b68b425afb..71b58f5f2492 100644 > --- a/mm/mm_init.c > +++ b/mm/mm_init.c > @@ -1580,6 +1580,10 @@ static void __init free_area_init_core(struct pglist_data *pgdat) > } > } > > +/* > + * Kmemleak will explicitly scan mem_map by traversing all valid `struct *page`, > + * so memblock does not need to be added to the scan list. > + */ > void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, > phys_addr_t min_addr, int nid, bool exact_nid) > { > @@ -1587,11 +1591,11 @@ void __init *memmap_alloc(phys_addr_t size, phys_addr_t align, > > if (exact_nid) > ptr = memblock_alloc_exact_nid_raw(size, align, min_addr, > - MEMBLOCK_ALLOC_ACCESSIBLE, > + MEMBLOCK_ALLOC_NOLEAKTRACE, > nid); > else > ptr = memblock_alloc_try_nid_raw(size, align, min_addr, > - MEMBLOCK_ALLOC_ACCESSIBLE, > + MEMBLOCK_ALLOC_NOLEAKTRACE, > nid); > > if (ptr && size > 0) > diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c > index cec67c5f37d8..b6ac9b1d4ff7 100644 > --- a/mm/sparse-vmemmap.c > +++ b/mm/sparse-vmemmap.c > @@ -27,25 +27,10 @@ > #include > #include > #include > - > +#include "internal.h" > #include > #include > > -/* > - * Allocate a block of memory to be used to back the virtual memory map > - * or to back the page tables that are used to create the mapping. > - * Uses the main allocators if they are available, else bootmem. > - */ > - > -static void * __ref __earlyonly_bootmem_alloc(int node, > - unsigned long size, > - unsigned long align, > - unsigned long goal) > -{ > - return memblock_alloc_try_nid_raw(size, align, goal, > - MEMBLOCK_ALLOC_ACCESSIBLE, node); > -} > - > void * __meminit vmemmap_alloc_block(unsigned long size, int node) > { > /* If the main allocator is up use that, fallback to bootmem. */ > @@ -66,8 +51,7 @@ void * __meminit vmemmap_alloc_block(unsigned long size, int node) > } > return NULL; > } else > - return __earlyonly_bootmem_alloc(node, size, size, > - __pa(MAX_DMA_ADDRESS)); > + return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node, false); > } As the kernel test robot reported, the __ref annotation for __earlyonly_bootmem_alloc() is still needed, otherwise you get a warning that a __meminit function (vmemmap_alloc_block()) is calling an __init one (memmap_alloc()). So I think it's better if you keep this function. Maybe get it to call memmap_alloc() instead of memblock_alloc_try_nid_raw(). -- Catalin