From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fout-a1-smtp.messagingengine.com (fout-a1-smtp.messagingengine.com [103.168.172.144]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1CCD3E51E4; Sun, 16 Aug 2026 22:46:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.144 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786920386; cv=none; b=TBSeJEBlbE7S39ZfcMpYw5Z79AcNjU/xEwprMigfbVA1BRABCf96XspkMB1Zb7GkxC4OwTFjjGfElG2IwIrYGnnhpUCrE4IlYGenKB0TGXC2nEl0qIxiuBEB1N0Lynayuj8jhhhjYNVZa+YVhHL2rztTomGPI9oIx4tmmTYdVwQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786920386; c=relaxed/simple; bh=HPOCNx4enohxIzT7Fhfygk3tYV5wiLuL+4DNZUVHhGo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R3y9VMDbArhi99vc/1MmjwkSkkgyKTN0ASvavUxS2QLN97mXXoQHXm2aDxWfjPCxcHzDA2/+Iw8CoXG1i8MGfk7SvrdoGoh+F3wXoP6nklKEZeoxBK++RCSctoV3G1Z/8Nalab1W8ccei5f3d2ckm+p4UivYZ/bvFRr83u6+1Os= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name; spf=pass smtp.mailfrom=shutemov.name; dkim=pass (2048-bit key) header.d=shutemov.name header.i=@shutemov.name header.b=NVMztfIJ; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=QbF1DrsC; arc=none smtp.client-ip=103.168.172.144 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=shutemov.name Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=shutemov.name header.i=@shutemov.name header.b="NVMztfIJ"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="QbF1DrsC" Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.phl.internal (Postfix) with ESMTP id CBDA2EC0235; Sun, 16 Aug 2026 18:46:23 -0400 (EDT) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-06.internal (MEProxy); Sun, 16 Aug 2026 18:46:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov.name; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1786920383; x= 1787006783; bh=dznHIYuQ1ajyQBks66dmRoan+CjULGV0RuvhMnG/G2s=; b=N VMztfIJHgpufE0l08lyVHehrOv6tgNPkbVqrKdNJiWgC1/DN6tCXD+b3K652oQv3 rUPk1XJdMIWbUlYOHW5t3EAUnp+FeqGPPbqacTy2Kf/iBI1IDjSFUWmtQjSxlBRg XeSvsuaPmFGDv6SvP+KBjfBj/089rqB0rSOMpkgmF2LeiyJLK9va1ALJgv36XkoB 6gaP44OjEOnRPDfKuJUCNIuEwaMcKddLWPdcCrEka7gyg2krDJ1dpp5iEX4k4xJk A86uTeE21xObCvG/GHEST4rn+47mfQh0/pT1992r4vmNVe322qu0loavXD9nr01E 0IVHOl+5M8ILE3psRI79w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1786920383; x=1787006783; bh=d znHIYuQ1ajyQBks66dmRoan+CjULGV0RuvhMnG/G2s=; b=QbF1DrsCUsaenM/zP 75ODtb3Wg9zYCtU/3GE/5VL/FqEdTYOoS1GCyO/KrhfRDNMNxdsk79MgNRV61Apt sxtmsLkpNSzfLgQFyFFh3d0ssLsB3DmdnbiM5hhuDUYTw9lIaA9hYU8JfNVrIMwX G1TUUtCxbkzhATrGpfpoGHET+8UXNUROHIahAwkqdidRDV1g/Hd4QqfMGx9zFdGk hWJVF6IgwHjXYwE0ctmGl6nwi36qNtDdFmaupGgyaH8O/ZISHzBARJ+3H/1NDQ7s y7pJ6GgWxpg5vqicq0TUe+9I9UY+6MsGmNUZJ9DtJNA3tITwSwZFEuJYxW1yn/AN go3kg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: dmFkZTGQiHMMNOd1xnoN6lXQSIrGAe7MwYo75Qud3VSOh3aIjL1T4IX+wE1i/v23Y8aWnG m9SHT5inuXsr6fNeLF7q+XcMZ+pkZJxjpb2XQQyKrFdYKaLz7QDFEiegvQaT+Y5rGxRgjF euipinLXiFMtCpFgMqQP9Dwn4SHq3YG285QsMU4KB7YfRQHYWKIG6dJTmdP/7bPKv1qUNe 3LkhBXaaROXWrLGafj+UVrogU8Abxo2OvgWTBKIlLl3SY5Eb27sggkfdoaZJgpjY1+W5mK IYgTH3bmg7umgeRjJmx+WAhyhWPmGn2xLzWKHa3nzXVCTdFk2+6Uh9D41+s+1+4ThvFtow zRcsF02Rw/s88ciL+Ju4C2PxiXq8tPwu+8Qdo1MrZebmhpblmIj686SZmknQU+yMUOhU1l t9NuITAmqXyZDmpmrtLZj+XoUkG3+0KvG83OUa5Yww/LEDfhZtqn4v9WO3J2AGIB6HEnq5 VYcp0R+H7kX0WKHf7r87JCH51mvuDSLM8YQEEUE/nxj37Y+vVO2vT3W+DqI+jkRevSJNLo DDJIZE4VkgrwzHArnxvHkDSm0mvPCgPYD9SDMYzOR5q3nvaLKSZ/Y1Du6Rf+jn2NkIiJRJ lTQ05f2gfc02JHZZ5xdgaNmnLcXtlUmISaBbPVItb11H6yaSx6wrc2XCMBUw X-ME-Proxy: Feedback-ID: ie3994620:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 16 Aug 2026 18:46:23 -0400 (EDT) From: Kiryl Shutsemau To: akpm@linux-foundation.org, david@kernel.org, ljs@kernel.org, nico.pache@linux.dev Cc: baolin.wang@linux.alibaba.com, baohua@kernel.org, dev.jain@arm.com, hughd@google.com, lance.yang@linux.dev, liam@infradead.org, mhocko@suse.com, rppt@kernel.org, ryan.roberts@arm.com, shuah@kernel.org, surenb@google.com, usama.arif@linux.dev, vbabka@kernel.org, ziy@nvidia.com, usama.anjum@arm.com, agordeev@linux.ibm.com, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, kas@kernel.org, jannh@google.com, willy@infradead.org, pfalcato@suse.de, rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [RFC PATCH 03/57] mm/collapse: add collapse.h for the shared collapse state Date: Sun, 16 Aug 2026 23:45:15 +0100 Message-ID: <20260816224609.308019-4-kirill@shutemov.name> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260816224609.308019-1-kirill@shutemov.name> References: <20260816224609.308019-1-kirill@shutemov.name> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Kiryl Shutsemau (Meta)" Preparation for building the new collapse engine in its own file. The engine and khugepaged.c need to agree on what a collapse result is and what state a scan carries. Move enum scan_result and struct collapse_control into a new mm/collapse.h. No functional change intended. Assisted-by: Claude-Code:claude-opus-5 Signed-off-by: Kiryl Shutsemau (Meta) --- mm/collapse.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ mm/khugepaged.c | 52 +----------------------------------------- 2 files changed, 61 insertions(+), 51 deletions(-) create mode 100644 mm/collapse.h diff --git a/mm/collapse.h b/mm/collapse.h new file mode 100644 index 000000000000..26dbac7beddd --- /dev/null +++ b/mm/collapse.h @@ -0,0 +1,60 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __MM_COLLAPSE_H +#define __MM_COLLAPSE_H + +#include +#include +#include + +enum scan_result { + SCAN_FAIL, + SCAN_SUCCEED, + SCAN_NO_PTE_TABLE, + SCAN_PMD_MAPPED, + SCAN_EXCEED_NONE_PTE, + SCAN_EXCEED_SWAP_PTE, + SCAN_EXCEED_SHARED_PTE, + SCAN_PTE_NON_PRESENT, + SCAN_PTE_UFFD, + SCAN_PTE_MAPPED_HUGEPAGE, + SCAN_LACK_REFERENCED_PAGE, + SCAN_PAGE_NULL, + SCAN_SCAN_ABORT, + SCAN_PAGE_COUNT, + SCAN_PAGE_LRU, + SCAN_PAGE_LOCK, + SCAN_PAGE_ANON, + SCAN_PAGE_LAZYFREE, + SCAN_PAGE_COMPOUND, + SCAN_ANY_PROCESS, + SCAN_VMA_NULL, + SCAN_VMA_CHECK, + SCAN_ADDRESS_RANGE, + SCAN_DEL_PAGE_LRU, + SCAN_ALLOC_HUGE_PAGE_FAIL, + SCAN_CGROUP_CHARGE_FAIL, + SCAN_TRUNCATED, + SCAN_PAGE_HAS_PRIVATE, + SCAN_STORE_FAILED, + SCAN_COPY_MC, + SCAN_PAGE_FILLED, + SCAN_PAGE_DIRTY_OR_WRITEBACK, +}; + +struct collapse_control { + bool is_khugepaged; + + /* Num pages scanned per node */ + u32 node_load[MAX_NUMNODES]; + + /* Num pages scanned (see khugepaged_pages_to_scan) */ + unsigned int progress; + + /* nodemask for allocation fallback */ + nodemask_t alloc_nmask; + + /* Each bit represents a single occupied (!none/zero) page. */ + DECLARE_BITMAP(mthp_present_ptes, MAX_PTRS_PER_PTE); +}; + +#endif /* __MM_COLLAPSE_H */ diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 5f7126cf42f5..804b1d35f52a 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -26,45 +26,11 @@ #include #include +#include "collapse.h" #include "internal.h" #include "page_alloc.h" #include "mm_slot.h" -enum scan_result { - SCAN_FAIL, - SCAN_SUCCEED, - SCAN_NO_PTE_TABLE, - SCAN_PMD_MAPPED, - SCAN_EXCEED_NONE_PTE, - SCAN_EXCEED_SWAP_PTE, - SCAN_EXCEED_SHARED_PTE, - SCAN_PTE_NON_PRESENT, - SCAN_PTE_UFFD, - SCAN_PTE_MAPPED_HUGEPAGE, - SCAN_LACK_REFERENCED_PAGE, - SCAN_PAGE_NULL, - SCAN_SCAN_ABORT, - SCAN_PAGE_COUNT, - SCAN_PAGE_LRU, - SCAN_PAGE_LOCK, - SCAN_PAGE_ANON, - SCAN_PAGE_LAZYFREE, - SCAN_PAGE_COMPOUND, - SCAN_ANY_PROCESS, - SCAN_VMA_NULL, - SCAN_VMA_CHECK, - SCAN_ADDRESS_RANGE, - SCAN_DEL_PAGE_LRU, - SCAN_ALLOC_HUGE_PAGE_FAIL, - SCAN_CGROUP_CHARGE_FAIL, - SCAN_TRUNCATED, - SCAN_PAGE_HAS_PRIVATE, - SCAN_STORE_FAILED, - SCAN_COPY_MC, - SCAN_PAGE_FILLED, - SCAN_PAGE_DIRTY_OR_WRITEBACK, -}; - #define CREATE_TRACE_POINTS #include @@ -103,22 +69,6 @@ static struct kmem_cache *mm_slot_cache __ro_after_init; #define KHUGEPAGED_MIN_MTHP_ORDER 2 -struct collapse_control { - bool is_khugepaged; - - /* Num pages scanned per node */ - u32 node_load[MAX_NUMNODES]; - - /* Num pages scanned (see khugepaged_pages_to_scan) */ - unsigned int progress; - - /* nodemask for allocation fallback */ - nodemask_t alloc_nmask; - - /* Each bit represents a single occupied (!none/zero) page. */ - DECLARE_BITMAP(mthp_present_ptes, MAX_PTRS_PER_PTE); -}; - /** * struct khugepaged_scan - cursor for scanning * @mm_head: the head of the mm list to scan -- 2.54.0