From nobody Mon Jun 15 20:33:01 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010065.outbound.protection.outlook.com [52.101.61.65]) (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 81091314D07; Mon, 13 Apr 2026 19:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108049; cv=fail; b=Dwj7C7a3s5PYSjNHQvbxvxVe00ayRFYj93ur/8RaSGvCGm8A1OthNXyh5yY8ULfS4wpd9yZLZnHJ8vKxm2FpNxZ+x8HTUpp2UWckX+x5THDllro2SB624tvRYrfksYEBZJm1NRfVEYbdIWcXaBIg9dCWeZlHgobPjuc4fgJHgOM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108049; c=relaxed/simple; bh=9PJjWEKEijD+4G3ClMk4bI0elYGkJa+i0mhz23cjGF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WPrvYMknj/0WDR08hq/P/KIbKokxxLMMQoRYUtq14SQk+axKB0LgPgUJdjd3/F8c/CftFF48cmcejScQYQsOWj3GM0hINcDXo4bAUEYBT+h5PZoQGQQmkm2I0fIjZx+emFJhDFrWaoiNaD9aZPi3Q60yemn7TVm5fxPCOMyxbTY= 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=e68eF1VP; arc=fail smtp.client-ip=52.101.61.65 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="e68eF1VP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UXXtlMSDrIOWIMqj3B2N1rcUPFGfoa/wbUPAhFg/ADCSXZ+3KymAdQvbur2rDFk7GuVf4ICp+y0jbLlMnz81DAcFtb+eHgWZZk5L/P8sFYyo/7La0oXp+SX8hVPXUFVBvW6+LptJR3HhTJgubbFE/fFH4QHYjzgTpun+QJs8C71PFJG8OQan0WZZ8OnRoH5YmEJn7AJcfYwRXzS8umTomWxAM3xozNAjm5uBIaVyydM/6nciZxmHMgIRglba1KYe0HT/PYIpn3klv0sSVS3b3hWmClgbSQbc/d3W8RX9AjVA7RtCHlrh/R+lVw0doqylYphFxqi7mkuY+o/HT7IlYA== 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=E+5z+liynp469aw3FnXdrr/mMQViI+U3MfIRO5hKMWo=; b=cZEXP400N9/EjlgSMh4tR5yCBXf0hiNsM08Rn+xE5g6whjCNpQOhJAD7otUzicT0ofYVQBEakJO7bFOu4yH95mYV1HcEwouIwtLV+QIlWgJBe/UGsNtDZILiF0Hkd9Wiu35NUp9EdoW20wD8L3tCucNh0VXoh7JO7issexdEdAEepT0IS9h101+CKXV1w9nJA4fxGJaxWRT6QSY8UlREJSqf5jFr+MAi7VeD0/oItf/VJB1TeVxO3agkwRLc/tnbdY9cvUBgQVdtHTLBsG+MK7Y13daJqGlvDUlWde7b9YgcCNHZTgRsLlwvNyKFrJxhTZveSdFT+D1Cfqi3R9TRoQ== 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=E+5z+liynp469aw3FnXdrr/mMQViI+U3MfIRO5hKMWo=; b=e68eF1VPQQggWJn6X2TL+sYM1Auk7BQtX0Oshl0SQVjcV86mjESjrx9A3QW14k3cof2EnoIrajrto4tIJ2uDycvCXCn9YeTZGS/XAsaukln95o762cKfBmhOGSypqnN8/amx+AiCr6b2qcEtBLR0mGdUtL1W8pJF+pM1Q5XsQAY6JwYiruzO7/E6VnyN3fjp+AsDXu43xF9xa5Y3diXhO/35qp5Aa29T8T7izf34QrOGiQs+fU3kEySXwYztLPYDJGpp/kiYIY34zPjeildxWvAXqpKuxX53+4Z+vOvU3OrBjFdO0YYHGMaQ7kp3zo3ZHguF3XQLGhb4J5zHGpU9Gg== 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 PH7PR12MB7986.namprd12.prod.outlook.com (2603:10b6:510:27d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:41 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:41 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 01/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check Date: Mon, 13 Apr 2026 15:20:19 -0400 Message-ID: <20260413192030.3275825-2-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR06CA0023.namprd06.prod.outlook.com (2603:10b6:208:23d::28) 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_|PH7PR12MB7986:EE_ X-MS-Office365-Filtering-Correlation-Id: fd6e2755-5b6f-436a-8d0b-08de9991c04b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: /D682BQFPE2fJKybPmFMU0tr+Ouc+PrXtT8oWGHRH3hVlJSWJ35RL6jGXBy+2Z30aCuTZiVPs8d/kMg69eI4H+owNqgrlSG2kDgeGi41+LxgpuGi/xgZqnGuJEnat7QY99r5foBCe0o6aXjDf5W+q0YGD3eCMoN9ifEkjgtBdgRukY1QxYOBb5VVHgNbtSJc/hJEj34eLt0g755OvA0U9+bU+sCbZmGGchNDgRey0mu7SxkvERJg9X6Xz78Rm9oEe5wdJA21blH7EJBL2c7z9aUvSm9jJTcKYDjqEWHe0erFeCBvaIjepxktaecicbcVxmrx1Dn4QMYqQz8Sw/X2Xgz03dH/CvbmIoaHX2v7gSwzIo6/ds4z+dRuhAvWVl5q2bRfiw7aTuEn+e2KIV2C7Vvd4bxd1b9HZ4E43VJx1OM1pkrCJfhAVGcMwr5Hd7o99+5OZrxnwV1KJbz3ziDYpv4P6lOqhshCm3KIANBwcN3pmQCRtCMq2kT9Zsp3pDAzpAI1kEeBvr+1QAsg61B3NtQaO1MorkA8qIS2pxq9pNt5m3SjfxagGmFctlw+oFE3AYz9mT9c0gkHc5sbRzOilbynnR1sE9uTO/4dUxZ0R0RkNOU8cmTZEYGHEpljRKHCnA9/RMs32YAgJPQICkv3x6gsMGFrrFkj+wIxIv/+oHDwb1hObDL9UXEWij7BWkT6pKzaOAElVD3xUx5MkY3BmZ4DqJQFwNoI+pfGu6aeueg= 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)(7416014)(376014)(366016)(1800799024)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZtFacIShghHgjEzajCY5sKldXpfpJExC1oqk70V3EH1y1MRjSJ+OvPnKssLM?= =?us-ascii?Q?7DTqmgeuDrwHf1t75Fp8aoUNsU/xGspEfNdRIjcmM/Ch3hRLBzMGpLls6Ems?= =?us-ascii?Q?ftX0hNTectOU0HOgS3xnqzYAf6JOQ+RPdkKK2Tw+f1d7Pkz+nYaVnZYRmJAv?= =?us-ascii?Q?ihIEVoLEWOp0K3UrYnRfae74hu6Evs7z5TTdUE7j+sXD6UwJqx7BBf0wBIXD?= =?us-ascii?Q?1N241i5qrR0hGE2x/TYmNfv2IGnkBTNl3j3F1tp34PD3WYFvai9THMzZC37L?= =?us-ascii?Q?uh5IVhydiM3Coswbzh+6tFCsrXcHwk6L6zPSbNYqqF+LF8P6M9NWsaz5Xr6q?= =?us-ascii?Q?7VwdZHPMzEesuzYhX1wSmdlxyCCGdTh46bFbwezVG+VmMZBJvxXraqp1ZyhX?= =?us-ascii?Q?cpEIIFym59yp6nXD+CRlV6wuAUJreq2OyZIkD37/7NnSJFeX0zLR4ZwAL8c4?= =?us-ascii?Q?CjQtWgkEDwxcnD9CTZ//rjRWfOCs31fI97zN97KrtQLb4yKxLpwLOSBO1Sfg?= =?us-ascii?Q?EJiQe5s52/m5CiEwz0v5NXV7R9ujworRXeuGhiVcWTqg24OEf6RDc54mHRTc?= =?us-ascii?Q?blXUHRvT89Pk/eYNdeqv1FUd3NJGg2oyHzGN2AJYjnUzqCpGDfZEXGeMimwQ?= =?us-ascii?Q?bczB1yM5NTberJBm+trocaoE8Z8zPaCMSyPJ5I1Pb29DNA0fbhrj1UDI/wd1?= =?us-ascii?Q?FvzULixvqfgyQtq2Agk0CHs6dH8ip/3I4apH4VbO6pploQJRZgVJ3cUnZ+aW?= =?us-ascii?Q?7HhDbK8dDcLxSLIJFBATLhZUzq/q97dmbtF40MnmjbHKhTAXP+U758ZEF9LD?= =?us-ascii?Q?vtFIcLJ0vCTtGZMrMVevZelHzX9yry39qAOYKyPk2cGkaMDwSvuP8L1QcZuz?= =?us-ascii?Q?fcHv47wxgDSMwn9z6pBOKfvTFjvh1SoS09VsgvpOmdhA4VlyVhr2waBW1jkl?= =?us-ascii?Q?5wtTcNUjdBmMJ7lc74BsPOeMwvAvTk3ugrJ9PoE+mwc+MQj7H1dfMpEF53qO?= =?us-ascii?Q?6xHhDlz+DUX6NShc/RK7sRIHS9bP38ZtYK8wNuQW2E/2j+LJyJ6ne4k3AOIn?= =?us-ascii?Q?6fHedKl/fP6KgLQWmFUPwbxSweMDaxi/EiBoHIW1qCAL0EN1gd4XFIhpTuxe?= =?us-ascii?Q?SF66Moa+vigHS+GaqW1mMo4bfdbA3llRXtSTGr3FYVDdo9vi8zFA/6wD5+wE?= =?us-ascii?Q?JriwN8jYqjP0zNCPbsAI3FJKhPMwiFRXhQo3XVQ5OOMhdPdmLNBO80yCEkEY?= =?us-ascii?Q?a6HrV8WFTG8GHI+59QG7JLaTwlvlom2gzCVvtbS4Rw3+5hZMvmX817pgk547?= =?us-ascii?Q?wPIa1zTf2E19nE6F9pgifgE89EFD+NhHTDK3tOYbIX2xhMxC6qKcZWe3wxvn?= =?us-ascii?Q?CgxnfhCeZUDX7IXA+FjL7hs3o4oWC97vdjm68GfGwd9V2c5NkBT5aiolihsd?= =?us-ascii?Q?5FPELVs1gX29DmZzqI8Tcm4mbhz+O8F3J3AkLFNAF0CPFSWnO/5c7NANuXg5?= =?us-ascii?Q?YyX8AsZMbIkBcuIvgK7CLJ+ysvSxSqrlHQGM6o+LPjlqlfViOggbIvHR+glo?= =?us-ascii?Q?z/9q+wAfMvtuuHPiApjWnZcXETUWUC0nsI7V7p8oKuCZkSMcUUW3/VodePQW?= =?us-ascii?Q?P/4L1lE1ArXlzYX7qJFLG8B8iAUE9XrOLrp51iYK3p9yfsUhD02g9RNpsqVw?= =?us-ascii?Q?pm6d2wcK7iJajjZ7nCfFD7YcG3/Uyj5WIjREMe8WZ8PDQpL5?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd6e2755-5b6f-436a-8d0b-08de9991c04b X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:40.9736 (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: Osjic9wG0tzCl0RhRM9SUd8cE00d0dnUzSsqNR4WfZfASGHGFK94X8KxQDBYw/wS X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7986 Content-Type: text/plain; charset="utf-8" collapse_file() requires FSes supporting large folio with at least PMD_ORDER, so replace the READ_ONLY_THP_FOR_FS check with that. MADV_COLLAPSE ignores shmem huge config, so exclude the check for shmem. While at it, replace VM_BUG_ON with VM_WARN_ON_ONCE. In collapse_scan_file(), add FS eligibility check to avoid redundant scans. Signed-off-by: Zi Yan --- mm/khugepaged.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index b8452dbdb043..d2f0acd2dac2 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1892,8 +1892,9 @@ static enum scan_result collapse_file(struct mm_struc= t *mm, unsigned long addr, int nr_none =3D 0; bool is_shmem =3D shmem_file(file); =20 - VM_BUG_ON(!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && !is_shmem); - VM_BUG_ON(start & (HPAGE_PMD_NR - 1)); + /* MADV_COLLAPSE ignores shmem huge config, so do not check shmem */ + VM_WARN_ON_ONCE(!is_shmem && mapping_max_folio_order(mapping) < PMD_ORDER= ); + VM_WARN_ON_ONCE(start & (HPAGE_PMD_NR - 1)); =20 result =3D alloc_charge_folio(&new_folio, mm, cc); if (result !=3D SCAN_SUCCEED) @@ -2321,6 +2322,13 @@ static enum scan_result collapse_scan_file(struct mm= _struct *mm, int node =3D NUMA_NO_NODE; enum scan_result result =3D SCAN_SUCCEED; =20 + /* + * skip files without PMD-order folio support + * do not check shmem, since MADV_COLLAPSE ignores shmem huge config + */ + if (!shmem_file(file) && mapping_max_folio_order(mapping) < PMD_ORDER) + return SCAN_FAIL; + present =3D 0; swap =3D 0; memset(cc->node_load, 0, sizeof(cc->node_load)); --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 36BAC318EDF; Mon, 13 Apr 2026 19:20:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108056; cv=fail; b=WLVHgYNQoW0pr9CchuhCy6cJZM2MDh1Z824kAbtffAzHUMct+0ySIlXuGytL41vW7ZR8k/Y25DM7epLezp7tbKT/yotvAVGl0/6lk75uCG7ESxrJX4SzoxFaw/wAS0tktGjSHCx9BkDksVuFHFRx/B1+gyxBQkC5lZfdGZNx8CU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108056; c=relaxed/simple; bh=Kgmme/a6bfrYrO122tNVX0F219arapVTHWZnUrQv9b0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=VeTlRE9ER7qxprvlfiKzMoQWARnBPY1oUB3FmNR0AnmZQDAURyktKIuYXZBlDeyfhaEtMHcYn2yuQszza5LdnXvuXla/Dok8+qnlMiiSs5kK8OSoJfMudJJXHUBGjBqP8QlHXVlVXu3yDIbPIg6D39B++fA0AgDBme2aC2UxPtU= 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=Bng+NzvM; arc=fail smtp.client-ip=52.101.46.12 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="Bng+NzvM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HtUrOGp9TkAR8jbf49uhTKY62Y7ywnhQUAA8p3ruUoZV0FNMH5Ob2cNDP5wBAL0u9ckktPJvgpwACmWMhJfjfYpba4dpSidLOYwoc+4MWbKnDO02f3uC8SBZ3qt8W90r8Vv3Eizl3eotvBDJI4anl++QTSyGBE5+MBFxVsYOC/wlzVBW2ZHGq6bXIXQXzss9+DCesMQbTqJDK2RJ9iCAK4WN0/BS3UMKJtMTZkZMsnuOs0VP94wG9LhDxULuu/YLUtX/D3H3EWg6aHyJLyaqlWQciscpzl+hFCwTZRp2rWvbTdA0js4a8UwcZ7/X97c5549L3BQRb/0CRbxrXrfB/A== 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=NejS8Z1t6Y+7zgrdIe4+MUiS+w3T7QiEI133vyKg5EM=; b=a0VPjtlj/u4yD+o8fEXrbJ3+8MNXHntWqLo1hdnN0ShFPZpACzEb+f/gAI7ahf83Gtj07QEezPiPWRYD7hJ3By+WKhweoUOWax5RANjo4abyUFzLABuGLNz9rL0NyRVf/hNsLGKKVbXMUNU0MogDc7BkUHs+letpGZ5AXYc3aJi0X0tpdsCqrLpNxCn9AKqNJ/QkXKAMQA+Y2dt8TFcXJ8swvoR8cO3M6V152hocpGLC88FkFtko6l+OZfHwJdxbvTWwv4kOllOgDs8ym2xZBp2XJKQrwMC3Qw2DZWnWukL0I/a9E1I8un2cOvuhiT9r+/GBD/i4Vib/QT8prA3Xtg== 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=NejS8Z1t6Y+7zgrdIe4+MUiS+w3T7QiEI133vyKg5EM=; b=Bng+NzvM+lXEmrxAl1fAjM3uX1YCqdGCki+r1l3maKO0qRj0i5LtknfNL2xHvqEA9lOfsv+Z/xrUzNo8K4p/dPp8dN7ZO3ASMZwsKFcnfMvP7p4tJQdmfkxt2av+b7DifC3aYL+CefqQeFTXlsVQEHV0GnxgDDL6W4kkLQMJ5mJJgh0nuCE//Dh7EUhqQSxYWUQu+xGZA6pfxDcDdZs2GSxwXP0/8tL36aSKas8K9INT7kDRPUNyvMeRMmP0AYj6zujYRmgGTzRhwV3JFPWia2S8Q1Sj3t+ahB4h4z4fOxTfaGum62DsuvOolXZJZbG90TQOMCkBRjR0QxDfUuOBzw== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:45 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:45 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 02/12] mm/khugepaged: add folio dirty check after try_to_unmap_flush() Date: Mon, 13 Apr 2026 15:20:20 -0400 Message-ID: <20260413192030.3275825-3-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR20CA0053.namprd20.prod.outlook.com (2603:10b6:208:235::22) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cc6e3b1-42bf-4c68-7c6e-08de9991c0fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: /JMYe/d9coFEAMupAhJIgy+huvYYKY5qE2JYpRcnU8Oku5beCqr261CAav6r51nvg3mNdOAPoODnI9wiJiNhPUUv/O+4XG49yBuQTTA071DNh15jwgyghgkOCDEN5tS161iFb+xLz3fFrlvFpDsGUVzK8Vi7stKs/aYycwAAEsPH9SCESjaW9pkBmSwxto65GRLqd24NcWsDxPg4O2Vb6hUhDht7npBYGBcUa8VkIFsFwl3hcmxuRyhL2KyFPYn8teshPibex+Ol13jh38oUMCOaAvoXQEFTaWyQ5vCeMjxVMkOONG4+m/nta7LSrT8p453MOYPuB0nX4ZyaeIgzViQ40KHsKGDSiZpTcCV4tq7/Wb173Mya9KGlvR52hsFRIPtB1cdtvXy55hBGQBw4kiDcp+ZbEidPP47IK2TthztT598SRrlWlefKZMA90Jx8/IuD1gv8Xt+AcMUMmpyRspDvBYgHbPQhEuy5BH5SJ61AV3u1AAP4SK6NGOogo7JIfm4tHApUASaXUBgNNOQjWRzH+uYPInlETzLu97y62N6By+IlfPDccoSwU+UoZ2cFFCOU2QX5KzPbEHhDeE8AcBGBhCttjzG2+/8tljyx25VkazcmWXsggsaXIYYvsF7yjgZjQTWxceYUScR4rV6J9p86gKvoPWDcCBIEb/COtcBF0XA75pIJfRZ9TgpjZa9nlEku2ytOmc1w8O1LfvIk/LZ3F4hhNRrJ5N8Z8szm2MQ= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E0eH109nffSXRUXcwhoshmpovR0dUEA5tTstMVfZFXNw4+4aLNIyn3L1jeaA?= =?us-ascii?Q?iF43UPsaz/LbzTOwL4RS7z6WpZgUowQpL6TfLa10dtGJadzpMEcf9iCqG7z6?= =?us-ascii?Q?2RcF2R43x1qIZDXtURItj50CKU5z3zK8GALLI8R1TPe/AFWGumvdcxgraX9t?= =?us-ascii?Q?DZ9LI+PP0ycrNB+nhr49NdihUmRuMLRe8mHzYTkYtrOmjRSqitKuEhn7P7s9?= =?us-ascii?Q?B9ThFYBmPfpcNyiXQFZTEppFOIJCWEjcCXPzYVLVlEj1dMMzhASDOodnvmIH?= =?us-ascii?Q?3T7MldL8Bc/2EP4MaIEg2yetQRxLVFG45ftHt50GqrH7cuHxET3llPcvvdov?= =?us-ascii?Q?MrDBNtJ8eR6zUT644Y3quBYxQS22XVnxx1JIVqI1CAhHLBlNOvzXWoAODmhX?= =?us-ascii?Q?uy0kG+9lv7WZYHQQgBHuQcgHOzzlhj0FS30NIHDn4Af9M6wpZqQGOGiqXLIG?= =?us-ascii?Q?ErFtyBAlggaBfH2RQkx6AwXezjWXwBrW4kdaYAwOHG1vv6GLWrEBf3cTtLLT?= =?us-ascii?Q?22pg3fxUdWnB+q0WMduSkpRCNu/ej2y0LIW9O4XG9gdENY96B3Az7r+Y+MnN?= =?us-ascii?Q?G0DW3ACWX3r7dRpEdeTAZgudxljZrH/eluNWZ41bOAmkScggUNzJ/x6O1Wnc?= =?us-ascii?Q?2br8XMwFr6lPStiO2j/MoS6otnRRSFLIPdTrGvUaKCo8jOqZlk2tjfQdGFss?= =?us-ascii?Q?iqrUJOWjb3hGuiyslqQ7HjbHzRu1F5RMwR4bDmKicZ7K7YY58kYBy3LR4GIY?= =?us-ascii?Q?ITmeqXif29qpHaUthjur8/47HSaHFuRRquFyHok7uaYuxtw7hLAB3Xw5lQlB?= =?us-ascii?Q?TbF2WwX7I7Di3TfaLSqvhs8kiTgFA8xZzoDaKCzjz3PnQzjpQPBemAeRN+15?= =?us-ascii?Q?0Z8yqn/L7tzD83tL27Os9UXqZptXth+mRp3aGCdC7Ilf/JJwju3sKIHMqe9u?= =?us-ascii?Q?fuXmdDFFWz1ubD2skWsjbcm6QExQdMyKpEJXi6NLWcLCO+H0QLMx90KPeAWR?= =?us-ascii?Q?dYalBlQgWOa62ff1mRYGGxfnnqVjLj0YqsSV7+M1K4b47YIKc4VOPqMDY88s?= =?us-ascii?Q?9M1wa+/61z0/OJ3xGPnnKNN+SdkL5UEqaYLIAbgiyqigrmBwx2mkGT6+moV0?= =?us-ascii?Q?2X6rQ0vIB/8uUwld+9hX0URTvad0pdrZWz94y6JNtzoIYgxouRBoa+hjbZB3?= =?us-ascii?Q?aXwSIhV74zfJlTdKpa1ikF5BetH5uf6+sGmUlVIp3GxTFttBao1tSTgIk0QJ?= =?us-ascii?Q?LgHJ5aTuoFTCY0l/kP8UVinPHliajv6PYrOoaXEe5pS9l0FU6WnA3u1WceX1?= =?us-ascii?Q?g5jcHsb/4JipkLWH03makkgIqs+xN2OruUddz0qIumnqcnMxBrmx5q4PBE7L?= =?us-ascii?Q?bmXpkYJGaqL3RZf75PWE5FR+gDMkwJlLlKGDJtQF8FQru7nsb/5AzMfCPcED?= =?us-ascii?Q?0U+iAp5Qa2boi7KGXSAqMwDZVTs1xRuR3pb3hV8Kr9BXfDuLVZ6PkXhuA4gz?= =?us-ascii?Q?dPrKT7aFXQdYcI/as3Sanpp9X3IDzfCJU6L/ByaGSzfVBTpEhV6SKKp73hLo?= =?us-ascii?Q?pNGWPk2Wlf0ElgSLRlE2EjlslgDcmsB0jM0R5eBHD+gMPplpkz13l6jTKpD9?= =?us-ascii?Q?KMp/L3EBqQagkW7cbqrKpkOEzJoVjNnEv987oalv6mz9zop4iLD4cMaFkIqg?= =?us-ascii?Q?QGKEQewK3o+lvXNI6n6lPCxEwbSC5T3vjMKjXcz7rmwIzayM?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cc6e3b1-42bf-4c68-7c6e-08de9991c0fb X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:42.1475 (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: ugPUB+427UJ3LZSt8uERTHGOA3ZtyokutYUvNgNe/csoZzqY6Ujn6ozK7YKoeUtt X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" This check ensures the correctness of collapse read-only THPs for FSes after READ_ONLY_THP_FOR_FS is enabled by default for all FSes supporting PMD THP pagecache. READ_ONLY_THP_FOR_FS only supports read-only fd and uses mapping->nr_thps and inode->i_writecount to prevent any write to read-only to-be-collapsed folios. In upcoming commits, READ_ONLY_THP_FOR_FS will be removed and the aforementioned mechanism will go away too. To ensure khugepaged functions as expected after the changes, rollback if any folio is dirty after try_to_unmap_flush() to , since a dirty folio means this read-only folio got some writes via mmap can happen between try_to_unmap() and try_to_unmap_flush() via cached TLB entries and khugepaged does not support collapse writable pagecache folios. Signed-off-by: Zi Yan --- mm/khugepaged.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d2f0acd2dac2..ec609e53082e 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2121,6 +2121,24 @@ static enum scan_result collapse_file(struct mm_stru= ct *mm, unsigned long addr, */ try_to_unmap_flush(); =20 + /* + * At this point, all folios are locked, unmapped, and all cached + * mappings in TLBs are flushed. No one else is able to write to these + * folios, since + * 1. writes via FS ops require folio locks (see write_begin_get_folio()); + * 2. writes via mmap require taking a fault and locking folio locks. + * + * khugepaged only works for read-only fd, make sure all folios are + * clean, since writes via mmap can happen between try_to_unmap() and + * try_to_unmap_flush() via cached TLB entries. + */ + list_for_each_entry(folio, &pagelist, lru) { + if (!is_shmem && (folio_test_dirty(folio))) { + result =3D SCAN_PAGE_DIRTY_OR_WRITEBACK; + goto rollback; + } + } + if (result =3D=3D SCAN_SUCCEED && nr_none && !shmem_charge(mapping->host, nr_none)) result =3D SCAN_FAIL; --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012028.outbound.protection.outlook.com [52.101.53.28]) (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 E27FE31A807; Mon, 13 Apr 2026 19:21:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108063; cv=fail; b=kO2EfF/U8N4fs29XROxEbicLffBfw88o4SNmLcuXJjcDjHeglHxYzTXyZXZ2DLmscKji4pVt2pBBCEcl4n8qyIBpbH4IMh2jN3l3G4SfRWA69sBXVFIm1TleEPAB9FfbO5H5Q6HzPwo//Fu1qJboXQ4dbA0drfIRWjkdRkg6y/Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108063; c=relaxed/simple; bh=VHBnTE0WgNQiiw6RqY0E5R1Yl9Kr+DurXHF6Hi+Nwc8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=LFnUpWC0TBUd/B//As8tY1MypjjE/Yd2MbGC94m4QW/JaEW9YjJJZb17t1G1mrVO3DYNZekAQMNKiCWZCVaEkFleEENKrV8QiebOdq5RWW7/WqNHuz+2I3EpbWNx0fz4mz/cGnuaYcbB2VUXwfs//5s6vJtwR76D997uArJTq18= 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=TeIAjVwA; arc=fail smtp.client-ip=52.101.53.28 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="TeIAjVwA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=glhUXnNZ5KGVw4ogruX9y5v2DRxjijggR5oQrXcheBPBbxeWH6DNu9Q1hCcxcpfmHGYat17O1bBAxDI8o8f37Oc/yBOKRaok/0FxycnXeb/Tf1Ci1UX5qSskpZWod/9CSBc0pGySd2HbJbRqdrTHKeV6Zsek7HuXUBqleHXsISY4IG7/mWyuL+lXD/k/GMb5SczWJYNwS58zzsrp1sUvD4vssbIIKjiGiSlCk2tk3SvYD1lxUO0z9/PKtVBH85bpGGLcKrCbqAtEx8hT2xCUO22v7r3abSzdTbqW9lJPz5160LggB/c/+J3RkUvhKVXIfKBTxUPcu4tj4qmAiZvyTg== 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=yActp2s80GIDcma74HmE47OX0r+m2huf1uabN+Ec8II=; b=Jr2iMsN56g+5Ih904UAedLNR+f11wVYYRSNmk+pS6VlE+YvKiVjsXAVxrPWfa03lh0savJfYbftj9wnv9nuns90SnpMPET5RsXETw8UzQdkYsqZGi0jTQP4fCn8qCGskBc0msW8yD4LGtR0AOumol4KCq7BlqtAd+4Ik3bioICynRfy8q7y6r9cYYTDBHR73O/YFv2T0E87+mFxKKqXRNrPHNlA7wjeiFNFNDOMW2VtoMtJHx9UOV2bAR0VCUJziQVgMC1ekeN4l1PKE58zx+vD96+2lqMNLkq7YQ/Gh2Y3JJsVpyqkU5docePo1ZjOoAV/prnbL/OC8RCdrIT6LGg== 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=yActp2s80GIDcma74HmE47OX0r+m2huf1uabN+Ec8II=; b=TeIAjVwAHy4rP0ZE06UoNjSs9oSmfXbqm4bqQ7e1JFTvi8frgluISt+P8n8SZnUqw43ETcPdszzhFIGrw+FsRepfNQRpdPAS2uoELCZ4ipqlOKefHof0ahM0+/H68sl7wpQCuYatbQAFzPZhYMqhmdJHiXYgLHxRoH3GXw7gcEc1U08TKB7eTpB3Uc0HhGDc7Z3ySkPxkHJxZ+mAtZVPugcD3xuUxYaPnC72E1HHAKtbiWLPQ6cFOFlbAknE60GPDzoO9j6RtsM0mr5b05XXo6rsUQ8PDiYLyDpOqSNuumV9UceyqrZLvf7aSdvBRNEAldwoWT6x9ZX/nf8K9fX7dA== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:45 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:45 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 03/12] mm/huge_memory: remove READ_ONLY_THP_FOR_FS from file_thp_enabled() Date: Mon, 13 Apr 2026 15:20:21 -0400 Message-ID: <20260413192030.3275825-4-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0188.namprd13.prod.outlook.com (2603:10b6:208:2be::13) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 231d12ea-bb39-43b9-ae22-08de9991c1be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 5NDOgR4HwSIhGpIwHEjN4Zet6vchKt1HgYzDlpxHEvdrySg1WtSv53U7wFIWOsF4NKetKd8DEUbxLSPa0aQpItYtWEJHayqBBjBF3V7b0N/eLzz3pF3OJ8tXrgrB8UCaTt+JsEwcfUB/00KlGFIs+xf95mtD6e1sGqG1aE77wSLxPb3e8sb1EjQMGhCcjpy7z+1wfGA72gk7AyKyaXW56neWg2lkUV6d6a4ESs4i6XBT3spOiWE/RVD+i6Mhj6r1rS+jPypYXxMTU4bCHVTlsa9d8p0cPwiGSleequEVnGpmtFI/652PhRBVhIGnviFhEI+62Y6zrgEhEVvk70d9NzQTLvfVEpr3R5i2+T5VcZ4q9D2ExoTrZAOlTZ98sZYtb6cQ6A6b5v7kdImmSnOxw8aKtr8gQ8GI9OJoQP3rRLVlN4dx2CGvwjmMS0NkMZ/4pN/1RF0Q14JB48u3PiyrMa+Uk1twT+yTWH3PdR40F1J9kjJFN4hzZqX048Z7IPCRP4tTECLFDqYcBLND+EZICYrTRG/CMZUjzlNZNFQ5GfvHDJpNi6xdy6EnvRfd/DY2bNUbjGQiGs3YRuy/G0gUCDm+9O8zUJTU5oYcShlkNMEXYya/XaWakJQhaTwew8+//CUT/RmF5SpuSAezKI85+vzKnxR+IXRx4/8H32X4RZ/vXvP8sYMr+e32Jxi+0q1DxYSM67y8+OnNcGgqX+BgJoccgu+TieXvtiaV/Qr/22I= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tLpAsomZlexGCJUb4FpCDdh4PAxBs2hV/df/ou3/JpkqNDrPBtEbUbfZz3fT?= =?us-ascii?Q?aeV8WqlEc5fUhkGecfrNXJkrUaRLgkUiCI8mOix8jPEuWQa55gQBiyIPHmZr?= =?us-ascii?Q?zcDf5JIjTvM47zj6QFXFiEnu/ueZol/eFT8v4xRpv66NQEzz0VR4KDrTshTV?= =?us-ascii?Q?BjGeGZwLynNZxb3W7PZCkQ59x6BKkdc/T88YlLGOrCN0dQ0ALJCQ7VkE1EcI?= =?us-ascii?Q?s+Wj8nYcU/pnVKXwDY6GYqkbBBLCkbmVGwl4HatR/iyb5OmzgDNzRg3net6z?= =?us-ascii?Q?7H5TsVuEGNlZHI6zR6Lfl8rG745+CQSIwPQf0KJWi278xVXy/s+dutEzKAYG?= =?us-ascii?Q?RNEHBqs1NZ9/A/fq5ULikxpYKxYrSWsO3IP3ieOfo8+m9PRJQS4CiULjO/Zl?= =?us-ascii?Q?FkGgCtUbA1hMOJawvah3R6wLU+jC5rP8mGTNyBxVePt5TQ0WLomjzFSqmXYq?= =?us-ascii?Q?1alIdFEihVYacZ7yUOrUvRSmBN9sDuI2gnXi2NK/1jOGfUgOwVsEWxh99hcN?= =?us-ascii?Q?rAK6WSEMoMJjwmEQvlyHlksdNFIpc10yQH/ghrQzKU9IAwQ1xdYIeoS7ENsX?= =?us-ascii?Q?jL+DEeMrPZOYcByvA+TbcYtdoqadHawuSBP7Aroz0cwcnLgE4xMxmBhkoVEo?= =?us-ascii?Q?Ij5n2+iMG8Up7s9/S4YKFI++cOur9gAkuT9Oeq/EWiUXerjytjJfEKpdtc33?= =?us-ascii?Q?c4LLd25Ch+ilz1D4BiqiYnbhE3PM+5jG0ZKu/EB6Y6BrsQZpiymonAAdYMMv?= =?us-ascii?Q?QMi2XdDTtyQePrno4gjq3Y/R9gM+j+vKdbIi82yBUNYZu5wnNxlZkVXR1x/F?= =?us-ascii?Q?hSZuyLccQyOwzKlC6hy/sKhLziMLh81FZik4hY7XCbditQ6HAsDKQktC2zPj?= =?us-ascii?Q?JItoMf24eiMC151tMSnvTb/OZozxiniFyI0cOnZ3pt/6u2pBccmyGr+2+J1R?= =?us-ascii?Q?wz7Yd92YpmnOyVd3wVxv4VPVvXK7P7TeRi7X7lIyeRU5F34+PMHML2WTJEHD?= =?us-ascii?Q?1m7P5orYlIs+S8UTGwUSghNqBqbvd1PajrB/UZqpQXxdNquHg90iX0LILPoE?= =?us-ascii?Q?chMLlBPWWtRgPhCo27nzHxuGQ0vRkB/7upAjDI+pHIcth+08Xl4UbyBNgrqj?= =?us-ascii?Q?0/NimvIarKHfr+KJe8Pl98NXQdm2qaeJcVJw3lspiW7oUrybD9DTGSwwq6bC?= =?us-ascii?Q?PAOTGco+7jjToTidR9zfjrojYPDLC8L2Sjals/hMNcmjre7xEmyQRmLtGznN?= =?us-ascii?Q?ukjCYaRwCJA7+mL2ERnHYk8qJ+IC/sWLgyNfp1auRo9JZq6mgQnFQxxbiRe0?= =?us-ascii?Q?rZDjAp2C17oV7BoHtPt90sA9G6MZlopGqGYnM+rGQlAoc58ACjTVIdhzYBy6?= =?us-ascii?Q?xj2lBGVH+cmGDhs2qNqlxPYbsRpKUMbBfoS0agCU+Kg6ADLQ61BvRKwcHKXb?= =?us-ascii?Q?IOUleBxDOg0KniY53gh4LFkSzRRA2sMIrvdiwmt+qjgbYKE+ZNMYDPBWMBjA?= =?us-ascii?Q?me9dWLZ2T5x79djBczYQDE39VUhg5YO+yP315nkCwzODzxJXstN9KPLFEe5M?= =?us-ascii?Q?ajb3HGGm5CrzRdFgsd3VEiPMKCaI/7R6QTyRrBiTLGYw7dGdkhN9DX/8+n17?= =?us-ascii?Q?f0pfv0MC0jVT7cHcZYw0B4N1UeZHSmcUhSERexhLojWC5urFT3p3XdsHP9lT?= =?us-ascii?Q?s/JpPkzfFz3kcZ5tYFLdaKQePVGouAD0ndJH0poKwr7Hjg1L?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 231d12ea-bb39-43b9-ae22-08de9991c1be X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:43.4147 (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: 7XuUF5NAp9tPG+SubHuh0viIFdwM+vmXmUNtg+vJepDU0oYYKoFGNMLxmZoWV8Bw X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" Replace it with a check on the max folio order of the file's address space mapping, making sure PMD_ORDER is supported. Signed-off-by: Zi Yan Reviewed-by: Baolin Wang --- mm/huge_memory.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 970e077019b7..a22bb2364bdc 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -86,9 +86,6 @@ static inline bool file_thp_enabled(struct vm_area_struct= *vma) { struct inode *inode; =20 - if (!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) - return false; - if (!vma->vm_file) return false; =20 @@ -97,6 +94,9 @@ static inline bool file_thp_enabled(struct vm_area_struct= *vma) if (IS_ANON_FILE(inode)) return false; =20 + if (mapping_max_folio_order(inode->i_mapping) < PMD_ORDER) + return false; + return !inode_is_open_for_write(inode) && S_ISREG(inode->i_mode); } =20 --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 8FDEC38BF67; Mon, 13 Apr 2026 19:20:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108062; cv=fail; b=M8w4RHNhLlFkGusrW2XdxALm/b/csV5TAcsfD0ZWCZysYopJmYWBGtaAQcFGzGKT3IT0hBYS1IxlVh+cZ0yAFVKmY31SHaenO1x97fURYDz2AhEFgRLTeKoDlTW49Cf0OjXeJ7u00FazYJp6vKYHSZg2kPdm0eCuaMIsSdDuRPY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108062; c=relaxed/simple; bh=9UZ7CgflI+rTWOz/aenQ9A6NQMXpdSs0u+N7b4wu00c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=dcajp0TKaNhEklBBCzJqzrPXqTKwlyq7PuxAvSZ+wNcCMAyhLAXLfdQe9cr3ScdGrkm4UK2IK3D4/gtOUrzgZxnd5vPn3RidY27kse8d3lJ96tO8Uk9pM6SkBn3JSAhGD+oz15MVtUiPkfOkcycsq+Il6HDhXY53vPFjbnENXlw= 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=F6SCRSL3; arc=fail smtp.client-ip=52.101.46.12 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="F6SCRSL3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=voNZrfbMb7E49NQKOoROtHdZtDK2ffkq5yagGFNUaG0NUoLHcgIsnT4h4l7AgQiiBfJiy3cwix4SqvbXx72CxpJpww6g64ANp9Rb/YAe8EGoT8/jxJtMaKYd7e9qUfj/B2+WMsazgpboytowaV57Zvixd3yqyw/Yrg+UQkz4N72kbU1KESyVjfn/a0ptF8uQKED/gisWbZ29wOx1s+DTV6C4V3lzIvdx4hojxDFsnwpDhDHiKejZWDoYWpNv8F9XMNtsXVa3Yb0Uq1CLnFifYYZ00aHSDV7/sXSDGefk8zlBoTK0K65sMosvb8Hg8AbrTY5UNwmZlVPSCDg6FIcwNA== 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=ajPHYunhj8kAl/FupGqxvgNKDNEGgO8NKtECuhF5psw=; b=CUBciNYdYw+l+zpMs5hr7yPjfT4zwnsqsrzCNWdgxN2/5AIBh8UWusg4SeRBB0Lmv/io47kYbGnvBplhwClFY0L6/YJqgdWT+2UeL+9dIzPTLh4uI+uYMMktOzM4eRg17qo156fNPQJxsnBSbSUG2VdfrOFfqPoI+ukBwP4wfVzPcDLCSCQUdtvfKRR4U/sysJqrIR7rjxhLPOCGHbRBOsGBSeeUdQkiP1YY9y9Z4k2W1xBYR/daiYAYk1F1b9sHXf9KhstWIZ4C66RQJ9Hqo8LszMYbm7TOvv3kXp8nb8e7Mabl5uEV4RqR3M4RKwtPWnFwTJqRLPimGbc0GjzQxQ== 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=ajPHYunhj8kAl/FupGqxvgNKDNEGgO8NKtECuhF5psw=; b=F6SCRSL3rdKmJKC7RLM31fJCh7RwvfjG+YdBliuUNAAdquqC3BgQrGgsqfFTDxckWAG0y8Zv9S9ibValdDej2RA+JfOw/xxkP+7MVx8JLjwJRdfcpzrq+pQu0+3mXREMlOpw2Osw/+HcSPa1STVscCCXHz4uFq+TCEXgMDpuWwio77Cb62QOqjB7UlfZfk4SDfGrh6Xa46D6nX/+ectNKonhddBoCChuZ3mKUlQDwqOaUtJqwP+Z3d2/xdqzitgKJRbhjt1CDPc1LNsMRYG9jptsviOYPs+TPixskockhPP/ag9Rilz09+GXkpbH3Plb6YdSL3dePb69rUNVRtD4LQ== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:46 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:46 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 04/12] mm: remove READ_ONLY_THP_FOR_FS Kconfig option Date: Mon, 13 Apr 2026 15:20:22 -0400 Message-ID: <20260413192030.3275825-5-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR20CA0064.namprd20.prod.outlook.com (2603:10b6:208:235::33) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 53a74138-536a-47d7-f090-08de9991c2ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: cPlp+ICnVLzyav2I3ZYKI37zOIlJ4u4fIdIt+/JeekuRQHQ/zvQqqEdnqE3YjjDtLozPf6o58WYQCvL7CFRrhSD4kEE4/HzA+YCSukv4ErnDFFv9NxjYGToRnypwPuL/xXg2KTLufvixQ1RAJZ75W3SgJvwkg8/tJuJeqRU0q8OeuittLu/9Q3qfFETff56fma6A30DpNoGCrBkH5tyMLG8RwMFJm615K1UJLodVcJLP8kcinkyv2hKGe8sbMeeql11dV0qAGe4vNzzV850Is7whquq9HbhNzY7Z9YlC1ZzrVXJ7lC6JQGR4exRLoUoxR3P2r+wmrAmGB7O26hC1FY/TKTM6vM3TcGxmM9pztvCZtaQ79cMsMR/pDZKkU8IfAhquq5yCSNJw18eC8p31s1cIdo5leUsj8KXP5YcJh1iop7roQa7NsFH3BF4V7dhESEdGH1Ug8wrxj2AXlPlg9a7WhT57hHpjZjfXrsYJy/ToNroib3w+ozHBI+hogY+rHHTpm8oNg/NMHLO4cEhtpPtk5lMkH0bwrUm6HL2Z9aJ+B0LjBvb0hZT1GSCNU24JRLOSpdRdBcUS8QSdZlsUncLZDc9SNAOqyHD6n8uGbQtUp563cB3krD60rHwVAQMUfISzF+54eDuGxiHTfJWwwUHWbFe4wzWptza492VhIv71+uojYatresbSe+voktKWy0PsVjOYs/XL8gf5xCbBn4XdiXvqmEABImUmHRHYLCo= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ooDnSDjGAH+dEnGQCaLuo7sbWIE2B57ZW5U5aMpIxja8Ldx55QfZ6I77/ws9?= =?us-ascii?Q?Wge59xryrCZrLoM3brf/yI/OXV8sXoz1gMzUrBBncCPDvPJvNuVRSP6ri+62?= =?us-ascii?Q?7vZh5CJDkB7Vni07wZD0917MVHcAGNjMRcnAwINkversPmBbvHbkbHFlgtit?= =?us-ascii?Q?2j9N6yHsRaVXPEXvMU3Dw+NHOb/EXNEuHznVt1bb98KP+Hm5aMPkP40qyADR?= =?us-ascii?Q?8QWnH+XCTWhaWTXR6p2OUp8NoqPl57owmz3YL+Itp6ndLjFg/ehw/axljm57?= =?us-ascii?Q?DSMUsxCwBHDPXC7VBSswcgwWEZxDfHWj0WAwM1uC2qT49koOywpHRYcn4X3l?= =?us-ascii?Q?IPP6keSRr7bM/J6bA60BMoNq6BeREH4kV1SDfCDYdWOd1iqBv97vsvNmzWnp?= =?us-ascii?Q?f6C9jojbwFXIiOPacR9cjhMYZe1UU9oCm9lWg77w2xVVUqpkkRJeq7Abt5IC?= =?us-ascii?Q?9Wsg/i5cyyV5YdYMZtUYoEBDgWUevdZRQkawIMPUz4CsEHyfLJvTYv9KpF+R?= =?us-ascii?Q?cJXgiCcF3J+yAPcTSU0HBwzedkkUI2Ad5K+Tiy8Nc+V8KsW0P59kJ4Wj7kP/?= =?us-ascii?Q?lnutnbFH7xAygNOovkpdPMu11k2mJ4M92MiB6yf+VTKGBgbXM/Bi24ntSrBw?= =?us-ascii?Q?XbD9xutNMsoHXB47FyVAvt7dEU8muKl/l9XudyihicRDG9GP8MvXrtsGbUfV?= =?us-ascii?Q?+fY59NEZIpf4YOJkByXRiSUI/jt7otyOZ8ZPNYJsX+t95jmPdKm7jd6FYYMk?= =?us-ascii?Q?OGvPiTNyvX9knx2/aTSyoEcCbxXq0GCQ5FaH5mv+/5BVV9PZQs8zEB37ixJq?= =?us-ascii?Q?EgQHF38R71rstTxqQN7qD2ybgRDH15g0ZpX7b6OZtkmPmyBbSlyUQqIULLfI?= =?us-ascii?Q?JT5+/Klzp26dko2ztE1AEj+uTxviJMifDpa3WX+Qb0g8TzBFWMNMbkHk/4mZ?= =?us-ascii?Q?FEzgLjKCWbpu6/K7wtICNGX1a9xqPpH+8FWURzeZCJ5wPIQ80fFMewgo/xB1?= =?us-ascii?Q?Hs5SsFy/DOl2MreftVUe4DY9FIPFwwuXjG6fFbgrfUkEPQTTOYdNe7SKfRYX?= =?us-ascii?Q?GD8uF0+5oleYR6YN2U/pFKXi3ehiXLubsQUFr12Yb5SPeG5DD+89TSFk6XQQ?= =?us-ascii?Q?qCqk7kdrGPkXwAxFGS/M1YGtTKB2SS4XrfLLDm9dI+QAwDOW1+d/Op4JobLC?= =?us-ascii?Q?gMS+OmSBGdFiMqZBjaPB6EaXsh8UD8D0JGm4QYXp/HIIz9kNj0tC3QB5zFJ5?= =?us-ascii?Q?bw3tVdK0wm11BEIh2f0BEPjBqdHzgDEB+b9Ab6oeS17/RjoMcwLhoOZ9mLtB?= =?us-ascii?Q?0b4Q58/USFI1ZOgvfpn3GDizc/FsGKvdj4ELr3laKQYulgPy5Wk+0mFOo3me?= =?us-ascii?Q?DoqLqlZag424L2je2F0+JK4hnL+u8k07GzZWEi5wOMo7Er8QgKfDWzwRemXq?= =?us-ascii?Q?cpYzqfwGy2o++a3J7VGi2bTPlHfiH85yVLupMX62rCgi+pa4lMQK7WZqzScb?= =?us-ascii?Q?QY9Y8RAscqwdpOkSL9xyD/KUuJPlo1/q8pEjHWNlbpRN98gAz0tLlFk8h74L?= =?us-ascii?Q?oaMfuLRbUULf6isIeRBu8W+SW5FMgZ6cNvVIiGh/rCgOqCgqj4ks6rSXlsTw?= =?us-ascii?Q?SPBTZmixaMKd8lemlYuH/CuN6aSwIPZSpNLNGYnzVeNUWvVrenUVSskPEMEI?= =?us-ascii?Q?rcFM88o/IMmkqXFclIz2NbQ2tvD3HWQ6wXEbIQVKkmSj4Vam?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53a74138-536a-47d7-f090-08de9991c2ae X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:44.9854 (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: 4r9zAqQoYrFs67MI4BZtu+DJo5V3ixqvuHHTEqgrHPC8T4zbjnkKUQK7brHI4aOY X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" After removing READ_ONLY_THP_FOR_FS check in file_thp_enabled(), khugepaged and MADV_COLLAPSE can run on FSes with PMD THP pagecache support even without READ_ONLY_THP_FOR_FS enabled. Remove the Kconfig first so that no one can use READ_ONLY_THP_FOR_FS as upcoming commits remove mapping->nr_thps, which its safe guard mechanism relies on. Reviewed-by: Lorenzo Stoakes (Oracle) Signed-off-by: Zi Yan Acked-by: David Hildenbrand (Arm) Reviewed-by: Baolin Wang --- mm/Kconfig | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index bd283958d675..408fc7b82233 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -937,17 +937,6 @@ config THP_SWAP =20 For selection by architectures with reasonable THP sizes. =20 -config READ_ONLY_THP_FOR_FS - bool "Read-only THP for filesystems (EXPERIMENTAL)" - depends on TRANSPARENT_HUGEPAGE - - help - Allow khugepaged to put read-only file-backed pages in THP. - - This is marked experimental because it is a new feature. Write - support of file THPs will be developed in the next few release - cycles. - config NO_PAGE_MAPCOUNT bool "No per-page mapcount (EXPERIMENTAL)" help --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 ECDB6383C70; Mon, 13 Apr 2026 19:21:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108065; cv=fail; b=c4f2ZewBMMlklQ9HsEJ+EgBFTf2rD1M/t+rgOA3KyexQB4ZE/aDWmPY2eer+6Vu0Q5sm/gmvmExzwpl+r3jEk4YPYt/TnDBpJ9DvrTZehA3HUYfDYEIFsKAhCoeRQ9QfQQRmS74teSFr0ouO+ZkLOrNG72ob1G5SkGp3/x6okcY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108065; c=relaxed/simple; bh=yh2fzdF0AibmOhFZkR4+wwDceiybTIMlaBsl+0vnpI0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Mba3dKHz5gK7xotlvtYjP0FQef0r8KFKjSxm/iz3SgmDhPGbxBBIeo0lV7T/9rYv5fgYbwpygUfD/1/a80UbqVfGdyw1V3i6EJq1zWPNTtKcFCFUra2pgPrrS1aURQDPSMEEu3fuk2ZP/vViQN/BeErJqQe+YvVJ4phJ80Hpnys= 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=dOjqbnmS; arc=fail smtp.client-ip=52.101.46.12 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="dOjqbnmS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=upvGUqbZo5B02dzkX1ufgOPrQXMCt5R+2yGNM5vXhXSjTZVyu1GhKYd86rKgDoLRVsrKyzPkfE7K3dcqmJo4eAjSXxQIjMTcpNKKVAZQ0m8DmMyhB1uFRsm7PCRXYfSQQ5Ve2VvjVqF2noPjDCoFSoePZfVD4PTlnGURiH1BkY7KUr0mLxTd0oMyk7eDmoOeyawX7isqB3loQvrH+p75KnuiFM/ofE2eDhzDuTcwSxCzxRf63dCd6bmyuLPG6UJavE+sFgXXgzGqfCKyocDPtsiRL1zdNS/uTZJ1Tuiy6fPb8OIvIiuPXIWGowu6HICksXJWcDhDNgiutI9HRqggAw== 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=vrUWF7cM3Ji3HXk66NC+SyU1sQosqMDJgeX77XPYmJw=; b=HU47+pXHlkVy7wVecAiJiRWtz+/iWUrjf+yhxQQ4/qz0g9V0kj1dxWfw7koGGNG/GHycJFla9W+Ye5L2ksJ+UewNeOmVAoQ/gry/dzk6Z0nOf6WqXcLGcEY1zrDCeJNHGUdibMvEEBfdfH5DFJnWHtDMAiA53A11RuRSiTVc1c7kXDW4jUY74mLZ1cpItRUOqopL7j1FymEpydXboMDsE1D3rOL6UADvPct7afkEnYRK9wJP20ExyrQNev4E7uVxoy+ito2u1KCDh0d0WfaLKsrcvttcK5u7oI3ca8koTwbvIWtSlJsIAAPZNQgwEMrv657mY7pSMRPTpNM6MT1m+A== 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=vrUWF7cM3Ji3HXk66NC+SyU1sQosqMDJgeX77XPYmJw=; b=dOjqbnmSoagu2R1JykeL4KjdTvjiwFgySLfpdjEJgnUI+WDLxxSoFwCS7d++q5xnJfPHApw3QxNAQBQ6GqB1Z3YipOQPWRfQwsQSlxp/JFIHg7pOYTfzUDHXhGZ24buJTvO4H9R/9x0gkVrgNu6Xir5jafE3K011VIJsfBLeEq61yaQUjYref5ZSIcQFTB9ycRurie1M8zIJD4lG1YYFb430CDwMB7E9iLFO/RJfxLGR4nJ2M0rXbZqcTu0OXYJj9Q2D+vkktIvhR0gU0DfVbbunK02QP18SvhvRtd+yyNmFCMg3wttG5c0A4G6ZMgFMb5Et+5TcKCMJXommqII1xw== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:46 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:46 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 05/12] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check in hugepage_pmd_enabled() Date: Mon, 13 Apr 2026 15:20:23 -0400 Message-ID: <20260413192030.3275825-6-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR20CA0044.namprd20.prod.outlook.com (2603:10b6:208:235::13) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: e1226200-fe06-478d-875d-08de9991c37d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: PFPuMYbaqAxocRC/7yHOxeevODHBrT7KktWKOPAVGOA8lUM1+saYVOQn+Cw6v5eLEeuNSDaIuaGnnbsJkVkUcgqWduhdaIAJXgghfCTqQinh3zkAvvX/wTpCcX90Kh4F0rkJqvyOhsjgXybrM0bXqQCkE9z59r9N44Zfe5h5CIprUpGydtYnBr0PKkXcX+8T7i5ldTA/q8P8bmT+dT25qOwM0b+nGk1MctbtSlFHa0xy/F/BUH/iTK3zy27JWjZSmOxDMA4SWRGurCbE2UGDShAI32buvdwkCoGQwBlBUqHz0IMWcQUltru/cGNOBzQ+t3R9/RVQwqSXaor0LlgtTVCmGjwP9WK8cLQ1ZVEmR4wCaPjfUgu6GsKjQouoMs1/Ko8ge6uyE3X7Xs+hOgb4+Ox43s+ntnsZep85x3pw2/153xH1Jxm+6X4xZ+ailcwgddZronvkLS/tbR0abJEW1/I26TATpMQ+obT89NuGrlfaurLDuz8WvNnUTwC0hPOeFecrIHng7duOReDOSSmh+vThf48aY/vfFyocmp6qF1Eogx9EV2a2EW88IAFccRG5Gx8eyn7h696y0oYaioSQozQAeKlpFBaPjS7qPMVY2AkWsTdoRBdOhYjsyLm5H1SvXadD5s++/kRns8wU2XxqUinkhvc/sPPApoouML3ShttaNN6EBDfSvUgx7xEJbLJ96/w5aEoo1aFnlINuBIL+W4cJ4bBE5YKVDchRuXLOFXg= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VX3e3EnWq7F4aNTFH8CLpy1zu+bXsIghfretDQ7AHHueKueE8lLPGmAR/1wC?= =?us-ascii?Q?zBMp+pD62dHrBuS+VaNXjwaIj9AUOZajBUfPrklV/NWEB86WRebPV1Ii8XPT?= =?us-ascii?Q?KgheJ6ZRrES6FFET4bbuwsHZtkHpUtJGXzs1O7VreX+AH2gq/S+NKqzWrVxP?= =?us-ascii?Q?08hyUMgivy1zUpKDVjOMAt3SFxMYvgT9WpeIUWn+nfGX5peS6/BpFPzNADtN?= =?us-ascii?Q?UebCo/evEunEiqvHbWBwWEofAzPz8+B1Vlo/xZm7jXksmlX2yNEnzlEIqC27?= =?us-ascii?Q?2UowAdnHlJGIOeh7ojn2rwlvTuMw5vIHO17O1UVLfDjs7oREqxV1ly3wz6Li?= =?us-ascii?Q?XU3FmBGaogh7eeJuhNlynh6tXyzcTvohSoqGLuREduJCCIOtkDeIrVAg80y8?= =?us-ascii?Q?rGgrySXCq7YmGrtdf2hz/m3spzikfGJnrHrDVAyWiTX1ffk9WJdsbaKRLPNm?= =?us-ascii?Q?ZhzdhAblmgACHE4CsI9vNKgQOfDtr/N61DQDIlpaZMkdHvtktqvs5+iSaQ+w?= =?us-ascii?Q?GCW1QUDHLWUL9nMdxvJsr1ZxyHOg5yIaEd8/CwX5YmCwQbgu9TLsrhKuuQbG?= =?us-ascii?Q?iWm2PfRMUoaKY5rm3qYHFMCeaZD9EPug4YA2P6ypEGX44Q5yJyqYYH6YfOQI?= =?us-ascii?Q?9EqO3DCsv0nq1rvj7DnDAKfPVA0Oda7Kd4GzSuGrTaxRv18FIf2rlcsm6vaJ?= =?us-ascii?Q?VW6To6NGdXb2swMTdDgWRJA6N69ErvAbzwfBlHlxsu6AafmGgoaZScGZMZ45?= =?us-ascii?Q?U8Lw8jP2TSZ/xOe98NUxqqAyX7CnKuI11di6qXkoA6ZrFo/vZ3QcgZhoZ8kt?= =?us-ascii?Q?D92Uu8djo3pHTl68hy63/3SAKgFjmv9RiJhIXo2I1/ytZ2guJ9WE7qgXfvJH?= =?us-ascii?Q?mSwNEPNuKrHgJoDwmgabASoZE5nyrxi+FwQ+Abn7kUOpFnAE/owtqv+/5yPP?= =?us-ascii?Q?DdC4JMtEQJFhY+ADMJPPLJSW2xD9oVLqQvgmZiXjlGerBqdgIrF15vQ0ilc+?= =?us-ascii?Q?wMtnbHVN7CTGStxInFpWnIXBoUX4IdaQ+q7/dLX6MtBrkFSJ/BLHI+AIqTNp?= =?us-ascii?Q?6f4GckmnNmVymaqPN6VXEqMWrD6b2SUaNLtDqg6jq19290ymzrppFkYcr+BZ?= =?us-ascii?Q?nN2UMeqezO8oqaEM3sY79t5nh3+eT7BhxE6iJ4h9n6/Yxse0o1OgqUmbAM2A?= =?us-ascii?Q?PbEIeogK4PlrOjNgF3T3jQY3JgODJpnVEG7vFG8jJJ3BmfF7xw7dOH/ivdKH?= =?us-ascii?Q?COdrkO4JJ+fsqk6gjPhs0RcL8zXzAj4TxMWdowtbQCLw5Khs6ou+Q+yQb9R2?= =?us-ascii?Q?lZNi/GVTtafp+4OAJbAXcXYK65ePi+zAUvNzUC0a3w6iZtRXd2hindPzgyza?= =?us-ascii?Q?6QNKrgU1rt+xuynQmCwXU8dWuQ25mK3zL80ZP0gQrnpIUkKOwAsCZT1p6MOH?= =?us-ascii?Q?2OALCoedBUi9CG7Y2TeZjKabBT4QdeuTMXMbEH8klIW9Ii/oZ+N/1DJ1TeiM?= =?us-ascii?Q?nnRun9i2Mov6ytwLMA7NkCejiybCobzkNEmh0svyPk7P2k+P1cacNALgTnCL?= =?us-ascii?Q?VN8qCDq95ZAAPwfhpATSJKNV8VyZ/gbxRrZMjBefVlOZ4nmM5gFvPAzrLxQD?= =?us-ascii?Q?8BzWpaGqQPX3UK3JBhwQIEB5ALI/FWF4llzJTB8psFLTc0NS9SqiRmsXgEn0?= =?us-ascii?Q?yHQoJlDjV7Rm+obyHsZQZCLA/htCaIGApeJle0/nGHmVF9IQ?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1226200-fe06-478d-875d-08de9991c37d X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:46.3617 (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: +wMhfmofJ7eQJzSNS3ZY+YViY+P8CTZLMnktUfBiaWuIRmO6oCSMUvnrh6IJ5Ihh X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" After READ_ONLY_THP_FOR_FS Kconfig is removed, this check becomes dead code. This changes hugepage_pmd_enabled() semantics. Previously, with READ_ONLY_THP_FOR_FS enabled, hugepage_pmd_enabled() returned true whenever /sys/kernel/mm/transparent_hugepage/enabled was set to "always" or "madvise". After this change, hugepage_pmd_enabled() is governed only by the anon and shmem PMD THP controls. As a result, khugepaged collapse for file-backed folios no longer runs unconditionally under the top-level THP setting, and now depends on the anon/shmem PMD configuration. Signed-off-by: Zi Yan --- mm/khugepaged.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index ec609e53082e..79c985d7fa03 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -409,15 +409,12 @@ static inline int collapse_test_exit_or_disable(struc= t mm_struct *mm) static bool hugepage_pmd_enabled(void) { /* - * We cover the anon, shmem and the file-backed case here; file-backed - * hugepages, when configured in, are determined by the global control. + * We cover the anon and shmem cases here. * Anon pmd-sized hugepages are determined by the pmd-size control. * Shmem pmd-sized hugepages are also determined by its pmd-size control, * except when the global shmem_huge is set to SHMEM_HUGE_DENY. + * The file-backed case is determined by the anon and shmem cases. */ - if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && - hugepage_global_enabled()) - return true; if (test_bit(PMD_ORDER, &huge_anon_orders_always)) return true; if (test_bit(PMD_ORDER, &huge_anon_orders_madvise)) --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012028.outbound.protection.outlook.com [52.101.53.28]) (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 59ED03CEBB7; Mon, 13 Apr 2026 19:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108068; cv=fail; b=Tgvh3XnVQIL2c5NfLAFJ3f9AqZkTY1rWLcZIgItWzXk60w8zplRo/aAJf549NYSu2JVS81Dy/8HqKBo9S3zFQX8Gkb4B5DrbWmh94AdVF4XHSzLLzpZ/mRP4n6PWekTV8Jw7VFOJGk7WEAytE33beNB80mv/2k+u+1F4hC8n26o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108068; c=relaxed/simple; bh=SQtlMl/ceqB8A9gVGGGG7+aWZvovmdeT22RzyARcfxo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=f9oSVFFHj9NYrPbjMG9eOoKVH2x+jcyYb7N13mIuxnKbz1GoQk9djdwpVfkZR8nK7Fj+frW1a2TkdFQLVlaNOY1GYt85lslulrhBSMtoEAI/lPhT+2NJBuJIt1aFa7nFcEnhHei6UBwhKEC8fe9Gw/9pqet/Ldbl4tPa9l/vtio= 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=CU11jYTJ; arc=fail smtp.client-ip=52.101.53.28 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="CU11jYTJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Y7UXtC252Z2mAKwt6WIuouUMn6ycYKKYsztwBDhY6X8NQictujctvICddyT6nYsIujNFbm7YfuyMd42iAx7qLAtHu8XeRZT/8UQhhJI8mfW17A5Ds+NZ4s2YGpAgd/eEjuzPez0+vafXyD+BKfSoKEq1jhGktoCx+A/vUV4sw/ip69cRTcVyyOyLtpksHGzIEhwUTV4Bnutvr/yLz64rj2RLUgw3xc2V+/39uQ1Us8kgNcHB6BdzOOL661fGJOnEhaGTdguW7PjyUwUMIGDEZowTMHvSocBEuQK01qwcZhGoGlRD2VNS+dltZHbkhI1zKikzGg8oN5Cy4S3lA7ZdDQ== 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=Iwuc/J+Q3KWcuSwpmGg4LdX7/rt5d8jHE9U7kPku4aY=; b=EnPCEsZQqvbnD9e+stexmMMfyCIAoxnqB93SYCDH947Sz1C6iZniz1XU4AuiQk6cB4WQEAJi+pe1LWx5a6Jqmd3RJn9hPppU9QnhM52dS5a3w/999F5U8NI0YkuzDFdBdtRyqHfAen4DevUZRVWS3RRTT4ByGO081JmPscIAEb591xawH63O4X12j4WdlIsmvjYNwdNTwMjnFyGOl3PJAdXtMQVciVR6679gfIVgc2MwXXlebzYebiZeLckMnkyh77Po4WneLQXpm3fN6X5VZR2cWPFNY9BvlPJfscDZv+9IPB1s6PcdhKO1j4IpU3DMUDjhEAyV4pr7ISIuv9P4Dg== 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=Iwuc/J+Q3KWcuSwpmGg4LdX7/rt5d8jHE9U7kPku4aY=; b=CU11jYTJ7oDgyoyVMwgKBkbdqI0ePXHwB81lgKBQ3ZxpZXUjE6y3WrVe7i9aL81ar0PagC+igqI7mjNs04kcwNPzjqV7EdqjQMv9TP7P+7FOWTArksgvJ+VXOVd+7LdIrXajPeeCSmzifA50TuhCmVZ+mfXJKw2WvbVsvDNeWIJ6jb3VFFhi8MxXBmE9LlQD8OQBdV+co2VpXsO00H+Dm03I/pe4pC2BntepDIeNL7YZnOcMxtk5bj5pH1q4rN2EgoD959ff8JNQ3D6qrEfYrXGFEOgaOQ/u8N5QNYk696150LexRXPrjQfb6ui0TSIcFpCJG5WoeDr3fxWZY8IeFg== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:48 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:48 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 06/12] mm: fs: remove filemap_nr_thps*() functions and their users Date: Mon, 13 Apr 2026 15:20:24 -0400 Message-ID: <20260413192030.3275825-7-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN0PR03CA0025.namprd03.prod.outlook.com (2603:10b6:208:52f::9) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cff2b42-d61f-4378-bbbb-08de9991c451 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: TNjGpheEXX7yMjjrrpPwl39Sd+xDUUWx/FNjDX4MjHdXQ3TEdewJpqMIAXw59BAnv4THAUFrrackhVSVlyida2/H4ibgzcc3Ca4TJcXmHK91fEmjTrNk+ZyKMb0BkoinoLEpN5//oQMkIWzxfPp1wc3g1+5jVs9MdbLArm5QhA3mbBxWSxZxCz558sqd8ALOowMvuYLrhnkyciulY2GselgnZoaDfZCmMhtWZi2oTCMQzaEtwt+uo2Ta/tPgn/dhYnGM+HwyKmMvWPq3koqn7Spp5PAFrrk3XRbjWJePB2BhAf93XMqfQCG6xHI2zLO88rY/vyUBKhyU13Umz2atMd6UZkRznPpwi5wvDtNev5tO6YcfeApEdUzf6N41GEY3IrDJKhBKu45dLtiEM5IoGmGTWfBnDCMxRwrZm4hzE5qPJv82tJkqOxncE9wAgdMgtOg3Qtzn4Pi/7QAOw/vMT7dfOSBwlEBUCcbcybd59RXF4fyrE9FNgfSPuTEYR+Tf3qseFXipU5kw/DUrj/ZqBGlqizWu/YVKK/0/WJKFDtco2w4ZkpV7plY6MeisfMZI42YVnl0wZVgOsRzjL/tGZsKeVSF2DPBkf0SHU6FlVWusyM/tpCaDKr061k900PfI0Mk+apdRXRZpoLU3YG2BbY/4mDfS0o7NP2jRzqfzcTsEFYzOwLMYOf9Gge3zhn6hRXjKujztGeVk+1MLo8fH8WEuBPOpvAqU9LtdDDs0pAU= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jFMT9Rp6eunDdyz/pf+dldNCOHg9b4Ac/zppWvNoilfp8YYhSNgQ2DWTkWDd?= =?us-ascii?Q?9dzM/acNsoBhqpCTmXQEQFlaOKmBd7xXqsKvU479SQQXoyvs20fdmoObG/Jl?= =?us-ascii?Q?r1+lwYmG3N/YjsFxA8Imbm1CKqfkDgKyp1AFcC/VFd36Mrc4uvDshhCkNcHJ?= =?us-ascii?Q?S1k/2K85yBXbCQ7hDK6MWA8HTyszPX8xXj7jdZUzK0a+HSASGJS7hu5QWRLN?= =?us-ascii?Q?CzkuYfDf9A46xPKgtW1+/BDeLf5iG7wAbH+HdAoQpH0iPlvYXTGXysxjQPSV?= =?us-ascii?Q?bdVqSbjK4w5maK/3hluGnqYNZS5c3o+f2CPx0vc4cSWJf5koAoclzni/xaFR?= =?us-ascii?Q?qLr2krFpsaOFJF8fYYcBaFEkc559UOXu/OAI0HUNSaIgq+uwZ4cAZHWmpwV/?= =?us-ascii?Q?zJRSvfdGJwRbEXkWThKVOA2+GD9NkFl2C7TG5ttxuh200WVhHLz+I0y1YzPA?= =?us-ascii?Q?D+uvTk60VAxnGoqMNbhIpPD9pLuX6TfUpGDWJiwSxbio6rvwO9fHlU6WC2Th?= =?us-ascii?Q?Xu1fA9/uzBbE8jwI/t2KbElrbgEbupEQrhPkaumD5fflMkUFKU2VWdMzfYBb?= =?us-ascii?Q?NEbtheZiP9d0c3fz+MdeAGrlj5sDc6nS0Xwr/9uHjez6RyCdVpeRmBNrhJSr?= =?us-ascii?Q?aK5SC/UsZjRx/5ZOzYmVMCDyWz90r1XwrS9BwN0Ev/cLlhYsLknWm3rGRtsM?= =?us-ascii?Q?vfq9jl06Ncb3A0AYj/CyvKgCwnYtRai+x3Py5cN0bJfD99mbL9ma0rUoRxjV?= =?us-ascii?Q?nkBL9GwZRpjt/JVm7/tfgbUa8i9vhpMsxU0+S+59Q7KPP4UlUany5I8QQTkB?= =?us-ascii?Q?AlqpL30mw8dbr7j/ZGBJd4SV6C0zy9j4O+L4UGmUnhyFxAT3Ej7h0l4yTgE7?= =?us-ascii?Q?y/1gjzbvfMxKwbf1w5zjA06MLfYB67jiqeh5nCpxw3/UYT+m8laPRpiIadxK?= =?us-ascii?Q?z4Yxv2vRnTemLf9kn7Yy8mxTKn57QBUTpPfj+p0/fxrmSE6YvwCWCcLRoMfm?= =?us-ascii?Q?qOo0BdQl+TxUyS24lKHcnl5/m77rIJjk+pF58gNwakWCq0DQBcqVQbLsjuzR?= =?us-ascii?Q?+Ta9eUV1woTelcXF5EjveDbIpI/Vnm8Rjlq0tp+mpLp/4g+kojOfpwCTK44r?= =?us-ascii?Q?XjtFPDFGekWiuw/V43+9SbgErXfw9j55dNGEO1lWBQ92hzj1B9q/PwYzahQm?= =?us-ascii?Q?r5NwECqUaYIxQVAOLwyVg+rvUOBV246TuDA5RSQwwUGT9LUBxpDHIzEOGZv+?= =?us-ascii?Q?peG9le0qNbKsFAKftv7nY4M/aYFX1RBITpofYuxQSBpMCgKxzU2P4zT0UAkT?= =?us-ascii?Q?XSUAsx2gFu1lVOu7cB/bMyjpMWZ5urcwpXE4U6d7ZqybklI+QwrwFSBLELtG?= =?us-ascii?Q?YLCwQ9opU0JcJmcSSo6fGneLC+MNRmlAigg53InZrWKfOPPaSX7ccFqVW4k5?= =?us-ascii?Q?zij4Z6z5YORk6KZ1oeiXCK640BdenWI3DZTfWZ8ol3qPti4ow9hvxR/rdEuK?= =?us-ascii?Q?SWlqmjnMnrlp5syqVuorcGNQEFvKAtUY18a54EvCF6nBhXncOCJiAMz53AR+?= =?us-ascii?Q?Z6BB3dRb2lhveqOkxyTogqVKz59G/i0KBPNXRnrmhONKECkorff+Z48dJjuU?= =?us-ascii?Q?7MzcwLh+OG5FFC3I5NZoS2fXA92KVtFFkj2+V1wlSvmuqvVgw4pB2LtLfx5h?= =?us-ascii?Q?4jPhrUSsW/4cASd1RugXKZNhXde4zFVshH9yXSSf5S+5mtxQ?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cff2b42-d61f-4378-bbbb-08de9991c451 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:47.7399 (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: 6l6UQLULvt2L8PmrYngeuVbo4urT9aPObDZL7n9q6CMwOBLP5PF2PcBH7r25Isny X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" They are used by READ_ONLY_THP_FOR_FS to handle writes to FSes without large folio support, so that read-only THPs created in these FSes are not seen by the FSes when the underlying fd becomes writable. Now read-only PMD THPs only appear in a FS with large folio support and the supported orders include PMD_ORDRE. READ_ONLY_THP_FOR_FS was using mapping->nr_thps, inode->i_writecount, and smp_mb() to prevent writes to a read-only THP and collapsing writable folios into a THP. In collapse_file(), mapping->nr_thps is increased, then smp_mb(), and if inode->i_writecount > 0, collapse is stopped, while do_dentry_open() first increases inode->i_writecount, then a full memory fence, and if mapping->nr_thps > 0, all read-only THPs are truncated. Now this mechanism can be removed along with READ_ONLY_THP_FOR_FS code, since a dirty folio check has been added after try_to_unmap() and try_to_unmap_flush() in collapse_file() to make sure no writable folio can be collapsed. Signed-off-by: Zi Yan Acked-by: David Hildenbrand (Arm) Reviewed-by: Baolin Wang Reviewed-by: Matthew Wilcox (Oracle) --- fs/open.c | 27 --------------------------- include/linux/pagemap.h | 29 ----------------------------- mm/filemap.c | 1 - mm/huge_memory.c | 1 - mm/khugepaged.c | 28 ---------------------------- 5 files changed, 86 deletions(-) diff --git a/fs/open.c b/fs/open.c index 91f1139591ab..cef382d9d8b8 100644 --- a/fs/open.c +++ b/fs/open.c @@ -970,33 +970,6 @@ static int do_dentry_open(struct file *f, if ((f->f_flags & O_DIRECT) && !(f->f_mode & FMODE_CAN_ODIRECT)) return -EINVAL; =20 - /* - * XXX: Huge page cache doesn't support writing yet. Drop all page - * cache for this file before processing writes. - */ - if (f->f_mode & FMODE_WRITE) { - /* - * Depends on full fence from get_write_access() to synchronize - * against collapse_file() regarding i_writecount and nr_thps - * updates. Ensures subsequent insertion of THPs into the page - * cache will fail. - */ - if (filemap_nr_thps(inode->i_mapping)) { - struct address_space *mapping =3D inode->i_mapping; - - filemap_invalidate_lock(inode->i_mapping); - /* - * unmap_mapping_range just need to be called once - * here, because the private pages is not need to be - * unmapped mapping (e.g. data segment of dynamic - * shared libraries here). - */ - unmap_mapping_range(mapping, 0, 0, 0); - truncate_inode_pages(mapping, 0); - filemap_invalidate_unlock(inode->i_mapping); - } - } - return 0; =20 cleanup_all: diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index ec442af3f886..dad3f8846cdc 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -530,35 +530,6 @@ static inline size_t mapping_max_folio_size(const stru= ct address_space *mapping) return PAGE_SIZE << mapping_max_folio_order(mapping); } =20 -static inline int filemap_nr_thps(const struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS - return atomic_read(&mapping->nr_thps); -#else - return 0; -#endif -} - -static inline void filemap_nr_thps_inc(struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS - if (!mapping_large_folio_support(mapping)) - atomic_inc(&mapping->nr_thps); -#else - WARN_ON_ONCE(mapping_large_folio_support(mapping) =3D=3D 0); -#endif -} - -static inline void filemap_nr_thps_dec(struct address_space *mapping) -{ -#ifdef CONFIG_READ_ONLY_THP_FOR_FS - if (!mapping_large_folio_support(mapping)) - atomic_dec(&mapping->nr_thps); -#else - WARN_ON_ONCE(mapping_large_folio_support(mapping) =3D=3D 0); -#endif -} - struct address_space *folio_mapping(const struct folio *folio); =20 /** diff --git a/mm/filemap.c b/mm/filemap.c index c568d9058ff8..e7da925ae310 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -189,7 +189,6 @@ static void filemap_unaccount_folio(struct address_spac= e *mapping, lruvec_stat_mod_folio(folio, NR_SHMEM_THPS, -nr); } else if (folio_test_pmd_mappable(folio)) { lruvec_stat_mod_folio(folio, NR_FILE_THPS, -nr); - filemap_nr_thps_dec(mapping); } if (test_bit(AS_KERNEL_FILE, &folio->mapping->flags)) mod_node_page_state(folio_pgdat(folio), diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a22bb2364bdc..5c9ee900ed90 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3926,7 +3926,6 @@ static int __folio_freeze_and_split_unmapped(struct f= olio *folio, unsigned int n } else { lruvec_stat_mod_folio(folio, NR_FILE_THPS, -nr); - filemap_nr_thps_dec(mapping); } } } diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 79c985d7fa03..afd52e4c7ccd 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -2092,21 +2092,6 @@ static enum scan_result collapse_file(struct mm_stru= ct *mm, unsigned long addr, goto xa_unlocked; } =20 - if (!is_shmem) { - filemap_nr_thps_inc(mapping); - /* - * Paired with the fence in do_dentry_open() -> get_write_access() - * to ensure i_writecount is up to date and the update to nr_thps - * is visible. Ensures the page cache will be truncated if the - * file is opened writable. - */ - smp_mb(); - if (inode_is_open_for_write(mapping->host)) { - result =3D SCAN_FAIL; - filemap_nr_thps_dec(mapping); - } - } - xa_locked: xas_unlock_irq(&xas); xa_unlocked: @@ -2302,19 +2287,6 @@ static enum scan_result collapse_file(struct mm_stru= ct *mm, unsigned long addr, folio_putback_lru(folio); folio_put(folio); } - /* - * Undo the updates of filemap_nr_thps_inc for non-SHMEM - * file only. This undo is not needed unless failure is - * due to SCAN_COPY_MC. - */ - if (!is_shmem && result =3D=3D SCAN_COPY_MC) { - filemap_nr_thps_dec(mapping); - /* - * Paired with the fence in do_dentry_open() -> get_write_access() - * to ensure the update to nr_thps is visible. - */ - smp_mb(); - } =20 new_folio->mapping =3D NULL; =20 --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 A150D3E1218; Mon, 13 Apr 2026 19:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108070; cv=fail; b=DznTd5eMGntUeQcRroA43rJQNsEOD61r6xb5QLbopcNhJ700eDyAjCjQC3us3FBO+SlThe02+g5seb4lng9+nrDfeqqeFpF15EnljwbiTmXKub1qB324quhqA1bZJPhVCnMTXjt4EXcYvEQvnEt24EQmutaIwxpx7mUtTPmDB7Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108070; c=relaxed/simple; bh=9h7w8+Wr8t6fqCW1eT7hHzfjN9CkipktgNBkOOzsMh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ce8MuiwYaaBqrefxbjDaYsDJdhUmq0YOsMiJ2Ea+trd2xGwHsJY87EE6tYU7a9MyKeh77lz2xcoUgKhDmVnLFjmF8DgbXQeyY+JZaLa2Ewgo1o1RpMJtXHHM+Q8A+U56DM/mOJilhIwzaSKsam7HBXGUHB3ekSIMs1IQh9A/i0c= 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=m/r1ExBa; arc=fail smtp.client-ip=52.101.46.12 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="m/r1ExBa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ChdQ9Nar/3A+5aswCjPN2JLDgOZCEWPfCx4Cb4RWt48IB76E4I/b5rLkyMOdZP/0euaqI6TH2VRYeCRYkau0ByUvZLM3ZN3ejbA6sxiLIKPWlDZpSr29SUkmQMj329p+28ng1l5fmVBaAZpBPMIi4mD37r3Ua0XttI0D/whXniFW0hdaX6Ez01uvuWDQj+2GSF7hleHHPpP1z+TliXI3WYC6+D9j6hlPRiCJIDNKGXPnWcgmguqipB/YaUa3E73yYqjrDHYbTaCMrXk6IGA0rfpdOaUppicStIIa2lYyynrMSM6m5W1vIyiLvY/BwtaXrvHupDuuZ5XrNPgBsAPozA== 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=Cb1C19gImkxeTr3FWZH+1IFt3hjaxVTf/e8ZvzJeKOA=; b=RSVw0IdLOMJTh1bF+WF/fM78i9Z00AnCvDpNfsZ0dceLUHMyT7MXbfYGYF75qTLT5fi46p2csSPeNZA70KWiUwNS/mAmwzpLJecWBAFEZtwTQYDXeSq3SfyYN4AOB0kkP+DwtP02MpjwI/m+9PtuUf3SOWc21CoT3VL2e8zoeYheBByOKNrbD+UDEn/1p1qPaDyC8OJAlIpDO0FmOyecnqCfqPUheVCOwRxgoKrs86qx3lx0x4Jebor4zTnr4Ji6strHkTjIYrtbPyK6Aep3Z3JEaPu1mN41oF0d+X3AIZYTduMxMSXj0bHusntyf9YP1fq8uagkrMS96oCosC1P7g== 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=Cb1C19gImkxeTr3FWZH+1IFt3hjaxVTf/e8ZvzJeKOA=; b=m/r1ExBayaL/egN4e9z/ulmFo8pLgrsyBxOY0q4dLnNO7XUURUHQjVoHaC74OxdmfL4b1DndsmCpxBkEDi/yotr7UlHgPvokFDEztPyBV0x6ywb5eRZTVID/GolHnfCim1oLqDRDRmIbX0mRm+Yb2APGY3BHYEBz1netHG9JbCC8Y0IJ3O7dpwlAD47Lq+JOgsA+WKwtsfzxTulpBALSbOup/9RJAxt6qh+WqRtR++8PEvGmg/nRBMxm6JRpNvODV6UxXprLoSUeEW7iBb3yvUzHXU469umKaIXyluQdeNSgperUqcewFpZHMqVQrjbUeP/r8VgQwXLv/4pQ7hcDyg== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:49 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:49 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 07/12] fs: remove nr_thps from struct address_space Date: Mon, 13 Apr 2026 15:20:25 -0400 Message-ID: <20260413192030.3275825-8-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BLAPR05CA0042.namprd05.prod.outlook.com (2603:10b6:208:335::22) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: fdfb06b0-fc91-49c5-a779-08de9991c51f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: c+DCloSmEImTi+VEZA/HVEkxrIxDFDCiXpnIGtCezsZybdgZ2nvuoB2BcLoHW5e3xOiVN+LNJv1uycLJ2xhuvgtDz9tffFh+aVD4iQj9GAeLRMTnaEN6X6VEJkkS0y1V8+B4T9gUcE4Wp3sZ5eLpxduHTYtGurELHHAzrUpNwkkJm0nDsA3zDpC3MWtUGA83NaWQNqJNmn+pGKLKG7ePiXztyhFEhNXbyYe8u6nhAQwATKUbW6b3AFjnvSxzdvtq3V8P2oeYZmhI3D9jVngJ59dlGh2FFXdeATcUOROAzicFLLHDKO6dr0EqrYImyL8UGVZb0RSZZ3Jy1F4QGWCwDPf2dKoe9y0P/FBuv2Spf0A2KY8o+Ncb/PPQpV6cbvQ5XPV+jlBPgFEDIvEkTaHBlBjOk9p/67ZkkOBbj/RpjemnV08K+TEv5lpu8EmnftslTE9GSqJfqEi6WiNFdx9SujL0JAfbE0qsWRIOzAwq9tzlEagVFI2e5nMPbslMUVRDOCwDPuBzF7gifGfqePkbzb8eo6YAbzJ7IfZ5SWsdbmeKU8PIE+g8A5RPDWTD6jbD89ugtSO/VcEhX7l4N24bj6U1dCr5ywPWnOTOuB3lFY9+Y8XEOTtgdsKLtyLbmyUeuONtEdeqn/lp1pcFZqOl39QhYkDATIQP2jnflxviy3RJ9eMDeZgrAWU0/8RJirKyTNsXulb8mmX6q79ICqDRlRKnsZNKdmCcwQjvS7e/0Es= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bz/rPfMsEC0FOHbgogIPdeKDpBW0MItHkwYSxUqhtV+HbGFHy8Ig2R1EEJrs?= =?us-ascii?Q?LDT+rtcYfjBL8e2PzOumoYzu3ymn5ShRKM35hIpJIzP+mPP24+25CYJEmoBW?= =?us-ascii?Q?xX367YScfEaUeGEzsF43vMzApI0wp17CHSDzxed3Qro4WwvpdZ5K9vTeiYBH?= =?us-ascii?Q?7JynoULsN2y37DkgxEFoNJDScyeUuEK7iQFKm0ytBtEz8Ua1coEj5bM5Y5XK?= =?us-ascii?Q?vLjh5ZYAbdviiHuirM3WLwxPt1RSn7kv3rYLbDc8jfnmWh4zTma8ZlMwKTLs?= =?us-ascii?Q?KoGcS3Un0cUkr+Sj1Uun/B7BY57dNu8GO0P8jp0HkQmgwPLkHOcYlx0fiS1T?= =?us-ascii?Q?PN+JdyIwrcfzH1KqnMAXwiXbT3C1w+i0qmYP+hn3UL6kIYBNy3vyXZDQ6uaN?= =?us-ascii?Q?Gr4z1ojzFhhZ/HICaxYf35fYWF7mppdrGgTaGYtVgayVkQL8e9mN5Tr5zdB/?= =?us-ascii?Q?CGbUCSi+K6QerqZ7DJHMUo/Qj9Rl6h91dHKp6claP6kxAohj7gqiZJGlrVA8?= =?us-ascii?Q?MlCpTc1BW7+AuRcsu5Bp/DQV5BHVwlAHddK/Uq0X3jc/8RqJhc02LfesZQd4?= =?us-ascii?Q?PGCnwCBJA3gMGXpud3SPVpiWau+slZu/OTsqjj7DDeoaVvO17v41u5h6Bp7R?= =?us-ascii?Q?lO6rnrBvpgyex1USVX2/aqM8Xbt+WhVxXZV3wy9dwP2UdG566ZFyz8RDw0c4?= =?us-ascii?Q?Giu39V0o9SWLkLV+LGbK+owlh216SojhqQmh848fWSG9TS/glf1SxRnhmwzl?= =?us-ascii?Q?ONcJxUHbqC+H7PEZu/stCP7WVArxvWQhe4IxYVoa4d0lzV+0k4K+PmUHe9I/?= =?us-ascii?Q?CjAYb8Yt/Tw9m3H0eRVpcHQU1vpV9Bq190px9TMy585zuTIxzHdQrWOn46FM?= =?us-ascii?Q?Hb/mEi4FNOO5Hy3e/tXyZ5/FJjDaaLcSVhK+0bCs4cDWz2OVz5SZZJL1ehpg?= =?us-ascii?Q?aQK/nZjX9sqBVJ+svkp5CzH6BR0ZBFAFUfbrsu7GRUZgH4Skoz8trfDhE9N8?= =?us-ascii?Q?ajUT1B6Jt3hK94JpoJv292XCJgA4uFVqC+8nFwdJ1QF4M4syndlg6tvJxnhp?= =?us-ascii?Q?dAf+AwJYBzn0EDLro2U3SwmrqjGbopaOMoRRVL+54jUWGo2OPKh1E47c2hzt?= =?us-ascii?Q?54YebtTKATVpwWEAXLMv4oP/VkET6SMEBKQ2C9nNU35xR7FXzKE50i4TV+dM?= =?us-ascii?Q?qobt8Pbzr7vzpKBO5lnw/qsqeaRXVsfXU+pSy2Q32TKmtIH04+xDg6t2FOh5?= =?us-ascii?Q?TpGAJjwh2ABtQGJe6ydMr1+78igQ8mOmDOnhIrhbyDOqpPF3r/GpXTT1mcFe?= =?us-ascii?Q?P3eQdSU2TuS3o5xTj2FcEoq4m7YxqqEUPFARMY/vEGEoYcqRirYfNv9zETXq?= =?us-ascii?Q?tGXrmA6KY1sVkfkBAykfyfCZjkev/hCxiJ2E59fgI5bk0y55AOQVytqqwJpa?= =?us-ascii?Q?AGwXzdqktDBzovCdFVz0kmpkg8TJi6Rv30fifKC6rQJg+CzE3+BDSaZU2vlV?= =?us-ascii?Q?fFUnbveh3DUk42BvCkTWCZoU9FrIbXleMBzvihWYdzmCrlEc2ilqTQy5xMSB?= =?us-ascii?Q?Vk36Q7m/d2aJ1Tvse2DIUtre6JMubq8aALuQ87wBfRRFYiBIKr2F2iFX6Rme?= =?us-ascii?Q?5/yTS4277w83vsRLXJnvlT1EpbcNHPtVm43b77suRKbN+0B4z9nMpHwpCCK4?= =?us-ascii?Q?1Fs59iVK09MCbwEwPx9W1xsqkgXwW5OEy/kMMKynUjRyK2BE?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdfb06b0-fc91-49c5-a779-08de9991c51f X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:49.1254 (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: qm6GtJ3gOlxmlxopD18idfiJbnvPZKmk+NKa6mq0erDcYkUjh0+s/sYZVo9n91W/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" filemap_nr_thps*() are removed, the related field, address_space->nr_thps, is no longer needed. Remove it. Reviewed-by: Lorenzo Stoakes (Oracle) Acked-by: David Hildenbrand (Arm) Reviewed-by: Lance Yang Signed-off-by: Zi Yan Reviewed-by: Baolin Wang Reviewed-by: Matthew Wilcox (Oracle) --- fs/inode.c | 3 --- include/linux/fs.h | 5 ----- 2 files changed, 8 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index cc12b68e021b..16ab0a345419 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -280,9 +280,6 @@ int inode_init_always_gfp(struct super_block *sb, struc= t inode *inode, gfp_t gfp mapping->flags =3D 0; mapping->wb_err =3D 0; atomic_set(&mapping->i_mmap_writable, 0); -#ifdef CONFIG_READ_ONLY_THP_FOR_FS - atomic_set(&mapping->nr_thps, 0); -#endif mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE); mapping->i_private_data =3D NULL; mapping->writeback_index =3D 0; diff --git a/include/linux/fs.h b/include/linux/fs.h index 0bdccfa70b44..35875696fb4c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -455,7 +455,6 @@ extern const struct address_space_operations empty_aops; * memory mappings. * @gfp_mask: Memory allocation flags to use for allocating pages. * @i_mmap_writable: Number of VM_SHARED, VM_MAYWRITE mappings. - * @nr_thps: Number of THPs in the pagecache (non-shmem only). * @i_mmap: Tree of private and shared mappings. * @i_mmap_rwsem: Protects @i_mmap and @i_mmap_writable. * @nrpages: Number of page entries, protected by the i_pages lock. @@ -473,10 +472,6 @@ struct address_space { struct rw_semaphore invalidate_lock; gfp_t gfp_mask; atomic_t i_mmap_writable; -#ifdef CONFIG_READ_ONLY_THP_FOR_FS - /* number of thp, only for non-shmem files */ - atomic_t nr_thps; -#endif struct rb_root_cached i_mmap; unsigned long nrpages; pgoff_t writeback_index; --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012028.outbound.protection.outlook.com [52.101.53.28]) (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 35C233E317D; Mon, 13 Apr 2026 19:21:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108071; cv=fail; b=jwraMxqQd87cMZ0LJUYTesTfiZojkHi2D1dKl61dTSntBhzClkmkreHurxSNGzVQlLlQbJM8H+EB+RJuypIkrImOV/SifPRoYy9wY35KMpkRrN3vM0UYsCi/MMInEA+83PbUePFV+JDM0pSfzNWwOw0IKEePo97DqGzyhb29ikA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108071; c=relaxed/simple; bh=+0WsQZ7bWfTdszz+QrILEGaymsKdfqpavNgteVKoOTg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=YKDb3kFdPsBe3YV6Zy/poIW2K3HteufzgiIvaZMG7HqLQiwW7TlaPLOe7ULRi1AzOmsN3VwbQUbt6BtenTScs1K+ZyXjk3pB4wXnTYzjDO16KdIQAorqoH+nVU8FqffJD5C6GHeIO+/dDCiJdXZldf/MCkoitwd2qtUZty2ntWY= 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=DUqRPQsf; arc=fail smtp.client-ip=52.101.53.28 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="DUqRPQsf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Xo/zHnRSLWejjjRQ3G2IH6Ow+TMraU/XTo+W8SyL+LX7sLUImO3h++B/aCsy1IEtyDaCVAqOyVu5oXyncblp9uqaafPu2PXiJv4R0YL9o7eenn8Xqqy7jbVoWxSp1uz45LPb4CBeoL3YoFwvCaFvt9YqJqwHGuQWEN/ZmuVxuY2je/jB/XQcDs6W8wZYndJBMM/yh4VN3vNG/aeVQK9gw4KtI0duiMpWpJZRIn7c1YX0pcxDs5XE7ooKlPGl5JSaMY221w6XgpdfkyQavHJKW2RSX62cUMm1jNpL21uGFKN5pBLkMv63VkL5K9emkNOyCu4ngl12VSKCQ3H/6Bcjcw== 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=ycci1Ec5ilfqJF+ZZD7TAuDXAjaW7BdC68giBul+An0=; b=Ar1o/fOglqTMJib/38nnQ4aLV8cMFA9OdrkubhZVnO8Zc3NoHoOIv+w/zFVG8i9HpikEQeUeEe/HA02qZm3UjOhhN3QRxPEpU7zoEQ3rq95DRJVDZzkuc3P2g1iCeFpbzJ5ZuNtMz5PY4gL6rGD3ZiA6MmfNBmTa5R958Dmb5lUzFyf6LwAb5CNUByamTUVNIFNKglnXGxlyBgA3w15z2nQA6saYggLddNgiSNbI3GOiXTUav5LJQ1QYPdrFU0TGfBt8sJTrHcMEqiHO7+8ldvBK6y/FAT1gpT62pFl0j1mUb1bUhzNBAbN0VCbAqFnX4adNZkyVqu0pCkaU+Jup/Q== 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=ycci1Ec5ilfqJF+ZZD7TAuDXAjaW7BdC68giBul+An0=; b=DUqRPQsftbQyO902RGHWNk70V60n7ekk6uMfwQZNzc8v2NE4YsU4vvN/c3PmADULOqrODYE3YV/QcLHSZbPz5nw9U5ph1YEuwWcmZ9BmC5NcKrozkTYYiYK+aCb0UivZyxbG92Luj3/rx6KFjSAvddyIBkduxdKYeC4pj/d4+V7aRAZzohnWsCwUzIN1Xj3+Glp72zCjUZODhw/sqZ5kH8ofSkNYJq4+PESWeUvK1HgIOrSMDl7L/L9m0WZeuugABaAce2jIH1GqNZwclaVzKb1263UTuJ0KeKpPjRFzVG22M7ofI4LqjKR+skQV9lPVr+zDikM21oAOJgIFF6ExKA== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:51 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:50 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 08/12] mm/huge_memory: remove folio split check for READ_ONLY_THP_FOR_FS Date: Mon, 13 Apr 2026 15:20:26 -0400 Message-ID: <20260413192030.3275825-9-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR22CA0005.namprd22.prod.outlook.com (2603:10b6:208:238::10) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: d0460a3a-c933-4351-0151-08de9991c62e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 5NjpS2Z0J3E6RatXCr5YW5psCXoAXVTbBvz5GZQqU5rhBA3P1RmAkzgC0wa8JBlKCBdN37K3f1I7RmCootqplAlgnbkTnc76ZZBwDwhDJ6X4RSWlnladFeEApzzn13VfFnkxCOcBGuXEASNhomSa+bfZjaj+R/feyeyNCorngIlxFtW79a1rDqpRmta6lSEmTJTKKoILSj801NZNAm20M0w9G0jQUvD9/7QJEuhmQFdntACXGCl1Cu4Z/BjtHwlNlfXV8lUAwMPiL+OiyJwyZFI7d26C0utWCHi3MtzGMKXu/9IE4we65u6gtsCgswqcznYDUwxrNYawxidnMSbKoa0dVuyKaMCGP/OCTozN3/sRS3MNxqKDV0Yrxo0ryW8bAoUMFFRLsQqTPsSR2zCIO3G8rKtjqFJbAbI7gpgd64fkgjBAw4eBKXt0YK4SnvrJEFCgdywEtQEQgm4L7gk32rW8HtqUjftaV8oEYR6dBrV/tmDXAgh3i3flkQdRl4+no7h724y9/z75fp8y8tqgCz4v72juhOMlgpdIT1DeUB2NNTUJa9REuNntZNgW7V3C3pXKnK1DwkhY2skYp2pBTH3PKFeKQN83J+09MHOR+qbBhkJ41wEbt0a+De9W/p5Kp4QmFfcxItOKxVismDovdo+WPeab5zpHee+apYYQCMqhPyhpjLQRJTDXU6bnf5psXRptQ1LtdtlLCd16DS2V9GDW+k52bPv6RkUqL0fSFyQ= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?92hyHQIaXnjbLPOsEfYnxMoyELVEnWl3J9I0zrDCHLAe29Wph06bdgY9iSFq?= =?us-ascii?Q?q5YvcVBqgbRUnoFP4dyfXD4hN13WPhCiKq4+wOTCUVlQIuoqWdGcNvypZsf8?= =?us-ascii?Q?8r2Ry9CceMgPcEV7cZrLH1kFzRSFyD8osFTHk7B7C+J5k5JHxJX9LhfWWM/H?= =?us-ascii?Q?YgKRGROsTzwCUqjBVybPXaB/wJU038SxJvnWM3CLhpB/+6vrMDRkBBnDCNZ3?= =?us-ascii?Q?QkzEW8m4fLqxGioQNg+4ubReaiGKjSxcK+51i8GQ/cDpAqZCDokqHfeOew/W?= =?us-ascii?Q?Y/dyUDjNQIhsHjwYpLfD0354TIFXZDzKJ4j0Q49JT/tFG5F1svVecow8CgA/?= =?us-ascii?Q?daiQ+EQ8xaCZ6BeKK4uGL77hqmzeUHCE33csNW9D5X9pkwXx4em0vSG6dxXH?= =?us-ascii?Q?tEeKh+KD9bx1hbjZsAmUhdwwpBg5bb+wdxSBbML/21VvxhYc2uQ906Wuxp3/?= =?us-ascii?Q?VdR5OPa7A9Q36mfrKfkTSYGhoCnNruhoMrPV4a4lvq0daUNSVtDWeIqGtJvK?= =?us-ascii?Q?YeTLuZkHFHMdz+FoVwL13nHZZzYTL/UHMtTonr8rsrRd+xG2ojjiIBgbEqRw?= =?us-ascii?Q?/xrJO3Nrd+uTJRO3WzQnc01uTIOYQMpB5vTt3rcN1HoB3wSvnv9p996lZRMV?= =?us-ascii?Q?aqCCEobddtAW7LdDckWEusPbMFiyO/l7kuhWTpZTiUsztnR3W+NTxTG3aRs3?= =?us-ascii?Q?UMLRzKZ+ZvtnOil/AZw4IgXnDdE6K+dzQIlij+Ld/tWCtMqev0w9luGxUW3S?= =?us-ascii?Q?N+eY8rimuxG6X8IECsj64+p6BZEIruL1bYOafdQYkcmkQvcvb0mmP+ekY+in?= =?us-ascii?Q?GjDhDP9bq1RTqdljp7sTrDRjbb4iN8RWh827uO8eBFeqHpC/nfufRhnT3EvN?= =?us-ascii?Q?sTFUcWb4RutPITCypBFAFUVT2bEyGj9+FTyVVTQuJ38xeE2H6F6LLNf/Ehb5?= =?us-ascii?Q?nJIN0nepTxnnBLgDwnY04lsSsblgv45nLAgv0dErlzT4FZ7wKiZJmMlZfr7Y?= =?us-ascii?Q?1qfevuA67JXSNm8dh7fnSEhpn0qziC0lN68RtDfsesFa1Brk7LwkgKtmGU2F?= =?us-ascii?Q?EnHZvAiHKVOLq6TLECoscR2DnB96i7lsuPPwoL+PlS/kpYhi1gU3W4rnAkNR?= =?us-ascii?Q?ch5IoP/PIb3XffA3bE9J1MdJs453p30u69r/fN8YRP6BtEhTAKIG/37ZGcUy?= =?us-ascii?Q?T2OeJwA+NI7yAIw6KvJydCdu16oqBfno+mqOgv2ZqhYzNmjKM0T9zMbayksI?= =?us-ascii?Q?ZESvdE130BGddTXNZGkut0keHp1rRIywwJi45tFRFdyMbJHpQB4wT7j0Lrz8?= =?us-ascii?Q?YnYb0fjX3pNVmS760ETh9OEN+FjZobySaozO8tmTiuQIERT1stwfsHtqWJPK?= =?us-ascii?Q?lSBqfE9gwcUjsYskMt4QAYY9/f1Lurzz3g3uG0Ey6ribqxmAn+aaEqwb6/GM?= =?us-ascii?Q?BBJrIWAgrikWCr1ThMwOpaXUdtOGu7673fpTLkSPsO53SpF0QXqXR/uwhdAe?= =?us-ascii?Q?56vECCHqJ0M7Q5BvAcArGx0Ud0VwShv77tVfps63NfW8sftWXC0YwvrqY2AA?= =?us-ascii?Q?V3/NX4Uw06nTpiHYNZZ4NaJMDra1cwVsbLfXQyQneZlzEGq3tULfO34y7/7H?= =?us-ascii?Q?6j98ULKihC6i7FfR0mNVigAJBP17PFb8lK0wBbyLCQmdZR2CgsYlptEypGH+?= =?us-ascii?Q?3LwmKAkSl7xHt2cK7CiHTsgoeqkFepUdkDpezjrhRf+D5c6D?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0460a3a-c933-4351-0151-08de9991c62e X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:50.8576 (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: aSaMKBTlHwl23MAuNLGiDtJfVM/iPYVStztTRFYhoYHxp1YWBDOw7oJbdodSIsmO X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" Without READ_ONLY_THP_FOR_FS, large file-backed folios cannot be created by a FS without large folio support. The check is no longer needed. Reviewed-by: Lance Yang Reviewed-by: Lorenzo Stoakes (Oracle) Signed-off-by: Zi Yan Acked-by: David Hildenbrand (Arm) Reviewed-by: Baolin Wang --- mm/huge_memory.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 5c9ee900ed90..4de38c6c6d06 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3821,33 +3821,9 @@ int folio_check_splittable(struct folio *folio, unsi= gned int new_order, if (!folio->mapping && !folio_test_anon(folio)) return -EBUSY; =20 - if (folio_test_anon(folio)) { - /* order-1 is not supported for anonymous THP. */ - if (new_order =3D=3D 1) - return -EINVAL; - } else if (split_type =3D=3D SPLIT_TYPE_NON_UNIFORM || new_order) { - if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && - !mapping_large_folio_support(folio->mapping)) { - /* - * We can always split a folio down to a single page - * (new_order =3D=3D 0) uniformly. - * - * For any other scenario - * a) uniform split targeting a large folio - * (new_order > 0) - * b) any non-uniform split - * we must confirm that the file system supports large - * folios. - * - * Note that we might still have THPs in such - * mappings, which is created from khugepaged when - * CONFIG_READ_ONLY_THP_FOR_FS is enabled. But in that - * case, the mapping does not actually support large - * folios properly. - */ - return -EINVAL; - } - } + /* order-1 is not supported for anonymous THP. */ + if (folio_test_anon(folio) && new_order =3D=3D 1) + return -EINVAL; =20 /* * swapcache folio could only be split to order 0 --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 14F753E3C6E; Mon, 13 Apr 2026 19:21:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108075; cv=fail; b=OpSyMyc0bsGZadRxAY+3XCooiASBYkjdjva3zmAvdwC6Se0EgSYuy8lO4zyeM3MCCsC9m+osPA2QFSwmSPMLA/q9T81QXZ3Rmr9INvIeJyCm7Xd+xYQd0DDCGI2+IXuxMAIm7Qs788nUiYo5E77k5Fu3bW17o5M/ukRjkoyPAoY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108075; c=relaxed/simple; bh=imuIp7T5Su9LDlBk+FiMZBWYTV82a3GxVk/OoxIsdFI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=N8KW12I8GUno5d/5+oSAY6CMxiUiylEu30whyuBsvvFj1faflCeTQ6gmPH/sI1Zp8fzqevo5UksP2WtcWLcMms65cZO5Zj9G4M3JS+A5tgxxbWWpmZwXMkSLdXrmJB8o7+b3QYMBef2RPLkoftnHUGbFycsQXpV9w6JJdyfcZ7k= 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=a8Ww+TYU; arc=fail smtp.client-ip=52.101.46.12 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="a8Ww+TYU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QFKcZYbtBFZoLabneBqewnkp3blEQStbZGfoduOwRDHKoOHUUanoS/A0ccF3N6RYRImd0Qz8iTLInjQrkJPUvBqSXYGOT7jEa2nTeuhngo7ItcrUmZd3xZ8h0yojbOthyL81HK1DZeSbDle01OlDdsFSjfuN66atSlaMZVujVbwnv/PQ/Ox1BBeUtzOadQFdMPovnx01DoTO9Sk7ld/xrgdgFrbnkVGa+U9SqiUsKen1CMVgBHBqDNXpE0vg8M0oHsVkv2dBTFJyAnRB0sh0N+iaHlTiCDTTXxN5s6QByjtP9dNRQ5ASOHN39L8yWtONNnX6pApWv6UmrjlyF8MZWA== 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=+PyHzfYdAcd1o4K499pb7pf/Ryc6UfaIgPSO5VqSG1Q=; b=ebnqLYHWE66wB2XcY6ZvfC9hxZR3+F8sD35Zw4n7KD/17MLJ8pKkkNt9kxoDktexyWtGcUklSX0muI6bGJL5MmPekGcbRU4W8r0zFDw7rLd2cYzfns6b7W4d4YGg4yKp7xOi8UysGE7QQdb6XhxPg1vialdGks7OMVVPDSDSXuEMYpjOAEUMKGfqpOHo0ERj3+GkJX3AWut4OESutavraEltoSHjpyug0KvUaRHEuJdPUG1Pfyr+BxMmFylyJatkjthQiyGoM8aMN7bc+JD5xKt54yROQqeCujHta+t0Z0xzLxft9SpEHNjNYaXSPL2I1IAliY1A9fOw7idcs6hyBQ== 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=+PyHzfYdAcd1o4K499pb7pf/Ryc6UfaIgPSO5VqSG1Q=; b=a8Ww+TYUq5FbIxgweRwiMGoYuJPrMVPqaOoQCTv+ILCycjQtWktlfqWR4ws0fe+/t0u6pvFtivy0Fr1tV4dYu1M9k6QF0TuncvPgpGnRNL1tmcdyi7tdIbzNYSaMuldadg+skDs45pePvfRL+6X4JVC3Y0h2XzapAeJgPMTtK2UXxoEuWcpDLaWZpVwtQWsw4+2blxDs3zdAmKEb37lDX663HXPKgqxMFMUpUm6583pqT+i2p85T6uIuRzRsY9bkrbuStpWj0I0Sld2d+LzY6FVQXvn8arMMJCVWkb9/jj7EJ2GA/XBf9pRDzQG72KYf98wrQvbBDCoIES1EgVgkiA== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:52 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:52 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 09/12] mm/truncate: use folio_split() in truncate_inode_partial_folio() Date: Mon, 13 Apr 2026 15:20:27 -0400 Message-ID: <20260413192030.3275825-10-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: MN2PR19CA0006.namprd19.prod.outlook.com (2603:10b6:208:178::19) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 286c44fd-c02e-4699-b007-08de9991c70b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 8ymQvvPmP1aTw1psNbqogMstwcyt6kCxjfnfUeGOxCuWPCZlwyhcO+U6w1uLD9SH3B2+j6jhTtDFFeUmH9Mwn/N9IuN7xz2wTvKRA9kmGT3hoYDozoR5wW9rIp4tgGUP5m+iiHmJutqLQ6N1cXro7BIpQ2Sd57pOcfwiqdHWWAVrcq8EzZis/YQIdrxPPqXp/v9YDJbxlaXbW6ERETVHPaEVr6fD3oZEy4ZlLG1M/FE/YEWRzBCSYArp4x8fmDoWyr9aakyOf7fIcdPEfEVYYMaQWSyL9bQffZZp8vYPzPgFaty0UUR2EcJoy1zGSAtIO7FgvAoXddLuKq/nP+g6pQw/qnBrGgJ/Nh796LdBEb9cdClzbwOaklR3TcPMwBrrKPbHsC28J9m1c5HcLxRrwqvNsCwrnzoTpSJRDCtjHcQDGU5lixG8wbCsGF9ruJRqWNRPmBNQreyR+dG4/lPs5uAhIfIMvsdGLPNYSe4ZLJo7kCtH0t3gpkWX5gFTxpqpbwAv2uzQS9SlLMn+zUe8Z0M0MGKU88us8xWDURPzAXESK2GjzZvFCJXPwGbVrvZG6Kxqyev9KA3jOYrcyL4YzCCWr905n2Yrsnx3srG2SQDYx/oQE9JMlDMIWKrT7XtvEb9bA5c60tcaPEFPSG3yRynE89zST0ZB3bPcUKp0kDibGK3uGPlXEhG/eELp2Xk7qa5GNtwfc3K4cG6qM9NaJi7FY7NHQw+N3q5L3orshDI= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xAF9TigT68TP2dKrf+UsDBtuuz/UHoCG4oZXV7mfnKwoVpDfrFJGNwyDIjsf?= =?us-ascii?Q?OVmdrxe4gudr/qNso6PBurftuPsphg2m7VPqmQrrhf5sxm5zURc2mCEoZNR+?= =?us-ascii?Q?/by8sknTcRq4LSZCzcvkhGdCyehfnjsj/lOoJPmfnpKgUF+/bIxqvA+3FWeH?= =?us-ascii?Q?jtIWgvL8UPIohDyk0KUXYa07uVkTqaqLuQnFD5Dx1c23UAtUUO13F1vMwx88?= =?us-ascii?Q?oOnrTOHGHxE5g7irLCYYFIXPYrZLFpw572pGnKjIvMDPQGhlf67sC2n/QdxM?= =?us-ascii?Q?KmaQdjpixkEDrztH01HjBRJLEtrit7KEUFT5UlYlizlA85w5EFotfb616dEH?= =?us-ascii?Q?ODEpJWgSgfErCvLiGEND7B4x1M1vtdWBbmFjeiAHa1XZarJLF7rLxXUPKYzn?= =?us-ascii?Q?F9wr2WjYnnDYygq6LmmRvcWCpNLYHNHO+MV3V4O+Dhyne0UBRfdiqf9iGNiA?= =?us-ascii?Q?H3uiZBla49fVFPHh1XqjK29OoYyNcqCV8s5cWyaJfO/nyd/SmqBr2iVZcE2A?= =?us-ascii?Q?b8otvgsWhwba/fVrq9wGLGfsbmBSkZVgteUUapC+IK7D9dQBpKcIwOSBhqkX?= =?us-ascii?Q?zkct0mGT1NFgRTXYtgJ5/K/DuXTnCa9S1G2Qv1i4r4fUGIjUxnS23lAN5LAo?= =?us-ascii?Q?A2L1RMPtfP/2X+pUlBcC2G1fHODMVdUTAyIEFVM6esjQzpgnZp4bYQMs6Nua?= =?us-ascii?Q?+mGS3PC3QtMgztY7x1/QkWvDk83nVo2zQqKLegiT9DKUxL0JdfQLcUrgVtYP?= =?us-ascii?Q?TFtIEiarsz97iwcsyg/PIjwE6FBei++JYzQO2FQiTicS395JZ9WOgawVwcrD?= =?us-ascii?Q?wJ3HXytpK76W/mdBEPoLlTo8OVsOxxsKazqT4++UfMMtFMYdd24xXk5ba2Sc?= =?us-ascii?Q?enJ629FeRWIS7c5wt9ES4jcJiGTtWZzI1BSjTuzYNi1jeFK1/mrHafnprBH7?= =?us-ascii?Q?rTJ/syZTdCnJ4klDjbOItzK6Ifj10YYDP9BKixnJ6EohfO6tM+IzUmXzgIJP?= =?us-ascii?Q?cAyjEYMO+1Dc2V3ViC2zh1Za/akYDpmSf/woRkqZf1B4Gw8jQkyWDTLnRfiz?= =?us-ascii?Q?CVDZxOYlteZcBlt6pGMT+QLXLkdmQdzEBOyLfym0KuI+2OTcPtezlvoCiVFK?= =?us-ascii?Q?EcOfUCGSzjyV8d9X/SSrDH88mb6GTYOv/DizzQ101CtmhzNWi6mRJpy8sCrJ?= =?us-ascii?Q?FN+/tDqXcf/uEkRudYX8bcKoVu+atCnn7e+5Og0fckgEgVcYAIOM1EftA1t5?= =?us-ascii?Q?pqOOFD2TVSYKp5UcfswYRyz7tMsLz8OBSMm7QtZOrKWvuCa97+Fc1cyphrxw?= =?us-ascii?Q?v2LhFbw9Ypx7f6NjSXxibkpz2Qrqwue+6/MGpmA8aJIB87EQryCD1NS4s5Vy?= =?us-ascii?Q?SBPivGWCRNmtw4BsRk+36pYQhnIMlrPeuSju5k1NK0N9fiPcmAlHVQoavYFY?= =?us-ascii?Q?z46QHhjCrza2FvZZ4nTrZkZhcWMtViAdifP7HcHLoxvpaqD9WgVCrv5qJc2N?= =?us-ascii?Q?QyIsNXNHsQw4KGQWVx8r92sFx3xZ9knyPMVgNUCmJ2EelVRHRjVBqUikhmd0?= =?us-ascii?Q?jPBE83pKP9fwbQxFBrWDvNt0OZ1nuwisRIfdUMruw2tFVZH0RJTngclVbxR8?= =?us-ascii?Q?zHOdX9ZFEiDR8COkxMgfTQfarpZLZwDEVzD18CN/EWjSmC4J30sn55N/wDWl?= =?us-ascii?Q?BbZs27zk3X7sPcAt/G24f4pRkbksbKVA/Ieoo+E87lNGD3yk?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 286c44fd-c02e-4699-b007-08de9991c70b X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:52.3362 (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: XT2ZEk8vIb3qMbJH5+gfrb2OTgoRCsP7idaF7urjPvQJk0siXgJhREHTMEFFPEsB X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" After READ_ONLY_THP_FOR_FS is removed, FS either supports large folio or not. folio_split() can be used on a FS with large folio support without worrying about getting a THP on a FS without large folio support. When READ_ONLY_THP_FOR_FS was present, a PMD large pagecache folio can appear in a FS without large folio support after khugepaged or madvise(MADV_COLLAPSE) creates it. During truncate_inode_partial_folio(), such a PMD large pagecache folio is split and if the FS does not support large folio, it needs to be split to order-0 ones and could not be split non uniformly to ones with various orders. try_folio_split_to_order() was added to handle this situation by checking folio_check_splittable(..., SPLIT_TYPE_NON_UNIFORM) to detect if the large folio is created due to READ_ONLY_THP_FOR_FS and the FS does not support large folio. Now READ_ONLY_THP_FOR_FS is removed, all large pagecache folios are created with FSes supporting large folio, this function is no longer needed and all large pagecache folios can be split non uniformly. Signed-off-by: Zi Yan --- include/linux/huge_mm.h | 25 ++----------------------- mm/truncate.c | 8 ++++---- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 2949e5acff35..164d6edf1b65 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -389,27 +389,6 @@ static inline int split_huge_page_to_order(struct page= *page, unsigned int new_o return split_huge_page_to_list_to_order(page, NULL, new_order); } =20 -/** - * try_folio_split_to_order() - try to split a @folio at @page to @new_ord= er - * using non uniform split. - * @folio: folio to be split - * @page: split to @new_order at the given page - * @new_order: the target split order - * - * Try to split a @folio at @page using non uniform split to @new_order, if - * non uniform split is not supported, fall back to uniform split. After-s= plit - * folios are put back to LRU list. Use min_order_for_split() to get the l= ower - * bound of @new_order. - * - * Return: 0 - split is successful, otherwise split failed. - */ -static inline int try_folio_split_to_order(struct folio *folio, - struct page *page, unsigned int new_order) -{ - if (folio_check_splittable(folio, new_order, SPLIT_TYPE_NON_UNIFORM)) - return split_huge_page_to_order(&folio->page, new_order); - return folio_split(folio, new_order, page, NULL); -} static inline int split_huge_page(struct page *page) { return split_huge_page_to_list_to_order(page, NULL, 0); @@ -642,8 +621,8 @@ static inline int split_folio_to_list(struct folio *fol= io, struct list_head *lis return -EINVAL; } =20 -static inline int try_folio_split_to_order(struct folio *folio, - struct page *page, unsigned int new_order) +static inline int folio_split(struct folio *folio, unsigned int new_order, + struct page *page, struct list_head *list) { VM_WARN_ON_ONCE_FOLIO(1, folio); return -EINVAL; diff --git a/mm/truncate.c b/mm/truncate.c index 2931d66c16d0..6973b05ec4b8 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -177,7 +177,7 @@ int truncate_inode_folio(struct address_space *mapping,= struct folio *folio) return 0; } =20 -static int try_folio_split_or_unmap(struct folio *folio, struct page *spli= t_at, +static int folio_split_or_unmap(struct folio *folio, struct page *split_at, unsigned long min_order) { enum ttu_flags ttu_flags =3D @@ -186,7 +186,7 @@ static int try_folio_split_or_unmap(struct folio *folio= , struct page *split_at, TTU_IGNORE_MLOCK; int ret; =20 - ret =3D try_folio_split_to_order(folio, split_at, min_order); + ret =3D folio_split(folio, min_order, split_at, NULL); =20 /* * If the split fails, unmap the folio, so it will be refaulted @@ -252,7 +252,7 @@ bool truncate_inode_partial_folio(struct folio *folio, = loff_t start, loff_t end) =20 min_order =3D mapping_min_folio_order(folio->mapping); split_at =3D folio_page(folio, PAGE_ALIGN_DOWN(offset) / PAGE_SIZE); - if (!try_folio_split_or_unmap(folio, split_at, min_order)) { + if (!folio_split_or_unmap(folio, split_at, min_order)) { /* * try to split at offset + length to make sure folios within * the range can be dropped, especially to avoid memory waste @@ -279,7 +279,7 @@ bool truncate_inode_partial_folio(struct folio *folio, = loff_t start, loff_t end) /* make sure folio2 is large and does not change its mapping */ if (folio_test_large(folio2) && folio2->mapping =3D=3D folio->mapping) - try_folio_split_or_unmap(folio2, split_at2, min_order); + folio_split_or_unmap(folio2, split_at2, min_order); =20 folio_unlock(folio2); out: --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012028.outbound.protection.outlook.com [52.101.53.28]) (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 EEE873E3D86; Mon, 13 Apr 2026 19:21:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108074; cv=fail; b=QuZ17xOZR0+s3SRiomSdCmJhhAAgpEvZjPXJ/Ii2FXOp0cegh8zkUxWxCKKlOWiTalA2j8lqACiafGYN9GaxcYMxXyBapVeT/jMKwVneg4S4MYVbhescZI5N8NNKIVKzW4j5WAkuFKY8EluZV2Utm5c8r9kSfeuOnYbpBOvsGD4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108074; c=relaxed/simple; bh=xJ1bVa54/gfYSfMzfc0wJvPJXNZTUflGAaNh6wIbHyk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=SBTMtBKvZ/0RKt4wFjtmsdVztcPLk9lptSmpOdGb/vVG23YvsAur7H5RncvoZ2AcMyk9IbuWC9fx23iryho7tTcaRPeHNkNQJ+mFLpQQ3SVLJuNWQ1GifrNRxY8ngxu5OY0cT8iy2bxmAZeXFmrWoATzVCyry5etnAuffFYbifE= 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=JMe3bKFz; arc=fail smtp.client-ip=52.101.53.28 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="JMe3bKFz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=To56EoEcLb3U+MWtWRUv2h06gLBeTArjINobbYIQW+sKzs95q68D4UGeEMbdsPp/LpXkVb/nJop+knnqgw6Ie2lVa+lmUmsvOD4z4dxggYbAyVf+g/oJTDOKSH+gecOBurvz/cD5CSjpQGCmJr2gUVsvlIwX2LIC9U8M3jvy+Ga3gthzYUoOUaKCmmRXBiANZ8J7Q6FgvTbjnAN/zs9B63B3+Wy+7s4VM1Xmu3wV7Lv1KWPx/PJkIKBT7cFKhP0UOXpehjBUJIXsLM/FbdlU45Up3HamuaLaC8P6YBBx7VTqgQQVWv9/z5PgeJk+yj7ZZeWxjqCVwuSCE/kEvi97PA== 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=0+HC3XRSMhUBoGzAwri26E5aQw8VzOyP1Ks5RR/GuQ4=; b=RCzOBro6JlPdhMimCV6wHKpH8VKAeKpqmVVm0pzJgU8uTOeeIMPreJVAvT+umjcol8pxII/0EJIusO0lmZYTFtkBcFRtfBsxnWQUEl0MH8WPnsHm0Z524SvHQD4LVGv5o5cfQ1fRaAGpNpOjv8BqDXTNPTlc8lnI+QZRRdj/ZTuy+BGDj3K/N5EIYD0GyL91GExTqXaqSwwFW2NKn5GGOjab5jzFFRW1ewFmK2XuOPTxc8Slymr4yTQkF8YYcHQ+fZBR0mE6f4Xle4gdnz2EejAJT3b+paScczJMc7WnGGgCVusH3ydfw7JOXJ2U1NAEaB41Hv8aOHs08bPS41AGqQ== 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=0+HC3XRSMhUBoGzAwri26E5aQw8VzOyP1Ks5RR/GuQ4=; b=JMe3bKFznQgqcvomhBCTFAtG42bvP1VJ5FXCdzOKdqq9m3m+0dXEgXV8fn0cU+BktGL/DoGwnUUcPWlD3pIjo9MErAetT13jkgTX+IGxh8KCaKr/ZFjLS0cFcJ9taVx1UAA7NAh0CE7sqdwk6dIKP1dygDgO902pjQmFTlCDYc57BNYXKsoovJR+lIbG1OzmtnmW1tndw8OOimSoiRLi5kZTkncoxOXH0JuJ25cp+8anFDCeWa4OrPDCv1o/ITH5b0FRUAnASc4WqnE1BS+Cnub//MqqUDcR1/q9j9UXIKd36PwaBOlCun3vMm5Io82ZkLFnpYxmmz99zDIlEuUJrQ== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:53 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:53 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 10/12] fs/btrfs: remove a comment referring to READ_ONLY_THP_FOR_FS Date: Mon, 13 Apr 2026 15:20:28 -0400 Message-ID: <20260413192030.3275825-11-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0138.namprd13.prod.outlook.com (2603:10b6:208:2bb::23) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 21909d1c-b390-4951-d854-08de9991c7ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: pCqHdW/Ov0gPjrV5vth0q1i6OcPqggNFlgTvOHo40GHm0PtHqodKiQ+CjY/+HHMyQf1kBc8fMgpqOcH9NeIkbveSqXhfX1wtfdPdmXZ+YDul/enalDHxKrPLFS2RECe0Mj7825YaYgDB/v/HL7FhNQnkgW7ZA5uyFQVJAsj/294K8psttWsYFDGYAjDi+sx6+AnzF1nFvJoTg+VW7YzXzdbWl+4bso5RgQlZ7Xfr09RKSUvFwDrwOG0cnyQxYTfqeLnB/NSyxFj/CFAItkOfsMYWKunphdMzC2n6f8fHGynEvad7ni6cQuljzAtNWb6ynOE3DLORY3FpVZ2kIZHQ5XOJ+Ct8rbvWWbQKoVEBSRKLVC95m8b7CYpKYSC3tOBPxfBjTTaX62Xed5f4icfEtZnm5tcUXMFPH96SXphTKRhbsVJaIDTCZknwhyMqIir4Y3QCcnF3DYWbpppp2Vt1cCvNT9jDwRPrddTpkDa9GhgDAzgmpJJO636YbCUDTB480LCaQwrU2+3qorZKsZbUGWJ2+qJ9YQreth6VC7HFNAJ4cltSdoEG/TeFxbGtoJsOdXgXbWGlhJ7U59gRufC4X3LSZhNP7TVl+XBkGN6cyMu7NxHgtmH0MwEn4YW7uW2KTW55febkNA0fH++PZ79MR1O+rsgNf2ejRRrC1UguID4j722L0L8/ZMhZhJDy8WWOODSaDqIQpUSN9rz6rqPTp7DD+HjnV/VKPK1+XNf5D4E= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zq0n7IuzyxPr6pbtMlG8li1OJSsoI7L+/5tsmBRYdizZA9Yg0nMHbFkFl0U5?= =?us-ascii?Q?op/EfEoSW0tC/+MCIRgcR49B8vt/cyP2MzMD6e3iIGU6bZNl+RMf0BDfY/fJ?= =?us-ascii?Q?VNm0d1E9qEjUvr70vaziY49A75J0L9BOa2ui13Uinrj6CufsJ4B+iCaYNqTg?= =?us-ascii?Q?judrlGolToRZ52eGWQtxQ9n3igbdhQJR7ZNVh9Q6uy1pNuadKNqgHiNNwIJn?= =?us-ascii?Q?x5dLlyRlSElOsWPaUnKNzZbp8GAFS5NkePSPgMu4g+qI9aGVpPuBU4ppl+WL?= =?us-ascii?Q?9/tQ9IQSEmw4kvgTcS73ST+oaxw05UmiNICdmY80wUH0VtrNajEhgpf4rNY6?= =?us-ascii?Q?n/1ngPE27ZBMq+H3UGD6ODOO/yR4Eo/+BmuQAuBaSSdUNbgmqbPgDTtaavSm?= =?us-ascii?Q?XUyJoEEUZTYJf3RKMnSoPq+EdHg6EQVDy3zUYrbS2vin2c8YK5EXumgOEZtX?= =?us-ascii?Q?GoIWmXAdsuVfzGxcKy5V5TTznySMuVbAETUfnga7KBGMEKK0XJI/HXOhoPsM?= =?us-ascii?Q?HZKUMy1Z+EJg9PcAp7QFGNuhFIiYLcgs/U2M5DraZ4t5MClGedkoVufqQs1r?= =?us-ascii?Q?mFIx1QgE05/5lyRCraHIsx68szISpaakBgqYDrhRghF6Q7561H4MycraOWG3?= =?us-ascii?Q?qtTrXdpiwLCcsX3kz5s2ORvxoLkAnUvKlrRbydT/HawSI+9WlJT+kP4oe5+z?= =?us-ascii?Q?PHqFAuTOJ6o92RT8X5e92UU0R608SeetvPydtAlpUC98N5UqXjf2h0MqdCd2?= =?us-ascii?Q?JR0CrmbswpeRRdcoYmRPoBIW5JwSfs53YQpvJh9BA4iLCXVt8ge4INzwObmF?= =?us-ascii?Q?uAvMtMiG+lakpOfPB/jR1NYpK2Td6P5ykKDybBJtCUys42+7yj3FiZm6cNgf?= =?us-ascii?Q?0kIT5iFhkw62vwHqhvFM/5EX9Ezw+qsuNF4cKb2oOjPsNUpIfIlywLkoWJXe?= =?us-ascii?Q?eFNlATX20Af9UFU1W6K7uqsTz/ccA5Ucrxs5yhpTLHlLoJTx9X4aDBTis0SZ?= =?us-ascii?Q?aBJxv70SJuWGtayCmqrQ1EuDMYKAJb+/bWbwgiC3MXmi7BvvdHdXGRP1V5Bo?= =?us-ascii?Q?f9jjuzhdKbpF4fDoFvy3f1GT85Jgj0rmyDHUjJgkM21IjkXQSXXtcRZM3Uy5?= =?us-ascii?Q?QdLSSPzVzx+JLXrYcSFRK1cJveQ1Owga3l5Wz2IQtShyUDZotjUvhhe+HTj2?= =?us-ascii?Q?cjw2HeSZIecHIq6eBxoECwKmw7xLZplFxqR5jIvL4M3KSYLhHSlgv2q0FPGB?= =?us-ascii?Q?F8R6CXFncqbabVYLH7r9s506a5z5d24CRHfGy0SjZwBjyVooqwtTIA9TaVDU?= =?us-ascii?Q?g/w2etgzdvFA9CMjNerzgMp+aYhpKOscEHmXUOdh7YW7sgfyijY2c2HmT5gK?= =?us-ascii?Q?FtdV7+jf+ATEZCLU3VAtkcpWllVgIfmQe6WhFaakyJ2K5s05AvMJhennIn1U?= =?us-ascii?Q?7+kTzhTiwKcTiE3sFIW8lwgHc913OpEyGgP5KynQ7VmQCXFi2Agyxn8tP1FC?= =?us-ascii?Q?e7YoA9IgAKMb0GKUN/MDzAMKes/xuSF39n744KBXujy/Tqtphpw7718AyrU6?= =?us-ascii?Q?yeQoWzlSDEBTQY9AMPrVUgUVCuZsVbxJr6wiVNPpl5CvkHcYne7vSt87b0C/?= =?us-ascii?Q?h3wp3sgEM5MjmaBRk8HTblw6vnJ4W9sxPD4AiZLAAqIRBM5ofExZntA7n4q8?= =?us-ascii?Q?n0DDXrjmV2QRveuS1lBBeAHIM67/2Y6rN6YF0PyySBfIBWf/?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21909d1c-b390-4951-d854-08de9991c7ed X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:53.8147 (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: G8DgKc4MLtLKad/NSMBY6vPg1IENw5XS4R5OVCkdtZO2yyCn15uSKQEw1GAWizS1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" READ_ONLY_THP_FOR_FS is no longer present, remove related comment. Signed-off-by: Zi Yan Acked-by: David Sterba Reviewed-by: David Hildenbrand (Arm) --- fs/btrfs/defrag.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/btrfs/defrag.c b/fs/btrfs/defrag.c index 7e2db5d3a4d4..a8d49d9ca981 100644 --- a/fs/btrfs/defrag.c +++ b/fs/btrfs/defrag.c @@ -860,9 +860,6 @@ static struct folio *defrag_prepare_one_folio(struct bt= rfs_inode *inode, pgoff_t return folio; =20 /* - * Since we can defragment files opened read-only, we can encounter - * transparent huge pages here (see CONFIG_READ_ONLY_THP_FOR_FS). - * * The IO for such large folios is not fully tested, thus return * an error to reject such folios unless it's an experimental build. * --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012028.outbound.protection.outlook.com [52.101.53.28]) (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 8F42937C92B; Mon, 13 Apr 2026 19:21:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108076; cv=fail; b=sEeuHe+yUsissO6WN8aAJIL0Z/ea+Ra7XcnXk13GV6jdhxyXIx395u7mQ4UkVgOh5FveSB96qCfwhoGiPaTlpZAVZxXFi+gfFmfs1EUYx4uypARBu8AD+MCzqrZQNNTahWQQeVVyRV7gF2ZOAAvCa1q1ojqq6MoyumS3S1Vtysk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108076; c=relaxed/simple; bh=kl+nhqAgppA1Mp/gMWSttAhKOmjMPtelEgmQnKlvprQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=BScsusXeof3h2Y0Jg99l9bKcWOUhh0i2SO/95Ru+N5kb0fy91NDxvkWXoLRIJSwJeGfNUHuXDOE1NfCOgX9ql1rFImZqEFvW4GaU5ePD6edEwBCEJy0deAl7z7u3FaaMzz0SMyI9le2DvvPCcJKCc4M4etdQopsEUpg1uMFAnXQ= 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=Sm8dKinC; arc=fail smtp.client-ip=52.101.53.28 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="Sm8dKinC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XmmwKCVbf/eqCyx85R6zhWS8BcPicKA0TdM1lwYll3MQreRIV8s925tbuUgyCp0ePUj1wz9wh/0l2jstCn23Ddlj/4QmCfJx7LaGWiUM68nFxwI6vtaz22nl0/4Ix3OvdS0hM5O/IqwQDDuI+w6KMs8813mV85YBeFYRCv0/gEueze76+wZKT67T5TgbFKfGOcT+wBvvKTyCbLaVTVIeSzBbUcM1jxuyrPa01KJcESQ+Zgjxa6ep7P2j4L3PK2tMtFxPRizTz3pNx7HzqVIcJst6Vj/K93UG/43ZlV/QOuk4+4MlrST01reMOenYqSMS97FxbekMgR60SQgKkC4p5w== 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=4pPDdKDPyAnyBEpPwSyNQ9WAtdgTQNUESex29jy0624=; b=dJu8rUK1Bqy5I8vGx+4onBD5CTQo4B/2wKFyDO4XWG5kTh0fa5eQ74V0JlhKkKQ5EonX8yRoJLiNFpMtYPqDo/rgCUpvCo8ITl9oSWtsdgepapDEtk/aQW7gg4H9go7F9bMgZ1+z+blTVwAImPx5RfIX3uRaxOyDamvfQOubEu+17Ezf+fyJ0oKo5XBzSiw3EGbbm4pTI1k3NehQiQw8IbePJsLyAlufTqmR1HVeAnelisA8Uhd/iyKSWvf48q3ox9N/NCx+ZsKBvkzDqOZpq1nlxSYQWWqogzRVa6gBp9keHw9yLQW2HtmRs4u2ti61chtutVInqEkat7XqdyfRkg== 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=4pPDdKDPyAnyBEpPwSyNQ9WAtdgTQNUESex29jy0624=; b=Sm8dKinCXTEqnk1bS0CpcWQTBARnLna+zo14A1BP4VptL/z4Gw71G93V5uM7VK8FbNYYRgTPAp67Zk5IXRph+wQRK3m4folu+eUuppnWTB8lqg2Ie+VUAvh8L5oshtYXQ2o2XQgtFhjQHwe8XkLy5j0SydGb2Em6SjKcfTrKJJJ3oxYa0ubBIyc2eb0pv6agwhmc6Jojelwj2qj5aPUvsXHFwXgRW9O0ibox+edESsdpDkH6ip71PHIFS316wrUSk9bsY2QybRofs612mc6AKkNS0rGB5OsAt2/wg1BxJLMkQ+1A4YY56UOR+W/FbWTvXqV6bkpxbf9nP6SVoj+nkA== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:55 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:55 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 11/12] selftests/mm: remove READ_ONLY_THP_FOR_FS in khugepaged Date: Mon, 13 Apr 2026 15:20:29 -0400 Message-ID: <20260413192030.3275825-12-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0294.namprd13.prod.outlook.com (2603:10b6:208:2bc::29) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: afbe1368-359a-413f-acc6-08de9991c8c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003|20052099010; X-Microsoft-Antispam-Message-Info: 46vxjgrlBFZ2ylFmQ6x5dgvRSfx18KU3gYv2z3xrKGD4/M5sVyiytlW/6Ftc0GL/KuBLgVMnGCz4Xkl01+KGNJNkGKsq8847mm8e5oqVJJS1ggsFBIO+1YmWIILKMTQ0WBn1QCPyHHRH+Q8fDbXUWjPVmH7fjbBdgSbo73EQQcwwJp1JHsQTMvW6KXAJ4zwYLV+v0/eCuE7eJOmrhKmgrx6clCIHohJRtcKDWyKVgmkYFGZwAnHdcnWlw+d577qh7oGRZEe9LX11BspGvnPKxTHZCg7gphRQvuM0kuHuy4jEqABTVQcs2SeNqXRS6LhRwtToWvUgsjWFCvi4YSj2hHPyNj0k131UojtOG4gxmLcboT655vVwjWXkLdXJDiLyei8vf0kE4FC6rmUsl5TWeFYfsRGsDDq/qbTZWGZPdzreVy9leH44OnZ7tz2XDkGvVZGtxp62tfePUgEL6Dl+/tYmbuSsqJDzjP4K0nTrLkz/EcAdKS/EZ3OoHUjyDSqeEewVwegmGEMVSwwLWa6fB8NrY4F3rH39ZkGIzT+7KzGbp6I4gUj0qc9uOYdpy9NBI0nNCkJEzPV1Zt6n8Bzo3DfrfHWU6+0z3heAUZxo1kN+sB91uPsK0nEXhk25p2QaaPBl9Bl5hhSFKa7fQX/ddrM4LcxFBB4BOUd7PsLFhywi7dtM8Qs/Z+fjq9mM++GnVUR7GmXhrptWB6FtE0L5TZSmQrZkDUXpQP2iSZ/Ep+A= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003)(20052099010);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PRuqDMnll0vZ8s7uEOG05DjVYdQ75Bq1h069S17yC4nB2VsZh9BkNUZ8iR0X?= =?us-ascii?Q?zniRfT8vbSM8adWFeB3FLgvFHGiCZsw8suNTxW5ehvojABYu287TEViGkBgl?= =?us-ascii?Q?WTNW3Z7TBGcNsIZ7D01v23jk1bN5WXny8A76tjhAxXSebSPtIE0Y21vt1DuI?= =?us-ascii?Q?uiehOhhOhvQqv/rjs/OEo411S36DqHzADpa6jS05wVFzYkOoTbI8acJFzBld?= =?us-ascii?Q?NPD2yaUthjilXFK9YuecrKkd9PB5UlZjuSTkwmgQ+VDv1cIN/BulfrUGVFe4?= =?us-ascii?Q?YUs8luwuANEV9Bj2r+r5pznXNqut8ZANYGY701joRK1mmMrm+5mVRb6/PFH6?= =?us-ascii?Q?Ken4ltDvXVZRt3LQ9h1POKk3y0FMl83/97Y6U26J7m4mPa14CYw3Ot2ceiji?= =?us-ascii?Q?XUC0iCi6581bzwsDrDaVvTBUnHQWRxhTQJ6Hcud26Ma49+lrFaPzP9PZRpaS?= =?us-ascii?Q?z9puk7Nel2uqxfeAA3Y4H/qkQMjOnjTbAMhBhyXRumDrPpT520JgEXWXuZeo?= =?us-ascii?Q?+hDiN5GLN9+nois0q6H6QJHSkvjr17iWgu6cW2PNUJHh/58NWhPCBINHMd1v?= =?us-ascii?Q?6Pu9OFP9aDPGkDD11H49yGn4c6zIBH8SEOd5KleVLsVlSmhBEtPOABQGGQyK?= =?us-ascii?Q?wSFy7wB1JSHesS/TkGFS1quH+NU7eOUFTWxykTc+FHnvhDcP3NSXlHv3/mDi?= =?us-ascii?Q?lVMtjt56Ul4/1kAanx4eqD8uxJ7HyJqwVkFZuQfaB70NYHx5tSkFsZ7GJXoJ?= =?us-ascii?Q?jEQOFEKOV9L451nJG52syoH1j/CUH4H+Q3ZLvtBzoRs97m/z2u3AwoejDVUC?= =?us-ascii?Q?b0LkO0WD0F/mif7DruHh72rTTVNZ/kpvuswF/Ux3ZAH8koobCr10KNacjwKH?= =?us-ascii?Q?aWFmsbggYDJHDjge0mu3nT8fabrra9s4YQJpTwD/f0Dxd9NlwbzrDBkf+sc7?= =?us-ascii?Q?D78qyh0a/dQAvbFKnLrIw84sQrQSZThk6jjGKzGuP/ydegZh3/ZJA3IZTUC/?= =?us-ascii?Q?BH6IWCIhTqrCTVtvchNw7G2+a8e8Gu5A7Ox9PhJYY7uPeWS7zGcRZcGWNmf9?= =?us-ascii?Q?GOEiPBQBaPLJ5fOIoI21sNIHAzcMDoO52TcFIOIaAzsPFJrE69c6U+SDILIt?= =?us-ascii?Q?cm7a7nZnNMijK6VMFTlnQrE4dEfN1TpwU2Abojema8ZVUslHQMiQnzEQprlV?= =?us-ascii?Q?JLXdz3fUMcABYsipb0CsfjU2KLbebcZAqX8zqsKVgZ2Njb+3L+tnq9m4Fhk4?= =?us-ascii?Q?5T9QpNrgthZ3KpIQN/5K7AQFX1vdqNed+12hXHq0OyKy6L3pT0s2C2Scrk/4?= =?us-ascii?Q?+paCnURisOe0JbFICc+qALAl/lq7I8tksiq2WoQdUKz5waSyx7sxJ1s7HUGo?= =?us-ascii?Q?zo0il0pDfUqiPQgsEIPE/uEsiTsaalgqRR+T9wY2g7B9YdFk5VOZ3s7cv61Y?= =?us-ascii?Q?YdXtmUrhOTy2+HIOGCy64IR1MW1rh3MvBKzszx5a+cQrgIRaFYrx/8eVKZmn?= =?us-ascii?Q?ZgwojjLXXPj2nWqxGyHf3QEiTykoCsI5AhOXBIYBqlymnldI9zb8InFj5EsD?= =?us-ascii?Q?yJeU88F9q84cznO6/naRzB2Pt057PXKw8KyDaFxzNoasKMNTywXhY67CkXc4?= =?us-ascii?Q?45DOYfTPK58c0OAgaSvH95Coc7CsXVQgv1INZtce4p9OmidKVsdUHFpcKBtz?= =?us-ascii?Q?KCDxUVEXlYUAHzepyKaahSO4HGBoe4abrG5RbWcTh6z9eSKf?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: afbe1368-359a-413f-acc6-08de9991c8c1 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:55.1812 (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: 9NjVIBapyPe9fbMyTiJ36pNKcy+48W4kMjXYKYoQvYGBa6bmVdqK3PB+pLEof5Il X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" Change the requirement to a file system with large folio support and the supported order needs to include PMD_ORDER. Signed-off-by: Zi Yan Reviewed-by: David Hildenbrand (Arm) --- tools/testing/selftests/mm/khugepaged.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selfte= sts/mm/khugepaged.c index 3fe7ef04ac62..bdcdd31beb1e 100644 --- a/tools/testing/selftests/mm/khugepaged.c +++ b/tools/testing/selftests/mm/khugepaged.c @@ -1086,8 +1086,8 @@ static void usage(void) fprintf(stderr, "\t\t: [all|khugepaged|madvise]\n"); fprintf(stderr, "\t\t: [all|anon|file|shmem]\n"); fprintf(stderr, "\n\t\"file,all\" mem_type requires [dir] argument\n"); - fprintf(stderr, "\n\t\"file,all\" mem_type requires kernel built with\n"); - fprintf(stderr, "\tCONFIG_READ_ONLY_THP_FOR_FS=3Dy\n"); + fprintf(stderr, "\n\t\"file,all\" mem_type requires a file system\n"); + fprintf(stderr, "\twith large folio support (order >=3D PMD order)\n"); fprintf(stderr, "\n\tif [dir] is a (sub)directory of a tmpfs mount, tmpfs= must be\n"); fprintf(stderr, "\tmounted with huge=3Dadvise option for khugepaged tests= to work\n"); fprintf(stderr, "\n\tSupported Options:\n"); --=20 2.43.0 From nobody Mon Jun 15 20:33:01 2026 Received: from CO1PR03CU002.outbound.protection.outlook.com (mail-westus2azon11010012.outbound.protection.outlook.com [52.101.46.12]) (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 6663B3E4C7F; Mon, 13 Apr 2026 19:21:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.46.12 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108077; cv=fail; b=CU7KEVjLIOWSo4HDFJ+Fyfg2s+lYXG+tp8AUkzIM06jlFI84cExPFK5uu0yawLiicByZ9Nn0PykpCG6eoI1/qcL28F2fDoktkHSjNufAd8zHdAy3z81a98EUVLJT2HiqPui7/Q62QBVylN0U0b3etAQFzfZW2eawYIfxUnjuxdU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776108077; c=relaxed/simple; bh=lSPfCbD2yvDjg0xeuJm643jvV0dHdThI8TgrcSoET94=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=LUc5HrQ03Bjmdj426PWluWH3RJ7LeYe7XXFcYtYW5Dc0IJl8xg589u3IQJmfipnn7R3xXQBPHnhf3P39NrTxi2xv28y0Ulg2AXt8E0cDN69I9y3f8atPgNy0JYCLExQ/SUgeDCnWZNA0y2YNJtp29ZQTWpKEyFIOme5JgdSDu+s= 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=jqPCqaGN; arc=fail smtp.client-ip=52.101.46.12 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="jqPCqaGN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kqXeHDOpVXCTk6vHNVdWzcMOEHmnzKvGvIvTKPs4RAVFW2UCb/B8ACx4tOfqzc1OEMgAMTVRPgqVB2wRSbjGJBh789/3xxWEIV26JWT1pkZjJg1f3ubMHB8LyKPjD463T3vRspKqSjORFaJUzUrHF7haP32GuyJe6X2bRjCKt0Pn/QOq8EWfwy9GqozTC6p/W/tGBmZwrzjCzOcVUKwkER8G+6rwalqjGBp3wYP7TDTRHrbt9GYuLpO4ClMBAo1t5pJmNEvKyw4pqcv2FHUsuUfNZ8+4UfolnPeMv0eei7r1L76wuNuBpIdmzus5K9bFynC7jcodzpM33ZRGulFI1A== 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=BoBCnPTeqfrm1QRjZz+gi0AjIAZR252PiL2hmCWGEaY=; b=oVsL5l0PmwormmoM877WeMY/BYaZi5uPteMKYxYqBdss8vAxU0ZQn+1J0UeigPOyCMBwkvIr9AARf5PHvkAwtWMfB3Nbrexx9ehJJxvb1y1Q7BzsUCPbbdoqniLAQaMaUrMrrq7of+xoy3FDmvTHt7gM/t+w76CppgaD89+Gh/j+sOlVhxjfgRPpOS0iN1N8dmu9pigL5CFQNZjQCwKP5e8fWYlauIQwqNixL5Cf5kjwgNXZuT9PO6ah+/n9WkfreLCqeCjxG4tp+dWzEavgaW1LSchA1MO9z1ktr6CuPq6Ocy7WLWQXEz5keTW07hXW8z+IhdikmXdtOZwczC0Dxg== 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=BoBCnPTeqfrm1QRjZz+gi0AjIAZR252PiL2hmCWGEaY=; b=jqPCqaGN8j2rL+NVGPNsWL+SQDZiwK5P1pXUptn0gKCkASwzLigD8M/Llh882rw9oXfJPO28oUHh1k+l8w+6VzdKRWoXwPuKaTXMZMIv+r6El5vebAykXwdL3XWu/siD5lwJrkNLFTD2AUBzaXfupSw46LPLH2xLZFp9fieFcfq+eFNA8/6HGj8laRHBoBT3WoSxulDh5JaKVH7PRWfAUr+7nkXvl2pPRgQXiivLiabc0CrKhNnd1Xs62nuIjjF1l0htxE/sI5+3oYCelZZxHlptqkKh85M375k4b+l3gMNONogwATkc6cui/RHQJ4Nk+TzeBOIPJtV/TmTvICf51g== 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 DS0PR12MB8444.namprd12.prod.outlook.com (2603:10b6:8:128::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9818.20; Mon, 13 Apr 2026 19:20:56 +0000 Received: from DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2]) by DS7PR12MB9473.namprd12.prod.outlook.com ([fe80::f01d:73d2:2dda:c7b2%4]) with mapi id 15.20.9769.046; Mon, 13 Apr 2026 19:20:56 +0000 From: Zi Yan To: "Matthew Wilcox (Oracle)" , Song Liu Cc: Chris Mason , David Sterba , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Zi Yan , Baolin Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Shuah Khan , linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7.2 v2 12/12] selftests/mm: remove READ_ONLY_THP_FOR_FS from comments in guard-regions Date: Mon, 13 Apr 2026 15:20:30 -0400 Message-ID: <20260413192030.3275825-13-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260413192030.3275825-1-ziy@nvidia.com> References: <20260413192030.3275825-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL1PR13CA0291.namprd13.prod.outlook.com (2603:10b6:208:2bc::26) 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_|DS0PR12MB8444:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e95e092-29a8-4c2b-35ab-08de9991c989 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: Zscl4/LgEGzPrCZJSbRaWK2vHOPlV5WBNISOc1NOmKOfS+8EEdUAkOcZgvnY8yCxzlYf8IH8URUFixBzyGQMNUn0KtGqJwfw+k4jHdQqQUd1nsBtgWB8SwhtVRMyURTvEs49IObnHLl6I8vCtGSbf6bV1L0f6QG4XQdNpN/H6J1XKWkw+nHvtc8R6Z4m88yQr+FU0x83LV4oLOigFBxSvg8SvPJAqxjyyuK0XtrCFTrHow+O9+UluVWCoKto3bDLHxBrqxSK4t9nfxygvm+lxKsTe5rfNFfIsllGZvLEk4lyQLO+DLFfrVWVX+DVLICDLrPZK0Bi1oDuURb5FN2fjqnyFhCmHU3s1mmnOiknL9fL1JLSP9Mky3InIK6ZmVN2hJSkbl/XkWx613ima9sn7mB/CX6D+sAuNm0JSd+jtiuiZWlcFlrurK96VM1gs7kUNkeWMAuZY4+j/A/9FuFympvcxrphuByGonQn4THkB+yI3RWzJtUFDGvuiCYbi4xa7XhZ8WUfAiZwQ6ZTBrl55K9HDDU2rUJy8jA/yi3OagE0Mow3RSc3nlfCeHXFlCOu+TjjLqrgsxXO90D8Oh5F6OkGyNYusEKbaz4R/beKlulnCuzfNISzWDgOqoTXOOWB4KLDXORrkMcJImOGBH0olSUGwRRlA18woG6piwE6mhesRL27x2PvcQ9jN88DCEAPrAPqRhqP+p+OPvfIeyTSJje9JV+wogVJ69i29r1BCjw= 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)(1800799024)(366016)(7416014)(376014)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g8qvfWn1QpNvII8JjI3UtZGPWwYKhrAFlMqV+uEhwKX1rWgqpv0paf9WFiIt?= =?us-ascii?Q?pKA6zd0WaDoVLuetp5f1OXd7dOtCa7AqsCAVdCxPvpNg46CNj+xW9VfcjADv?= =?us-ascii?Q?FaS5FQVwWCrO8Qf5FMpfC9a3bbFqDWC4MSNzF0g2v5FnMuNl9xscx/8m+pjb?= =?us-ascii?Q?uNkk24AD152310eZuyUOju6HSJP8lPAp0PUgaTHJVq7e+KudKQCjjMriCrwm?= =?us-ascii?Q?/9b85NjOlubq0yD4EikXKEkgYoMlVQJV2vwR929L6nIbOnKjtJFGL9Mnz6b8?= =?us-ascii?Q?boq0ikZ/yMLwdi+KIbNFRxcBtUpLoalhHh4WYI9crEJyWK0wgjRM/j16bbln?= =?us-ascii?Q?0XLpKtyYmG/uKIrDkH25LljJN2dwlpWHtGb+dlE5BDrR9cZcn2duE8HZPeEz?= =?us-ascii?Q?f4xk8lVRhBIzXC6y3tdMO80Ene54WOjfJ/akwLfgnPdvIJibBP7aP/jxOHmj?= =?us-ascii?Q?kar+UP6E8jVKK79QKYOuXZTIOD8V4fGXWa9I14cKIFBLTBD8fghRfUuxc1tc?= =?us-ascii?Q?si6G+3j7e/cuToukcqJTcwQ68hqBlv6iUwvk4OdawvUEtnEl3Wow3VM2dzXy?= =?us-ascii?Q?TdNpht69nBYiUm7DGqszFFbjGAZF0IyV+Ja5KfhMrMBUnsJAFyfa2OpS7hdK?= =?us-ascii?Q?aPdhDoJBczV6OtGRzjoJ5/EgTM7T9iaOCCFMZo1Me5BDGe7tjEeppGYQ2f87?= =?us-ascii?Q?Ag5r1AzBkE0dvHl7RbE6WR/kSzEs60uOWZ8a6pDRKyNoF/kxFo2uadPFr9Ya?= =?us-ascii?Q?Wkk4ox0klqck3/eFpNcW9U1YlR0Rop8sHg+2h3zliUekDZqJoDb5hIv3OG/s?= =?us-ascii?Q?RIgLhOB7aPfLePEnZoK0txNGwO9I/vRP/R/wxkA8vMc2f1zyjfRAdE1TqHld?= =?us-ascii?Q?hoMv+T1n/cExE7VQMLKiPPXDqwalCytVWeLFmZ2qMDn8e79oKxNomtt9HToi?= =?us-ascii?Q?2/pYMZrEtZMdG94mwVzuTyfhm+DmhB4oEgM2E7GU35KxKt/Q3dPHoHbQvKYA?= =?us-ascii?Q?aKC7S6wwGXNCp+iNiPUHiHFwfJs1qp1uq5kWY4G5df7LkQG3To0wFTIJ27Pn?= =?us-ascii?Q?9Cv3nj2yhn+gIqfJFnUiN9llDiAtodawfyE0yen5YRjE2QNC6HeE8q2jmufU?= =?us-ascii?Q?8bw9QPtFxlF1Z+P9pc90nAeyUG9pYBAEoCmB3zBNCbxqcnQ9x9urjxVgBsAu?= =?us-ascii?Q?Urr+rSzyi9c0rDn45i2Ntyx+beu7UTtQQTSmafL6iCJBmE/2APwojrr0PhY7?= =?us-ascii?Q?AYVD5Y5ZB5B1Gpw8LTqjFk76GfopTEPlUSs8e3yHcF9OQJLhZ05Tb6NHENiK?= =?us-ascii?Q?yQSQQrhPT/KUgF8AYK1PNpwDdm6X8Nko4NTBFhorX4AV7nGoHuWrlt1MYvVC?= =?us-ascii?Q?z5VQDn+twQy+x54Nm32OwHtHtpD1e5Q4JdW0Oy1ob6wEXU3Nia6cPRtzTGgr?= =?us-ascii?Q?cC0yvwqXad//dia5uDTVFLzs38idhYMMthLQtCR50nO1NWkYTF/KLgFXLbZn?= =?us-ascii?Q?H4GwJm4NVf/qITN78INTYtJ3HD/7LMR+Qr4aeEigQp93ru+/ztcMpZ3YXOjT?= =?us-ascii?Q?Tvjdrc7cYbm4C0hxCPDreFir23+yyRnYzJkHEBOaEr+QGsFmTPpnTJZjtR4G?= =?us-ascii?Q?f6CAzZVgl57bmE3QcXiMcs6T+gawf2tN4QhKYeoygH+9F8mnzXk6rDFUqN0D?= =?us-ascii?Q?0m9sQDxYv9VfOrgsPZ6n07sNZuOzCpXONUhpC1j68k3xOzqN?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e95e092-29a8-4c2b-35ab-08de9991c989 X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2026 19:20:56.5524 (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: 2GR5eSQMyQ5i2AQ39DFUYEYI/S3i31Zji1txd+Yvp8hrWGRNTGL5EcJpi6tp8Iw+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8444 Content-Type: text/plain; charset="utf-8" Any file system with large folio support and the supported orders include PMD_ORDER can be used. Signed-off-by: Zi Yan Acked-by: David Hildenbrand (Arm) --- tools/testing/selftests/mm/guard-regions.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/guard-regions.c b/tools/testing/sel= ftests/mm/guard-regions.c index 48e8b1539be3..13e77e48b6ef 100644 --- a/tools/testing/selftests/mm/guard-regions.c +++ b/tools/testing/selftests/mm/guard-regions.c @@ -2205,7 +2205,7 @@ TEST_F(guard_regions, collapse) =20 /* * We must close and re-open local-file backed as read-only for - * CONFIG_READ_ONLY_THP_FOR_FS to work. + * MADV_COLLAPSE to work. */ if (variant->backing =3D=3D LOCAL_FILE_BACKED) { ASSERT_EQ(close(self->fd), 0); @@ -2237,9 +2237,10 @@ TEST_F(guard_regions, collapse) /* * Now collapse the entire region. This should fail in all cases. * - * The madvise() call will also fail if CONFIG_READ_ONLY_THP_FOR_FS is - * not set for the local file case, but we can't differentiate whether - * this occurred or if the collapse was rightly rejected. + * The madvise() call will also fail if the file system does not support + * large folio or the supported orders do not include PMD_ORDER for the + * local file case, but we can't differentiate whether this occurred or + * if the collapse was rightly rejected. */ EXPECT_NE(madvise(ptr, size, MADV_COLLAPSE), 0); =20 --=20 2.43.0