From nobody Thu Apr 2 20:26:36 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010035.outbound.protection.outlook.com [52.101.56.35]) (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 37B29319858; Fri, 27 Mar 2026 01:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.35 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774575793; cv=fail; b=LLqgf6Gh8JFKIdHpTVl4xdOrvrpRoKBMRr5hApH+KWxavslYF+b905MKSiEjK58HrbFsxQDJQuISRjXwTzEYuXjJUoJtwTA+WRau0h0p8Drxwlp6LHbOtemg+229w49FsZKt0n/aKiNRiTm95n2wKaqIx02LNsxK5WuSjQca9LA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774575793; c=relaxed/simple; bh=Wizyhv/O2SUXgJo/4RND4XynlXxrthuBlkhthlaI1mU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hkoFsPaDM9p+XYb6q/1t4lAGUCwVWsBJSnhit6GSjeF4zl9VUcEzIxn8sYfevHISvu7tZN16eNJkdWg5on6veUQnWMFY2Oouh7at8aquHYveEY+fB4exNeYmCKV/jPOVocOrk1GnAgdHGAG96sp00u7e90nneodB7+RPnzerEW0= 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=fVU5uYis; arc=fail smtp.client-ip=52.101.56.35 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="fVU5uYis" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OCVQTQUWHTMAlAmqdaGwisfw9djlyqKYpf8MI6BULPMpsXuhncUfnDOJ3Dt9IAM1PYmNhOKBVYQdFEbTiRTxK4Yq1Gp5PjqA+YpS4wrHFCcHRUNW3O/3lfbayptL1WcNadQTcoL+pOmRYQtcRTyl7pg4vgspFCEwAJREz/+mCt2plBigTPXunkyV4jcAxu2OHNAUhSG2LqRRfG6TG3ztu06y7PHzZS3RD/CTWwD28YxHKfyr7eecGa+1lTa/annXxPWUEmq4H/XrIq3elm10rwRhA4E0Bm/dfltm/6hwiidqGgrEiQDZLUaOR8Y+vUtmzGu+09hrju9sTXV8CVvICA== 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=VTkf814KTbAKcjKFZWTyPVHXuunVLktqolPhScWqans=; b=LyweZxSpTdyuhrEzbVpzRedWhn4u0RRF5ABWNTeJyyNQ1zrOqJ8BS/JO3CkOS74jc8bjVgq8voYqNjKspm4UjrzeRpfLyrdKEjBIEdCBgo9ZG6ff4YsP7/Gp3Xm/XmQV0ndoE2m/d4wIHExKUAyVitaMTgpoRbnWIRasHbrHjcgTiNfg3uPmhzAYzNLlonQOON5B4SKTq0Nt7w5hz+gFpxfTX895Tr5loC655sqZRi5550di+J3iGDJGpBAVc6QexcOCCq4259vjRAu2oGwhwcqyH6DVFa4irdpuPgsGi4aknp7FMmo8lAsHJcD2cm/yZZ+SH267QuImFjq/ByLFEQ== 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=VTkf814KTbAKcjKFZWTyPVHXuunVLktqolPhScWqans=; b=fVU5uYis0tgO6m8A5lItYEDdqkjMA1LAdS/+abWvxjP2JIV0THGjJVY+sfFUTv820Xj8ccFtneBG+n1K+aBo8dSCPKBccQKabG49eiz/NnmjQ3KoqWNow5SV9EJxcu9pQ/CebJYIkSYrWFzKwGCqUAc85iOlH6WhSo72lvhYT2pvMukD8XZe5607jYlvzDXsVnkhBQVTV0PgEHO1MZpBC2G1KBobpgGz3KzGqiPAzjFlzMtUKAXj+0pWWy8GySHq3c8EBeGOg5IxDj5asus/bW2RPKxbarZhQ2e4Jp+DKNvBW+AQVnBCejoD5fFdU8JcWwFVoGr1JepKQM4Sjr+ESg== 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 LV8PR12MB9264.namprd12.prod.outlook.com (2603:10b6:408:1e8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9745.20; Fri, 27 Mar 2026 01:43:07 +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.9745.007; Fri, 27 Mar 2026 01:43:07 +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 v1 02/10] mm/khugepaged: remove READ_ONLY_THP_FOR_FS check Date: Thu, 26 Mar 2026 21:42:47 -0400 Message-ID: <20260327014255.2058916-3-ziy@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260327014255.2058916-1-ziy@nvidia.com> References: <20260327014255.2058916-1-ziy@nvidia.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BLAPR03CA0035.namprd03.prod.outlook.com (2603:10b6:208:32d::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_|LV8PR12MB9264:EE_ X-MS-Office365-Filtering-Correlation-Id: 1295896f-2a72-4475-4af3-08de8ba231db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: aFWIFoREAFsHe3Mh5Op4FfCsSya7bnZgI0V5NkttdZRFUEVvyESmLGW7ZZLlp3g0wJrq2cTRNipO+aA9bEtYfdqoCL3fKHghGNrKK0TJgCZzL4CJsozSdwEduzRlATNt5/evKNQ348d5YaV+R8o8hXCHsCA7zW1WZI0xm7xHU9XyCNymCJs80ooKSwq9be0C2iZ/ez9m/yvm2+Dq2Apbsnw9G/mIDeMDqMl6CTt7Zbn9U/LYUYAL0s+BL/0tsLvqCiIw9f+oGHfuFYM/a8AupPbxKXq4dF2RcSbFAsEU6jZ1Ol+9EbygsVDCb5sySBPXTJ75JQNfMPsVfc5DRzdtifvAk2ZuwZkFH6p0vO58Qem4wxymQb6XKFhIfd+TiM4QQRXC7NrlmD5CcC8KDIPhf1hdQaxCoypmbhFgzPqGmgJIVtObR1sHzTepdLHWrv/aMnCVU8K7y7DVffZlfEAWvLxlcBg4uI3WGdx72m7q5vy2vym7reSAEZY7QSr7pbi83SW73easvsHG+VxR7nXzcXU8/558pD1Gw1iIhOA7SLvtN/Y66SfdZLGgfT4dpYzddFasE+CsZ4rF2hkUlUwaGwxmHcdvgBXdy4LWQfEJ0YQhTnyewt7cTOOdQdBDDZsPelB/fNo/P9KtH319yHM5zEu0E7APSWl0hMTPdJlLod/YiyrxLVksAgPqw09mzsD/CSeqWIkAMxHHfX1Q31qbuOES6f0J0cbdYN2VXYibEj0= 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)(366016)(1800799024)(7416014)(376014)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VB+bMButzeP96eFyZ/yipb75SGm3QoVOuYDolVoPiyXDK4qUfFB8j7ZGixJp?= =?us-ascii?Q?5huDoXY8sWzBTNoDO0sCuWL061hOmzlU5D/7R9yh9715dT7bG3JENwOc2vEt?= =?us-ascii?Q?dhF3nZNSUJKGd3fsJ7R5bao05hb9Uy9nikD7dBmRMUinAXDZp7pZcgTSmW4K?= =?us-ascii?Q?PPNnXmqfTe+ktNagmaioU/vFBDMjjdPRRKw/W1+Kknhpn7jnph12bdx7RvPh?= =?us-ascii?Q?9G+Q3wlRzn5hUgl+eXT1vJw6cVC5rpF8jH8r95d+7X7BhInkHKb4N+lJ1m/Q?= =?us-ascii?Q?FwshJdmn/UZMvOUHamJfiRAe0u73y9RHuhcqY5W11Z8YwH8x9VYvCdHoyVon?= =?us-ascii?Q?tFcXC9VxgVmTv2qDB5E3N0fJTmTPIrNNg+077wWZWnHL0XHl2x/5AkMn6f9a?= =?us-ascii?Q?Sb2TSyAd+W//xXvPzV4Zg9MvCJWARZ8HlHghNJVm0MVKapOAGDIvTpTJpIGc?= =?us-ascii?Q?BuaBrRQz1p7MeLL/RJU3nk6D5gYADWzNGLKfydbtwp4jAvXioF6Voy1eo2oA?= =?us-ascii?Q?hKq5ZFGLv2uVrVuZQB052X5CM2YZGZQ/neJbzLfYihe79k/NLMqDM5WoHWgx?= =?us-ascii?Q?H3P0LpPvILDrR1sSxdQrIHI/REfk5TV6fItIimYd/GcJvNTRWLoyNQML7PQO?= =?us-ascii?Q?HGC/HveN9782wDtL9/rbBDHvqb/zdUVBLwD77GeCQFsjLsixC114nA0RTZGB?= =?us-ascii?Q?aT8fJ7dJFLXpGQwBJsxTuV8KO/YMhtDMkvRayvAcAcI7vYdv7mmnWIPgR/9K?= =?us-ascii?Q?+Z5m6Xt2u1rK+JaFEe6xnn8rZMRzQj4v2NbuSS49haeIIiSYeaEeld65RMo2?= =?us-ascii?Q?i3n1UsnQf4NTn/irM8uE2CWBFtMHpsdwk/qHEbYTdNlpxVCqczONwoNmRVGO?= =?us-ascii?Q?WyMYgQK5EcdvbnEkZaTwwJ1xBuxrwbRBJ36Cl7zDDL8LG4/lQaDxYUZW9ZEq?= =?us-ascii?Q?1T+xwfTE0QU5Z8WwR+0ofPMASVe5u98St+J79G0u3hLEqyeRq2MxmtaxlJww?= =?us-ascii?Q?je2dl0gAvhYm0FCNFFRUFpPtTQppeck8ksjkGUCW9upkg0yJgIjwTvOOtM+S?= =?us-ascii?Q?Xq+v0+E6SSDUqEjva5JQ1BT6ggIVfjtz1toDSCLhVyxE+LvFG5ZCR3TCNfv2?= =?us-ascii?Q?ZqOBQ4I6/eooLWTfl/yGcmBnOrFL80yyXtQSoXEl1ObPESF6zktoiCedOm7x?= =?us-ascii?Q?vvEPYzjA+XbPjKKwq3OF0BBKboXa3DOMVA+na0pzI/u9tP+CT1HWSNZc00Mh?= =?us-ascii?Q?uEC8xp6PyiW419GUh9X06+Pth+SI9xmSyxOtMpPB2Tb6AK+z8hOAWlNi1lYI?= =?us-ascii?Q?leY+2ZvC2ytJWKnP26ISMZaiDq1ZIDmL9E4JiuurdSXQqYZsOqVV+qXbse+E?= =?us-ascii?Q?Zk4yAVsCRmCJSO2r5yssu8ZVMxijgA8Ta/dzO2DJYSWOR+8XQGC9BbTFirjK?= =?us-ascii?Q?iZP8WeK6EgPDDodL/pt+6Q+BykZ/lgP+MRQFwnwIcvDmVRLphvk1Bgy2qAZ4?= =?us-ascii?Q?Zj3GY++snROxi5z8HOCw32zctJ/w+dKpCN71enS5cky0Hs7NKqZiQvTf4A5u?= =?us-ascii?Q?oiui+grgtFNsz8872p+TPHMTyr34MShhENwHaOV1Ltd8ubQCvdKWnJ0Z+r15?= =?us-ascii?Q?QAptaCn1YB3owbdc5HRS4BY4470q6F2AyvwdPcxjuuN+kiRl2aTE8Sk5VjFO?= =?us-ascii?Q?/CbpK3lKAFmGNoHlHOKBc5FuMugrzZkmfXwvw+N3KoIDBiyW?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1295896f-2a72-4475-4af3-08de8ba231db X-MS-Exchange-CrossTenant-AuthSource: DS7PR12MB9473.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2026 01:43:07.1441 (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: a/UC/5UyBF+vZhMvAvc7H1vkVXiXfnJDquLPnp8mSovCizdtBbzDU+dryFKdYIH2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9264 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. shmem with huge option turned on also sets large folio order on mapping, so the check also applies to shmem. While at it, replace VM_BUG_ON with returning failure values. Signed-off-by: Zi Yan Reviewed-by: Lance Yang --- mm/khugepaged.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d06d84219e1b..45b12ffb1550 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1899,8 +1899,11 @@ static enum scan_result collapse_file(struct mm_stru= ct *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)); + /* "huge" shmem sets mapping folio order and passes the check below */ + if (mapping_max_folio_order(mapping) < PMD_ORDER) + return SCAN_FAIL; + if (start & (HPAGE_PMD_NR - 1)) + return SCAN_ADDRESS_RANGE; =20 result =3D alloc_charge_folio(&new_folio, mm, cc); if (result !=3D SCAN_SUCCEED) --=20 2.43.0