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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 951FCC00140 for ; Thu, 18 Aug 2022 23:39:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235113AbiHRXjW (ORCPT ); Thu, 18 Aug 2022 19:39:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345958AbiHRXjV (ORCPT ); Thu, 18 Aug 2022 19:39:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00CDBDC093 for ; Thu, 18 Aug 2022 16:39:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4736361759 for ; Thu, 18 Aug 2022 23:39:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9469CC433D6; Thu, 18 Aug 2022 23:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1660865959; bh=9Ql5RSUvFXJUZ2Lb6/NTNRlKOY3rDW7iPVPuhHi9PTk=; h=Date:To:From:Subject:From; b=TooUhTGzAbZJNSz5cEvn5zPcf13QrM1k5WXnQhpvPY/Ri4JOHRkTg9lHSKfYf18Xv v6eyPZj8B8bliwdsnSjaiPKDzI5EAQDX0+UDisYO87DKhrGNJaoOsqi3ln6276tjpx trxMnFmVGq3Px9DoXQsXYKAIx5DVBT0I2gnGnq44= Date: Thu, 18 Aug 2022 16:39:18 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, songmuchun@bytedance.com, osalvador@suse.de, mike.kravetz@oracle.com, catalin.marinas@arm.com, liushixin2@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + bootmem-remove-the-vmemmap-pages-from-kmemleak-in-free_bootmem_page.patch added to mm-hotfixes-unstable branch Message-Id: <20220818233919.9469CC433D6@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page has been added to the -mm mm-hotfixes-unstable branch. Its filename is bootmem-remove-the-vmemmap-pages-from-kmemleak-in-free_bootmem_page.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/bootmem-remove-the-vmemmap-pages-from-kmemleak-in-free_bootmem_page.patch This patch will later appear in the mm-hotfixes-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Liu Shixin Subject: bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page Date: Thu, 18 Aug 2022 21:21:04 +0800 The vmemmap pages is marked by kmemleak when allocated from memblock. Remove it from kmemleak when free the page. Otherwise, when we reuse the page, kmemleak may report such an error and then stop working. kmemleak: Cannot insert 0xffff98fb6eab3d40 into the object search tree (overlaps existing) kmemleak: Kernel memory leak detector disabled kmemleak: Object 0xffff98fb6be00000 (size 335544320): kmemleak: comm "swapper", pid 0, jiffies 4294892296 kmemleak: min_count = 0 kmemleak: count = 0 kmemleak: flags = 0x1 kmemleak: checksum = 0 kmemleak: backtrace: Link: https://lkml.kernel.org/r/20220818132104.2144770-1-liushixin2@huawei.com Fixes: f41f2ed43ca5 ("mm: hugetlb: free the vmemmap pages associated with each HugeTLB page") Signed-off-by: Liu Shixin Cc: Matthew Wilcox Cc: Mike Kravetz Cc: Muchun Song Cc: Oscar Salvador Cc: Catalin Marinas Signed-off-by: Andrew Morton --- include/linux/bootmem_info.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/include/linux/bootmem_info.h~bootmem-remove-the-vmemmap-pages-from-kmemleak-in-free_bootmem_page +++ a/include/linux/bootmem_info.h @@ -3,6 +3,7 @@ #define __LINUX_BOOTMEM_INFO_H #include +#include /* * Types for free bootmem stored in page->lru.next. These have to be in @@ -38,9 +39,10 @@ static inline void free_bootmem_page(str */ VM_BUG_ON_PAGE(page_ref_count(page) != 2, page); - if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) + if (magic == SECTION_INFO || magic == MIX_SECTION_INFO) { + kmemleak_free_part(page_to_virt(page), PAGE_SIZE); put_page_bootmem(page); - else + } else VM_BUG_ON_PAGE(1, page); } #else _ Patches currently in -mm which might be from liushixin2@huawei.com are bootmem-remove-the-vmemmap-pages-from-kmemleak-in-free_bootmem_page.patch