From nobody Sat Oct 4 21:01:19 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2076.outbound.protection.outlook.com [40.107.220.76]) (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 DAA892F28FF; Tue, 12 Aug 2025 15:55:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014134; cv=fail; b=J/mnXzDpFiefSLAZRjbiOmBAjAs4YTABAHhLwPzkcehsD37f3PWbziXOLjk+91BUzv610pfQjPDYASQUpyErfa2/xHFmmCnsz0DXRc1CVBr+ALIDLMOe1FYAUViJ/VOHswfbHwOG0GIEHUdHapA05wkGTQvu2GE5jouAtZ5hWQY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014134; c=relaxed/simple; bh=4O1oV5hG3ToRsxKdShlHQOapNdt/Z5F4/YQFZwVDeow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=UmSQKbBkG7GX8IviFxXxLb+0vVr3AOQZPbB+Fnml6IPMxo1PZVfVdrZYA2oxmucs0M5+oI8ur2ewOIPqLkTQfmPBaerZDIL6ZW6+YubfcErhEZlK2waRNNImW2qFwmGHGvQ5eglUPpt0rBUtgUDZBKCpFdFsmJVWkZWJ5uXcEec= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=bwBC5uY3; arc=fail smtp.client-ip=40.107.220.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="bwBC5uY3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R5e2V6C56vLz5OFiVODuqtOgGg58NQv878DAUsLpenvE6vtVkkHSAi6pUcX/Qbv6BKRCAeP1xP+jMxS0r+ON5pyFkfe97XE69G92ixjsS1WU/KlDrUJcowJj9UOzABMFV9O3+b0Q0wI8VSR4N4V1FyBvteBq3PnWWmYh0Aolm9k01WSBnrXkr+DzOTO/aaWVaU6VslIBZR4B7F2ZqUJci6aWIcDwMlkaaIplrK75LBtsbAUNMEW2gKmQ+EdL6rVnKNEaLk2qg6Aj936l/wHsjVw2PjPRgVjzENMU2acZR/GSB1xjPtkU0jd7BStkHLJGCUTuosbdci4WETehXpt1DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=49ZSpr/I8MWI8XUZKPEYSzl/XhTN6mjiL7yiL7QZf9k=; b=AIT+7CJWBxPCaJKowP/JzLG+6FBBlrZa1DE5Cfif50Z/nVG68tFi4aLg/KrsRxMKjkRWgLOCXF5KuhbfDcowmt61BZixBqYyLthTgvH5kTc7nplEfnKze/BwyhMyD4kZqPWijJ6bEzYtXBBmwlEox1PF4u4DsE2s0OgtxRkyPG/LxvO0DGsHgpOaNNhagVJ6UalnWS1SzwcEvoJFtbvUiRrbjJIsbFz2ki8SNoD0ZzaGdDW6oOC67Nk+Bn5u88y8tRz84UJEZYTlttjYhuZFMtmPCdtMgk37akligqbUmFZ4/BeW2iQRKQDAcsYcV/aCME08L7kgrnztfCiKWCqHOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=49ZSpr/I8MWI8XUZKPEYSzl/XhTN6mjiL7yiL7QZf9k=; b=bwBC5uY3i1QJMfxhTs+/FM8wHu7gRgrWyyppynrSDbV2YnHQFq0fyqOKiXABFpc81EQce7+twFnpFB5dEjc1xM0oU44VQI7ZKXcYIpDeCLQJjJDm9gIyhLxK7Ilz6FhmQM5EwdazdspHGyaCPMdBQaocmKBGtGsjH0X/u65uEWPzv0R/L7uCyWa72Ipp0mYl13Z0K+SdD4LPxlZ7r+uvNd7/8177pNmpZ1n7qRGNydAQWiMjdWMkGQQ0xcHFHgEBL+IVqG0NG8h2PfUSQQpgWyGlAZhmJE7vltFb98uXRI4M9lljUUyc3V6yDDpATzG35e6B4ir8SBnp8T05wpfKTg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9009.21; Tue, 12 Aug 2025 15:55:30 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%6]) with mapi id 15.20.9009.017; Tue, 12 Aug 2025 15:55:30 +0000 From: Zi Yan To: Wei Yang , wang lian , Baolin Wang , David Hildenbrand , linux-mm@kvack.org Cc: Andrew Morton , Lorenzo Stoakes , Zi Yan , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Donet Tom Subject: [PATCH v3 1/4] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug. Date: Tue, 12 Aug 2025 11:55:09 -0400 Message-ID: <20250812155512.926011-2-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812155512.926011-1-ziy@nvidia.com> References: <20250812155512.926011-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BN9PR03CA0080.namprd03.prod.outlook.com (2603:10b6:408:fc::25) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: dfe31b83-7335-4cee-7839-08ddd9b8a97b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Kmzlg0au49/cyx3puc0nOSMMpi0wo0VVsX7e+sseniQD3OaoT8QeerQogcoF?= =?us-ascii?Q?QgT7UW3fmgRIJNV3LW4C7qCgU74fpFToXX6zopzsrBQSzYr0HRbuUZhY+H7y?= =?us-ascii?Q?4W44rwlV54H3PLuFDUWHU1Qi45jGJ6T68X8l8EDBBpDkeVjzgjhw1Pza6L0j?= =?us-ascii?Q?j/CVOxp2GWM23KWmmSpeJlptWD90UI+5+Oxr2kWvLaO2DWcCv3LDNUFa8KP9?= =?us-ascii?Q?/sy365P/n2s8qwdee2YQujVd6zt/+Z1jD0jdpaKwukZtBLoF9zb+q268uvi3?= =?us-ascii?Q?XIalTvYBdNOHNFzORW8/90jkjAoEoO78Kctn257LDCpzSdEIO9Nq0c6JloGL?= =?us-ascii?Q?IOLb9VbdIPEeY9VLE/ba07lBlANYIWVnpeGTtDXop4NoKnIsjyoCu1eRndIZ?= =?us-ascii?Q?1h7oCgkKDQuRqadiA53FwoLv3Bn1OoZA5cdqB8tWgijCeGl5LAZhKwpogRtG?= =?us-ascii?Q?EWDClJSdi4jU1I/BA9XuocMdUqVL2PA8DrNeTYw9gG+JacBYhjwWFd+hDopf?= =?us-ascii?Q?Lr3kHHD2s0kc6n/aBUH9nxphml24w8L7QSE6IlULoZudfiol0xhtoDLle+WJ?= =?us-ascii?Q?y52JoLvi991c55qSDrztVVQTUNew/0y2uMP2+9yCcnOuFb7cZd+IbHcuhiCi?= =?us-ascii?Q?uQVPy/wo/xUHyGYloMf+YF+k5mDDM2kAm17hKL8jVlHTcBC8oYn+KQbR/azR?= =?us-ascii?Q?m6VWIqbmsz5OokucooIk1QwCwWRJYGD2QwjwssMl3AsNcoSS0TPNKxkiXZJR?= =?us-ascii?Q?cMIxdFOrXLYwZsAxtkN3oDLO5Ga+CzV8U0mdUC9NVgj8WWxboWkilCeVtJS3?= =?us-ascii?Q?0akeJPv07xaNG+dJ1fNv9DnYRiFisAVosZ7K2O8NyrB1GzpucZaNOhnWzPNQ?= =?us-ascii?Q?h/rtuctIssBC/ClWqyiKCQ7e4yKVasq3RVh+bdN7srexSc/3Wf9AzKy2hm/v?= =?us-ascii?Q?8q6MISpaS1fuAST3BP9B/1p0vH2ulIIJMu6vy/guwWIYFYobVS86ScphoEjI?= =?us-ascii?Q?0jMKFoPE0uGjF+WpaYOmjotZaR5FAKnk8Zw1xPKlY4Dr8x/u8J7ZmQBAXU/P?= =?us-ascii?Q?DuhJHgaA95cVMBjj0S3+nK+PTveLl0ydE6SFLcj0x8gyFyo+F/mF6w2DvUwJ?= =?us-ascii?Q?R4T2mHDBTpxuuGdBKzpyEsV93+iHrIQl2B1M13oUdN+nhJYugPor+2HRe0bn?= =?us-ascii?Q?oApDtW/8B+8nQYIM8pvMTjwWGdDYQkbwaLJhb4ciiWdDdTAGhA1WewcUgoJr?= =?us-ascii?Q?/ViL3mEJXAw5VgxIG5mIevifY6j63Y1Hk/LkJ69PT953hmKoabY9QdkII9CM?= =?us-ascii?Q?yN9L6ibaVdYmQ1Z0M5DNPQ4Re2d9jPt7mBKMdZc8mvHPsdf/AtPbsxRlxMcX?= =?us-ascii?Q?5JfsqcWkaZya80ZNXVrsD2V+0sbdtRI7BZksf1V3hz8CpQsuDMLpGbK7sv7H?= =?us-ascii?Q?OGXc13Hewik=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024)(7053199007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZbDAxyMivNU3x8ixFjtYgtKCSeR1KuH4UdzRX2UJjimub87TNhIUDMbXuPU3?= =?us-ascii?Q?7xnSsu8VGozXvrf85rxDJ8O7+zFIwMSvM9qzQjQn1GWDbT68bC+zRCDV0+b5?= =?us-ascii?Q?J0c1IlsB/eaFZh72/Mu8vxb1vZIiUuSAbTsjRseONr8iBVzTDHFnCl6YV+Py?= =?us-ascii?Q?+kcQN4YMxoWk5+My9ZKxKv4Gt/AASU8/9OSiyvnmkDnBU/HJljwxb16jAS53?= =?us-ascii?Q?qhTaP+VYxXifLCbWeBuep2R0WGCpvIC7oEPs88zEwtFrA67zM8IWD5xuv1EZ?= =?us-ascii?Q?X+ije46mSMCs0gNGxTMnQjyKK29V+puixrV787Y8jzX6dHAH0tbiWD17URgx?= =?us-ascii?Q?ANzz1/4Tm7Elb1Lu3vWCXRUCTXO+cB7qPMXl+/qXBeGBRIm3j4qm4jJFHYhm?= =?us-ascii?Q?jiKEak3c4ikPslRystf1lIEAP5195Gze2q2VPXqkdGQuAkg7oXwHDNaJtrVO?= =?us-ascii?Q?q5Brx00l5VWN53Jpqu8476awvl22UhY39GpjqbI2JTgGtz/4N906u6sXkLtE?= =?us-ascii?Q?EvLH3Tapn86LKuwZ/scQc70VO90u2eulDr1A4jD7lZmd8uj+j+hr/UW2dGOq?= =?us-ascii?Q?0xgg+XakJskIUCDbF+zU9DxJobt1ai6rq75g773y50u2I60XA1VRW4QmHLET?= =?us-ascii?Q?1357rb886Z0rwqy6S08TETDezDy6vP6+7iC7IKmWQeKz9Z9rXJKc9XjYNLA0?= =?us-ascii?Q?DV6JFfTa/Sjn1Qq5GoeuXzHw3WanF+I4t1X9WdaQhLwKg7ZI2Bpwz99Rfosn?= =?us-ascii?Q?GjourSK8vu7gmFFwH/5AP32lCRCVHeZnwsCk2Fq0Sk2YrJ7KsWCaq9vowS29?= =?us-ascii?Q?OEKuW8IL1Z+CrVIJ7UqxjkyMk9T277PddLPpt14xTB9fuyu0dxim1HyZevo2?= =?us-ascii?Q?UAB2isAmikGC45exZU1mbeKTokUO8CnrpfSLNBkQ3Z+bJBXKAk1GTd8kH1Vb?= =?us-ascii?Q?0BlMQ20vIIP/PXrhW3+bQ4qQdAz8JwHybdxNRIBgRekT+2xIrsqPYZ4RKcCu?= =?us-ascii?Q?SOfKwOM0E1H+011jvO8GMFjEhFsSQ8rHwsJj+3zrMBg92edjUdwIzHL6keyp?= =?us-ascii?Q?afen/kSN5U+CONpJXnpbaiEBNGfZuhc9fIEvNZAHvVeJgnEUu8lyg+mWCQly?= =?us-ascii?Q?2x+oeA6D+NvH+vCif0DbiOFAhzfsWOshciNOFo/72Nh1SqMnUhYoUYoYvoIy?= =?us-ascii?Q?jkGR2sfLLJqWNAIFLPjk1zsAJ6MCek2IwXi06LJ+N7GzJ9tAGKpu8SsdYaT+?= =?us-ascii?Q?EQMbQSjqqcmHt8aTkVa3umPIJszrQP0OGKMEW4aEGo4IRtw1yzA9THOiJ5NS?= =?us-ascii?Q?f/hNUXU6n0mfCXrWYDZPL0JA9uCnwvHWYinXIcV2hH38RcOHqHJ9H1Q3+rpg?= =?us-ascii?Q?g+dSytX8ZGanY5E0YKgjvd/sRc3NDicf4b7q7TCdeXwYnPYTWMY0v70rW+GU?= =?us-ascii?Q?orp6I4CEc/GAr/yHZZLaohB7VQYabEEZRj1P3Ps1UM/koP3mRUEJJhSMifyF?= =?us-ascii?Q?XpqljWqBqd57wZnAZA0qibvjgLKu5+liup9Gb+Zk0JMj++RFzEURb7hky0Fa?= =?us-ascii?Q?z5Efi4G+5nCrRUPfkCj3kK5//+nO+xuJEg7C8+IC?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfe31b83-7335-4cee-7839-08ddd9b8a97b X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2025 15:55:29.9683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bja5+Hk1Vpuh8WYQxQiBme48nCcI7bUiqe3SHq3w8+PFbhoBEWDcoIMwl2/QZ9AH X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 Content-Type: text/plain; charset="utf-8" They are useful information for debugging split huge page tests. Signed-off-by: Zi Yan Reviewed-by: Wei Yang Reviewed-by: Donet Tom Reviewed-by: wang lian Reviewed-by: Baolin Wang Reviewed-by: Barry Song Acked-by: David Hildenbrand --- mm/huge_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index b8bb078a1a34..22dc727d1d27 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -4319,8 +4319,8 @@ static int split_huge_pages_pid(int pid, unsigned lon= g vaddr_start, goto out; } =20 - pr_debug("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx]\n", - pid, vaddr_start, vaddr_end); + pr_debug("Split huge pages in pid: %d, vaddr: [0x%lx - 0x%lx], new_order:= %u, in_folio_offset: %ld\n", + pid, vaddr_start, vaddr_end, new_order, in_folio_offset); =20 mmap_read_lock(mm); /* @@ -4430,8 +4430,8 @@ static int split_huge_pages_in_file(const char *file_= path, pgoff_t off_start, if (IS_ERR(candidate)) goto out; =20 - pr_debug("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx= ]\n", - file_path, off_start, off_end); + pr_debug("split file-backed THPs in file: %s, page offset: [0x%lx - 0x%lx= ], new_order: %u, in_folio_offset: %ld\n", + file_path, off_start, off_end, new_order, in_folio_offset); =20 mapping =3D candidate->f_mapping; min_order =3D mapping_min_folio_order(mapping); --=20 2.47.2 From nobody Sat Oct 4 21:01:19 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2063.outbound.protection.outlook.com [40.107.236.63]) (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 822062F6580; Tue, 12 Aug 2025 15:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014141; cv=fail; b=LkgQPsHOvu5VuF0gw4Nx6bbM+su+t0zZYC0p4wqv8QKQB7Vi1FL4CCYUxMpS2EanEaTwMf8czul3A5a2XpqivIwHrKHz9nfleJrA6e/0TZQne44DMCHuSIQLSWWzaihJT4BtIIgLUVzagov+SVZ5ufnXRhTsQ7qLtKo9Z/baax0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014141; c=relaxed/simple; bh=r+Ip1rfBAaAaeuBKinqkSPzMmao2dUMUraoBshRvIwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=RI9cLTrZp0aSn285CEKZMu2N4krF5cw5TwW6Mz71NeCjrsRFZ+/FiQDE56MQQbqVAlCh1yNpi/HLF/SQZrHGb3fSMl1HJOLFYwk2pHE9qD9dPDNLy8B3JurLskOu5UtLDY99iR2JDVVySw1imwLdTUW8SFvHaFOx/ai6WCE70g0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=TgY0Bwag; arc=fail smtp.client-ip=40.107.236.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="TgY0Bwag" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=h6QdhfjzIQyTKWg17ieN3EI2LO2iNS8nI+nxD8x8hDyfOF0tvEBw3PlWdB5g2dnKedF1li3E3TLcd1zX4ACpJk81unvWHjAAzzKpf2+1xRptn7tkMkSBMLlZAblMtqOEhfyE6bhokeUtN2YAh2ft6OBN/k5uVfNEbwed1gCQI/I4+0KkZCj6xRfgJrLAys5Kf+ckKvF/ooe+/2UNDsQxBAkE5jwYfgl0OTBMqMdXl6Rd2lUlL/7c1z5Ox2qSuTA4B8za3ay5a6zgLvwefqZ/OS50G9ULhXQIzYxzIaFMV2l66CiLJp7yiJ6Jqds6HlMLCes1MxnQjmHzNVH7Q5jCqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WDnWZaN5lDYiCS8c4E3BShOduiflG41zPWvj5Ydk31M=; b=rvVl/n4iLcQea5HrLmjk2FetxaiER5R6Bo59Z940p70svx823sEBlzOGw/pCYO6r9WjrPvG959KprIRW84neS3rGTX2vg5HDPQJGTa7IelSe1Hf4WLzsqVlosGb+sZiX6sOVVxnHaZHOT+W6i6FUg7/E+3wkFqPEdD3Y9AY0dxxXk31UPGpjMwSBBb2N8iukJlrkB6CUh8bxoNzpj0bOrLEDLu8FI6HwenUWsAq1u6DPM1ODHtHbeXv5IBcbvYirTx+vsCwgwQPwQremCWei6ON/qLl/HYU4gx6502COttEySaE4Sk5P4FjkYiAoX5CUACtdD7pt2vVeBv9iiEvZAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WDnWZaN5lDYiCS8c4E3BShOduiflG41zPWvj5Ydk31M=; b=TgY0Bwagy8exqinlsoJlqLK8N4RLSiwOFrZ3RyPtaMaSPVkc41jmkLp/6DnJTUY4xUiRSRGiUvnR9J1zZHjxmGdga0eFSfRYO5K2AcR7O4Gwur4T2WxuQ1/Vqasvqfu0zNszHucya9Wmp2ltlSwX9TnBNUy6S2Ww1dIebo8oJ/iC3u38grPYmRrBKE4AHBRXgUXmFHP+CtiY92C6rIhARCe7OO4SX2hd87XDrTzt1knxA/dWA4KeQcPEhkXY9ojFMPNzUYHbxluVDWZQH5D4dmxnIcltRsnqhYvug9ZuMg4hEq/v/QokvBH3/8adDKoJlCTnUUC11cmMdBzsQsVNNA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9009.21; Tue, 12 Aug 2025 15:55:31 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%6]) with mapi id 15.20.9009.017; Tue, 12 Aug 2025 15:55:31 +0000 From: Zi Yan To: Wei Yang , wang lian , Baolin Wang , David Hildenbrand , linux-mm@kvack.org Cc: Andrew Morton , Lorenzo Stoakes , Zi Yan , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 2/4] selftests/mm: add check_folio_orders() helper. Date: Tue, 12 Aug 2025 11:55:10 -0400 Message-ID: <20250812155512.926011-3-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812155512.926011-1-ziy@nvidia.com> References: <20250812155512.926011-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0186.namprd13.prod.outlook.com (2603:10b6:208:2be::11) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: 5c21c1ce-bf95-4f79-1ac3-08ddd9b8aa6a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VgcjAu8Ci0EreHtgbFrXoJNUOSAWcM1iIVs0CEgK6Z2i6732V7yW49tHuJ5W?= =?us-ascii?Q?2ZwDf1sAlzaGHYyU3G0xuNnSunAPozyqZO2LKmgVmnRs034vh6gA6u67i+NI?= =?us-ascii?Q?F2D3CF1uQUQ18s8Ov8psCCZ5bdeLsYPpDyfz9WPYsavMp65qaBa3r35KDKdQ?= =?us-ascii?Q?a2dEUmB7eYrNaGJbUBE8159C+zotUgNf8neancj/W1h78mbzhvXSx58kmozk?= =?us-ascii?Q?s8o54rW/a0zoSYeMYHQ8OiyRMOIY5i9I+28gcsDirgTb8JpQjYhBBP7K/XK3?= =?us-ascii?Q?CE4rxYSlSmuoqRGludr4+8dOGTUVXaYDfTKw/w2MMtgQJmfA69csKJUchEl7?= =?us-ascii?Q?GY30ZNWGx9O90jV7BZfgoLYqK31gxn818Eg/B6GxEYAQ9X7gkKsGCpdDqmHT?= =?us-ascii?Q?7ZE4L55cU9bFh/YMvt1WQ1ROTgWdWXgAwmg7idsHFNpeYN0vBhR0M0xKHO0S?= =?us-ascii?Q?TieeGdHBAgK2cSUTy+E5qJ/bip0amr0nd+QVHmjXAXC2XXEfJT0szB+vlUq6?= =?us-ascii?Q?BwTrfQwmtNZQyFxWDb9TutmCFoEyRf7DdNBJvlEWgkdknIk2ZBXsg+BZI58b?= =?us-ascii?Q?KNOFkXjXSAAbVWb8BT4IZLJ10TUcMPNmKvB/frM1SuchAvW0IWHYbC6sajLD?= =?us-ascii?Q?0VB+ppZR/kGYulXwdK2cvyJQTHik5kIEG3MTWPa2CaNEhnPM5zdi4Mj+8bCt?= =?us-ascii?Q?6h/95Zlv8kR0M+cqKr8oCQRBTPmH3wTXDaK1lXoKRMqgnfxnf3IM24qbdWgC?= =?us-ascii?Q?PbF6uIWKZvLn2IeZS1QH1nDkUr6otMjs7gjc4bt215Pghi87JwNjZZ98+TdQ?= =?us-ascii?Q?4tWFQwI9WnK9sF0DhiakWhTmG+J0VEn70m8fWcsKsqAQai/Af9NiDxOWUiIA?= =?us-ascii?Q?6G7EZDUMgLmfiPBb+xf2/A225n/CXXxpu6r9Vu3PkB3SjMdKdi2Wkffv22MK?= =?us-ascii?Q?ttQKQFg8AzFvOHFIXrXkc7gUgaACl4ZJkfHVIms9jaWaaVXKxKKo7yvC5jyE?= =?us-ascii?Q?zPTAinWlNCvGQMstSxrH8+cLLqf4kO4N22RxrIRvwM1u6eQl4nu33hOp+zeE?= =?us-ascii?Q?1hOahBBMH1x2c4x+59pPmh86Wzp9+UTaZrru18CGT4UGdH4a6aw8yhVoKPS1?= =?us-ascii?Q?2aNqOM0DHr7FWjvX19b0yBWjqB/SOXXNn32PCoeAKfZXQ3DhQD6hbLG1v0qM?= =?us-ascii?Q?/swgAZ+H7lAZ9zaWeczRkVwPrnj6xKW44ZLxeRHi372JQ1GY6HGspZV2XQID?= =?us-ascii?Q?arwzzaLU8XuxHXHjOmYJ5C1rnEzulFm7hsRk8E0ZS7m0wtKc3WDxycrKa6Hj?= =?us-ascii?Q?B1rW31N9joXkX79HZk0H+eYKa/ctSPzm0XVGo11wVJszpKpF3FHqzkTMgePy?= =?us-ascii?Q?CSF82jRv3aBxt5EJdAWwRNRwGBez7+vROJsmLYN2fprMF6/O4D2aLQai1VMv?= =?us-ascii?Q?5y7yryMnA+o=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MdcDEgTzAe9AHKUMKrAFEi+fV8eehHp8Cz9rc/kLTAFQhR9UM18wWXuz2bBk?= =?us-ascii?Q?P6gKKAYe+UyLKHMUzIxEDf822+FlHhLDnGF5BCaXZ5GpYTyPDjmy5O01s8XJ?= =?us-ascii?Q?wNnSnxry+4WnoXerAo63V2UZA8gpHzhxcOCQQludLE4590aSfhFhLVGmOq0J?= =?us-ascii?Q?dVZXL/LW3546xq6EFSn/GRYdOJ961vNKVOKdmHWVRxZFDqkfRsrEDNdn9gLL?= =?us-ascii?Q?JjTdforu7k9lhGVuT0nDlx64XWpFvi0D65tgMY0+9RK13pdxNyrradhlJ9u+?= =?us-ascii?Q?pMJSbR/YM06VVcXahEU6pO/GvkBLprOTNigzORLRcnfFp24EQJKleroF713w?= =?us-ascii?Q?92O8tSVtQlmTPs69pVErzydU6RDRYPbTfn1eGvqUmqaRnuQvNc7QuKu/JRFz?= =?us-ascii?Q?tWxIAeGyRvkkvRavBSjZ0j7pb3kDvMq/78M5a1rb5EnP5bY1ZPrlNa7SaTVe?= =?us-ascii?Q?TGte8tNU8wXandfyZf7UM3s+CNYFCEZcVNs5ojF8ZdYoz5FNhlY38hUj37dp?= =?us-ascii?Q?hZSXFdJ3S0/o4Dv/ls7c4peohWHV4EbJBajBEt12bMR8/ZUHz3BdooZrYePn?= =?us-ascii?Q?HTjSmXPKvzNH8u3txd/uBvmGjyZ2pwf/HjWv5uiUculaikxnU16XgI5uYJ6B?= =?us-ascii?Q?0335RKhaArH7n/SHz8VK1NtK59iZMgXFsqUtODm5G5ecpfznwbPIeIaL9uTA?= =?us-ascii?Q?jhaHRUitzmoMvTlPebLbzzmMhPr2gjFcYaXMnR7hZ5AKOMIXZpVHeYGoz5X6?= =?us-ascii?Q?l4oRTzOKxdgZ1hihehn6HXKLnS+AOcTe6D6s34FhYzdfHqNL+M9tQbVuiWVV?= =?us-ascii?Q?FoTs+n8adUAXuuy3BLjFUovoB5pbdd9bZHktxRkGd72dQV6+to0tT1u4GOY4?= =?us-ascii?Q?FTCpe4Xgrj85q6TP4yas4pyt93P+Nm+U6lfF3rxXYrpmkH1UKgI4hp1sxZNA?= =?us-ascii?Q?xfpJNb+UcyCPn3Ja8vkJ/3iFvMcOY3xNvQEs6sZ14wu+Ss/rSaZT+TBCv5vB?= =?us-ascii?Q?3UXnpS/+KxBJsYXm2xueupNWvbFgTWOK4HccKFctLGEdmwDvN5Qh2HhAS9RA?= =?us-ascii?Q?7H7Q3VrO20Nvlyg1N906dWRxl1UJOJp5daaYvrCo6v2xApB9+UwyXnPotjTG?= =?us-ascii?Q?4TZYbxrFozp8NLt3Hzxuh1clvwu4HBK6mv5tvZEJ2N6FYyxNoTurqOirlma3?= =?us-ascii?Q?CRrEOLibxfrj4nYfrSRoF/QNKGRvRwhmKE6fe8BlOOH4ZJyM13nnXLYB6x3y?= =?us-ascii?Q?nibGLF3EFcRLyTTJFiRJK3aa7Mne+z6WhIb4yyQBe6R6AKI/mPBbB0k6pW6m?= =?us-ascii?Q?44xFX3K38/1ywtvJ7kFpfUp/Fxs4YCQdlBr3KA5p+Ti3PYZ90JJLKqn7hrOt?= =?us-ascii?Q?l50+vKbU/C+JumY7bz6JFF5/IeJ0CFfy4k1tL45KJ8SUenlfc352m3bJz8jX?= =?us-ascii?Q?XWN0SMDmMIFEqpGERqseI0CftKuwB2u63+8oYBa3Vd7ZOb2IsAQLQp2FRkh1?= =?us-ascii?Q?GDrY3K7u0z2ltBTOJQfTH8TzYpAeCoyY4avmx2+Tf0BY1V+XQYqvr9e+4VA6?= =?us-ascii?Q?1XNklTvj/5o2akuU48pVcw8iOoVXWKpa7n4ZIPsA?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c21c1ce-bf95-4f79-1ac3-08ddd9b8aa6a X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2025 15:55:31.3990 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LdVOW4q6PCRNVnTXiPoBM03bgfOMUcdS/5gGglM9gcIC6WFXr+O5KQ1cT9PA4r5u X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 Content-Type: text/plain; charset="utf-8" The helper gathers an folio order statistics of folios within a virtual address range and checks it against a given order list. It aims to provide a more precise folio order check instead of just checking the existence of PMD folios. Signed-off-by: Zi Yan Reviewed-by: wang lian --- .../selftests/mm/split_huge_page_test.c | 4 +- tools/testing/selftests/mm/vm_util.c | 173 ++++++++++++++++++ tools/testing/selftests/mm/vm_util.h | 7 + 3 files changed, 181 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/test= ing/selftests/mm/split_huge_page_test.c index 5d07b0b89226..63ac82f0b9e0 100644 --- a/tools/testing/selftests/mm/split_huge_page_test.c +++ b/tools/testing/selftests/mm/split_huge_page_test.c @@ -34,8 +34,6 @@ uint64_t pmd_pagesize; #define PID_FMT_OFFSET "%d,0x%lx,0x%lx,%d,%d" #define PATH_FMT "%s,0x%lx,0x%lx,%d" =20 -#define PFN_MASK ((1UL<<55)-1) -#define KPF_THP (1UL<<22) #define GET_ORDER(nr_pages) (31 - __builtin_clz(nr_pages)) =20 int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file) @@ -49,7 +47,7 @@ int is_backed_by_thp(char *vaddr, int pagemap_file, int k= pageflags_file) =20 if (kpageflags_file) { pread(kpageflags_file, &page_flags, sizeof(page_flags), - (paddr & PFN_MASK) * sizeof(page_flags)); + PAGEMAP_PFN(paddr) * sizeof(page_flags)); =20 return !!(page_flags & KPF_THP); } diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index 6a239aa413e2..4d952d1bc96d 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -338,6 +338,179 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max) return count; } =20 +static int get_pfn_flags(unsigned long pfn, int kpageflags_fd, uint64_t *f= lags) +{ + size_t count; + + count =3D pread(kpageflags_fd, flags, sizeof(*flags), + pfn * sizeof(*flags)); + + if (count !=3D sizeof(*flags)) + return -1; + + return 0; +} + +static int get_page_flags(char *vaddr, int pagemap_fd, int kpageflags_fd, + uint64_t *flags) +{ + unsigned long pfn; + + pfn =3D pagemap_get_pfn(pagemap_fd, vaddr); + /* + * Treat non-present page as a page without any flag, so that + * gather_folio_orders() just record the current folio order. + */ + if (pfn =3D=3D -1UL) { + *flags =3D 0; + return 1; + } + + if (get_pfn_flags(pfn, kpageflags_fd, flags)) + return -1; + + return 0; +} + +/* + * gather_folio_orders - scan through [vaddr_start, len) and record folio = orders + * @vaddr_start: start vaddr + * @len: range length + * @pagemap_fd: file descriptor to /proc//pagemap + * @kpageflags_fd: file descriptor to /proc/kpageflags + * @orders: output folio order array + * @nr_orders: folio order array size + * + * gather_folio_orders() scan through [vaddr_start, len) and check all fol= ios + * within the range and record their orders. All order-0 pages will be rec= orded. + * Non-present vaddr is skipped. + * + * + * Return: 0 - no error, -1 - unhandled cases + */ +static int gather_folio_orders(char *vaddr_start, size_t len, + int pagemap_fd, int kpageflags_fd, + int orders[], int nr_orders) +{ + uint64_t page_flags =3D 0; + int cur_order =3D -1; + char *vaddr; + + if (!pagemap_fd || !kpageflags_fd) + return -1; + if (nr_orders <=3D 0) + return -1; + + for (vaddr =3D vaddr_start; vaddr < vaddr_start + len;) { + char *next_folio_vaddr; + int status; + + status =3D get_page_flags(vaddr, pagemap_fd, kpageflags_fd, + &page_flags); + if (status < 0) + return -1; + + /* skip non present vaddr */ + if (status =3D=3D 1) { + vaddr +=3D psize(); + continue; + } + + /* all order-0 pages with possible false postive (non folio) */ + if (!(page_flags & (KPF_COMPOUND_HEAD | KPF_COMPOUND_TAIL))) { + orders[0]++; + vaddr +=3D psize(); + continue; + } + + /* skip non thp compound pages */ + if (!(page_flags & KPF_THP)) { + vaddr +=3D psize(); + continue; + } + + /* vpn points to part of a THP at this point */ + if (page_flags & KPF_COMPOUND_HEAD) + cur_order =3D 1; + else { + /* not a head nor a tail in a THP? */ + if (!(page_flags & KPF_COMPOUND_TAIL)) + return -1; + + vaddr +=3D psize(); + continue; + } + + next_folio_vaddr =3D vaddr + (1UL << (cur_order + pshift())); + + if (next_folio_vaddr >=3D vaddr_start + len) + break; + + while ((status =3D get_page_flags(next_folio_vaddr, pagemap_fd, + kpageflags_fd, + &page_flags)) >=3D 0) { + /* + * non present vaddr, next compound head page, or + * order-0 page + */ + if (status =3D=3D 1 || + (page_flags & KPF_COMPOUND_HEAD) || + !(page_flags & (KPF_COMPOUND_HEAD | KPF_COMPOUND_TAIL))) { + if (cur_order < nr_orders) { + orders[cur_order]++; + cur_order =3D -1; + vaddr =3D next_folio_vaddr; + } + break; + } + + /* not a head nor a tail in a THP? */ + if (!(page_flags & KPF_COMPOUND_TAIL)) + return -1; + + cur_order++; + next_folio_vaddr =3D vaddr + (1UL << (cur_order + pshift())); + } + + if (status < 0) + return status; + } + if (cur_order > 0 && cur_order < nr_orders) + orders[cur_order]++; + return 0; +} + +int check_folio_orders(char *vaddr_start, size_t len, int pagemap_fd, + int kpageflags_fd, int orders[], int nr_orders) +{ + int *vaddr_orders; + int status; + int i; + + vaddr_orders =3D (int *)malloc(sizeof(int) * nr_orders); + + if (!vaddr_orders) + ksft_exit_fail_msg("Cannot allocate memory for vaddr_orders"); + + memset(vaddr_orders, 0, sizeof(int) * nr_orders); + status =3D gather_folio_orders(vaddr_start, len, pagemap_fd, + kpageflags_fd, vaddr_orders, nr_orders); + if (status) + goto out; + + status =3D 0; + for (i =3D 0; i < nr_orders; i++) + if (vaddr_orders[i] !=3D orders[i]) { + ksft_print_msg("order %d: expected: %d got %d\n", i, + orders[i], vaddr_orders[i]); + status =3D -1; + } + +out: + free(vaddr_orders); + return status; +} + /* If `ioctls' non-NULL, the allowed ioctls will be returned into the var = */ int uffd_register_with_ioctls(int uffd, void *addr, uint64_t len, bool miss, bool wp, bool minor, uint64_t *ioctls) diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests= /mm/vm_util.h index 1843ad48d32b..02e3f1e7065b 100644 --- a/tools/testing/selftests/mm/vm_util.h +++ b/tools/testing/selftests/mm/vm_util.h @@ -18,6 +18,11 @@ #define PM_SWAP BIT_ULL(62) #define PM_PRESENT BIT_ULL(63) =20 +#define KPF_COMPOUND_HEAD BIT_ULL(15) +#define KPF_COMPOUND_TAIL BIT_ULL(16) +#define KPF_THP BIT_ULL(22) + + /* * Ignore the checkpatch warning, we must read from x but don't want to do * anything with it in order to trigger a read page fault. We therefore mu= st use @@ -85,6 +90,8 @@ bool check_huge_shmem(void *addr, int nr_hpages, uint64_t= hpage_size); int64_t allocate_transhuge(void *ptr, int pagemap_fd); unsigned long default_huge_page_size(void); int detect_hugetlb_page_sizes(size_t sizes[], int max); +int check_folio_orders(char *vaddr_start, size_t len, int pagemap_file, + int kpageflags_file, int orders[], int nr_orders); =20 int uffd_register(int uffd, void *addr, uint64_t len, bool miss, bool wp, bool minor); --=20 2.47.2 From nobody Sat Oct 4 21:01:19 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2063.outbound.protection.outlook.com [40.107.236.63]) (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 EE7B62F657F; Tue, 12 Aug 2025 15:55:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014143; cv=fail; b=oXyeor80V2VYYMj8G+eV6jZ4ouO2rhJukwVWCu7L2beh4WlhgW7kN5z8M/POo9pRRgXnWg4Mjixb7Og6eotb1caXzlkZHKXtzA0ZMotOMF0anrEl/+8UQd3t83oqLLMDUO14JLnW53Xhumt53aU4kqM++W2UroVKjjWqG/LkLrM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014143; c=relaxed/simple; bh=i+6/AV27vaWELB5m5rLq2Um3Z2EfHWw+gt/zlsKeMKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=O8INXoRPKLZkbap5ql1Ckh6YWFAQdiATXOydBqTFGRucyVnXerfanr/2h/ec+6pdwJH9MjBpN+ryLS+JymtRBtUbALksb5V1D5pXntVxz67INhrGWj6UbR8XtZ37SD+irLui0QEcp3NHFnRVms1IfAWbVs/yKNmnTtLEPQ4Exxs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=CkrzWkoe; arc=fail smtp.client-ip=40.107.236.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="CkrzWkoe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k2QE9aep2dknTtM5Y2Qfg1DJtjLDqflXlQPVYxBogEHUgjSy3Z0w7l4Ozne+1HYcMzhU2VUB1t0NQJmRiKTwnvMHuw5c9XiZ1ycyHYGF/adEIMkBNJVNVRfU/8gXhMtJ9w5omFwgTFwCw6dPpoNX1otOhO3gOkSBze2lkwkhLEjz8Y3FszwV8cDZCyxg1VNNs7t76irK0opn4TO8Hta0NBvLzR/mfnIOgPnHBbA6hR0ItapQtO7e+ZbFbefTvZ8Rfsk02h3+rUNT4cTuMqmYQvQ5lDBvJR09OzXxiqP/vuIpDGm6IB79tuzq4nPou3NGJUpI5Z72wfxl49QB1UXgPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3CqXEQKKle0iqTEjvC8PrOPweXjobzLwhZAxzGE3zOA=; b=m1NmSqAxYRH1eULjrFesx5F7/N566YFOvTzs2/nsKOGfxttuQldW6dOsQ0v4i1Z8mNxAp8g6o/VP90INKlpzRiWWyd4Tzu7lV0n/lyqMQntkHriuuJwSYtuYT2Y5lSvDIxTddvhYInkeFT0zL3407dvaeHHVuejMCiMyfr/aVDW0pmzL4MgXyJcIMXFrBf4D2ojhQvXiUxuB5zc67NXZTYgcD+a57Ejs2Y+5QbIjcfE0pHUHoKCHUp8ulwAgCc7AYu0aMXwbhlppF/0E3gpVZrKbIw2Cmp1QahpW+Eo0jX4iqXewRo93K/1evgTN1crJRVoiPoGKTjaN1eGCv6KlRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3CqXEQKKle0iqTEjvC8PrOPweXjobzLwhZAxzGE3zOA=; b=CkrzWkoexwQCDO8n6TmPYrk9jxAXC1vh3xBVgyAjhX30p5Ru6MklROp7EVJaG38pQdKqPRvM2RKHGU778Cdv4c1XhqNDiGcjCcam0NjWvELwpH2C2gyOGfAfr7pGLfWijJY7PJ2MTDxyINiCcr7k2Qu64NoU/e5Svfv1h+Xg7IbLr/e1Kpkm/RdcHARb0Jvy1oTXRtPXyIQUiWpbf4+wRPOLyt7Zf2k3a39LKTeBIcfxhE3dHMH0pf2Z2udBCKLLc38zjHs0jIvmo8iCHQBDT6+sdfH1yZ5nFgVE7amZTwCOdR1TPD2sxfQzRgu5f+DL6rhFeYNnk3lnHoCHjXnZvQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9009.21; Tue, 12 Aug 2025 15:55:33 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%6]) with mapi id 15.20.9009.017; Tue, 12 Aug 2025 15:55:33 +0000 From: Zi Yan To: Wei Yang , wang lian , Baolin Wang , David Hildenbrand , linux-mm@kvack.org Cc: Andrew Morton , Lorenzo Stoakes , Zi Yan , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 3/4] selftests/mm: reimplement is_backed_by_thp() with more precise check Date: Tue, 12 Aug 2025 11:55:11 -0400 Message-ID: <20250812155512.926011-4-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812155512.926011-1-ziy@nvidia.com> References: <20250812155512.926011-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BN9PR03CA0086.namprd03.prod.outlook.com (2603:10b6:408:fc::31) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: b95679cd-9a7f-4878-22fb-08ddd9b8ab6d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tAC5ZRG7xNbAjw/EjUG/nClmeMbpkigOiGU/4riFe0kMofKheP4vINNxkxbZ?= =?us-ascii?Q?KfDAmB0DwDF4bC8OC6qGCDmQGTnrofjdRQ+wt+QJmN7E0F4phFu6reBmvBel?= =?us-ascii?Q?g8tetsXo80qpr5cJj4t62z/pfutQly4Uc6JIEeFCV0HhVvhL63WA5wCTlVfe?= =?us-ascii?Q?VRbMpUJ/mFA6pFt0GDfLGhVHAY/N8UZ31p49BadMweW1uq43QuTLlx87UQ2j?= =?us-ascii?Q?Rcod4WJhjtSJNXD1N3OGdovhxYAsDdCWp6QmepkUJzpERgJW++54z75Cv8Hb?= =?us-ascii?Q?lyD0V3IguPJlzIwmHyTWiZOt8exlTnTT7yLWXAVkwt1/ie/w4xBR72tlTmQj?= =?us-ascii?Q?Cl3gVdU7d3/opBbHyrO1Xx3Dz+x4QOYz2lY8ZNP+l1RWHnoQrNtTam5XsJR/?= =?us-ascii?Q?+3yHDbCVlLfebw9RYp4eKoAcT4F67vcAAgYzGcOG0Pjf1hk9lhmCWDY0HYgw?= =?us-ascii?Q?yXsyFo7jUd2hnkBTDD0qR1Sln+XWBKJNVRr5iviNMPxCnXHEL6QPor7a5E9V?= =?us-ascii?Q?zfrVtdzXcwCSUhS5RO0mnqgVqb9rrF+wSYoOCAnJSYz7Y8QrF7dkb86oV5sw?= =?us-ascii?Q?ZjeoAU2g8zB/qG3YO6EpHwoomHfgCxDqY5O/iWOQZPEOiK2BGC4nV1edLK1E?= =?us-ascii?Q?YQib02h4DH8LAX7xOzhrItBKWocX1ylrLEzqQ8IuVWge61VC/I7xd43vOKjq?= =?us-ascii?Q?werlmoUWv9nEkewafPMHHQ2pNDIDJxsHIh27ZUpZFc1FRFXxM4JvwHeB6oLW?= =?us-ascii?Q?3+B5HDLSta0vpb488C8UWmjABiIIlET897XgsWLrwALNeG8gcspKMzSKiTIZ?= =?us-ascii?Q?iKSO0oMHoUwcd+xp74bxlfmE7caWljrwmsoq3W+y0uVbK2TnH5BLmxfd/mg+?= =?us-ascii?Q?ImloNmcaOSKtsNVEYcC2PIUlm6eZeEquuplcD1MffthgtqxcnOTlelqSW1cA?= =?us-ascii?Q?2wvu6qCazeLPjVVvXzHR6CXtAgqjg0TpWOJr8AwU6GBa8YpyqnlmVtF2S5HU?= =?us-ascii?Q?OLHc0f51J84vnwp14kRcREBmxm8Q885eD6o2oJ3UfATmqd+v6GAFVQgiDpNE?= =?us-ascii?Q?MQd3xcSdRPstz0tXGpOTD7xVY5LO0quSt8zeZoHxz4VMYXKMOfwnpDG06G5W?= =?us-ascii?Q?ozwikpba4RrEfCBI/K3qaby/epZs9uAPZFqzm2cQrlTk3+hnig7Ur5sK/Dzl?= =?us-ascii?Q?LiNyoJxWQRl6LvKqLFzippvtBRblzfICBjDIKesrJN9GRaurgLdE1FyCtpPn?= =?us-ascii?Q?WIGMQ23PSuwjVR7RhfQD4NuuoXpPKYW85dQAGA1M2kk0TSnN5VxGOgwyo62b?= =?us-ascii?Q?bOA7St/Qlq0hf978sXVuV33LJRtZkygmYxNJLvA2119FhVHkO7y1tbpfV9p9?= =?us-ascii?Q?LR8j9/JsDw7h2tDtvPFFMAjMgIO3HpwXWnOWnOrsmYXdNprv6/i+KMeiNG14?= =?us-ascii?Q?YhovGd9qrZA=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7axYHgwKIRlX8e+l+4yvfoAMvgouryonnZkY/THTYmAU86J0GorDpIhFtcRA?= =?us-ascii?Q?veW17ax5xEdunx6CmeaSPQM9n581Y1tM2hJQyys3Ub4dnambwqGV1Ga1WqFP?= =?us-ascii?Q?fEm4a6zjkX/gZE+mjcvhDnmHDxtfOeqeRvtyi3VP8KlDUurr9pemnVYPLQ/2?= =?us-ascii?Q?hfESwuSztLV3uQa2P3jFgve4doHIqUt6nBb/BGyDxR8RHhmM2JhS74EWkRbl?= =?us-ascii?Q?SdaTZmgyMjo7MY8tBMbC99KNq4O2a9q9HsujTvyQLiIx4RU5H8sl4tdTZs7e?= =?us-ascii?Q?uD46ZrFZ8DulUsyPuhcArkrrUAb/4p9B8K6DMBREGIA4qNn+xe7gE9ges9XG?= =?us-ascii?Q?wyi+CGY+2i24bXRy+CO+gPAq6Ec9Qb+Nf5J4DxxuMkwzQ+TQgtB+yYPu1r+F?= =?us-ascii?Q?s/pC2J6+n/bmiCdze/GECN15RZpc0gzfcOgaHmGbJba02/I9R8rgzaCCUDQ/?= =?us-ascii?Q?8kqcZ/HJ81OwgRv/fqQbGlEkep5JazIwWBJ95ELU+aadYDNZTbQ66DXVzVJM?= =?us-ascii?Q?z4zMg8mffcbuTDmMQzeEjEDcXATEEIE8InEBecb8rgGVbHlpTXDpsjwUQYZ/?= =?us-ascii?Q?wyHiI6tMPltm6n5E9xdhM7gILYf2aRPlfe2bCY9/oIo3O2znG4SCcuU7Yiek?= =?us-ascii?Q?K/XzWJOcOPtksyO6D6QsvpOqF7Lthbyr6Lkgav03hzFuLPDB7nA0O26bVuir?= =?us-ascii?Q?7GeN1G4vr4dDHSTaKiVupT1aaLuQOPP+2otYy0NmMxYXuRFxF6M60B/JIYJX?= =?us-ascii?Q?Sk0kFUcGepUltqAu/MzFYWmkLhbZ95UdRSo3jlXC1hxdBS9MXjQ0fcFwQ3zD?= =?us-ascii?Q?k/TOyig9DUeAkqx6oAaKnGEifiXRJYgomRYsuUVj/RZhH4WPUVui/DinQyHk?= =?us-ascii?Q?4hh/v33Rw/ylJBm1j7e2cftglKTBILxVkcaGYScOSU+tr00bHbQtqqhVNn1F?= =?us-ascii?Q?gy5HAA5vHd2zec5IusFmcGL009akyVAZppcpAM4C9wFOgC+DrxVMQK2Y1Ez2?= =?us-ascii?Q?XekwbtztL97zJ1wnYEbkffVKn1CcigD46z876us9IDr3hDE0k8cH/xZ5KYW0?= =?us-ascii?Q?zU53y0TeJcBDR6VwCPT+Le9ubH8/ERv172FZECEiWn+i23KdvCsT2NUqUwqG?= =?us-ascii?Q?2QZ3jvtnIYNczAs7CEhsYgR+kbxsijcAARvJ8UDtYT5xPOe2HHOsYQcgUran?= =?us-ascii?Q?mcgRQK/xgpgScFI6Ze1xvVlv7dg/MPz8jyc5KBYsnjk2hxNUwp+RnDPk0mZB?= =?us-ascii?Q?H24kNlHKiuK02oo1spIDfSi93/T16jxkIOm4zNMTBTtwbnFbzpnyiJ0huwAn?= =?us-ascii?Q?AlMPrPCb6UNVbOAf6OHTq3q2VdnJO27LUPlyDFJKaFS9TsuNH9MXZfz/2pY6?= =?us-ascii?Q?4w6Ksn4cSIfWTT3X3fv61wFwBuTgLQkatemfqd7LDq6H6+aHcJdPg7nBt+aS?= =?us-ascii?Q?n3HgnCtBigRaK+XS+B7k0vstUzOpn1kCz+jBU5J1omnzQiW9WONCm8E1OWDz?= =?us-ascii?Q?uZdUBJqQ2mjdhZH92fj2uTh4Nv+D+DiyIEb8AzieAumq5xo/EC8fmhQSuL4F?= =?us-ascii?Q?0E6TFWyJ7FWkMvrpmDim8i23sUyZTDJaNaoLqdL1?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: b95679cd-9a7f-4878-22fb-08ddd9b8ab6d X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2025 15:55:33.2647 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7RmoO4Roj1qD82RNfn0ClUAbgrbqSqQwn3YvnDOpUq4o2s0m5XgzTHCkUNtuYgZ3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 Content-Type: text/plain; charset="utf-8" and rename it to is_backed_by_folio(). is_backed_by_folio() checks if the given vaddr is backed a folio with a given order. It does so by: 1. getting the pfn of the vaddr; 2. checking kpageflags of the pfn; if order is greater than 0: 3. checking kpageflags of the head pfn; 4. checking kpageflags of all tail pfns. pmd_order is added to split_huge_page_test.c and replaces max_order. Signed-off-by: Zi Yan --- .../selftests/mm/split_huge_page_test.c | 67 +++++++++++++------ tools/testing/selftests/mm/vm_util.c | 2 +- tools/testing/selftests/mm/vm_util.h | 1 + 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/test= ing/selftests/mm/split_huge_page_test.c index 63ac82f0b9e0..3aaf783f339f 100644 --- a/tools/testing/selftests/mm/split_huge_page_test.c +++ b/tools/testing/selftests/mm/split_huge_page_test.c @@ -25,6 +25,7 @@ uint64_t pagesize; unsigned int pageshift; uint64_t pmd_pagesize; +unsigned int pmd_order; =20 #define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages" #define SMAP_PATH "/proc/self/smaps" @@ -36,23 +37,48 @@ uint64_t pmd_pagesize; =20 #define GET_ORDER(nr_pages) (31 - __builtin_clz(nr_pages)) =20 -int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file) +int is_backed_by_folio(char *vaddr, int order, int pagemap_fd, int kpagefl= ags_fd) { - uint64_t paddr; - uint64_t page_flags; + unsigned long pfn_head; + uint64_t pfn_flags; + unsigned long pfn; + unsigned long i; =20 - if (pagemap_file) { - pread(pagemap_file, &paddr, sizeof(paddr), - ((long)vaddr >> pageshift) * sizeof(paddr)); + if (!pagemap_fd || !kpageflags_fd) + return 0; =20 - if (kpageflags_file) { - pread(kpageflags_file, &page_flags, sizeof(page_flags), - PAGEMAP_PFN(paddr) * sizeof(page_flags)); + pfn =3D pagemap_get_pfn(pagemap_fd, vaddr); =20 - return !!(page_flags & KPF_THP); - } + if (pfn =3D=3D -1UL) + return 0; + + if (get_pfn_flags(pfn, kpageflags_fd, &pfn_flags)) + return 0; + + if (!order) { + if (pfn_flags & (KPF_THP | KPF_COMPOUND_HEAD | KPF_COMPOUND_TAIL)) + return 0; + return 1; } - return 0; + + if (!(pfn_flags & KPF_THP)) + return 0; + + pfn_head =3D pfn & ~((1 << order) - 1); + + if (get_pfn_flags(pfn_head, kpageflags_fd, &pfn_flags)) + return 0; + + if (!(pfn_flags & (KPF_THP | KPF_COMPOUND_HEAD))) + return 0; + + for (i =3D 1; i < (1UL << order) - 1; i++) { + if (get_pfn_flags(pfn_head + i, kpageflags_fd, &pfn_flags)) + return 0; + if (!(pfn_flags & (KPF_THP | KPF_COMPOUND_TAIL))) + return 0; + } + return 1; } =20 static void write_file(const char *path, const char *buf, size_t buflen) @@ -233,7 +259,7 @@ void split_pte_mapped_thp(void) thp_size =3D 0; for (i =3D 0; i < pagesize * 4; i++) if (i % pagesize =3D=3D 0 && - is_backed_by_thp(&pte_mapped[i], pagemap_fd, kpageflags_fd)) + is_backed_by_folio(&pte_mapped[i], pmd_order, pagemap_fd, kpageflags= _fd)) thp_size++; =20 if (thp_size !=3D 4) @@ -250,7 +276,7 @@ void split_pte_mapped_thp(void) ksft_exit_fail_msg("%ld byte corrupted\n", i); =20 if (i % pagesize =3D=3D 0 && - is_backed_by_thp(&pte_mapped[i], pagemap_fd, kpageflags_fd)) + !is_backed_by_folio(&pte_mapped[i], 0, pagemap_fd, kpageflags_fd)) thp_size++; } =20 @@ -522,7 +548,6 @@ int main(int argc, char **argv) const char *fs_loc; bool created_tmp; int offset; - unsigned int max_order; unsigned int nr_pages; unsigned int tests; =20 @@ -543,28 +568,28 @@ int main(int argc, char **argv) ksft_exit_fail_msg("Reading PMD pagesize failed\n"); =20 nr_pages =3D pmd_pagesize / pagesize; - max_order =3D GET_ORDER(nr_pages); - tests =3D 2 + (max_order - 1) + (2 * max_order) + (max_order - 1) * 4 + 2; + pmd_order =3D GET_ORDER(nr_pages); + tests =3D 2 + (pmd_order - 1) + (2 * pmd_order) + (pmd_order - 1) * 4 + 2; ksft_set_plan(tests); =20 fd_size =3D 2 * pmd_pagesize; =20 split_pmd_zero_pages(); =20 - for (i =3D 0; i < max_order; i++) + for (i =3D 0; i < pmd_order; i++) if (i !=3D 1) split_pmd_thp_to_order(i); =20 split_pte_mapped_thp(); - for (i =3D 0; i < max_order; i++) + for (i =3D 0; i < pmd_order; i++) split_file_backed_thp(i); =20 created_tmp =3D prepare_thp_fs(optional_xfs_path, fs_loc_template, &fs_loc); - for (i =3D max_order - 1; i >=3D 0; i--) + for (i =3D pmd_order - 1; i >=3D 0; i--) split_thp_in_pagecache_to_order_at(fd_size, fs_loc, i, -1); =20 - for (i =3D 0; i < max_order; i++) + for (i =3D 0; i < pmd_order; i++) for (offset =3D 0; offset < nr_pages; offset +=3D MAX(nr_pages / 4, 1 << i)) diff --git a/tools/testing/selftests/mm/vm_util.c b/tools/testing/selftests= /mm/vm_util.c index 4d952d1bc96d..193ba1a1a3cc 100644 --- a/tools/testing/selftests/mm/vm_util.c +++ b/tools/testing/selftests/mm/vm_util.c @@ -338,7 +338,7 @@ int detect_hugetlb_page_sizes(size_t sizes[], int max) return count; } =20 -static int get_pfn_flags(unsigned long pfn, int kpageflags_fd, uint64_t *f= lags) +int get_pfn_flags(unsigned long pfn, int kpageflags_fd, uint64_t *flags) { size_t count; =20 diff --git a/tools/testing/selftests/mm/vm_util.h b/tools/testing/selftests= /mm/vm_util.h index 02e3f1e7065b..148b792cff0f 100644 --- a/tools/testing/selftests/mm/vm_util.h +++ b/tools/testing/selftests/mm/vm_util.h @@ -92,6 +92,7 @@ unsigned long default_huge_page_size(void); int detect_hugetlb_page_sizes(size_t sizes[], int max); int check_folio_orders(char *vaddr_start, size_t len, int pagemap_file, int kpageflags_file, int orders[], int nr_orders); +int get_pfn_flags(unsigned long pfn, int kpageflags_fd, uint64_t *flags); =20 int uffd_register(int uffd, void *addr, uint64_t len, bool miss, bool wp, bool minor); --=20 2.47.2 From nobody Sat Oct 4 21:01:19 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2063.outbound.protection.outlook.com [40.107.236.63]) (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 BD1B82F7457; Tue, 12 Aug 2025 15:55:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014145; cv=fail; b=es+A70YR/R3yeDBxcx591vn3we1mAJMMBimBNeQZc9UWtihvKopz7AnNo+vXnbFWyqfKRDOtKbIr4VRrY8HPdkSwEJNyzqOHacgDLzbdnMoEeqcjfwEDYK9mno8aBqWlHH4SYxYfp8BYF0H3bt3w+I8lqonWzH/y6iVtFXskp08= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755014145; c=relaxed/simple; bh=ct4bo06R7vGo0uxb+/b3CJ/9P3EYREcm/15Zcnm8flM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ZSJJ5qCxcjfUTesMJUzYPT/l4s4lT7Zl3Qa4d+pDZ3uoYbrjHyZoDBebArqLJqbkeY9AWYdo8wsML+0HfTRAcUA5bdR2ogsu7TlEXpiFjmzjo736vDLr3abG+pBf/herPPprQAGhlVy+GbdpuNPH7kDtThtzkObpLMGjBmGyLO0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=p7vt6KpV; arc=fail smtp.client-ip=40.107.236.63 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="p7vt6KpV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oqx1Ra0V0RogACDLEhNpGTqi6gY7ebW/j0FtzIgWePnHnMRExc1ZcQDQQJbhaNnWxe7OmyxNPsjHmm0OGQPKjNJHj/ef/u71i9w74ggwIxF18bpCB7djqOyIgNbroWtnqCOVn6mQVGqRSPrS+UyXfnDKnMnJtzyTm6r/1e4TOUGFO5BxpjKPSvSheIcemj4TfrrRSOtZ2W2+GHuqaebjeOpIbiS5jkZMX+JtStM9NR32NiOYAl2koOBkgj3zeEShV3s1g+hj2F8W4YHP9h7RgJ0044qKK/zxZb74w/doC+heW4c9AYT068WefDuu3P/uO9RLly7Ut2ZhHZYcFQtzqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8hdFH4a1PWpMGAUKGFm9BZbELCgo0toT31U/ahUTeeQ=; b=Oojbup6u2eX8STN9WG5R/Owrc4Pru+2evmf155DW7xM160OoTuEsFhbIkfF03+9eJfX42XrSpz0uXKlDL/whCBxOxUhudfcNkti0bkd5eaBldvcisOZIpenkUTACT5hos5Fr3bFOiWNm3hcfMHF6ag5X3tFarHTLCav2F+Lb+TE+99tyiSE7bGD8LnjsfQidNxhlnMPkREaNZI1EsH6nQeAGN4H8ldicaNwJhz/67N7+cHOI5VJn4guCt1AgcS/oI72g3hcQKbQ8wERC+wYY4msMkTyXAx+4FDRD8pRKfjJABgYjfEzB6CPSJhhcr6L07GMp3uX7SVUsb9heufvxjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8hdFH4a1PWpMGAUKGFm9BZbELCgo0toT31U/ahUTeeQ=; b=p7vt6KpVZv1+AsvtgEw2iYlTr95CrWQgutDc4wBjg1MRHOor6WcY93DhrPwWfznVtV6Y8x1AfHVCOg0cqUxgj00xPZocKQAzRiT3fNDBGOHH6OxpvAMaDiCD28oOgrLHr/em5IDQ6jXbQ/bkZVJrO6Q563MNKezvIDiNZdekmxIdAHOJKnTvJMpHJwYMGeh+gmi3xP1o22MKzCm29fTtOpjdU9X3uedF+dXMahlGnGtJV5D5j3w8cwIcJmMmzk2L+y9sglV5IcTb/U7a05FGzqThfecapqMQoXBUr2srp6n3Bhxn7Iwo9XBs0wzOUoIKiCUgUMgYZPd3ZjLJQZcOEw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9009.21; Tue, 12 Aug 2025 15:55:35 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::5189:ecec:d84a:133a%6]) with mapi id 15.20.9009.017; Tue, 12 Aug 2025 15:55:35 +0000 From: Zi Yan To: Wei Yang , wang lian , Baolin Wang , David Hildenbrand , linux-mm@kvack.org Cc: Andrew Morton , Lorenzo Stoakes , Zi Yan , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 4/4] selftests/mm: check after-split folio orders in split_huge_page_test. Date: Tue, 12 Aug 2025 11:55:12 -0400 Message-ID: <20250812155512.926011-5-ziy@nvidia.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250812155512.926011-1-ziy@nvidia.com> References: <20250812155512.926011-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BN9PR03CA0063.namprd03.prod.outlook.com (2603:10b6:408:fc::8) To DS7PR12MB9473.namprd12.prod.outlook.com (2603:10b6:8:252::5) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS7PR12MB9473:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: d38c344f-0227-41f4-e518-08ddd9b8ac89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZzryUON6ABWxVRCAmPWZKKFoiAEVUZZm9gJW/s597Q05rNNLyST08EdfDxH+?= =?us-ascii?Q?LmHlekZX2xtI4NpG4DzG65K2fFEBSsdhT4QXwUkHp4zuw1Zh2kTK1+d92iG/?= =?us-ascii?Q?KErXq8u2N614EB2SDPUmT5wOVuwFeECqxbqTS1k2n8EcYY2ExZqkn0vYMUWW?= =?us-ascii?Q?yzCz4DmW2WJd49vdB2Op1x7HGEC1XnhkidhX+LfX7rgfpDPetQuC78KnrFfx?= =?us-ascii?Q?u0ozIMQjqIZtvqangwa+v8UwQdN0nG0ogCfg0rEldwQwIy/kEqjAxR1zl5b/?= =?us-ascii?Q?BrLbj0pWjVqMBPsPhsbZPzSfP3638DCqL412HYpEnohQwpmQ3txCYfLC8v9W?= =?us-ascii?Q?x7iZzEqVCi1EJRS1Ch/DyJ2B4gtmO6guVXlMRwTrcPWBRZyqhXwevWpuEU5o?= =?us-ascii?Q?EFjCOpRcHL/Fih1OCxTQxgBd3iQdwK0o7MrscwkLl2BM0GKn8odQS9azt7TT?= =?us-ascii?Q?z9RFE63IqDP8j/ifnELxysZEzGAzEKtQ9QqdSc8W+FD6P5H/tD38WYuwhB52?= =?us-ascii?Q?oMVpJNTcTIE+maAu3voAd8m6SABAaL2DxNn1ZId0u7lPlIuV5CDAv2Jamn8r?= =?us-ascii?Q?lrya46p3E5B8gRuI9akTpubjZDRrsriNYGu5avIbDCwTHQ2n7DB1s8xyq5VE?= =?us-ascii?Q?M33iGKJ7jT80onrHhJUa6nMprXMp2tydMUz3YwZeiBI/o26xXtDN8nWaCPFS?= =?us-ascii?Q?ouECowtDkdEwbr7iVa/Y0s8h38ehNsVezw7mzCZHlb2mECHYlUq44aBQvgeS?= =?us-ascii?Q?57zWqnAN8cQnnZxNhmklru35+WiyNXFD6GtujLcnDLCCvZL9uvEJJD6KK8QI?= =?us-ascii?Q?tbjc/n3nqqqs2snTgGFXwuskQG0gEC82qvz4Azov7bHLM0Bh9/DYjcrCRUGy?= =?us-ascii?Q?h/dkt2PCGHGt0ODOtdNYUtAPWJsBzbAPMCdZgba753023MntWW4hb8YZgtHv?= =?us-ascii?Q?b08an3WhZ96IoyHw3ll/L+RlX5YufUL2+X8d4Bq/WehM4Vtkr4xgiTfIVGwY?= =?us-ascii?Q?lpzi/SgAIW5cEV1JazD77zqSxfkxXJH8ED95466VPaKbf/AAknYdOKWBDnBK?= =?us-ascii?Q?VbOsNDS7B37vcgza4S2LiOX34+Im9L9pUSfLN18zlsrWqVEDa4+D2PJyjDaQ?= =?us-ascii?Q?Dkr9sl2mtTHcjvqq1aWkYUxYAecWyX3MhmZoJtG8b6VSddFg51ge0hJmHZvx?= =?us-ascii?Q?myiFy5s+beiYPhole+jStQ+B1gSawhFgFp4nBLWgx9MzEfuaQSE3MLyYbjiZ?= =?us-ascii?Q?VmtJPp1FS/2qfDDrP73nf9YxLmTU1hWjSX+xRNlP15dLj5IC5AWeJ4luRt4V?= =?us-ascii?Q?MEBmRtaPfe4IGhNzrv5FlKWHjXvaqdSdbHac7DlyoHScTCRfg9k1KjKDB4le?= =?us-ascii?Q?Gj8lDZ6QTWsTdhTCU0+4GQgJlxDPw1EMragMfzDQm9upFxKVmIYIy85UFK0C?= =?us-ascii?Q?bzpUNAkwI/Y=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR12MB9473.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o+TSSdyhu6vJNHYXexWggtcU4mqE8ozSF3RDs3OlfSkHobwb5JFLCtMhPNaV?= =?us-ascii?Q?oV+FG2qGVFMQROyEJptwZJ4WeqhJ/Mnq03Na7GMntiPJR3JcJBy93q5TErn0?= =?us-ascii?Q?w7hsYXHAJVoGxdWBWrupnDMh1PvcWna59DMMZSgZ6bzs6JBGdSj1WLuJfDw6?= =?us-ascii?Q?p+c34UdOHKODT39iAnoBA7lfW72swEqWlmgSkOfQiayyxHUb8GfHVrbbd2rV?= =?us-ascii?Q?xLN121UKnEW3Zdn+ZpEz2KkAAlpMNrKa3fb/8Rv/NAXh7zv0weKiOYwznMSw?= =?us-ascii?Q?kBd2DE+AW3otAhuB3RIo2I5G1CGzb4EPdJbUCeVaS8Y83KRW11TNXdAC/rHw?= =?us-ascii?Q?e03ia2iYYnm5kEqsE6sY+9Cx/rGdZ/GPwSJFfRq66U4bljY8MJDYXoS1r/5X?= =?us-ascii?Q?buVuxMjymowSufhHJYK3xtPYO2qcTvG+UtNf2jSl7nV6MU2kJe3AH2wJOFb1?= =?us-ascii?Q?hy5Q+4A2NjR3JVqJ6aMEYL4Jsh//oaRdha6bRjDMLWL/lVBcNnoI5Rs91exi?= =?us-ascii?Q?0sNlDb9RViN67LJMYnyAszBDWhW35MC9YHeKhzNicb2XwEPAptB8NCjmIne9?= =?us-ascii?Q?tS50LibhUCtv6V7dYDTSRywpL0AzgOLQsFGussi3n4iMOfsQcxpF7NYtMLvM?= =?us-ascii?Q?JIoNRQuMbL/8wP0B3vckaEqjdUGaCoa0KP3ABWf4zd1eqHH6PijNQ9U7jjuI?= =?us-ascii?Q?dfMda3WZZ7oBhs4DZP7mFrpzrJdBIhb7avUtDv0GUZ9UgEW6RmLjkNpgRFfT?= =?us-ascii?Q?nt3SKB3QcTCp9+GsMItPHBh/RL7DOaaChlMXFGUW1c+5O1bkCC9qz1RZjAPs?= =?us-ascii?Q?596yUSB74C8l/uqDIVyx4DQlAYMLaPgfKHw1ZrnRFUQ8P2U48EQz3F9f3uw5?= =?us-ascii?Q?bRT30HFweQF5QJRhz5/vrDGmfFV9x7ySpy1APpAEwjS4JMfWv7W9vp8eQX16?= =?us-ascii?Q?qsW/c17FXmw8ioV05MbTEaS3Ljx/psWqfavRR24ZM78Cae2M0UcCdDPx8nCU?= =?us-ascii?Q?6eQZi8vaTBnPD7fT/6NLoq3U/jLnxYljs7f6d7RcUaPIoXj9OU/TqIfKWXXp?= =?us-ascii?Q?H6WxfWaee/H/5bYa7mEWHpG8OF9SFGCq/rk5HvVcmIXSlxBYjqPG7Ycjb6S1?= =?us-ascii?Q?1EWPPqqnE9RX20XgDqiulc/+9Ycn09KqNVIc1xA3IdN2FwgNkEtQ1UVTWX93?= =?us-ascii?Q?7lMT6pJUCpfDFOGtVOr1S3yFzL6kHiT319hVP7XXHrc5QkhBeObNN+qPUZM7?= =?us-ascii?Q?seXIhUzMZVwng6D6IjWu2P8kFZaFkrFhnAXUyBDd45CZSReNXdPV8HLVJ5PO?= =?us-ascii?Q?7y1fagpIBb5s8ifXM23F3RzsmT3SyMbOISduHailP6BlyiTlAmhflR1i2Vxt?= =?us-ascii?Q?9lp16wDlpbqbKcFSe7N1/mer5y/ateuzfOxefoUPiA3qtfBadFjYfzzQBXI9?= =?us-ascii?Q?xdjO7A1Gl6gRW0qulLtoVmbWKJV6Ko17iuPhGcHpr3EIKzuchVsMkoIU8juW?= =?us-ascii?Q?13mzywOP23phlPeTapF6ZUxxE7E0xhTxJDDXBkyKn8F+cATyxWQulk1DUyzw?= =?us-ascii?Q?ot1nc9B/fTEAxTF84nG0cW9PxLIo/2iQAmfFxjot?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d38c344f-0227-41f4-e518-08ddd9b8ac89 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2025 15:55:34.9400 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SOl2vhyCo73j5socPEFC4F6B62aqfrsTVyvr9D0tfU278ipARf/e3lyByDZE970w X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 Content-Type: text/plain; charset="utf-8" Instead of just checking the existence of PMD folios before and after folio split tests, use check_folio_orders() to check after-split folio orders. The following tests are not changed: 1. split_pte_mapped_thp: the test already uses kpageflags to check; 2. split_file_backed_thp: no vaddr available. Signed-off-by: Zi Yan --- .../selftests/mm/split_huge_page_test.c | 85 +++++++++++++------ 1 file changed, 61 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/test= ing/selftests/mm/split_huge_page_test.c index 3aaf783f339f..1ea2c7f22962 100644 --- a/tools/testing/selftests/mm/split_huge_page_test.c +++ b/tools/testing/selftests/mm/split_huge_page_test.c @@ -26,6 +26,7 @@ uint64_t pagesize; unsigned int pageshift; uint64_t pmd_pagesize; unsigned int pmd_order; +int *expected_orders; =20 #define SPLIT_DEBUGFS "/sys/kernel/debug/split_huge_pages" #define SMAP_PATH "/proc/self/smaps" @@ -37,6 +38,11 @@ unsigned int pmd_order; =20 #define GET_ORDER(nr_pages) (31 - __builtin_clz(nr_pages)) =20 +const char *pagemap_proc =3D "/proc/self/pagemap"; +const char *kpageflags_proc =3D "/proc/kpageflags"; +int pagemap_fd; +int kpageflags_fd; + int is_backed_by_folio(char *vaddr, int order, int pagemap_fd, int kpagefl= ags_fd) { unsigned long pfn_head; @@ -49,18 +55,21 @@ int is_backed_by_folio(char *vaddr, int order, int page= map_fd, int kpageflags_fd =20 pfn =3D pagemap_get_pfn(pagemap_fd, vaddr); =20 + /* non present page */ if (pfn =3D=3D -1UL) return 0; =20 if (get_pfn_flags(pfn, kpageflags_fd, &pfn_flags)) return 0; =20 + /* check for order-0 pages */ if (!order) { if (pfn_flags & (KPF_THP | KPF_COMPOUND_HEAD | KPF_COMPOUND_TAIL)) return 0; return 1; } =20 + /* non THP folio */ if (!(pfn_flags & KPF_THP)) return 0; =20 @@ -69,9 +78,11 @@ int is_backed_by_folio(char *vaddr, int order, int pagem= ap_fd, int kpageflags_fd if (get_pfn_flags(pfn_head, kpageflags_fd, &pfn_flags)) return 0; =20 + /* head PFN has no compound_head flag set */ if (!(pfn_flags & (KPF_THP | KPF_COMPOUND_HEAD))) return 0; =20 + /* check all tail PFN flags */ for (i =3D 1; i < (1UL << order) - 1; i++) { if (get_pfn_flags(pfn_head + i, kpageflags_fd, &pfn_flags)) return 0; @@ -198,6 +209,12 @@ void split_pmd_thp_to_order(int order) if (one_page[i] !=3D (char)i) ksft_exit_fail_msg("%ld byte corrupted\n", i); =20 + memset(expected_orders, 0, sizeof(int) * (pmd_order + 1)); + expected_orders[order] =3D 4 << (pmd_order - order); + + if (check_folio_orders(one_page, len, pagemap_fd, kpageflags_fd, + expected_orders, (pmd_order + 1))) + ksft_exit_fail_msg("Unexpected THP split\n"); =20 if (!check_huge_anon(one_page, 0, pmd_pagesize)) ksft_exit_fail_msg("Still AnonHugePages not split\n"); @@ -212,22 +229,6 @@ void split_pte_mapped_thp(void) size_t len =3D 4 * pmd_pagesize; uint64_t thp_size; size_t i; - const char *pagemap_template =3D "/proc/%d/pagemap"; - const char *kpageflags_proc =3D "/proc/kpageflags"; - char pagemap_proc[255]; - int pagemap_fd; - int kpageflags_fd; - - if (snprintf(pagemap_proc, 255, pagemap_template, getpid()) < 0) - ksft_exit_fail_msg("get pagemap proc error: %s\n", strerror(errno)); - - pagemap_fd =3D open(pagemap_proc, O_RDONLY); - if (pagemap_fd =3D=3D -1) - ksft_exit_fail_msg("read pagemap: %s\n", strerror(errno)); - - kpageflags_fd =3D open(kpageflags_proc, O_RDONLY); - if (kpageflags_fd =3D=3D -1) - ksft_exit_fail_msg("read kpageflags: %s\n", strerror(errno)); =20 one_page =3D mmap((void *)(1UL << 30), len, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); @@ -285,8 +286,6 @@ void split_pte_mapped_thp(void) =20 ksft_test_result_pass("Split PTE-mapped huge pages successful\n"); munmap(one_page, len); - close(pagemap_fd); - close(kpageflags_fd); } =20 void split_file_backed_thp(int order) @@ -489,6 +488,7 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size,= const char *fs_loc, int order, int offset) { int fd; + char *split_addr; char *addr; size_t i; char testfile[INPUT_MAX]; @@ -502,14 +502,27 @@ void split_thp_in_pagecache_to_order_at(size_t fd_siz= e, const char *fs_loc, err =3D create_pagecache_thp_and_fd(testfile, fd_size, &fd, &addr); if (err) return; + err =3D 0; =20 - if (offset =3D=3D -1) - write_debugfs(PID_FMT, getpid(), (uint64_t)addr, - (uint64_t)addr + fd_size, order); - else - write_debugfs(PID_FMT_OFFSET, getpid(), (uint64_t)addr, - (uint64_t)addr + fd_size, order, offset); + memset(expected_orders, 0, sizeof(int) * (pmd_order + 1)); + if (offset =3D=3D -1) { + for (split_addr =3D addr; split_addr < addr + fd_size; split_addr +=3D p= md_pagesize) + write_debugfs(PID_FMT, getpid(), (uint64_t)split_addr, + (uint64_t)split_addr + pagesize, order); + + expected_orders[order] =3D fd_size / (pagesize << order); + } else { + int times =3D fd_size / pmd_pagesize; + + for (split_addr =3D addr; split_addr < addr + fd_size; split_addr +=3D p= md_pagesize) + write_debugfs(PID_FMT_OFFSET, getpid(), (uint64_t)split_addr, + (uint64_t)split_addr + pagesize, order, offset); + + for (i =3D order + 1; i < pmd_order; i++) + expected_orders[i] =3D times; + expected_orders[order] =3D 2 * times; + } =20 for (i =3D 0; i < fd_size; i++) if (*(addr + i) !=3D (char)i) { @@ -518,6 +531,13 @@ void split_thp_in_pagecache_to_order_at(size_t fd_size= , const char *fs_loc, goto out; } =20 + if (check_folio_orders(addr, fd_size, pagemap_fd, kpageflags_fd, + expected_orders, (pmd_order + 1))) { + ksft_print_msg("Unexpected THP split\n"); + err =3D 1; + goto out; + } + if (!check_huge_file(addr, 0, pmd_pagesize)) { ksft_print_msg("Still FilePmdMapped not split\n"); err =3D EXIT_FAILURE; @@ -569,9 +589,22 @@ int main(int argc, char **argv) =20 nr_pages =3D pmd_pagesize / pagesize; pmd_order =3D GET_ORDER(nr_pages); + + expected_orders =3D (int *)malloc(sizeof(int) * (pmd_order + 1)); + if (!expected_orders) + ksft_exit_fail_msg("Fail to allocate memory: %s\n", strerror(errno)); + tests =3D 2 + (pmd_order - 1) + (2 * pmd_order) + (pmd_order - 1) * 4 + 2; ksft_set_plan(tests); =20 + pagemap_fd =3D open(pagemap_proc, O_RDONLY); + if (pagemap_fd =3D=3D -1) + ksft_exit_fail_msg("read pagemap: %s\n", strerror(errno)); + + kpageflags_fd =3D open(kpageflags_proc, O_RDONLY); + if (kpageflags_fd =3D=3D -1) + ksft_exit_fail_msg("read kpageflags: %s\n", strerror(errno)); + fd_size =3D 2 * pmd_pagesize; =20 split_pmd_zero_pages(); @@ -596,6 +629,10 @@ int main(int argc, char **argv) split_thp_in_pagecache_to_order_at(fd_size, fs_loc, i, offset); cleanup_thp_fs(fs_loc, created_tmp); =20 + close(pagemap_fd); + close(kpageflags_fd); + free(expected_orders); + ksft_finished(); =20 return 0; --=20 2.47.2