From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2D894D59D99 for ; Mon, 15 Dec 2025 08:47:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8F99C6B0006; Mon, 15 Dec 2025 03:47:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A98F6B0007; Mon, 15 Dec 2025 03:47:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 798566B0008; Mon, 15 Dec 2025 03:47:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 682A26B0006 for ; Mon, 15 Dec 2025 03:47:27 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 33086140DF8 for ; Mon, 15 Dec 2025 08:47:27 +0000 (UTC) X-FDA: 84221076534.30.01E6A7B Received: from MW6PR02CU001.outbound.protection.outlook.com (mail-westus2azon11012016.outbound.protection.outlook.com [52.101.48.16]) by imf24.hostedemail.com (Postfix) with ESMTP id 3F158180010 for ; Mon, 15 Dec 2025 08:47:23 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=TariI9ek; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf24.hostedemail.com: domain of shivankg@amd.com designates 52.101.48.16 as permitted sender) smtp.mailfrom=shivankg@amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1765788444; a=rsa-sha256; cv=pass; b=HVnQTpMK/kujMB6d6MtOajekwDU0YjQpj+ACufm6U/WyM7UxvOj80zgiqUchlWMyFC6tY3 Tuj+CQmAK5xh7ZsEAN0dtcm9mAKTaOO64nBYZYxSfiRLzaw9/4qV+L3SlbfjVraCEQCawD rzfcQk4eMrnXU5DmC9CDssp736vdGRA= ARC-Authentication-Results: i=2; imf24.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=TariI9ek; dmarc=pass (policy=quarantine) header.from=amd.com; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf24.hostedemail.com: domain of shivankg@amd.com designates 52.101.48.16 as permitted sender) smtp.mailfrom=shivankg@amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1765788444; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=yvJvyZpKzWgSapZy/mDwanRSyVEqfh2pWtEoiEGZwq0=; b=lmNejHQRuwnuAMv52cH0BBtyeYMSW1iF8ddrPBPS3nfDAyvn8vSkhIq4ddunVWmKnCX1tg /Hr0uh5ucBMRH/mOlWRrH2p/VGZ8kGhSJuxWJlQ1CXGXXJjl/iUJpiE46x0W8A9CSGgnkR hDo9zXpwgehYtgG8OMn1f/S25xg7C2o= ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JXNneNRz6RVZiNTEMYF+NnljNQuWLVFq8qVGWWpy2HKGF6sBy0Gl3d+zZbSao3WKPeOflz3oQQ9FsRulVHbPyUeGKUp6C96Ktt1jLGzeWNfT1f3AWEqL42bKc91OEcxApUPWjVW+5IrAtzv+8FMzatXoXZrh0sdh7tQZjQX+VcBfTYPeCTzOxWMer5V/XjowrALE4YfzP5/DPV84Ma8uLmlmUyqXzZl0WAW0EZ83gQlha2Jnm9thNR7cY2hpU03seE45pd3avCUdK+xa3UGbag5h9TBnCa1uuO9Ych2/QEwm2SDOeHL/xnM62g2eBp1r/yahEg/Gokb5bO7chM+OBA== 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=yvJvyZpKzWgSapZy/mDwanRSyVEqfh2pWtEoiEGZwq0=; b=Rp0WSLaGJ9D8zlMQOVUeoorVDcXxkotx75L6udK2m3SP/zfwYa4FL0/2bndxwaDKeCaQXJEa6dCvISu5WhJzj/UbQZ5xO5SP3l4WLoAthBCI1FGXnB78HMslXC8O78Rhk4TcXGBH4reLleqvaapgPp9NGupuq7F8KPlhUfjTDrivht096VvSlE8CtCd6TZR1Di5CT5FB65wqiBGW4HGrwsUlDjKaCwd5hJCLjqSOeYXR//Hq+K7L3kyAuAvyJEzdeY/V/Fu3yJT8rDZxBnzUujdqO8fJxZuw0gatG5mx01p486YVerMr33GqxYPG7q6tGDKZav5GYiGaeOotvv7fDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linux-foundation.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yvJvyZpKzWgSapZy/mDwanRSyVEqfh2pWtEoiEGZwq0=; b=TariI9ek7TY7QmcUAyRB8nX2shavZRoWwrIgq7AfMUuoyzH5nnnxE1ooyen7f2dLRr4LjT6DxYpj0mNelOSrT7vQ6kBTWViEzInhWjcDE4bb9bc/W2yH0u8ItLHCzXt4j+ykItTUa3KXJqcq1FFM6BdYgqR03hTjqaptR79TxpA= Received: from BY5PR04CA0018.namprd04.prod.outlook.com (2603:10b6:a03:1d0::28) by SN7PR12MB7955.namprd12.prod.outlook.com (2603:10b6:806:34d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9412.13; Mon, 15 Dec 2025 08:47:19 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:a03:1d0:cafe::8) by BY5PR04CA0018.outlook.office365.com (2603:10b6:a03:1d0::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9412.13 via Frontend Transport; Mon, 15 Dec 2025 08:47:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by SJ5PEPF000001D5.mail.protection.outlook.com (10.167.242.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9434.6 via Frontend Transport; Mon, 15 Dec 2025 08:47:18 +0000 Received: from kaveri.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 15 Dec 2025 02:47:13 -0600 From: Shivank Garg To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes CC: Zi Yan , Baolin Wang , "Liam R . Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Steven Rostedt , Masami Hiramatsu , "Mathieu Desnoyers" , Zach O'Keefe , , , , Subject: [PATCH V4 0/2] mm/khugepaged: fix dirty page handling for MADV_COLLAPSE Date: Mon, 15 Dec 2025 08:46:15 +0000 Message-ID: <20251215084615.5283-3-shivankg@amd.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D5:EE_|SN7PR12MB7955:EE_ X-MS-Office365-Filtering-Correlation-Id: 5043660f-133f-4d13-1e20-08de3bb68e32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700013|1800799024|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zAK31v2/bD77uuaMHyHqTlBVOy6+fq0vTelV1Jl0x7JNNdJdIGi0AlIkIkAF?= =?us-ascii?Q?EcWC/zsTtjaaeoFizDaUpo0Jfwy86R9fN0DpazPB5vgWz33gLavDNO9HYqGP?= =?us-ascii?Q?85XyuIufaVbOIj1LlzxZy/zwIjq9kZQg+SO+u0C9qw5e+7lyAEkf4txwDIrw?= =?us-ascii?Q?A9IG6fNtbK74m/Y59IzMP+gUrrNLSmkDsfaztaIPfreb4YueQNtssJWqRLdS?= =?us-ascii?Q?EjQk8r6gUbDBwzCMBGW+dJ66bouSKtc6P5WvJ4cy+8cRxvZ2dwZ+lhs/90rL?= =?us-ascii?Q?BTMfVEWcFx461inaVFcJxr/DbHATgGdmH8xOYiNE5zvAjjypyzFka0nRg9Ks?= =?us-ascii?Q?Nbm9Hsx9Nrc9LGPBEf1SDKL4XnAs/Oh+hJMEBdshcxf+GDtFQ+e/bEh9Mj/v?= =?us-ascii?Q?IZgSPfTuQp5rgo1jQ6+DQFrhFHUh5/ZOcpzMbfwcMOFXVnk7ybP4ZsL6rufl?= =?us-ascii?Q?ZCsCYOO+OeLWgLV/lAGo7V3HE7l4I1SdtPDh5muYSBKJH5WnAvDTCh/9lhm5?= =?us-ascii?Q?UAcwjcXh4a3SHEJxYHGGooDJ7uZ11W2+IXfUUYvc/dt6Mei9ztpup5iixyDH?= =?us-ascii?Q?dhrxJ8JsokkIxl4DEVmdz+TTYWoVJxVWJIAb0DFFufIGT35OGNAY5RmKX3/Y?= =?us-ascii?Q?DbKe9SFHkHVyKA1q8rlXe4W2H0xqwgmoDPibXXxkjan69vvq7xJkE9q1+XMH?= =?us-ascii?Q?dhLlD28Fvv8HpJLfBSqDjDCjDJD3dAOxyJNDOvDj4R7F6HOPw87HkZB7VSrz?= =?us-ascii?Q?Hl4hquxKGiKE+xq1ELQmYljM1Dec0rUuaWlBXDVqF+hhtYadGQGhg0ob563n?= =?us-ascii?Q?YwJWJttGx2+njBe4gubwPfk5nAEIKvktmvCBJA1W6te29KZgaHOj7EELGphu?= =?us-ascii?Q?xAw6ah1kVGf42nXLhT/2/oSh7v76ok4m/U3UqaRWxivmi9eS6M+bNJNFK7NO?= =?us-ascii?Q?LzDmBsYQiYIP5ewzHC/Emma6NO5asswlUy3r1ye+H0+VNXVmhCDWo7SgWQ2M?= =?us-ascii?Q?v/2XEs5rfMNsbluvxtiH6IaROtiRb9bCq7iof63eFsJDIJlRleZlhzGkBSo9?= =?us-ascii?Q?zOfzV94quv5UtDv6Pm+6TSuI5z9EmuZDEq3Y/XmVyn+DbHtqczjgX0naT23R?= =?us-ascii?Q?MMmjesKOEb6TKZqkNcinF8hF0Kda+9fPU/1mk3f4ZFz9VupiGKeklsamXvrD?= =?us-ascii?Q?I0P5ifVqgjWJKZ3g7aAZVYq02p/ft6+z7QPKLetBSDjnbl0NXby9WgOgq0N2?= =?us-ascii?Q?bs66L0TOdQg4Z8gWux5k3fTNY7xeWsazu9pO20vFn7W1eNZKsVGdq1JXgLfU?= =?us-ascii?Q?2iKvorWQ9Nxk17LJR3wM9aSsX29jJq6qAssUptaoapBDeRlQJ2LBUq1kN5qS?= =?us-ascii?Q?SCOy6K8mKDPqw1z9QJrsvIr/VS4uh3oIGMVljdYs1hvmdAxqd+c8t7MJHqe/?= =?us-ascii?Q?aPmov7XeLPX3DRK3vB6k/lg+nEAgRgE30X1x2Ed4nl4ve4Z1IYrsekaoioV1?= =?us-ascii?Q?PCr4ZM3YGywmiTiFAmLbgzwDqs08LOw0cbvfEqEe68Un4ym0Vbunf6nQy7uH?= =?us-ascii?Q?cXjhvOM3MpRLLmDg0pM9JcRs9PkvgHJ4vCtgrWGw?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(7416014)(376014)(36860700013)(1800799024)(13003099007);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2025 08:47:18.7586 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5043660f-133f-4d13-1e20-08de3bb68e32 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7955 X-Rspam-User: X-Rspamd-Queue-Id: 3F158180010 X-Rspamd-Server: rspam10 X-Stat-Signature: a3km7wcimd58x9ur8ig7nmjuzh7exgmp X-HE-Tag: 1765788443-539387 X-HE-Meta: U2FsdGVkX19kW6E8xo0SnOtqzigZJYu6wySSLyEVesYEo8FCy9kP5subltqPrbRqA3bo6VXEl+4O2eRguP7YwX6jyRXzFkadi3mAgT6c/EMzqEdJITqCkFNnSK7fa5x1VyI8sIuT9BR9pDWn7VtVaMcsIzflinuL29W6nWFZFoDRa4gVrJQ16fEH03nCZqciW/UrPBuOQpZaUmjhY/82g0k5Axqmmu30bJV4BnfW9t8YLexu1Xc3iniZXEzL1eEutvAR2k9o0492yixqsHlyEoEO48NkJS2iNc6PI1SZXWwzy/ju+L/uIwNa7cAxRGXLxNILvFKPSq41HLN5XS4pxTncGhDA2hNn4JbWSzER+aFhTz+4X+mPKISfkX4G41PQ2MTwnjPyP4wLT3B2Yp/YHedDbmSILMeKy1VWH0WLPha64VcNseiH1goufbwjrU6dQTXQ2UB1sMshWmV0BuBtCRFE4e5504tYBCF9uEcXtyCy40uXIZvgZrlWNvbcT8ueqk5XH6VtA/MuWok+f89Z2QL5Gg8mDF4fouKZ+DYYFCuNp6lLg+iynsifGzw1MndhqlWYG/lA+cK0CQdgAPjrnnOJwSns0OVElvTl5o18jW8JTMvHEAWpxzY3EaBBeSJKndoS4clTYW1yT4CAf3l9hDYmUvcdoZVMiGVrETp2pW3El48/dCD24l/9cWJN8w6hk97ZCdmuWJEyFuOKe7CGdETBOGN7lnW4B8RFm7P2XjOhhWxJzSS4EQOwzyC/8J+47+G8IxzERZ71QY3xW+SlISKTL7RJ6dQZLKvNdZ/NMV9rH5BS+IgwOVYb0wLsZ1YTBF4ZwGNleSSp6Ovg1WcugzzdAwaCk7v8UbVATd/xuxJZdOK7EpDivQSuizfrEysUBS1yAGZf6KXrrW3Cf8uI+3KI2YDQt/BBTANGLPV+LXePqQpj/gNk9jqjG6FYcU82QyxjXoBhJB1uFXjdj4L Ggccr0Yo QYZ3C3ukHyOAEVrjfjmA1ulkws3GmZkHAPRQ2dmBWX8kzhGLkDmN/CNhJiP9+0I3HN25hm7Qz3AT+r7lzpDWQVYZ6TtmmpDocpgmCyCAEWb+oCqD+YbBjflCfhEg8mA8K6QJUyDReFuY6v+tZJ3H1wwXpCXnOjHJOyiZ1C9lRo4dugN3l09KNxcTakP4pYcshmuCH2dDhpC4ofbukmnruyD93bniQ0A0e8H7nr0yIAQkTx+J83Z5prhXEFV1SmbQlD2mDz7gjjt6pYa9IQH4uiMJ5702yi2XXAXH0mCDQhy5yl+7wbJj5+CCMLhjLaS791hvixIRrMdxKrbhCW6/EGBuSUbXGxcnL7kvB+hk6TWi30akt6rVa1/J9ZfKBqRBLATnaqE9Nso32ay9Bp4ttTNfEDCkRtHuIHpBVFvVFz4FCv9u12UEWK4Vu7CK9P63M3i90yI2E75BLE/ZlDjWCa87x7i3QIfFRYxJN5aPJmMR3xKh8vkDubYvVUy5yXdxoM9iuf6i4H2KY7J8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: MADV_COLLAPSE on file-backed mappings fails with -EINVAL when TEXT pages are dirty. This affects scenarios like package/container updates or executing binaries immediately after writing them, etc. The issue is that collapse_file() triggers async writeback and returns SCAN_FAIL (maps to -EINVAL), expecting khugepaged to revisit later. But MADV_COLLAPSE is synchronous and userspace expects immediate success or a clear retry signal. Reproduction: - Compile or copy 2MB-aligned executable to XFS/ext4 FS - Call MADV_COLLAPSE on .text section - First call fails with -EINVAL (text pages dirty from copy) - Second call succeeds (async writeback completed) Issue Report: https://lore.kernel.org/all/4e26fe5e-7374-467c-a333-9dd48f85d7cc@amd.com Patch applies cleanly on mm-new (https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git/log/?h=mm-new) Changelog: V4: - Rebase on mm-new - Fix spurious blank line (Lance) V3: - https://lore.kernel.org/all/20251201185604.210634-6-shivankg@amd.com - Reordered patches: Enum definition comes first as the retry logic depends on it - Renamed SCAN_PAGE_NOT_CLEAN to SCAN_PAGE_DIRTY_OR_WRITEBACK (Dev, Lance, David) - Changed writeback logic: Only trigger synchronous writeback and retry if the initial collapse attempt failed specifically due to dirty/writeback pages, rather than blindly flushing all file-backed VMAs (David) - Added proper file reference counting (get_file/fput) around the unlock window to prevent UAF (Lance) V2: - https://lore.kernel.org/all/20251120065043.41738-6-shivankg@amd.com - Move writeback to madvise_collapse() (better abstraction, proper mmap_lock handling and does VMA revalidation after I/O) (Lorenzo) - Rename to SCAN_PAGE_DIRTY to SCAN_PAGE_NOT_CLEAN and extend its use for all dirty/writeback folio cases that previously returned incorrect results (Dev) V1: https://lore.kernel.org/all/20251110113254.77822-1-shivankg@amd.com Thanks, Shivank Garg (2): mm/khugepaged: map dirty/writeback pages failures to EAGAIN mm/khugepaged: retry with sync writeback for MADV_COLLAPSE include/trace/events/huge_memory.h | 3 +- mm/khugepaged.c | 48 ++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 4 deletions(-) base-commit: d0a24447990a9d8212bfb3a692d59efa74ce9f86 -- 2.43.0