Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1802369rwe; Fri, 2 Sep 2022 04:13:00 -0700 (PDT) X-Google-Smtp-Source: AA6agR7G4TLOSHxlFBrcepimg/GZS8nFUbStYvhXZZqXiVpa0cIRE45gfBfFwmobqs1raDY9PVzV X-Received: by 2002:a17:907:6da1:b0:73d:877d:c56c with SMTP id sb33-20020a1709076da100b0073d877dc56cmr27273009ejc.342.1662117180380; Fri, 02 Sep 2022 04:13:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662117180; cv=none; d=google.com; s=arc-20160816; b=eLHIs1G3MW4n+0llg2PbdNN1QDbCyYDU/euOWcdq824LP3vW8BYg0CbR4oBM6rH8na HTTYmovK0jsD3lqkdqGP+aHFl7UFVTLROUoKDDIfMH9lY7ecAT8kMf914xJGBHH4SaXS O71NwAie7KqNVQRe3vgkUqrW5UE8cpj4lngtJS/aujg6IDmUtzc+fesdG383Im7JlZ27 z6zVFfwuU8ctsc6+R1Sp5jVI+UArax3vIVDwc2fU6ChtXfGQ2CshKrmeuIU3/SeQmHxq XW4hYKqK9Iw5o9qHMXPKoV5PNnEMDJy0U7hn0OIOh35ujl9a+tEhP3fi93zrkZdrv9vM gF+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:to:from; bh=oNRVLevbLTNTAz722W6CQAiPOmKu2ycgEWV3wSlVAbs=; b=tUVLrvP7s2Ddc1ySbYv9oZ/MR8GGe71SDmCJcUt2+pzjEfGbcdA3hi/PESwo84JxlG ESuF5KrnKTnM72eFudftJ5nIU6fAUvxHsTi1XiTr+6gywEhqLq1OlznsoiN4r2TqaURA +kDqS2MIQGGmuZbaDoC8f6uYafT2sVObNic10KBRD2FeY8ce6TDfzbiT0ffpQ2iAjnaj Bkr/uPhXeISjOrcJVB7OYKz0Hhg04E7cWw4mmJMzwPqSWGed+lkM1SAod7Dt1cD467W0 IVpBBzWoV92JlyJi5SoRbxFQBdVDG52WTx9rwQEbGzEaB7nBs3/HuftsZUcgu/9IhwSB b9tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v21-20020a1709061dd500b0073101567b5esi1375977ejh.482.2022.09.02.04.12.30; Fri, 02 Sep 2022 04:13:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232723AbiIBLAS (ORCPT + 99 others); Fri, 2 Sep 2022 07:00:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230436AbiIBLAQ (ORCPT ); Fri, 2 Sep 2022 07:00:16 -0400 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3AA83B954 for ; Fri, 2 Sep 2022 04:00:11 -0700 (PDT) Received: from SHSend.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by SHSQR01.spreadtrum.com with ESMTPS id 282AxQN9047151 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Fri, 2 Sep 2022 18:59:26 +0800 (CST) (envelope-from zhaoyang.huang@unisoc.com) Received: from bj03382pcu.spreadtrum.com (10.0.74.65) by BJMBX01.spreadtrum.com (10.0.64.7) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 2 Sep 2022 18:59:26 +0800 From: "zhaoyang.huang" To: Andrew Morton , Catalin Marinas , Zhaoyang Huang , , , Subject: [Resend RFC PATCH] mm: introduce __GFP_TRACKLEAK to track in-kernel allocation Date: Fri, 2 Sep 2022 18:59:07 +0800 Message-ID: <1662116347-17649-1-git-send-email-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.0.74.65] X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX01.spreadtrum.com (10.0.64.7) X-MAIL: SHSQR01.spreadtrum.com 282AxQN9047151 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhaoyang Huang Kthread and drivers could fetch memory via alloc_pages directly which make them hard to debug when leaking. Solve this by introducing __GFP_TRACELEAK and reuse kmemleak mechanism which unified most of kernel cosuming pages into kmemleak. Signed-off-by: Zhaoyang Huang --- include/linux/gfp.h | 4 +++- include/linux/page-flags.h | 3 +++ mm/kmemleak.c | 2 +- mm/page_alloc.c | 6 ++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 2d2ccae..081ab54 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -68,6 +68,7 @@ #else #define ___GFP_NOLOCKDEP 0 #endif +#define ___GFP_TRACKLEAK 0x10000000u /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -259,12 +260,13 @@ #define __GFP_SKIP_ZERO ((__force gfp_t)___GFP_SKIP_ZERO) #define __GFP_SKIP_KASAN_UNPOISON ((__force gfp_t)___GFP_SKIP_KASAN_UNPOISON) #define __GFP_SKIP_KASAN_POISON ((__force gfp_t)___GFP_SKIP_KASAN_POISON) +#define __GFP_TRACKLEAK ((__force gfp_t)___GFP_TRACKLEAK) /* Disable lockdep for GFP context tracking */ #define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP) /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT (27 + IS_ENABLED(CONFIG_LOCKDEP)) +#define __GFP_BITS_SHIFT (28 + IS_ENABLED(CONFIG_LOCKDEP)) #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /** diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index e66f7aa..ef0f814 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -942,6 +942,7 @@ static inline bool is_page_hwpoison(struct page *page) #define PG_offline 0x00000100 #define PG_table 0x00000200 #define PG_guard 0x00000400 +#define PG_trackleak 0x00000800 #define PageType(page, flag) \ ((page->page_type & (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE) @@ -1012,6 +1013,8 @@ static inline int page_has_type(struct page *page) */ PAGE_TYPE_OPS(Guard, guard) +PAGE_TYPE_OPS(Trackleak, trackleak) + extern bool is_free_buddy_page(struct page *page); PAGEFLAG(Isolated, isolated, PF_ANY); diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 422f28f..a182f5d 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1471,7 +1471,7 @@ static void kmemleak_scan(void) if (page_zone(page) != zone) continue; /* only scan if page is in use */ - if (page_count(page) == 0 || PageReserved(page)) + if (page_count(page) == 0) continue; scan_block(page, page + 1, NULL); if (!(pfn & 63)) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e008a3d..d8995c6 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1361,6 +1361,8 @@ static __always_inline bool free_pages_prepare(struct page *page, page->mapping = NULL; if (memcg_kmem_enabled() && PageMemcgKmem(page)) __memcg_kmem_uncharge_page(page, order); + if (PageTrackleak(page)) + kmemleak_free(page); if (check_free) bad += check_free_page(page); if (bad) @@ -5444,6 +5446,10 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, __free_pages(page, order); page = NULL; } + if (gfp & __GFP_TRACKLEAK) { + kmemleak_alloc(page_address(page), PAGE_SIZE << order, 1, gfp & ~__GFP_TRACKLEAK); + __SetPageTrackleak(page); + } trace_mm_page_alloc(page, order, alloc_gfp, ac.migratetype); -- 1.9.1