From patchwork Wed Sep 14 03:37:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhaoyang.huang" X-Patchwork-Id: 12975548 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 C3F38ECAAD8 for ; Wed, 14 Sep 2022 03:37:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2FAF6B0071; Tue, 13 Sep 2022 23:37:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BDE908D0002; Tue, 13 Sep 2022 23:37:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AA72C8D0001; Tue, 13 Sep 2022 23:37:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 9875D6B0071 for ; Tue, 13 Sep 2022 23:37:57 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6AC35AB1F8 for ; Wed, 14 Sep 2022 03:37:57 +0000 (UTC) X-FDA: 79909282194.13.7F1A15A Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by imf10.hostedemail.com (Postfix) with ESMTP id 3925BC0085 for ; Wed, 14 Sep 2022 03:37:55 +0000 (UTC) Received: from SHSend.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by SHSQR01.spreadtrum.com with ESMTPS id 28E3bKew069060 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Wed, 14 Sep 2022 11:37:20 +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; Wed, 14 Sep 2022 11:37:20 +0800 From: "zhaoyang.huang" To: Andrew Morton , Catalin Marinas , Matthew Wilcox , Zhaoyang Huang , , , Subject: [PATCH 1/2] mm: fix logic error of page_expected_state Date: Wed, 14 Sep 2022 11:37:00 +0800 Message-ID: <1663126621-26926-1-git-send-email-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 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 28E3bKew069060 ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663126677; a=rsa-sha256; cv=none; b=MfKmJtk41UK43gBLHxiAwlLO/0Ue6dK7t9mp7r5PvqZuFlS6130bjLQTRhB9Ot+F1A7u9M CEd3UQ/ftn19OSL8zHkiiGpGnxnMfGUcfh8QX4+WzclC2ELLncXp9C9njM/YU3MdmONZuV FiZhXG69Mkl688+vGJ2JQwYdYnFSkL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663126677; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references; bh=iR19rd3RLT6GzH/NzASvzOaIDIlW05DjT3u/v+nzIS8=; b=fB5r01UDE3tUm3Bj1ccar7FM1ahlUvQiMB18igxurA6KDuwMcKk9z0K3QayDmyFPkC+UEE MLIWaXFi3kt2S7idKXAGJ0zcG6UiVxfa79VaRtXcEr5qqg0D4InGY38mMLvbfAFNN3a1n5 Emvxrj2pn5ZGbOqhKrpXG97mmsYjwUY= X-Rspam-User: X-Stat-Signature: y8ckjywi9gyk9u1b9bmit1bu7gjoc8hb X-Rspamd-Queue-Id: 3925BC0085 X-Rspamd-Server: rspam05 Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com; dmarc=none X-HE-Tag: 1663126675-323333 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: From: Zhaoyang Huang The page with special page type will be deemed as bad page wrongly since type share the same address with mapcount. Signed-off-by: Zhaoyang Huang --- include/linux/page-flags.h | 4 ++-- mm/page_alloc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index e66f7aa..5d3274b 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -946,9 +946,9 @@ static inline bool is_page_hwpoison(struct page *page) #define PageType(page, flag) \ ((page->page_type & (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE) -static inline int page_has_type(struct page *page) +static inline bool page_has_type(struct page *page) { - return (int)page->page_type < PAGE_MAPCOUNT_RESERVE; + return page->page_type < PAGE_MAPCOUNT_RESERVE; } #define PAGE_TYPE_OPS(uname, lname) \ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e008a3d..3714680 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1164,7 +1164,7 @@ int split_free_page(struct page *free_page, static inline bool page_expected_state(struct page *page, unsigned long check_flags) { - if (unlikely(atomic_read(&page->_mapcount) != -1)) + if (unlikely(!page_has_type(page) && atomic_read(&page->_mapcount) != -1)) return false; if (unlikely((unsigned long)page->mapping | From patchwork Wed Sep 14 03:37:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhaoyang.huang" X-Patchwork-Id: 12975549 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 AC18FECAAD8 for ; Wed, 14 Sep 2022 03:38:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 070276B0073; Tue, 13 Sep 2022 23:38:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 01F388D0002; Tue, 13 Sep 2022 23:38:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E02578D0001; Tue, 13 Sep 2022 23:38:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CEDA86B0073 for ; Tue, 13 Sep 2022 23:38:04 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A3A75140322 for ; Wed, 14 Sep 2022 03:38:04 +0000 (UTC) X-FDA: 79909282488.15.D2B5100 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) by imf25.hostedemail.com (Postfix) with ESMTP id B9565A00BD for ; Wed, 14 Sep 2022 03:38:03 +0000 (UTC) Received: from SHSend.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by SHSQR01.spreadtrum.com with ESMTPS id 28E3bPE7069914 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NO); Wed, 14 Sep 2022 11:37:25 +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; Wed, 14 Sep 2022 11:37:24 +0800 From: "zhaoyang.huang" To: Andrew Morton , Catalin Marinas , Matthew Wilcox , Zhaoyang Huang , , , Subject: [PATCH 2/2] mm: introduce __GFP_TRACKLEAK to track in-kernel allocation Date: Wed, 14 Sep 2022 11:37:01 +0800 Message-ID: <1663126621-26926-2-git-send-email-zhaoyang.huang@unisoc.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1663126621-26926-1-git-send-email-zhaoyang.huang@unisoc.com> References: <1663126621-26926-1-git-send-email-zhaoyang.huang@unisoc.com> MIME-Version: 1.0 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 28E3bPE7069914 ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663126684; a=rsa-sha256; cv=none; b=1s0A+YHBu81XuRgkRPBCLyz1s83mFrFmeW7TzTYdoFGyBTYG36wqjIsTpp6vg9YnmeZM3b cnW8r2O5jNyUSlDRntgaVjomG/03tk7bFJzAdz5INyq53/vST/RgIcSlKWx0kPOA166HBp 8tNgWqVE5whL/gNe02vqVUBe7rdrOpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663126684; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tvzYsQUPRVreslhN+4MDXiGS41T+WaRlrdAjQhHYpcw=; b=XM7LtU+bh1UIY8AasFLVv7zkz+4BFFmXC/Q8JeDZxdHSsvOBDY3Rcmu4rZWNsleLtR4aji pNzHAJV4E7ocXioKL+o0Ba3I7poOru/3Y/fIOA7EVyk7EYfc/C9ZF+Nhx91QLsari2HVzV boJzpTrPXw9DBcRZWHUSAerO9lqmygs= X-Stat-Signature: gsitoidwq3qx6w8p1zwjcmy3gwztzp9s X-Rspamd-Queue-Id: B9565A00BD X-Rspam-User: Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of zhaoyang.huang@unisoc.com designates 222.66.158.135 as permitted sender) smtp.mailfrom=zhaoyang.huang@unisoc.com; dmarc=none X-Rspamd-Server: rspam12 X-HE-Tag: 1663126683-409717 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: 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. This patch has been tested with alloc_pages(__GFP_TRACKLEAK) & (__GFP_TRACKLEAK|__GFP_COMP) and got proved as effective. unreferenced object 0xffffff807c620000 (size 65536): comm "allocator@4.0-s", pid 745, jiffies 4294906308 (age 5136.616s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000ffefbfdf>] __alloc_pages_nodemask+0x108/0x3a4 [<0000000083595277>] ion_page_pool_alloc+0x178/0x234 [<000000008267995a>] ion_system_heap_allocate+0x13c/0x708 [<00000000d4df5a5e>] ion_buffer_create+0x98/0x67c [<0000000043fa6683>] ion_dmabuf_alloc+0xcc/0x1c0 [<000000000d1db17e>] ion_ioctl+0x150/0x350 [<00000000a2b89048>] do_vfs_ioctl+0x5d4/0xa94 [<000000008e9b61d3>] __arm64_sys_ioctl+0x14c/0x164 [<00000000114425a9>] el0_svc_common+0xd0/0x23c [<00000000ec9cb1b1>] el0_svc_handler+0x2c/0x3c [<00000000e44a2c21>] el0_svc+0x8/0x100 unreferenced object 0xffffff807c189000 (size 4096): comm "allocator@4.0-s", pid 745, jiffies 4294906309 (age 5136.612s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000ffefbfdf>] __alloc_pages_nodemask+0x108/0x3a4 [<0000000083595277>] ion_page_pool_alloc+0x178/0x234 [<00000000b30c4562>] ion_system_heap_allocate+0x160/0x708 [<00000000d4df5a5e>] ion_buffer_create+0x98/0x67c [<0000000043fa6683>] ion_dmabuf_alloc+0xcc/0x1c0 [<000000000d1db17e>] ion_ioctl+0x150/0x350 [<00000000a2b89048>] do_vfs_ioctl+0x5d4/0xa94 [<000000008e9b61d3>] __arm64_sys_ioctl+0x14c/0x164 [<00000000114425a9>] el0_svc_common+0xd0/0x23c [<00000000ec9cb1b1>] el0_svc_handler+0x2c/0x3c [<00000000e44a2c21>] el0_svc+0x8/0x100 Signed-off-by: Zhaoyang Huang --- v2: code update v3: update code and Documentation --- --- Documentation/dev-tools/kmemleak.rst | 5 ++++- include/linux/gfp.h | 8 +++++++- include/linux/page-flags.h | 3 +++ mm/page_alloc.c | 14 ++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst index 1c935f4..b1128fe 100644 --- a/Documentation/dev-tools/kmemleak.rst +++ b/Documentation/dev-tools/kmemleak.rst @@ -81,7 +81,7 @@ Basic Algorithm --------------- The memory allocations via :c:func:`kmalloc`, :c:func:`vmalloc`, -:c:func:`kmem_cache_alloc` and +:c:func:`kmem_cache_alloc`, :c:func:`alloc_pages(__GFP_TRACKLEAK)` (1)and friends are traced and the pointers, together with additional information like size and stack trace, are stored in a rbtree. The corresponding freeing function calls are tracked and the pointers @@ -257,3 +257,6 @@ memory leaks``. Then read the file to see then:: Removing the module with ``rmmod kmemleak_test`` should also trigger some kmemleak results. + +(1)Don't use __GFP_TRACKLEAK when getting pages for vm_iomap_memory which map +physical address from kernel to userspace. diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 2d2ccae..53464c6 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -68,6 +68,11 @@ #else #define ___GFP_NOLOCKDEP 0 #endif +#ifdef CONFIG_HAVE_DEBUG_KMEMLEAK +#define ___GFP_TRACKLEAK 0x10000000u +#else +#define ___GFP_TRACKLEAK 0 +#endif /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -259,12 +264,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 (27 + IS_ENABLED(CONFIG_LOCKDEP) + IS_ENABLED(CONFIG_HAVE_DEBUG_KMEMLEAK)) #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 5d3274b..1374e29 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 bool 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/page_alloc.c b/mm/page_alloc.c index 3714680..9e036f1 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1357,6 +1357,10 @@ static __always_inline bool free_pages_prepare(struct page *page, (page + i)->flags &= ~PAGE_FLAGS_CHECK_AT_PREP; } } + if (PageTrackleak(page)) { + __ClearPageTrackleak(page); + kmemleak_free(page_address(page)); + } if (PageMappingFlags(page)) page->mapping = NULL; if (memcg_kmem_enabled() && PageMemcgKmem(page)) @@ -1521,6 +1525,11 @@ static void free_pcppages_bulk(struct zone *zone, int count, if (unlikely(isolated_pageblocks)) mt = get_pageblock_migratetype(page); + if (PageTrackleak(page)) { + __ClearPageTrackleak(page); + kmemleak_free(page_address(page)); + } + __free_one_page(page, page_to_pfn(page), zone, order, mt, FPI_NONE); trace_mm_page_pcpu_drain(page, order, mt); } while (count > 0 && !list_empty(list)); @@ -2468,6 +2477,11 @@ static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags set_page_pfmemalloc(page); else clear_page_pfmemalloc(page); + + if (gfp_flags & __GFP_TRACKLEAK) { + kmemleak_alloc(page_address(page), PAGE_SIZE << order, 1, gfp_flags & ~__GFP_TRACKLEAK); + __SetPageTrackleak(page); + } } /*