From nobody Tue Oct 7 10:00:50 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 7F50B27E7DD; Thu, 10 Jul 2025 15:52:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162724; cv=fail; b=cNsAEQLEiq72JD2IDzgz/dnx6+k3rFCURqlzPqZTyuBgsN2qexVeMneyxmYF5ClIKudYDoZ40sMosA7NDjLM9IypNJkyzcLJFbZzxeQ7iJ3qv/3e9mO40ug6zPLp8pHQv74/3y3PIhFfT8oIye9O203rl8DvsDCjLlj2lBfaf9s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162724; c=relaxed/simple; bh=WwlZ5rCPvFaMfkS6flik7WqVgUEuUvf6OXDktBBPSjU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=gV9VIsHTyR8lt1BOdFl1+Aqob3eTpHcV1qkrZWuhTh4fR87ToQpezADuK408iIjTt8XqDTd2psmFOOfVzIanaq3+t7jeUe0Ij3fZCVRqXnvtZl49NR5IOu2F0J6OkF1xwLgA2b1MN+mIKU3bX54qSuPM1WK/4+6i31KjBt1JD90= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=H8C4+Z6p; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=GpMBSzPM; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="H8C4+Z6p"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="GpMBSzPM" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56ADHPM4020307; Thu, 10 Jul 2025 15:50:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=0E/sMzb/aj9NW0QnRwBkCJjrM0+EqK22NFvcWeKYd0E=; b= H8C4+Z6pCRHfsg9WjliPiAfzJufBK6n/0+DrFd09TEU1OmOaUxpKl9DPVEq+nVOz vob+Mcuspg4OXJDRU18fEBXMP/fMwp4lRGFxpAUlZERtncZB3FHdrvB1lnTNiYJV KJhp5opHwv/bZdHTqVmHVIapRGKyyAj+8rArcsr/kRRrmcN9/jxzpbkkXyndtAvW 7IFQOS5HJrjenwIJ96BOZyQ0xdNYOniwoHZniWrK68ndUeJTG6jHOp4sMqONjg1+ oZsF1rKg35D26zhyQKvS6N8SM7jtQDVLkEuHec2iOkqPGIVFFiWYitEYA0P6dZkA SLmTnsBjXOXAw4+wfzvKWg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47te8w0dr2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:47 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AEQWfV027344; Thu, 10 Jul 2025 15:50:46 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12on2075.outbound.protection.outlook.com [40.107.244.75]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgceyws-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MD9eOSdzAo+uh12NodKDIhhDfEkB3m9mI1xoBCaqB2QTpqrTNYXiY6DOdckOpG6UKCxEh6akISa8nNIzGTGHFr4G8N34ynLUkdXDEHI0TzgFImemf7Ya93F+44+rMcC+AujISUgXe02lscm90P+ymSfN2Obi5i146hikSveS+NZGK7jqTegC0tqEBai7cB8b37h8DRID7qojBYagBO+uXm4v+9mcglHeZSZX034DLlTNOp0HiV+q/1pP4tWZsvjy8z641LrCGNzhacaQRkx1NmnB06rrVhINCap1rAtbK6zilS8j0f8g3VF4auu1H964YiqKlmo/XZG4BgVXZAQSzw== 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=0E/sMzb/aj9NW0QnRwBkCJjrM0+EqK22NFvcWeKYd0E=; b=qhVwgrtpm6To0HMxScMQqhDBpoMdr1WYmCVJsvSP1AJG0AQ5Q7ZApahqqLRt7Ze2ZdLW3a0q3397hcH6MBha2k+KQi15SRVb+wutkTRzR8bM8RcoKgtRwqsJyvYoyvuvl7h3gmSkV6sB+9nbcEp7jX+OGDvKeJcVZGB0Z0jBbGk2WiOsD10c9EC1Feeb7wAIrS9S1V4i4N7UZdCFDN1u5NxhUOdq0nk97ce3KCT21G9cGoPCi2Xby1wLGNP1x9ezrYpf/NwY9IhC1vGWudkAE/3FkQslb/xMYqrIVewhIZKrYxgg36FWlIRo+CcZFFWxC38Wp42ooGWpWkMubuzuFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0E/sMzb/aj9NW0QnRwBkCJjrM0+EqK22NFvcWeKYd0E=; b=GpMBSzPMADtqLxzKpWyp2TDlqCkcKd2k7uJ4wEW1UHZF9RDRDwBa3tRc5PnfQkGxPQVCwGJfzUH7+4xMkuy5m+b+wSOaaYHQo+JFI4QPiuDPOIKyQzNRNdpgLL7W9iy1MYSwUU3Imq7rB1cbn/pVu3j+JZzfSHmxp+/yqdvX4+c= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CH3PR10MB6691.namprd10.prod.outlook.com (2603:10b6:610:142::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 15:50:44 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:44 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 01/10] mm/mremap: perform some simple cleanups Date: Thu, 10 Jul 2025 16:50:25 +0100 Message-ID: <300ecbf0827e4a2207855358810b4cbc5d7d54be.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0521.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::22) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CH3PR10MB6691:EE_ X-MS-Office365-Filtering-Correlation-Id: f845017a-101b-4c1f-2165-08ddbfc9877f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ERuBe43+n/o9rgbpPfjM/XoAMqjZJeGh1+YGtLY8Inxthq+qeAqlzKq5ladj?= =?us-ascii?Q?h9+4BI4lTUnmC84J9o3wlWDxPhfd5b9aOTQ/YJHyOqEBpjA9x/XQ0zwfB8Bm?= =?us-ascii?Q?8QP0nbnjtPiu2GwcUyZfP+z/Jbh1MKbgzmI4z1uWe7INBhYDwa++kW1+SiUZ?= =?us-ascii?Q?jqMuHD/go63GeYr3mpgSp/T5XwVzzE/UN2FP/6/g8uyoG5py6cG1958LjIWT?= =?us-ascii?Q?NSvi+wacNB1ucp5QVfxTXj6WPY2tKQJsk+tmXpk4FxQnFcUCiwUjhZeyiUrV?= =?us-ascii?Q?LNJ5uILDT3jh/q6RqHyFIfi/hhFhxF/2faiZC1vvjHH6s9V+8iO7ah0RhDt/?= =?us-ascii?Q?r7a09STUmjb+tg7pOVbNtQblHJMWd+YQvg6HNXjU8DSln3R0SxtjymNl/hhy?= =?us-ascii?Q?RPUTof0b4rYKoWQd8ryCfF42aorvULs/UqLGMPlB587XkRs9iOAGJXJ9vGWW?= =?us-ascii?Q?kOo+bw9UA4wuGxjG2POt3lLzMyorkjahe+hEkJ9w4aqELmxVTbZmBr2wx0o0?= =?us-ascii?Q?GTcCXvMuM/Kob15DRC2AbDa9kZ1KVUhYtfg102OkadxTJIKV207v927di4QZ?= =?us-ascii?Q?GDZV0X7/t77dMKmZvfSHpHvHNj5nhVcfFhhqmZ2EM7aLKQCr8GohtLOnVHzX?= =?us-ascii?Q?2fYZwmwWcbVuyKAT54eIfqBdg2LooY+KJs6MzxEsaPJI4ZwR7KrCzhWqkoUE?= =?us-ascii?Q?68D+2hy7qsq8ysTOnsKRIR/D8H2FWcy5rxn87qfXcpIuEvPX742+rxM8NECM?= =?us-ascii?Q?pZcWo2R06/AdEjVzkjYtibEIKEYx/9B4rBdk+9Qh2vLxeEbCiAcHP/0d1mjd?= =?us-ascii?Q?3jlEnCGyGTrT4+rWlARUExztD+dsTfQEAPok1BcnP++vc/OlHGMej8htGjB9?= =?us-ascii?Q?6nQJW+3Z5R6DvLV4eXhMpnegNxhT/lwamA+q77/hnwCd5phF4z4VL2K3NDma?= =?us-ascii?Q?oU4WRJ8EFG3sRSFov7bWRqO7xnDHWy1SDyeLLuZIZk0AzUpB36AU90kmUQAc?= =?us-ascii?Q?u6gb/iYqYn09Peyqq6wWJDyLm5WNAcpgojCk/oWpfdJUzNU5IkLek+A/2/jA?= =?us-ascii?Q?TcbBZwlzGkjjs5QIE//4+dkc2VOAHBIhJb/PL1biO/eyolc1xwbt1M/jIH6r?= =?us-ascii?Q?dTgaO8JZG6a9zD0LQZQqZq9Pc0M+byDwhMZsp2eHKLLKynf2fVgEqUTQ36Cu?= =?us-ascii?Q?etNk72bydomBvzR2y6xDX96EcBM1GmWiB375muwsLxkn11Q8eaHnQ9LYN3cW?= =?us-ascii?Q?LGyEp+qUqAhfBCgDiJz0vu/IHvX9Od3A9kVL43MG65x2rkNXtJgVjp/kFrB/?= =?us-ascii?Q?zR8q6HUN46pfQjNLZ447sz8CnxxhRsTSZinbxn/N57GEZSIQMHQHticczrKy?= =?us-ascii?Q?zcNfeHgdFhXu6npY3f5HkXWO71W1LiZWlwC9uhk5i23Zb1+MXbD7iZAdP2a6?= =?us-ascii?Q?mZzVN8ElPdM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o3IqnJSbjUUCwA5Yo/GJLrIgnqLPviRqHHnyE4shEgGImtFqmzp2JS/AVrBY?= =?us-ascii?Q?2baRzGdKsJUL+QBZY11OU1Q9NzVGao+Z+GFkHbpKwdBUDw/+Q+LTIRYL5u27?= =?us-ascii?Q?1zM0pm2KG6vaDvKkeddCa00p4f9DxxLAGQMSbGkX1z2XiZpwPyprXizGVxj+?= =?us-ascii?Q?HkLJahykr6fjGCr/zwGEYt1aXNXLLG8XeCs2D0ygmbVzkKoDKpjMfUDNwu68?= =?us-ascii?Q?FUqWn4pp2ZETXcCUBMYI0uqObEvWL3/ntVDAYP928sLatyt9IXYQtqZVx0a3?= =?us-ascii?Q?VXxDGLOgzR7/HEhuCVb1u8BDkSrzUq52hy4004miB+jyOiTT6U35VqsUwB6l?= =?us-ascii?Q?RcePXuUK48ORvrpb4aaW0nv8Mmt2fCyEN1zQ1JaCaS8Z0FXVKXUpuxAUlih5?= =?us-ascii?Q?TyMk9veIob2Vn4QzXFpJKv9blypnqOu5I3UGLPQP26rXtojdoVyjHpvfnmmv?= =?us-ascii?Q?rfy750eD6Iifa3M/ya1Jax48LezDDOSqhyBZP9RXrJVfWz52suzog4BGuXhf?= =?us-ascii?Q?EGsg5cRl7nqWOKReRpxMrECvd0YZXUwEyu0FbNyPBgGg1oI8pZf9w/QKOqS6?= =?us-ascii?Q?h08hquaI6pN0FMaBmRmW/U18RfMol/5NZyWhLGyKYE1sV/+hwXjqJ2FNR91J?= =?us-ascii?Q?8XdwzVZMjsPdFDaK7oW4WCBSaxzFnTpFX0By/viLshbngIGQ3XjPdo3aTLXJ?= =?us-ascii?Q?dvqtOS4QMjMnu0u84Ba+c5aIYPkxr6ogEQ4FENlZUaaYxQ9ba9JFaHQTry7c?= =?us-ascii?Q?dkfCVsZVRCBEq9QjBNVTTDOLhAaydl93zLl1p/nl1RGchrHaCA/k5CIMyJGj?= =?us-ascii?Q?XtlDyPu8F+V4LJsaCmDhgxliMTx5r45o1ZmVtudQGqzwtH3k+cc/g3lkVYxw?= =?us-ascii?Q?PaZrGAJ1O0L9NhGS7xxX2BHiraalCFTiLHEXErOJIwYEr3j0C7NaKiCvBBWF?= =?us-ascii?Q?YHszSXxBtcuRSXXN6WVJGKl3Hm9zM81hq6aQT7mSCaspUXGGViwHmTcA2JZy?= =?us-ascii?Q?o2fwbuUz+foILOTpWkbysfrtdT8gbhxCSHn65KIozGOtiDFR0CO6bwlgyIsO?= =?us-ascii?Q?YQYaDCEmXMuCyNOHqt7M5r2sCgnjyi1tQe6Hkj/UCsryHzLVTBizAv0wCS5t?= =?us-ascii?Q?qNlQpKVXsThEhaeXJp24kzedHAyJa7sSdM6dPyMLY8ui6GzwOSpTNz+89gNg?= =?us-ascii?Q?h62/58YUSSJFKQWPDNxVWEQyNOXh7FgOeXezFwJ79SS7drpamzz9PiqztaGc?= =?us-ascii?Q?ByOvCXrsPPMX96O6FrpnkaM5jxTmyAxYE8O09Ol94iEsyULnhFwPjvGc4+Yt?= =?us-ascii?Q?WnFBgY73tia2Qv2XANWEXbJaexvVBZXMzzEVd0yox9iUr3u/+w+IPiQZmoD7?= =?us-ascii?Q?wlPVbexBBlppPwma9TH/9PQrTsVTM/l6wHZJs6BMsmi8PFMGmDez3oECm4rX?= =?us-ascii?Q?eOn7iqksPtMbHbW9Qw+mKFpRVITP8midW6REc4l5WondKDPSa/82CPyvLI8C?= =?us-ascii?Q?cN0ruxoXF7aA81/9e+OfDIbzoEIwVSoF/ZfIAFDd2ahWBtfALVixcbDKN8pP?= =?us-ascii?Q?X5gIvH702DrQtk+TvCGUz9+1OTgP+lbFSbz+fjf22JRpSGlQruHAIDdUex36?= =?us-ascii?Q?IA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IOv2MgssH/ubOWTtBaLxkscAi/xd/fPE+EwMmz6AT+nhh/Yocqg/gHdQMPWeaFsaCAYIWygZ29TGJJ/XQc5iCp/OLXCzq+/ru7ohkc/SYrPLgF0EZ4yH8wSOGxVgHsxlLHJ58G07P2Rda97Gvr/N//wAXiLPSKPOKw4TEJI42AWOeA1wqAJ4LEx9UPjWbdNSJ1dE9gYSUcj8klRqtWMoJOm0HQynl2WMCeA43nMFyuc4sMlBKdMRvSUPPPSXi0b2cHebhcL08U/M0C5LCOWzD3ritfO52ijJ1cd93CPP8yZrheDwCZGx7RjPFHxmGZ6IQWs8gstjYz3boqL3n7wizo6ncPbFTndXjLsJ/x8RndvIvMINr7gCEZ8EtwXexA34m8CLfMdpE6/t35ZQXwCu42GdngXtmr5BjbMPraaqRhcg3Wb2qwvLyC4cdWqb4fafD0d4hsU8iS9lGH40pEsG+H3pGf65l6INcajD5COh74j0+Y1XbniLIQ4f8/PCBPfqtQGl9yeU/+wW9xMWcUBerAyNkH3ZIfz6FPYqFa9qjku4MT8Cl7luzb1k2SoOlsKwcONiQ5dH4qr1VhTPRWBE0jCdfk+1MAkue1fB8ePUIc8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f845017a-101b-4c1f-2165-08ddbfc9877f X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:43.9772 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UhIAqpkNfXQazSzJc+NeaMVo+NVW1RdLvn15Deh3WDEITLE3/xdfKqlJfMCF1xVLRTmnMNmlQuRibKcZq2f3qXTPPkGapM223nmV/jB5qqw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6691 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX1UmOT0mmevqf 5u/Y6QJ02djF34eTzZB71DVEXvwvTyVJLOmHYh6TxafPmDXPc4U9fwVhS/SC04FFGIrxTC8A99x utvZ8aHER978t/tdR9OO6zvwRuVo0YzzYrbqY0mre4vwa1R+NwsSxgxak49dylLavUHRC9HTpeM I4utAtQ7WI92T7cvBE2OqJ9zxI/PN3ygU8i1Q+Zcq3T4jxHFEqnl2jwnvwtGrD3nDCtRPQXE0mD OquAK12YQeq+WRU3dO2wHdJ08eXTbV0llCWgwg0OjNfD7+j/O6cJmMoGTqfe54hcchQCC8PxEd8 xkWF9Jt74XYF0jTvMKUgGhbVB3WSyi/SDbCpoplQqfPvKjD9d911bkL4rwPWU8RYVbmOxxPUL/i 2RZ5pf1st2nOD4aYLY69w4uHvhh/eBroa4IQiqkDm/8n24xe31D3gTUZ38toaFWmxfyqwyOE X-Proofpoint-ORIG-GUID: D-0-rKEWAJR09ttFzVo92TYa8Z5gUYma X-Proofpoint-GUID: D-0-rKEWAJR09ttFzVo92TYa8Z5gUYma X-Authority-Analysis: v=2.4 cv=O5M5vA9W c=1 sm=1 tr=0 ts=686fe157 b=1 cx=c_pps a=zPCbziy225d3KhSqZt3L1A==:117 a=zPCbziy225d3KhSqZt3L1A==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=YqzgIYf9a6bYxjmC-oUA:9 cc=ntf awl=host:12061 Content-Type: text/plain; charset="utf-8" Patch series "mm/mremap: permit mremap() move of multiple VMAs". Historically we've made it a uAPI requirement that mremap() may only operate on a single VMA at a time. For instances where VMAs need to be resized, this makes sense, as it becomes very difficult to determine what a user actually wants should they indicate a desire to expand or shrink the size of multiple VMAs (truncate? Adjust sizes individually? Some other strategy?). However, in instances where a user is moving VMAs, it is restrictive to disallow this. This is especially the case when anonymous mapping remap may or may not be mergeable depending on whether VMAs have or have not been faulted due to anon_vma assignment and folio index alignment with vma->vm_pgoff. Often this can result in surprising impact where a moved region is faulted, then moved back and a user fails to observe a merge from otherwise compatible, adjacent VMAs. This change allows such cases to work without the user having to be cognizant of whether a prior mremap() move or other VMA operations has resulted in VMA fragmentation. In order to do this, this series performs a large amount of refactoring, most pertinently - grouping sanity checks together, separately those that check input parameters and those relating to VMAs. We also simplify the post-mmap lock drop processing for uffd and mlock()'d VMAs. With this done, we can then fairly straightforwardly implement this functionality. This works exclusively for mremap() invocations which specify MREMAP_FIXED. It is not compatible with VMAs which use userfaultfd, as the notification of the userland fault handler would require us to drop the mmap lock. The input and output addresses ranges must not overlap. We carefully account for moves which would result in VMA merges or would otherwise result in VMA iterator invalidation. This patch (of 10): We const-ify the vrm flags parameter to indicate this will never change. We rename resize_is_valid() to remap_is_valid(), as this function does not only apply to cases where we resize, so it's simply confusing to refer to that here. We remove the BUG() from mremap_at(), as we should not BUG() unless we are certain it'll result in system instability. We rename vrm_charge() to vrm_calc_charge() to make it clear this simply calculates the charged number of pages rather than actually adjusting any state. We update the comment for vrm_implies_new_addr() to explain that MREMAP_DONTUNMAP does not require a set address, but will always be moved. Additionally consistently use 'res' rather than 'ret' for result values. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 55 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 36585041c760..1815095c4bca 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -52,7 +52,7 @@ struct vma_remap_struct { unsigned long addr; /* User-specified address from which we remap. */ unsigned long old_len; /* Length of range being remapped. */ unsigned long new_len; /* Desired new length of mapping. */ - unsigned long flags; /* user-specified MREMAP_* flags. */ + const unsigned long flags; /* user-specified MREMAP_* flags. */ unsigned long new_addr; /* Optionally, desired new address. */ =20 /* uffd state. */ @@ -911,7 +911,11 @@ static bool vrm_overlaps(struct vma_remap_struct *vrm) return false; } =20 -/* Do the mremap() flags require that the new_addr parameter be specified?= */ +/* + * Will a new address definitely be assigned? This either if the user spec= ifies + * it via MREMAP_FIXED, or if MREMAP_DONTUNMAP is used, indicating we will + * always detemrine a target address. + */ static bool vrm_implies_new_addr(struct vma_remap_struct *vrm) { return vrm->flags & (MREMAP_FIXED | MREMAP_DONTUNMAP); @@ -957,7 +961,7 @@ static unsigned long vrm_set_new_addr(struct vma_remap_= struct *vrm) * * Returns true on success, false if insufficient memory to charge. */ -static bool vrm_charge(struct vma_remap_struct *vrm) +static bool vrm_calc_charge(struct vma_remap_struct *vrm) { unsigned long charged; =20 @@ -1262,8 +1266,11 @@ static unsigned long move_vma(struct vma_remap_struc= t *vrm) if (err) return err; =20 - /* If accounted, charge the number of bytes the operation will use. */ - if (!vrm_charge(vrm)) + /* + * If accounted, determine the number of bytes the operation will + * charge. + */ + if (!vrm_calc_charge(vrm)) return -ENOMEM; =20 /* We don't want racing faults. */ @@ -1302,12 +1309,12 @@ static unsigned long move_vma(struct vma_remap_stru= ct *vrm) } =20 /* - * resize_is_valid() - Ensure the vma can be resized to the new length at = the give - * address. + * remap_is_valid() - Ensure the VMA can be moved or resized to the new le= ngth, + * at the given address. * * Return 0 on success, error otherwise. */ -static int resize_is_valid(struct vma_remap_struct *vrm) +static int remap_is_valid(struct vma_remap_struct *vrm) { struct mm_struct *mm =3D current->mm; struct vm_area_struct *vma =3D vrm->vma; @@ -1446,7 +1453,7 @@ static unsigned long mremap_to(struct vma_remap_struc= t *vrm) vrm->old_len =3D vrm->new_len; } =20 - err =3D resize_is_valid(vrm); + err =3D remap_is_valid(vrm); if (err) return err; =20 @@ -1571,7 +1578,7 @@ static unsigned long expand_vma_in_place(struct vma_r= emap_struct *vrm) struct vm_area_struct *vma =3D vrm->vma; VMA_ITERATOR(vmi, mm, vma->vm_end); =20 - if (!vrm_charge(vrm)) + if (!vrm_calc_charge(vrm)) return -ENOMEM; =20 /* @@ -1632,7 +1639,7 @@ static unsigned long expand_vma(struct vma_remap_stru= ct *vrm) unsigned long err; unsigned long addr =3D vrm->addr; =20 - err =3D resize_is_valid(vrm); + err =3D remap_is_valid(vrm); if (err) return err; =20 @@ -1705,18 +1712,20 @@ static unsigned long mremap_at(struct vma_remap_str= uct *vrm) return expand_vma(vrm); } =20 - BUG(); + /* Should not be possible. */ + WARN_ON_ONCE(1); + return -EINVAL; } =20 static unsigned long do_mremap(struct vma_remap_struct *vrm) { struct mm_struct *mm =3D current->mm; struct vm_area_struct *vma; - unsigned long ret; + unsigned long res; =20 - ret =3D check_mremap_params(vrm); - if (ret) - return ret; + res =3D check_mremap_params(vrm); + if (res) + return res; =20 vrm->old_len =3D PAGE_ALIGN(vrm->old_len); vrm->new_len =3D PAGE_ALIGN(vrm->new_len); @@ -1728,41 +1737,41 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) =20 vma =3D vrm->vma =3D vma_lookup(mm, vrm->addr); if (!vma) { - ret =3D -EFAULT; + res =3D -EFAULT; goto out; } =20 /* If mseal()'d, mremap() is prohibited. */ if (!can_modify_vma(vma)) { - ret =3D -EPERM; + res =3D -EPERM; goto out; } =20 /* Align to hugetlb page size, if required. */ if (is_vm_hugetlb_page(vma) && !align_hugetlb(vrm)) { - ret =3D -EINVAL; + res =3D -EINVAL; goto out; } =20 vrm->remap_type =3D vrm_remap_type(vrm); =20 /* Actually execute mremap. */ - ret =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); + res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); =20 out: if (vrm->mmap_locked) { mmap_write_unlock(mm); vrm->mmap_locked =3D false; =20 - if (!offset_in_page(ret) && vrm->mlocked && vrm->new_len > vrm->old_len) + if (!offset_in_page(res) && vrm->mlocked && vrm->new_len > vrm->old_len) mm_populate(vrm->new_addr + vrm->old_len, vrm->delta); } =20 userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); - mremap_userfaultfd_complete(vrm->uf, vrm->addr, ret, vrm->old_len); + mremap_userfaultfd_complete(vrm->uf, vrm->addr, res, vrm->old_len); userfaultfd_unmap_complete(mm, vrm->uf_unmap); =20 - return ret; + return res; } =20 /* --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 5529B27510A; Thu, 10 Jul 2025 15:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162684; cv=fail; b=XJqWpRuZutLPilO5mT3Y6t61iyx5jEDP0w5VI8IZg6NA5i1pHDiE4O7dXFZtMx13NS6jmPW6DIkfSsahctnyS87OwtT+JPtYC2AF+9tpTN9WAjMjpKKXX6/KKRexdNRGMDk4IfXV/QxgJ8ALQf4qp69DmousLuYY52WrS0rnNgo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162684; c=relaxed/simple; bh=ELCWTjVUKWu9lWDsxrGyIqbVes+UQrULMHIthnl31p0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=XlHKNCJn/92YlpJmGj1GDtQfsjqAEI5p84MHhLV+Z3XCbuMYZ8HrcajMUH799GZEglB0QKSR9TwIGDjc46w8gibWyZ5vAyqSsXsS+XeMtsgrTT/7aK8EiQzhYW2S5Do8tmEska5YDr8G1bH7y0VnEfSk1lakH7I8QuwhxXV+PZo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=f6bmLnnh; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=YRxUa4JB; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="f6bmLnnh"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="YRxUa4JB" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF73Nm007434; Thu, 10 Jul 2025 15:50:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=/6/5GxZyNlGBOsA1ixk1CmOFmpuMo6iGz4f82q6m2mg=; b= f6bmLnnhyMIgdFl6OZ/6sfP+vA/EbJ8gseDCxQwoBV/K0d2EQ4JFddxVW9d8Mg2N LSMZjonDzFm+mAUQRrRzxH1629bQJgjTbxtSZLa6UMagO0zHwT8/svUTF7ZZoj5Y IFrUiPY5EIVQ9aDP86uIQ442PSWeYUqWSoq4/sCGvdw7AtgEACIMKzRu5dF4seI0 ZDt2Wyj2k0TuJ4edvOI4P+gw9a5y+F1BCCQYqkjBaERSFxxw10Zmb2gMdOAozyMu WOlOixHu1wSkM6j+hhsXlwlphI5zHFUye3BmzLIaIJxMYA9IQ/AgiukDyI7d3Xcr RJGVrsFIKPu5iT63DJeoZg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tfvd038e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:50 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AElogq014084; Thu, 10 Jul 2025 15:50:49 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2063.outbound.protection.outlook.com [40.107.243.63]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgcfqpu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xXPoS9bDCI0J+KuOF3Kt955q/XI/Blh0WKdCuIKofvA1dYGkeQqZuDETixXaPFbQCp59OI4eAULuK5SgX1Z2gnAqTtGsWgsICEjXzNlp/uT7gky9XX4xeyI54iPso+wyoXm8A11LJq3pzTkV8sJOfYcZbxNK0L5w3FkI9goa6l2fM01dsY45tRPNo6oWH7bqpaNS0cwg0RlVPNfPa58rEOCLRxEU2a29luC+rlaZeAft+jXpLkt/YEqu2PZSQAqzAnEOyxMiQKNtc3TDcXg3IBbaqc7ytraJLckTH7qqqBKOiRe/PUxowkGzpmgspO3WJoOvW4XhPuhXvxn367HwGw== 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=/6/5GxZyNlGBOsA1ixk1CmOFmpuMo6iGz4f82q6m2mg=; b=SArPKOmj6CLP5+ND3YU1DGMbOMIyB+AsHxs8t8eXD4qeSZyKe5Ri1MfBxzQOHPW6g/C6F9AL7csZnIh2s4cgZF2Ilsl9IcHVbrN23c1tHXnR5PNMTRBN9muegDHIQsl6+XkI0qNzCVLEueOu3dLZ70jdutWlTUTeYcHi5766vMDdSfxv+f6VyimIdmvZRaOQAHeCW7x41Zw22a26jTu6KvSfxPwYZZ3zOHHxVqFjubwbbikWoxvoZPWKll8B5iEQenwMQOr9XkqL+mHk/EV6RXElDl8HNqSWOaLt2X305yuRPNVlaSmOrY+ctXGpJzOoLmPSlx2kUvveS5QGrkshgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/6/5GxZyNlGBOsA1ixk1CmOFmpuMo6iGz4f82q6m2mg=; b=YRxUa4JBA10CNJ5m+Ry94kaFJV6us072MnioPeWnopycTixJvayVUgE1xkQPWo/XLOUFGLIXBXjL+g7LtjGCOBYLuZSlbSfvuvY4CX1qg65YmiTrrxRS/u72p3D6hZxpYcmRYgg6YoIVPBfEauB7pCG8M54uVrEhPXaW3zY+bFM= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CH3PR10MB6691.namprd10.prod.outlook.com (2603:10b6:610:142::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 15:50:46 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:46 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 02/10] mm/mremap: refactor initial parameter sanity checks Date: Thu, 10 Jul 2025 16:50:26 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0069.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2af::12) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CH3PR10MB6691:EE_ X-MS-Office365-Filtering-Correlation-Id: 64c49fb5-2806-47bd-e713-08ddbfc988db X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?S7Wo0gWGtZCbrWkAHLXKbm+luB9ey8WQEHn+dI4+/IN7rIumUiX9Myt36AOL?= =?us-ascii?Q?0LqPGe+4QlDjDVjK/XEqUkkTueVCoGBOGvy+ndUT4/SAewL4xAEU3Av2ZAEq?= =?us-ascii?Q?TXVjNleNZMsLfkKsIOfhe2ZvdxjcNU67ku1/VEk0USek55/nGUGvlV/dl7Pg?= =?us-ascii?Q?Pjtjb7dHPomGwBPTm8kxitDaZvL4/X+xh7j4YJYbX3t3hi6CamiNU/1+f/jv?= =?us-ascii?Q?v4f8WamydKztsntbeXkpy9Gqvd1hN4RatC7ghjqKa1Vnc84V2usl3e08evYW?= =?us-ascii?Q?mJy/3CKfAheX3oCRspbXDtAal8Stb3CV0SruXAbq28DZ3BWPvQ0SdtQ/SXQC?= =?us-ascii?Q?7ugayRZwthwXcBPLuQsuQAAURwvGKsaiMDfD0AkFSEYQKlBEpOwB/pw2eIdc?= =?us-ascii?Q?jJvriStGSvFZZqUKGnYI2aRt3XyGQK2a0943Zw81N/LdlutysPEkz/t7NTrJ?= =?us-ascii?Q?6MrJJfhv75uH4F6+zLaKwCUFEjkNzIybg18rnNfHvfjE9IAr8vtYBfEPgRxA?= =?us-ascii?Q?DAHfN57unzsSxPEzOwBfYF0rScR1V00zmkVi5lu8Zg4+9i8EL5wtkHKDRQ+Y?= =?us-ascii?Q?SNazUkk3/8EfiuomyIfw1TunbJLTmk2xMZplhJbS97Fz/o2kTrlSvbjQiwF7?= =?us-ascii?Q?6C16cFfA9GmvCDqbSPTsm84tEjwxqn3+3FZ/PqVtdrWiHmMzfNAd3LLaOiz5?= =?us-ascii?Q?9kv0iSfJwxAy2oWMOjQHlA/mSUpxtBCyyQzAOWyRWqU9TAmV4oBW/JU0/AqE?= =?us-ascii?Q?fNoZZDmJafK3AkMHSKXA60yQtLn87rDKP8GBPOvd+fq0onjG4dq/EPEi2KXA?= =?us-ascii?Q?IJgWQHQvhzsFTtZngVMQ7sRrXzYM+Ys4RBF892Aaoq9ZewNXVbLStoBYtNJZ?= =?us-ascii?Q?Wb3cC589Tz5X4oOF9ewX9TtVJrH5V7Ce1IZ/D8/196dw105Cuup/BOWrpEg4?= =?us-ascii?Q?gb+s8cj9Kf/3kCJbncJ6Zii5QxgRAEoUtEB7b8A+5BvcbtQYJbB0FlbEGn11?= =?us-ascii?Q?pDTTdEnIKXTt1WxBbjEoXurGRaSWrhS82TXq7V4E5yD7l+EZKqH9hgDBMe22?= =?us-ascii?Q?BSz+P/2bxUVnJmJlrtLmtId4n0R0JVl9kWBmEx/TQ9Y6Kfc3K0YWiXokbuap?= =?us-ascii?Q?aHHWHcsMjaBSZrRN/kLMcw1t7gS7f8TTund+LHn0wMKSHA/DwihKSPgD6qkD?= =?us-ascii?Q?9Hx9hUvqyghnwBzU6JLMRSLv/7cCJBPFpM5sN2As8ARvi9P5pk6jkipxPe3w?= =?us-ascii?Q?JL6aMsCrAKGyZmydGXDzT/lOumoAUy+t+IDIyiCYRXzajX8PyTkxKmcLoMQJ?= =?us-ascii?Q?PYYNB75X1znaV0i1FBMfhEMqNoAdUHoJL10hXZO8ONMqzHzrK2PV2UCYF5bD?= =?us-ascii?Q?LSyGlhXT8kpRDX5aCJUT1kRHqCbv7VMd8X0kFf6XX4oMM8j5d6Uyao1k3qqY?= =?us-ascii?Q?s7zYqgMBSqQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6mUMdwU581nA8c0smJQMSn5NQseVeQrPnQZ3gwpd6Lo5EfjJwE9C7wb5RfaH?= =?us-ascii?Q?MoG+WyAcLVfmXYvQjM2Ue6n9E15SkAC6iTSSVuq0OsVATetf8tMNHLU0tHOg?= =?us-ascii?Q?RYLrYwfFIb/EHhXqMLixA94pzcovFVQOl+9dWBntPhLEA3lY+VwbPvTNXjY4?= =?us-ascii?Q?YQIKItrg/s6WTD0ChgRrIHrnmKqV5r1LAjhuPRyPklm4IghM9smo/N0idzca?= =?us-ascii?Q?fcbQiLmnaUE6r3D+FQ8enF1OQHB/mB2S8kuLId2+ckfynRuhVqlFc54AEjAe?= =?us-ascii?Q?vY73HBH2xNb6fjSPuJE0DwFD2cSRSgHcUqu5oK6dz57zkczMZsuNN08XuKGM?= =?us-ascii?Q?RpRnQSLUmQMvcNOGFTwbjToU0vuSDlwjnQypACUMwgoPie2BuDwb7FfvWeT1?= =?us-ascii?Q?JvIrPesLXfFyOU2Ej4FDOS0GcnHU8ZOJr+tu4MIP+YVARWpek1yb6F2n+nKK?= =?us-ascii?Q?nqxr02xcNIJHZttQ0mb5HUcChyhhHIjkrjx+gPhm7IzEEA6HB62Siz/uPyiv?= =?us-ascii?Q?sCB3bmcCE+0pdrnF43UUojxvrpofJVFJpYRhu3TrU8Akhg/ayQrEbqpTQoUl?= =?us-ascii?Q?WaFr2riiFpIrYlL9X/eCDXQcd+laifA9di/W1IvoPC9iab4q/aI+PpFWLO5B?= =?us-ascii?Q?R7oXtP711oFFA+AYv6NVEv0sQL3DGjcwD07ZEXPd+adrVfntpzuP1/TBWoXY?= =?us-ascii?Q?oXUSc5DjbSgGrjnu+WVUCbxyLFHpDj2lUySe7Nf3y9k8nzzVg3OJnYGBjI9c?= =?us-ascii?Q?dNxJGd1fgJ936Hu09V4SpxB+ZjvcnuMEuaSwbUyrr7l3PJNkG+bMC9mFsx/8?= =?us-ascii?Q?8mn1LIhTKkppulMcnqNKri7EjtgcfGc1hme2yXHAn0uQqYJ4qVow0l5VN7aJ?= =?us-ascii?Q?8ieTQTwM4uwCisqtphId4ewqHig7py6LCuDnItw3aVhSuahWrltIHr7gnFIC?= =?us-ascii?Q?imm1GV7PBtYVW7FKkUNSMlKdhjWGjCY3JIHD2JbkbvMt8Y5pQrtfDS2j2FD6?= =?us-ascii?Q?X9D2amVxphwYCcMzVfQ84xKrGvWA9ukEW2bHYswACOqJA7tWAV1jPPUeRoC8?= =?us-ascii?Q?Ggtu82EeqQlIlAP76tJs1cC8hBZTKgDwsn5eyMxSMTarw/6UBnp5LniYryg1?= =?us-ascii?Q?sCLAz+Wc9Pyn1ZdcL43fNVNGC1k1Kw+8T38+IEo6i9UrU4g/aNBfPMsG65dc?= =?us-ascii?Q?JBUYh3QqMG14ThdpBHoJcR6/5/H0gNe5w+eFp0ohi0MJQF/FRz5j18Jg2sTQ?= =?us-ascii?Q?OER4Hgyo76QKpWGh0AI5xbLC4Oc8py9Si2OqaECohMwepeTrafa6kMcDaXbM?= =?us-ascii?Q?QpfU/hrb9KoK967zjZ3qFyyXcHPe/nquv9lIVxYPm88ub1oc1KPNVx1IS5NF?= =?us-ascii?Q?J5UCM+273J1sG0qzK5KUMh+uJl7Gstawp+FciY1TtS7rp41JZ673x45v6aHE?= =?us-ascii?Q?vD5H1GiVIRXn1Yzimj3HpAcMtVRl3hVmW+y7NCmm6JnMn0iqXmdhOVWGQRsW?= =?us-ascii?Q?4BL1KEr8FGSgHCyOTGMi+nftkPdznzp2+6jf1Ivmg2Igj5tG4MI/KSer4kXr?= =?us-ascii?Q?2t8QkBw9DbR1S8ECsyZaFtmq6VmNgz9JKgGU58FnenK2eZ4FxBX/ueGnAtQ9?= =?us-ascii?Q?Xw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: M4i73HRnrN/IHJBxSquemZhEwWIsUMY8OVprHVJhwJB4zrfOdTaNZHTPsrb33Pyjikv8sNw8alI2BK/OEADnDz6BiZBnsz5lml7MsCjlFSi2EaDa/azQkmSPn5K2XXdgvGckJSZUGOM8ctlM0VnsyEdi5ZxvooYA60GqEfc4zhTQl4a+X0y00/7N6pEYC3SsGvo669Au0ZVjlAixJKY3QNPeS5LNHTaxlK0dI23T1l9QHW27CX8RSjgqvHmLWOYRzwtQXD622guvVx6tM+rYkvbQ9IgNuTYLvW49UPd9VHMK2H/MNEp9coAhuFANicN0I6xmGj8Kz1V1DGEvTHt4ug0v437I1jznF+Ib4tyisAwVOgIi7AASyeJgGbmKXX/Q7n/Sn8/7Vb3k9CSgne+ijeanT0PapUGBBVC6Zu3l3/WjsX3BZcRDv8Ny/NDO2qnrXKjH0ir80uASkExlsxneZC6N0B9GFsHMKBmXx0ViZoFHwVg98kBwf8Gzl4bQtKfaDIMxfM6yainFKkHuzz5Znvvg06L0xuwirhTUASoPY7jMRX8QgcKHkf4zFzgr6XW6uOx44+spCMcy42fXMy3rwslEo2lB7l4/tFg9CZPHixg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64c49fb5-2806-47bd-e713-08ddbfc988db X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:46.2531 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GEHzbTTHPn50Rxvo9LBrEkAn6A2ky+hgt8FI9YbD7djNq5M2DftrOz5HyyBQT0R5TR6j+omy63hAJPvqRJIzRdftvIwjptbr4vSeXIdJ/1s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6691 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Authority-Analysis: v=2.4 cv=Ydi95xRf c=1 sm=1 tr=0 ts=686fe15a b=1 cx=c_pps a=qoll8+KPOyaMroiJ2sR5sw==:117 a=qoll8+KPOyaMroiJ2sR5sw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=44BLHjD3IfhdABlFFWYA:9 cc=ntf awl=host:12062 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX4rnUwVnDzUAh JBiZvAtRRmLmTS0U2aDwc6kVRYeeaNT2E6yu+xktm9TTvvO7d7zckwCbqbAr+YgBGEwm1iAKXHC jYX+d+JBXEjTmRJRKz2OKH+g06ULQOqttSQBIlEAqNet9WEgw4X3DjDgYPx/QNNWvm2yRtCEO/t oSPXRHXPhlzuuxkvzYPh/Oupp2iGnEGYsmdNZKti++pBO7IZ45mWx+JP8vHJ3QL0bVekbsapf97 0r5wSiGA+Xw+4JuL7yqWfKd8+iqIYWVVAbxo40Ug0+4s3W+AluSepJe96BWj4BHf17NYoDCPeuW +2iir6zRIA1IZR2F7PXndbzzGJqv96tlekLspvPzg6jRnmZuO87w/pfXAEBKExxAkqE/8m6ULIS mAuTaitUoqZy98y8PPMWR08HXx7YC7ZIs7lbcSTqEOwNGf7pdRYVW9iQANC9ku8Vaod3qq/b X-Proofpoint-ORIG-GUID: yOAG9qU7KKx-jDl0HesvfDgTVv4nEDBS X-Proofpoint-GUID: yOAG9qU7KKx-jDl0HesvfDgTVv4nEDBS Content-Type: text/plain; charset="utf-8" We are currently checking some things later, and some things immediately. Aggregate the checks and avoid ones that need not be made. Simplify things by aligning lengths immediately. Defer setting the delta parameter until later, which removes some duplicate code in the hugetlb case. We can safely perform the checks moved from mremap_to() to check_mremap_params() because: * If we set a new address via vrm_set_new_addr(), then this is guaranteed to not overlap nor to position the new VMA past TASK_SIZE, so there's no need to check these later. * We can simply page align lengths immediately. We do not need to check for overlap nor TASK_SIZE sanity after hugetlb alignment as this asserts addresses are huge-aligned, then huge-aligns lengths, rounding down. This means any existing overlap would have already been caught. Moving things around like this lays the groundwork for subsequent changes to permit operations on batches of VMAs. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 1815095c4bca..a00da0288c37 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1415,14 +1415,6 @@ static unsigned long mremap_to(struct vma_remap_stru= ct *vrm) struct mm_struct *mm =3D current->mm; unsigned long err; =20 - /* Is the new length or address silly? */ - if (vrm->new_len > TASK_SIZE || - vrm->new_addr > TASK_SIZE - vrm->new_len) - return -EINVAL; - - if (vrm_overlaps(vrm)) - return -EINVAL; - if (vrm->flags & MREMAP_FIXED) { /* * In mremap_to(). @@ -1527,7 +1519,12 @@ static unsigned long check_mremap_params(struct vma_= remap_struct *vrm) * for DOS-emu "duplicate shm area" thing. But * a zero new-len is nonsensical. */ - if (!PAGE_ALIGN(vrm->new_len)) + if (!vrm->new_len) + return -EINVAL; + + /* Is the new length or address silly? */ + if (vrm->new_len > TASK_SIZE || + vrm->new_addr > TASK_SIZE - vrm->new_len) return -EINVAL; =20 /* Remainder of checks are for cases with specific new_addr. */ @@ -1546,6 +1543,10 @@ static unsigned long check_mremap_params(struct vma_= remap_struct *vrm) if (flags & MREMAP_DONTUNMAP && vrm->old_len !=3D vrm->new_len) return -EINVAL; =20 + /* Target VMA must not overlap source VMA. */ + if (vrm_overlaps(vrm)) + return -EINVAL; + /* * move_vma() need us to stay 4 maps below the threshold, otherwise * it will bail out at the very beginning. @@ -1622,8 +1623,6 @@ static bool align_hugetlb(struct vma_remap_struct *vr= m) if (vrm->new_len > vrm->old_len) return false; =20 - vrm_set_delta(vrm); - return true; } =20 @@ -1723,14 +1722,13 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) struct vm_area_struct *vma; unsigned long res; =20 + vrm->old_len =3D PAGE_ALIGN(vrm->old_len); + vrm->new_len =3D PAGE_ALIGN(vrm->new_len); + res =3D check_mremap_params(vrm); if (res) return res; =20 - vrm->old_len =3D PAGE_ALIGN(vrm->old_len); - vrm->new_len =3D PAGE_ALIGN(vrm->new_len); - vrm_set_delta(vrm); - if (mmap_write_lock_killable(mm)) return -EINTR; vrm->mmap_locked =3D true; @@ -1753,6 +1751,7 @@ static unsigned long do_mremap(struct vma_remap_struc= t *vrm) goto out; } =20 + vrm_set_delta(vrm); vrm->remap_type =3D vrm_remap_type(vrm); =20 /* Actually execute mremap. */ --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 8322129E0F4; Thu, 10 Jul 2025 15:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162735; cv=fail; b=g0wUt5s/IH5zKYOVWfxHYywfHIkZws3p+0co7w7tXBt03BAkVfoXfC2/do3BaO10rZzYlXlSHASK/W0Bbphwn27QIZNVORT3W8RsSxNZFHXY6bDahEuR2bN9mYioHKkM8m4copkehGHNM168JMOsUA7CBGn3PW0Z3zIl5lgdnS0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162735; c=relaxed/simple; bh=iXvm+GJzmq+6aRoft9XZMiELUBoxj1gUUYDdOebwrr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=j8/RIYF6noJ56nEr+g5weH3YEMS/lsASM3je5xJKl2o0EJQaLWZ7YE7J55onW2XStGDDYUwg2WvEO3XxQsbU0m0rCDRZ2+B5EACUm4vtzv1tqNBivxMhTyUsDxh6ws3lSPnHSS2am0sCca5HBtivumpSu+GPzRF8f4sTsuLhGUw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=BjKkcPTN; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=P4SoEFTC; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="BjKkcPTN"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="P4SoEFTC" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AFVtcR024091; Thu, 10 Jul 2025 15:50:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=sC+w+4PJixR8ioWtKbBNjGBZm0qH0EN1ahdArU658h4=; b= BjKkcPTNkegzN6AFoghtzz8OA2jeMYJ6OIrU8Yq1L7AmAslJJdmcyp8ky7ZmBtoh ayliO0rSDQQWBdw60m7s7QfZYEcw2/u1jwnAlLNigbcYQcLp2BJG8Fta9jULqgx1 FgPoR9+QnHKTBnp8z0wHYYi3N+3nY9DD6QGJ6XzpWxzn1AING/oLKnhoBMPgPtBi gtRaeg/P5cUDQRXFw4VlZRDAWKgc3lmiv+K5r2qAp98oGgWGEhJOGXcd2jtNALYC MXoI2tN8XI6VU/c7AkLDB17TPoRg2rz4sOA2yrLj/vnzn0hIfWhKMAslDAigv/SM zhGpBF1JpeEX7UjcKF2vcw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tg84g1kv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:58 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AEkQbb013536; Thu, 10 Jul 2025 15:50:57 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2065.outbound.protection.outlook.com [40.107.243.65]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgd7ywb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TMTwYGwpQrCQRoyE8Mw3lKW/Z0wh97itgbrelvEDJJTOhxNsqTNKW42oAM9ki7pqu9e8fCjcfmL4MkFkZ3dNJeYZEIghHJJ+lm7ujFwHg75epCYcCGRft2o6p5WMKii5Gr2FrTfSHGuXwKVuIlCv9io06XAT5kscRY+ziF2sDPWcRJLF7ao5u09EJKDK8B7vVVa7MiMU2otCKFviyiolK0dNvcelCfWvOUwPwRQElOjwnIqOpJ/S1jvMAkzePKHHcjvsb1glbXYPwdUGHsw19QaXhTzdzxzdO800t9iXAJ+vD6ILrXUuglXyAIPWLIBBQvuYcCRru0CAYB6pYOyAtw== 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=sC+w+4PJixR8ioWtKbBNjGBZm0qH0EN1ahdArU658h4=; b=TozWocIIOvOaFfYka/N1Gf20ipXr7D7Et6RkT1CR9XLKnMsPg3HYZuK1mZ51LNzD7HKnlmXwa96uh9OP8NXbp2PfKbrW/0TERKK5lpGiADvLeNbgY9yezVn9nlxvwU+iojVJyU1K9GE32leevkt4Yso1Ut7i7KpjsiwQXOdwdnlIF5/E/p4KAKNTsaetREPckDlPmVj6FPMbTrr29mwnOd5g9XMq0aWT3Il9HMEocWoI+deT7h9tjqTkqYp0tfNZnO3JU62OxWMfefw5HHQvWcweOnGxuXozVy9WHNgv9KOoPi0WijJe0evudwKfWxnWJpfMHd98eMZzOAGAj2zlkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sC+w+4PJixR8ioWtKbBNjGBZm0qH0EN1ahdArU658h4=; b=P4SoEFTC3+piISAnitVFTPY/86BWaqbbqCOcQ8KhQYbZzQKdOnh7PfH1JtWWidPzo11KHfeC9NyWG3tHrJkTsVn+3IPNtM6kY90wmooSOuMvm+nbKux1oOhgPA8hc1d2mEYDa6MipKk1YK/moatzuCf7VSyoA7k/wyXBEhJr3W0= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CH3PR10MB6691.namprd10.prod.outlook.com (2603:10b6:610:142::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 15:50:48 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:48 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 03/10] mm/mremap: put VMA check and prep logic into helper function Date: Thu, 10 Jul 2025 16:50:27 +0100 Message-ID: <3048e54e92bb858493da5d9be3d5d80b1fee7325.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0511.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::12) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CH3PR10MB6691:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a40a4e1-9cf4-4c08-d9b8-08ddbfc98a18 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Kuje++1kxfQgY3+VYU4lKyrmwKSrk4kfRdkacoNKabz84Gv18r+ClIVnw2/D?= =?us-ascii?Q?N5F/Hg31u5TTZryzGi2AKQmHYmiswhUNpez/6FVQBb1o7wSK5pwtcm29/7jo?= =?us-ascii?Q?6/1WvTKiaL6XWrKmtDs6zG+w3J+ZJvcpUtmVBJQ3x9EF5ji/NYFlMQlGrZdV?= =?us-ascii?Q?ShR3Sln0ybiCGY/btbkRlOXq3Ft1XZw3jz07KeUycALyez7W3ZVrVkkxc1Vk?= =?us-ascii?Q?JUgaoq2MSWfjNGBaIVmRIHIDOM1lxVchJkbCvVUxfGwL125vhwGMscnH59sI?= =?us-ascii?Q?tU6TXvqBBg8vJpL22WTY5ScpoCBFx73jXeDeqYi4n7i4nHusmTlD6Hl5KF/t?= =?us-ascii?Q?U583vM36SXXfKm07R3OIx2JKp9EgDsZeLTszVxDKDSJ+83KgkPs6eeWgF7h1?= =?us-ascii?Q?Smn8RH7MBAU1EWyOpOl9TqFu1RBzbIw7tJkXp7FojcdneLqpzgOUcQdHksIn?= =?us-ascii?Q?uatNWsFXVyo38FUqil7VrH046KlIE/oRR4R2/62L4C9EUTJ/NWe88qHvbrCD?= =?us-ascii?Q?wyuy7nBsq75BBfGaNUhmdHnjG6Cn99sTbU6T2Vw2KxEGNsNKjZ8CWkNMkvtd?= =?us-ascii?Q?j+LEL9YJO1PUJg5TDQ+ftuBNzz9IgbH3kuJmVR3sb5/DZCDljx3a2b/5VMjs?= =?us-ascii?Q?sVctU6o7/lnjCJZ3gcGjegzE0BT2WPFhxsPiq8Jb9TI0MAKxG7OOTZlK7kZG?= =?us-ascii?Q?B7dgSrirLJEG2dHeDF4iph1reoMj47twqnm7XARoPaMWhHh9X0PGENzSkVtR?= =?us-ascii?Q?6nQkT48Oz4utBtp8st6QfxcK5DI/kG8l4A3SHUXJ9EcCZ5o5j+ERyuGgkn/A?= =?us-ascii?Q?X4s9jFEYpT+LKSB9Y5pRWOh1NRxyuoSb2dGWp0kjk026xbZFKrzjn3KBcrzw?= =?us-ascii?Q?qXhltUotqOaUu2v0UgDH6nwa4vo0sTGcA17nOpu1eyjarGt/v8XiohDAi6Qj?= =?us-ascii?Q?Ze1JD6zDHxjKTHi7d9XDJwGHcZeYeLm13adKMkWOaSABJIU9keEScxC0kK+l?= =?us-ascii?Q?EHZAzu+eOXzTc8WGdZyWZSIytGMYMOaOQWGEjAjRMtM8wqHLkrvv8vKNE7ly?= =?us-ascii?Q?jRKZFQWOEwgDpiR9DSkuDuVNUEiPzy3i/gAY8g39YqRs2UHDBAwi1lN49zU5?= =?us-ascii?Q?NOCdA2XekLdBkamjoG1CE70SSc3m76XLHEmbm74MCeqFRlHqL1omuRO1nmc+?= =?us-ascii?Q?sQDJEiPr0TAWOoeP8axyybVQSGr1BuGCylGPLgGh4lgTj5xG1ZEBnOrzzfm4?= =?us-ascii?Q?z6mHj+QaMVw6E+uRko7TYHrlFUTHH+GXYCK1g+f8cVpzFC2KYgUXTZXOShUI?= =?us-ascii?Q?O2CA/2XZpuiAV2Zz99/AqzenBV/+5aRHUeNQNQxvVq/eNiWiI6gxQSTzkd5s?= =?us-ascii?Q?wB4KlP85iNArGolKhzn+ZKUM7aZbkTONZqWa+2bv8c22t3+qj03dPr1xOIMe?= =?us-ascii?Q?3nI7rjX4a+Q=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wfDmhcxmHimU+AxTRIWgEb9KA6dkUpcMt09d/pveiKbRN6eFyKPANi+tsSSh?= =?us-ascii?Q?fOMG/BN/6tkuZ6idAVa9F1Zb6ajLxF2EvndySxmittWRELDNCTxhn8FxAAFh?= =?us-ascii?Q?5tIpYrKlTl/yOnq6qF1UuActua7fPLiF787Qh2sIKkxa/K/zj06MP5u/zjv/?= =?us-ascii?Q?XU7BZ1bNBXmqzzekbIdwbLg6XPCmKs9b1RQERh6I0uWG/S7JcELxF2+WVIBM?= =?us-ascii?Q?vBmLMs+yt65SlwVyEeVx6GcO71Fr+ng+LS3KScNc92JguBC7A+sLJADcQ0Uk?= =?us-ascii?Q?TlBTaSCzkr0ptYtPK8E7QXcADdTRcc+tZNY8EXr3T2386AIhnxNNdPicVsrD?= =?us-ascii?Q?6QyxmlsXpQdDjo/3nWUO1kKFPeDoVoBCrHJ70fvmFPOuEniY8K9yu/IZo6p2?= =?us-ascii?Q?5JJ64e5kTUL9yBVgCXe0u/QRkWyQNI4riTWvi2eFpML1axuwX2ljZVe0NJkZ?= =?us-ascii?Q?nN/weEOpqvuKm1g1dmU+IIyMtOVya5QcHHI7w3HBv8QRD5grwM85Fh6J0Jjt?= =?us-ascii?Q?1q6MuvCKMXYPCFY7GoqvmHPxj2b2/YDYpRFdnwKZfThM5zsCUFK6GXS8EB12?= =?us-ascii?Q?99+5fYcxXVaCsF0rf0OZYqf7xaJRe9ptqUZybpK0T4kjPV2GdPKBoY++oxE4?= =?us-ascii?Q?dHNj8WixNuM1XSGVUgPIM+UIqqvd2CZJmthjG9gFvLC9v9u4vWVw83sb6ByN?= =?us-ascii?Q?utES0QVeIsQWj6jThewQQis+yw3sZR6GDYmGulmf4S3yuc3Ecz3eKbY9Etqc?= =?us-ascii?Q?dxzK/0KnKbq8E5TGa8oPP6pBOFjnf8GWxUm+HMhYkKsNee0SFBcgfe5PWmqd?= =?us-ascii?Q?w0U3AphALihIuVzYeunFtVS97ZxAS/eNgiSLA0vOI8vlc4MlnYbFX+Z9ByR0?= =?us-ascii?Q?60oO19BlhJBtng0wpw6Ks0GW5q2FST8yLaE4LuwbF3Tu1PCQdDaABiNTokT7?= =?us-ascii?Q?Zk4Q78RoJTC+Af84hyJwO6TNfTxjo0H6iFqbmngkVtZ/NHSQc2Vfg4+l7lPF?= =?us-ascii?Q?DWdKPcX8s1624blE5V7Tvmt4+BzT5L2mOiVKg5qVZxqciaWdljB0f26VH6YV?= =?us-ascii?Q?nUQTswLiKijFlgRR6Q8kJTcvSFu+SGNU2rARrJ6IRmAC3GGQDz9tWeXKPGXK?= =?us-ascii?Q?po92KXbeJFgfb/F/jSSfuBzR96wOwqXnhp9PF8UVJ6+d3YKhlL+Vbz5BUEiu?= =?us-ascii?Q?Wr2t+cL99UIDwoP6Zuw0i4TFSteoXwVpPAAxD1//94p1U95HBLVtXcGBSlDt?= =?us-ascii?Q?PlFkU5aG53NK9/5BJl7OsdHjmnQWTt41TuBz1w8Pmu1SosQsKv/z7CxnQlRc?= =?us-ascii?Q?Zae6ktNeRHSBl3GF47y4S3QVzSt+igGXm+a7fO9icElOGXL5PnJefK+O/EPU?= =?us-ascii?Q?BVagQh+OUH+k0vb2f5ptEM3Zfc5O13z+0kba2mnhO0/ugS0/3WMr/gfZipZt?= =?us-ascii?Q?SjVthFWXUtLk156mnFexs5f+V1iNOaTRrkOu2wqal8jhvBjafq7QX+S+rwgK?= =?us-ascii?Q?pg+8cWRgMGah6EXEukLs/L1Ibl4MXK3whO8NXBcdcCgoX9XLu7GUpr9ab8HO?= =?us-ascii?Q?IMBZY5nfVUGXmWt9K/HEG70ZGY33/AX6gqUXmVlZMtbm1ynrh+J5JvLv7otK?= =?us-ascii?Q?NA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: HWenT4TBfz7vJhmZFkIzqk7mqnaUDtyPuBnuD0Z1rvH2SL5vOCYwL5c9uLiOCtoR6n0UjYJjHPGAfRgBkww63ht8adLHQeWc1Wus6MYWgv5hpo2ql8z4ry2IVlOlt609LGEOM6A3A+E2O+OVGnhY2XcrEP2mjdDOPAONpHjL38UmTMRmiKMaHXJl7ZBpHLtiGLwz7rHWTho6zQmb+1auXvGGmDvvEM3Kw40iS2J069i4lYgAXO9gMGI03BCiNXjA4z2LfqVFyamLPEb0k3ZASXGo61kMu6DJE5q2cRh6P7Oypr6deW7P/fd7fHC5E2DVLFc0fXjVed4JZ5z2aMuC5zUtD227tOX7CA5dM1u0DhhYgjMqBPJfriUiER71/ujrxicYTWNea1g4Xsqkmi1wmvxxf8z4Fh/FgGMqIinHKohisYJcvzl+wNe59USOlwdeF7HTJ0pijgVWqT1yOdR1jUxHK0+eTFVwKwYEO/QGvKscppiHrm0csLvq4ylttbTcN2v/+GiYhrsTjlcRMB9dqDiew4jbKa3dItOOBdZeryLT+BY8fxVHycISPksc7nSC1dZJo9iiw/WOWrtx8jjOqfTVFHcLpgtTqM1OIOlYBNc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a40a4e1-9cf4-4c08-d9b8-08ddbfc98a18 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:48.3355 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MN6Tmwp6Qj5Mv6z7H+KsPhBPcP8dTDXoFKg8z6FScGxk8/IUSBdeW3vt7m9HJMUfQxc6oLovHlxJ3vdE7rlqr8VGjkIQVDVcxJkW1HSTz8c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6691 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-GUID: hRc9oMpGdTNNiDpuE20ErBx5y9xZGOp5 X-Proofpoint-ORIG-GUID: hRc9oMpGdTNNiDpuE20ErBx5y9xZGOp5 X-Authority-Analysis: v=2.4 cv=X/dSKHTe c=1 sm=1 tr=0 ts=686fe162 b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=iY89YN1uBm8AvMjWrUYA:9 cc=ntf awl=host:13600 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX1764LF6H80pZ NrFYZUNu3HkMuMktyzvY0uMlFCH9nakrP/tos/SqnXzHYeVzVum2z3t9/PUuv6MLtWyKL16XKEy 1b3ELNweEhNMvU9gjZq4Znp7vzcB0036WH4wZPwRA8f2O74efv6uF2JumYwD4sk4fVE/eNspXw6 YRfRwZMTNtSUB6U2kzQqpUBWyD1Ar7v4yXfwl6wRHSQAb0ieqWQ/UWUealW5shySe/rOF6SF3/C P+azNnlY5RIE88DTUWTuG8c/ypHSdH6ysyP7HF5ETb4M1WTxJtfzLOdZIVl9gomB/5uLpBBd8/z 5pgFG+W3xDvTWQOp6upDGPIqMXER+rBiT/OyNuUXyMd5I3CIMt0CT9+fioIkorId0AJ9MfRUrPU mi53hEkvimTtSeN12TrNtEzEsceiPd6V4xmIe4Hf6CKVB8PhRzY1MRKgiA9NNEM8ASG75yTC Content-Type: text/plain; charset="utf-8" Rather than lumping everything together in do_mremap(), add a new helper function, check_prep_vma(), to do the work relating to each VMA. This further lays groundwork for subsequent patches which will allow for batched VMA mremap(). Additionally, if we set vrm->new_addr =3D=3D vrm->addr when prepping the VM= A, this avoids us needing to do so in the expand VMA mlocked case. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index a00da0288c37..d57645573e0d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1636,7 +1636,6 @@ static bool align_hugetlb(struct vma_remap_struct *vr= m) static unsigned long expand_vma(struct vma_remap_struct *vrm) { unsigned long err; - unsigned long addr =3D vrm->addr; =20 err =3D remap_is_valid(vrm); if (err) @@ -1651,16 +1650,8 @@ static unsigned long expand_vma(struct vma_remap_str= uct *vrm) if (err) return err; =20 - /* - * We want to populate the newly expanded portion of the VMA to - * satisfy the expectation that mlock()'ing a VMA maintains all - * of its pages in memory. - */ - if (vrm->mlocked) - vrm->new_addr =3D addr; - /* OK we're done! */ - return addr; + return vrm->addr; } =20 /* @@ -1716,10 +1707,33 @@ static unsigned long mremap_at(struct vma_remap_str= uct *vrm) return -EINVAL; } =20 +static int check_prep_vma(struct vma_remap_struct *vrm) +{ + struct vm_area_struct *vma =3D vrm->vma; + + if (!vma) + return -EFAULT; + + /* If mseal()'d, mremap() is prohibited. */ + if (!can_modify_vma(vma)) + return -EPERM; + + /* Align to hugetlb page size, if required. */ + if (is_vm_hugetlb_page(vma) && !align_hugetlb(vrm)) + return -EINVAL; + + vrm_set_delta(vrm); + vrm->remap_type =3D vrm_remap_type(vrm); + /* For convenience, we set new_addr even if VMA won't move. */ + if (!vrm_implies_new_addr(vrm)) + vrm->new_addr =3D vrm->addr; + + return 0; +} + static unsigned long do_mremap(struct vma_remap_struct *vrm) { struct mm_struct *mm =3D current->mm; - struct vm_area_struct *vma; unsigned long res; =20 vrm->old_len =3D PAGE_ALIGN(vrm->old_len); @@ -1733,26 +1747,10 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) return -EINTR; vrm->mmap_locked =3D true; =20 - vma =3D vrm->vma =3D vma_lookup(mm, vrm->addr); - if (!vma) { - res =3D -EFAULT; - goto out; - } - - /* If mseal()'d, mremap() is prohibited. */ - if (!can_modify_vma(vma)) { - res =3D -EPERM; - goto out; - } - - /* Align to hugetlb page size, if required. */ - if (is_vm_hugetlb_page(vma) && !align_hugetlb(vrm)) { - res =3D -EINVAL; + vrm->vma =3D vma_lookup(current->mm, vrm->addr); + res =3D check_prep_vma(vrm); + if (res) goto out; - } - - vrm_set_delta(vrm); - vrm->remap_type =3D vrm_remap_type(vrm); =20 /* Actually execute mremap. */ res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 299192797AF; Thu, 10 Jul 2025 15:52:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162733; cv=fail; b=X683EJoWprlPyVw0mF+Vx3p+cI8NbFTDTln4sn7342DA9AvDT/56A/grwUSvSuBoWZRoaxD3OWSFJyT6KaUuxGE++/eXKdLM0dSPHEkAy4Y9Na5XdF2gOk0ydG21ukfBYGR0owhXI9gRqsbFX8BFgTzmK2luXAS996CKTLtBiDU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162733; c=relaxed/simple; bh=x2WfqaXmOANO5D4YO5/TRIo5NHLzlQt9N2l6zLrb9o4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=TigTw+A9f36Ml9Q+cLcop71Yl80c0CX7302sAvkyIy72+59dF61RT7jyOtEhrvTdbKtsJIWxCtAeU5F3wl59RarqGBGIT/vx558sTi9DVppdGOgRuBrW07/GTXfXNy5nSDXkASeFXgNn2nP/ReNS+2JGnceS898n6FVYC6f6YOA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=VQq5CXeB; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=kwRDOtzW; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="VQq5CXeB"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="kwRDOtzW" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF74jT007439; Thu, 10 Jul 2025 15:50:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=BNm3SwULJNMyf7RE+WPGHmXkhEbzBnzDprncZ6EzcYk=; b= VQq5CXeBCwo7y/4JsIRDu3VKw/fy/hU6bF6XU99b7sU7hJv2VhAEL+lOn/eOoR2q 2AmA/fWIAZRc/5FH9KN1Ag56yXLN3he3LhruOmUGHrYRcvMRWIpzDhoxMcIW+Kx6 8iVYGPMaF9LmurzJgaCJcz+yfHzdLJJ/gmAU9GTYzxbR7eFXVWXuz4XA57cOVctT 3V7UDRVXey0G+AqafV4GXAPrPEkHo+rLjiIjisVPqYfoj5lvCgyCJeZs/fK8ubdK qHFhU539lUGa+qd1XGXDHwT0/mtsnQ8ZwNl3IcgfktwcjKZozMqUAHUWpxkU9S/U ycT6czlCkmlpgxdukTmbmA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tfvd0397-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:58 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AEkQbd013536; Thu, 10 Jul 2025 15:50:57 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2065.outbound.protection.outlook.com [40.107.243.65]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgd7ywb-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sW6kyzj+5je0oyh8Ri5B+N260ADr6DRqbIEjI0KIIUPtr2zbK3HkF2qmP4iR6I7/2iGLir5m4U5iGm3lSD1ZnxiBivhz+5XDJJfhyh1X3jj3QJmgs+0OvPEcBS4oa4UzGkS10O0peq0Zmar0c539E00FFgnJCf4GP7Gqss5kXvwtZNye5pN+4OEWGqJoXx8wThP1YHmm29QUOEnesSNhsCTNr6FTN6N7jwTeZeMXvOatEpX9IiUgeaEauXsPg8Tw+hBpNlRrBgVEEX3bvBgw9ismTygzDsehhRWm4nF2PDOlD9xKjRCkGSV2RqH7RkOJ53X/e6XmzfLjit9LfE0pxA== 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=BNm3SwULJNMyf7RE+WPGHmXkhEbzBnzDprncZ6EzcYk=; b=x65fiTmZpNNg+2LYviB0kI+W3KcfbmKZz07b44s50GRNj+MWkpbC0isvfo8IlhYQh/IGiop4E0yHeG+Ut8/lmskc3P0g0+35MkFsAJzZDHRk83z/z9lC+8Y37y1ql67HRJ7wLoV4xW8bnuuz/ZDWGtm11XOW2pn32xD0Xbgoq12YlwGofJQJffYQHBQMAYP6AMZNHs+XFVjBEJxG7IKVrz178hlQ+s7N21FUVzDqK5VOhTjXIqKJHL89WIkFIujUBjKOBIOihbq15V4GwzAko4GT3JGXa7buvxdEQcuAf87tPPeuDk3ZAhre9bf02xZYbLv9aq2aN4ZnURLftFJPzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BNm3SwULJNMyf7RE+WPGHmXkhEbzBnzDprncZ6EzcYk=; b=kwRDOtzWLYrTYX5ZTgj8Cq+bqd1Vk5SC2xdrCi+7Hf2kS/8d8DzsMUNj5+/9OyA68hiHiKH7j+AKNindQ4MBRk7H9vtJR5q9L9c9lbDvQ5vN0etLMSTcxHf91r/6F8eTYlpu5uhb6HH2qk0QAr/FATeOXLt/ZoeHcfApL0M7mSU= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CH3PR10MB6691.namprd10.prod.outlook.com (2603:10b6:610:142::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.29; Thu, 10 Jul 2025 15:50:50 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:50 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 04/10] mm/mremap: cleanup post-processing stage of mremap Date: Thu, 10 Jul 2025 16:50:28 +0100 Message-ID: <4eb6dd13ff135a01a1cc82583214d8d790be9592.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0064.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:153::15) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CH3PR10MB6691:EE_ X-MS-Office365-Filtering-Correlation-Id: 835ceaa6-2e05-4ac2-8db4-08ddbfc98b61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bOWI4RhhvczHNWVlGKyzwJ2jo+vNWVQxYRNOnmhcw53U/2oSjQCfWpAtnW4I?= =?us-ascii?Q?Gg3YByOvO/GM8USwIlXLVuyvPQfVdkPvhRDDQlAyaHTTp4D1LDUV91fSKRPm?= =?us-ascii?Q?QmeW2KOMxQ3g4Jn+55rrQtMRzvZzasDxSUKU277Y8wSmJ9hFQmiRVFukt7xp?= =?us-ascii?Q?j6Bh49+xf2B4AnpRmzEyhsZ2Qt48FskujbFRG5dJvqiVvMIekQyMWtll4x3b?= =?us-ascii?Q?qdzVMk5oYUkanKc3XitOxVn5+a3tnk7wKVIRLyNmEx/295c14Iah2FRIbPyG?= =?us-ascii?Q?xmDUVxoZazlXEyxUzKR7m09RXd7LrrHP5QYmx+mtkZCHwpJiClWOSH9SYkMm?= =?us-ascii?Q?FXC5K62WqXlUv33oTAttvr8huEobOMj44WCxNyNfGE0ZqxQcVxZwEFLJ9Eyw?= =?us-ascii?Q?bwaR27KjBSM+4muPFEGhd2tAuVgllmESL/cjtkmFdpTuBRi8AnwXgmicbu97?= =?us-ascii?Q?ctc8ay97RT1hAWEn5UhNK/BGi4oCGTdFeaPEyow2odscLNd67bCOR1K8rkYE?= =?us-ascii?Q?9ri6g6MVrv0nGQIjzfHETKTZiZihJ1fDuOfW7TBE6QU02EuB9VGKZ2gyGjXK?= =?us-ascii?Q?soSdpmJORvKAeoxhNfZ3ZmlUWVCWaQ5igbgi+TYy7wjlVnewbi/Zpc0BvU8H?= =?us-ascii?Q?AWxdm6Qw74ApeVz9EPiqi8a1MhO/tsoXBVUuYk3NbmYOviu7QfQcRKK87XNg?= =?us-ascii?Q?xVgORI1J9IhHJOSiuWIxujqu/Y1x88yMYqehPyOkDg1FhIkIPBJ8TdQmmSMG?= =?us-ascii?Q?KHkUoejv5himnCfwQXt1aLjv8dzqChrdfRSUcqdjzN4v7e8z13qiin6JJtai?= =?us-ascii?Q?lxfbPEzCQttGpZW5ezZReiL9CRI7qt/m6uAIELilOGF37EAV0arFI1uYqqBs?= =?us-ascii?Q?vFoAMH15jJyy6XoGUNHVBKQcBW4us6oOdkycIn/i2BadJcQpxs5XdFu3JI9O?= =?us-ascii?Q?ub7LFE52pU3fskhbk6lSFnXW4+13hsslZC9hcDra4wOApjKzfZEu1JZd+r8H?= =?us-ascii?Q?O/upnBQTQQeJDCT8k0QH+5qlBMRQlvR5unafa9WnThEYPjtFxmALxOorVlCp?= =?us-ascii?Q?fHT4WMfoJFW02X4DAWsGv3u+G7NcRPrDrFRg8FjfptwPoM3xz2VBLBRD2v3f?= =?us-ascii?Q?56BBgekCDMqbCcheCW5cJKKkTBkoVlwSGSJWCP+I2pOAsW/WKCBKox5jUuVP?= =?us-ascii?Q?eseAY1y79A71VA8wgSLTkFbW+qxKdohI9Js8NLEjr/6zhbfjoxD5JCo9LhZC?= =?us-ascii?Q?iDuobqnbj7rgvBnMyL4crxQiAC8scEluESGInwHkQ7LjiXmtlyWaEDlD5jbg?= =?us-ascii?Q?fWXUV51WtNDGqgAVL3k8lfyfrMLOUfEfWTqf7D8zgx13ZlbNjo8D91HUou6O?= =?us-ascii?Q?W5ZmwdGWoJY3av71xCj1Le/WqWJc/pUubkO9rnBNhNJiizZcq7b7/zA7vav0?= =?us-ascii?Q?TlDQyq5KQFs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z0d0+uiikpipbMJUjKBueRUALA0B99bCXMXXe/9gpTq+IjsXtgVmFQqG3oNN?= =?us-ascii?Q?SBce4ANNtYEFhLNHsL0o5xIybrFunmatksAb/Z1aH8Lh/09H1MAiGxiCG30K?= =?us-ascii?Q?11WzJwIY1Wyk5eZ0sS8tTj7WgawDOWNQ49TokQ1DNIwPTGMByRqU9BbeHjlN?= =?us-ascii?Q?HKbJ0yavcgl1wAJBPRQ8ZUep6VqbidY7Fs/2RMFOTaR9PbaeXmBUsarZYlTt?= =?us-ascii?Q?eWzO0IdNMQdOkn+ZT1oD0ebtgL0ZZtHx8plSxZdrTSGeEqLIWCIu3VYr0u1M?= =?us-ascii?Q?2hTcJmPETQRC7/R4X4yWqTxzTCVP8YxKX8K9IYnPntahfUh90ESjNLda9iPi?= =?us-ascii?Q?aH2xcLBKm5m54m1mLaVx7TNywbgxdFIAbce/g8sdrf3sAhup6YNjdbzHQnd4?= =?us-ascii?Q?MS+LRE776XfNw38dhaPoalKxFh6/yZvuuxbRY63w77TpQdKnApSG7JRFuQbs?= =?us-ascii?Q?Btao/bvFSIH96gPw2UYTePYoMXDRy99AXortV2hW3om3QR2DNCPdEWHsrkXf?= =?us-ascii?Q?hdg4C0fOvoYrXC3CY+E+JfF+rtR+ivgj6hWXSrBcG7PQVd2dBMSXH7J8taqd?= =?us-ascii?Q?GNrxCIFbJ9XDUq78kiAWlwUwSx5rkNgwZO+HGSJnHqGiHquCG8J37H7oh9Eh?= =?us-ascii?Q?+KaoK3NsPnw0ZTkoU94elOyZ0+spw3ObTdMSQRx0sc7lSr2NaOSoCRYGfHuy?= =?us-ascii?Q?NxTXNI6yBDyorHGTmsN/K1Sc5rqCN4an37V1W6gcLwlNGULCVUYIj0jFHYpT?= =?us-ascii?Q?2cgdQXyq+Ib8yTWqBTdMO27c1N5xj+6j5FdbYzt3YtyMQI34pQIjJfCep1vP?= =?us-ascii?Q?BZiEDRvBmqJhWK8yQxPh2W12EiYiyPV0YdMR5VsOgM1oEW/szcbV52ZQHUKX?= =?us-ascii?Q?Y99llO+XXCxCKDnQRKpNnAlfxtOENgwCFqc5uqLv0EMwj4vyRFpGExHBcE5c?= =?us-ascii?Q?18zKexgQn1ejlOA14dDCn5tA0CSUMiOmWYwp1QVVA/u8sgskhSl97HxXMTop?= =?us-ascii?Q?o9mzf85AJoL9BPjKb1z8ZA3fMPlvSJVjXpb8m6jUjFpcsezlfxPvfWkcyhh6?= =?us-ascii?Q?qeltvcHv80u5FKCCCfsDNxrQHHsaG9hsNm2/ii8VO6JDUn6lYoVPPjomB7it?= =?us-ascii?Q?iy8pDNKOyv1khynoreuc9lMOvsqv88LJCqicKmYVtZV94gote/+liMPxcM1a?= =?us-ascii?Q?MbmITLJYIBYuq/UzGJnVotK4N7eJeoStZdmBsj/ZOxDjEw22YVeEEE1AG966?= =?us-ascii?Q?CyGIrHsG9f6l7o4L2qLmuI2GEpiZ2cz65X79vVdJoSwOSGuMoRoOv1fA3Z+W?= =?us-ascii?Q?5mAa2rdH9p23IB1jg3qcPmZl5i7k5pHrN1nePHrZAUYY2gHN++VB0JiNp44L?= =?us-ascii?Q?udqbcwCis0uvTsPUpvu7bDBi661jRI08YrMr8+Jne8UBkWWsquWH7fhyw/oh?= =?us-ascii?Q?d2OFA+nP6WWM4cdvjaVzGnVCBKmZFRPE2AGS6zemPCxXYP7DJBoxJlATKHEf?= =?us-ascii?Q?6EugHDn9ruC8kkGNBbZRstLMcpHpUr+fG7G0Kcug63Gko+JN+FN+rUHqDGV/?= =?us-ascii?Q?gL51fhWBf4rYWVzJHkb8J9g4bCsqnB/Ck4AEeZLAT6hXRGyBsCVMsJymaANv?= =?us-ascii?Q?1w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: kHrV9TdNoX2rh+bI8k+X5iVMYIxCvUCdUzGq0BkKjhNOylhhL/VXfTVuTX2naq4qZ+edb0zAo1iVmx59VgfUBw62+lKHu+Tz70fxWXupvNRnjtVdDiz5rZge7cwD9ZeSbEMxOCfMHP0ve5gVvzFtGnJTse0mck8lHlbHPo9Kgrbucfe9jbFbLlp4pHak0Pp7UJ5JtBH+vg3OH1DHxgVih62vl3VGuPqCeYfLP3Ad/XhXb1TBT5EPL6mbYfp3QbZestAKeIWflIR8p0dYlOCXM8518DKGpldZL+sMv0rE86nnHzqOfcHIBrMj1Ad9XgnF0SEKxkjQyOzVF6sDyqt0e+3tTm67/VP5oQmoNSL1EhVfeQwTeZUx4oE5HMttm9CEjBP3EwGn0kpEkj3i7tTtUBJqZ+zObqDHxppJdtHWLrwowYxc31MbsqToBvOKs3AGznLml4VqYRhkoPGORdE3QM7HwjBauyBAIU8LvS4oqcJrr4utmnE9UW60w9k+wcDNkn1Qea4x7XQjXyYHGLFSEOIPBU/kVDVmL6NLl5WrSC3/nM8e3SUGf6SInQYTTNiU9dmATqhMKb8lNn4RRrqmgfDTEjAh0eOUYtxEITjDPn4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 835ceaa6-2e05-4ac2-8db4-08ddbfc98b61 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:50.4910 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8asgWbI5lWIVc6QJLszjmXvLDNqONt8yRZJ6izlS+2rwALDscGi8HBh0GER3E+qKQ+FnZVWRDcO3t8mjs/7zw06kl1X31mDGcaSTJaRDKX0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6691 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Authority-Analysis: v=2.4 cv=Ydi95xRf c=1 sm=1 tr=0 ts=686fe162 b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=ULdmrcW3YHslXA7JyQcA:9 cc=ntf awl=host:13600 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX3k6F4iDj7kiC Kl4QknuN2ZeHTx0nL1pZiz5dPpkjITde1ri0CrAl5rvL4DA45z8vBaFLXNTMGLk0YOBCF4j8J2g MHGKlYlipMO8l/qTD+5Gbmh41fs5xMK+JSGGrQbfsWZlp7lY12e00JNoqUsBW4mk1WRg0IcGEt6 gSLc11l2KXBQtbCXjt8i+erbtkcds7h9Kevx8vYt3vWEb8btAk9zo9NJviPjBBQ/GchPkiaAFIg cT01fE/U+aQDpT4h/j31ZvECaUPfEg1d36UWISvdsCyb65yIh3qFTuvRVbFy6tTl7NR1vhM9don Kv0+Rt49Sznl5J6P1TmtP29E9R1yZhFEcrtI+t44+K57q/Ee1YNG+9BDe9cvLPia1+RMM3T/HNP I537qUWpEpcQsdOQXhLbkRjOEYKbya5/xUMy9dwUFXqeeZ/HAq6aJ+9aBqre4+pA/qj4xACN X-Proofpoint-ORIG-GUID: Qew9zwzZxYEVbXJe383BJgEiZ7QiS9Ku X-Proofpoint-GUID: Qew9zwzZxYEVbXJe383BJgEiZ7QiS9Ku Content-Type: text/plain; charset="utf-8" Separate out the uffd bits so it clear's what's happening. Don't bother setting vrm->mmap_locked after unlocking, because after this we are done anyway. The only time we drop the mmap lock is on VMA shrink, at which point vrm->new_len will be < vrm->old_len and the operation will not be performed anyway, so move this code out of the if (vrm->mmap_locked) block. All addresses returned by mremap() are page-aligned, so the offset_in_page() check on ret seems only to be incorrectly trying to detect whether an error occurred - explicitly check for this. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index d57645573e0d..87cab223f2bb 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1731,6 +1731,15 @@ static int check_prep_vma(struct vma_remap_struct *v= rm) return 0; } =20 +static void notify_uffd(struct vma_remap_struct *vrm, unsigned long to) +{ + struct mm_struct *mm =3D current->mm; + + userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); + mremap_userfaultfd_complete(vrm->uf, vrm->addr, to, vrm->old_len); + userfaultfd_unmap_complete(mm, vrm->uf_unmap); +} + static unsigned long do_mremap(struct vma_remap_struct *vrm) { struct mm_struct *mm =3D current->mm; @@ -1756,18 +1765,13 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); =20 out: - if (vrm->mmap_locked) { + if (vrm->mmap_locked) mmap_write_unlock(mm); - vrm->mmap_locked =3D false; - - if (!offset_in_page(res) && vrm->mlocked && vrm->new_len > vrm->old_len) - mm_populate(vrm->new_addr + vrm->old_len, vrm->delta); - } =20 - userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); - mremap_userfaultfd_complete(vrm->uf, vrm->addr, res, vrm->old_len); - userfaultfd_unmap_complete(mm, vrm->uf_unmap); + if (!IS_ERR_VALUE(res) && vrm->mlocked && vrm->new_len > vrm->old_len) + mm_populate(vrm->new_addr + vrm->old_len, vrm->delta); =20 + notify_uffd(vrm, res); return res; } =20 --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 BC21827C14B; Thu, 10 Jul 2025 15:51:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162721; cv=fail; b=EYoIJVFUMKFEJ//4QgIf8YLRuFIl8SJEVR/6sVTSyaC0I0GM4Q+6LL/FCNdNHY4NGSWqwC5/VKVLn07pgMQAQYEbNQNOZ6GL788J1z993G0tZHWvWEDKFjE1bTQCdWYUf2rPekPq++i2BpPJV4eil4fCQKia6jisjh0AiX+sRF0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162721; c=relaxed/simple; bh=rubp4EBrQsLX31k+bTmrsLo8VzGijXlxPXgX2LPCJpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=AvnKJA5NdjRn5uq+PxI+B48Ei2ZiBHpIam7nl3AxjtmtXmwcgKM8F6kw6lZ6P8W7j+X9UhrhkLsjvEZg8XK87dG7GzDZLLxU00F3ePdalbfActrV2noCBeOVhp0mCSfXCUivxzhSAxGh4Dr0OMgvm4bBGc5rUgMIuBfheAsG+AA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=Rv5UfvEq; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Swi3536E; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="Rv5UfvEq"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Swi3536E" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AEl0pd000637; Thu, 10 Jul 2025 15:51:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=4kr+QnoNSM9F5XY1TkuPv/psT11/S1/R0O/NyaF1dYg=; b= Rv5UfvEqWXu6O9EJWBvz4Sb8xC+ouGtljjY3jypgeag3pTGqK4DfWX1UEcEW7Sgi pN8sNgPHVPejhN3VS11d7sp91hicJ3ZCYXzomBz9WsLVQTTXKopMIZL3C2F37T45 fG+S4DeNYBGWnhA5fHLg5XixzW/1MgXibzYIZiTtCrrY+Mys3NslQZVYqgYgqaCi 1H9h4F7ZZOly7MEMcriXFz6XEvEAJ1L+8ONg7c02Z3+NiS9WdpBRwrSfZBDMB+Ks ys+Rk53on/mSlFmD8GOxZzhyQK1KoDcdglxtHOFY7LvVXoFnxPfeDL0OlpYA2T7W 3ndomS+c2R0Ls448/T0dIg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tfjy858a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:10 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF51fL013560; Thu, 10 Jul 2025 15:50:55 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgd800b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZIvaRnADoIc9WZDKcRfij80E+89Eoy5jYpUYCtaSKmQ0ae6mwisxNMT5wydz42FKNA4IGcbv36IZIYmHEL9kk9ymGHXJCuT9w8MqpefZaSGSRnmU/q2e9FkgO22PzJtm8tlIpy4lTVfbl35Q+2B2vUGgfZS344KpP0GlHzNWcb5a/dIeKr7jCgR8TForTstVlePbQM+qSPkpzOJOitHJOF6xp/CkwfFEO6O9zi/0VP+4CKrNtb1g1DwcpmrBkVbN/OdtOsSSoTx5IcB/snh3+RLnh8Vea6+FP5ty+1ZdjEOVVDH86pB7vGbjDLxfX4ly4QS6x/pnFRuMWF1AWcg4fA== 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=4kr+QnoNSM9F5XY1TkuPv/psT11/S1/R0O/NyaF1dYg=; b=oD1RyrB/SEf2Tvg8Yj//mFnPIchn2O8QP48sm+yhqMyM1YES+Avmgw743IxQIhmbxMmIqF3fwba5QzL/kNlamh9x+OojPT8ieoN6A35WThd/ZEd11DRYgN2j3lvu5tcGvpkHfxhDKt1tOSQIixCluOjQrGV9ORCWICfwfOONnujf6hStwmzL/m2RWYOfgm2znSvF5R4noTevBwf0qYvKN0cOmaG++L8zzivL7yb1ixJJApczLlDE56yFBJeq8sJSX+D8AwggAXVqLuggFnGn1fqEn+p7qEmk4A5NBfKW66c41ZXv6PCAU+ZhB+ixksW3yyVppoS+K7XeuGTVjv1anw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4kr+QnoNSM9F5XY1TkuPv/psT11/S1/R0O/NyaF1dYg=; b=Swi3536EHB2VNv7CV86bcrFzkCI3DR8x0TFXqRPdWIeMD6sMV9MhmKSB28UqG/vVhQlS8wT2D8ENBC0r2U52Tc24U3kkDGiDrJQc0KuoCHc4ogZ6NgtQQIfqUr5tnQSM0V5K+EjIJUtjA6Byj8dWqVHzdHCSaSKNH7SG2yBddrA= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by BLAPR10MB4996.namprd10.prod.outlook.com (2603:10b6:208:30c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.22; Thu, 10 Jul 2025 15:50:52 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:52 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 05/10] mm/mremap: use an explicit uffd failure path for mremap Date: Thu, 10 Jul 2025 16:50:29 +0100 Message-ID: <587d14070be9dbd935616749768b0c31f969f838.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0256.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:194::9) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|BLAPR10MB4996:EE_ X-MS-Office365-Filtering-Correlation-Id: cb3a91e0-7f5b-4ced-f4f9-08ddbfc98cba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UgoGSD47f0kKRvGki0P2Bzy7mr3g7p9Kmqk8IH8wsGTSeAs+B5tB2sW0MA7z?= =?us-ascii?Q?LBd7QUdxDLQ4sTvqBY6+SEitax0wyycTwKgyvtCyG4snzkhKUHUYxcBEk/7r?= =?us-ascii?Q?uooV52zcuDJKYrXKXbzqkXZAufAUlnlVSgWP0ObakSWWWKOzZzwhGXsa587k?= =?us-ascii?Q?aoSQH4Uip/ywfQiaUnnJ2NH7EBN5Oc+pVvNZ+cpXm78DgzoSDiL+cxHlpyb9?= =?us-ascii?Q?7y7maa8APUlTNedK5yprc0S2nx5eqDSLxtkbrONIAj+jAYpKj40aQjMdPVGf?= =?us-ascii?Q?6mTD4sy4YITvRX6TBNpxVIr19vuLpo0YnyNhWMa/UNlC58rQVnFxWcQvu4gL?= =?us-ascii?Q?dEvDXGPhmh231SMQzRYvR1ZvmW5Os2awJW8I3K11Bf/UFdOxmcq2W9lVMCe8?= =?us-ascii?Q?rDjnCmbjHQtxUJVgjKO/dIQH4ur8Zx85UbJ2bq9TgMuG0+/UZT8YLAE9Rncq?= =?us-ascii?Q?uvTjwgCJGFXelU+OutVwM+QHZVxOt5zp6MtbD8VDFry3vG5zLR9JFIsTYYlX?= =?us-ascii?Q?BoQocVFNoLpuoX0EPtX+QhgF9cXu/C8/qYyML/rzU+sJXCkEb2wb26lN0VRn?= =?us-ascii?Q?2vHUcDxbbL5K973Ky9vuBrAzlRxqmhTuG3riW2ZYlo/edmCikenFG1VaYCz1?= =?us-ascii?Q?5lpwSqJT3W75MnVflD0RddNyVIKASzv8/R+iasIREaCAbRYf//0/LxB6a0mP?= =?us-ascii?Q?dYg+tfyvsOnHoDhzmEX/FJGCsvJsw1Vqil1AFbW18ym9tBi2K5bfr4QTk54y?= =?us-ascii?Q?mDsvUg7+hwJ7TKsCKSZIHk1c3kBnPSJlK1O1SpyVYqzfMAQ1+4cYbrjKVnao?= =?us-ascii?Q?OfhD9XpvRkB2lyxDIjTuiij5gYzR1iBlpfzAA8nuJbBrQ3WKqFl0iH/+FHWI?= =?us-ascii?Q?jADB7kbzEkF1WsSC736WaaWmzh8NXnerOFgN/vIG8XtGKKVVmhbhpRJ/HSr3?= =?us-ascii?Q?JGgF5BOUXP5cswB3BtdoGUA6xH8AMB8tSX5XIbae9NMDlon6mJWPyxmb5//i?= =?us-ascii?Q?vWnvwkbYP1jUZC3M9QeZHSYvWitaZBmVazXiAnDiPIFT0Mr+hi/JEJwIe628?= =?us-ascii?Q?4kfpMQn+aG5jsMXCj/IHDBIsSpMiZM6K5WUJ745VCtX3ghDmsPLEvcaQHBWa?= =?us-ascii?Q?HkxZTzdSgEkOwtMNan6pWi4Ayz0oUWrjVZNYRx6rYVy513DPYT8CFvaRl/yE?= =?us-ascii?Q?IE/Pr3ijrFHfqetggpo4y4fhf3PA6rkdhbSFRHRtBEwKYQr8bUmI5AgMUmXn?= =?us-ascii?Q?2Askf+s6cs24BgizO1XlOyer8rJw0+v0hYLKw4SGrjeWZFFQd9AiyGN7fgkR?= =?us-ascii?Q?v7ttI/uZ9kb3B5hsujKlRMm6J2Vu9H2PLrW1BaerQCXuWWDlSTE5aKdFrQBD?= =?us-ascii?Q?HpURRsov34l02Z3wz4eD2Wdd1G+84hAr6XR09cmjmOZuXtDeOb/OptolbX1i?= =?us-ascii?Q?4l/554sUZwk=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nJAVMeAydXXWeTbsrvNXyIaWFX4+/VkdG87qXTbwH9cuL2JSo4TYZRKckwtG?= =?us-ascii?Q?7Zd2wN/fgYpYqfV7qznqwCUJQqZe+EL8P16g2KTDjwskz2TuRa8NJ787ymsj?= =?us-ascii?Q?5gs16lKMbz2RokGVRHudAvwtWpBqDNJ8mZ3SvvnZEACs8WM1BUPEN5SehOtG?= =?us-ascii?Q?Xpx3eBpltfuf2nkbsj4zozGLztXi0/4KMeqSetCgsCG8ESwgAaD31aYCc/Hb?= =?us-ascii?Q?ekD2X5fvB/Afl5WicDMxo+l8QRQd+g63n9gGrb5X+Fgve5B6Ix71r3pZy3+N?= =?us-ascii?Q?erZlUYCx+/i73xT/HS9g/FD1rtTTsuhNvWpFVu+25cjjlQbl8jNtKPOwvmS4?= =?us-ascii?Q?e/dK9kBuZRWfuOGuOO4HTH5AhECLJdd6pSMzptEdhJb/Lj69rc+HfYk5DHNf?= =?us-ascii?Q?RWbZewpGVasRxt7KS6F4owq+61LPd/rdtgfH/7htMdR/SqPf5MG7+gIu6wRy?= =?us-ascii?Q?/Jw4fA6tl5hLC5gxbm5/MB0lJJajuim6YoybO5caEYYAWmOiMmdYy0in4I+l?= =?us-ascii?Q?23roaxDQiKjF+6OKZSIoWNAR8WQlAHVfUqvyXTpKpC66o8WY/t8k2CnYmZpN?= =?us-ascii?Q?XjIicHwxkXcHNe59DNOIfzEH/tW60WWO0Z04HUfYQot/Z4mSFp+VnfNrZFD9?= =?us-ascii?Q?yBVRSI7Nxuh1USx0h6ZdLjwr9F/efizZ6zzQJ4SzUeJuJFWDeCdAKA4r7WjO?= =?us-ascii?Q?eaTSM8iFF0wPt0zvg44K7HEvwBzHHgb8NAiwHquWVghIervuPXs9ljs1thOi?= =?us-ascii?Q?deMxxp/6WGPrLhQesF5dPmkOffmhVaC0O+6UzQ/Rbs9pl8THf8AEgj4AFTbL?= =?us-ascii?Q?YhcvQk7L4VQ+8j2SDgiVHy3Smwm7IT7PNU8+VMIQ89WDxp1+1HD3i56071eH?= =?us-ascii?Q?Gop8vBi2EWFPAis5nrzum4sesBRvXftW9j1f0ozTv3cnTWpuIMX6F7VIB3/t?= =?us-ascii?Q?lpu88Zhao+CkhpvoQKW3BTw3a+UJJtSeXCG3UhvzPc5rf/Ld0H3/A/s066Zy?= =?us-ascii?Q?U2dwdkaSlgdTHx7njRKQR4JCSlq9Ugj6FgeSs/l9cboUGpBju6byxRUOc2st?= =?us-ascii?Q?nCM7CjjmMx5SpHr2puA7TCD8La9qpprmQJyfxz620lROXvwxabal9pJ0usNY?= =?us-ascii?Q?uEcx7Zm2z3FLhhxpeaEHluMp98VDmHcd74jew3DWRyRl6/ZOqeXNspGXYK0a?= =?us-ascii?Q?7HiYzmZ8JNtEf2NT4dvJFcASE7S4Qh165fnf7BHYi5fWZKegKLvK4vrrT4cN?= =?us-ascii?Q?Y+YtVFe//eQcJPzbIPQ0MsZej8wyp6ktt8JAJErK+8r88TfTk0OPaftTd1mo?= =?us-ascii?Q?iwTi6m88dfPR+kHiCDempShhgS3KyS43RaetsuLaDZM/oc3oAlV+WoihKq86?= =?us-ascii?Q?2vtuXcMOSRCXz66KQkwqoeg9D8jWgnT907Zkbkj9Zc0fla96UrfRhxo6hPW7?= =?us-ascii?Q?n8UUzy5x73cHICpoxKluHvG8VBTUjE3uA6vDifYcJdGEuQcX3HHAFGEJbI2A?= =?us-ascii?Q?m/hltIxM9MRXxx2WyEILsMo0RcmJju6jo1VW7UbMmtzMSvQZ4jreJMo8JcmL?= =?us-ascii?Q?mz9ZzuSTrtNXmqHRw5eGKWWF3nAefQtWTFUPJlD27ljsaisdMSRbZ+uS/ioZ?= =?us-ascii?Q?9g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T2mfkMJYvdtBudDhBTOZizD3vHxgS0Jtk5AlovtuOuCjGqrLtDZYTEZMCAYQFa8jhpOaJQOUJOlxG8gYNblICL8jDph+3hL52rmFyl0AxJy+v8iNu9powaqTEZQA+93xRVvG30qCv0EElTHEVYUNo8dWQanve+D+gxcitT8x12i2uTvYjIQb0oxNHF42qw6xJpsgyvX1HlhKnibjyZ12zGZDCikPsnAi5Ffs8tZ+/jTDNNJy2nidJrt4Da8dgZKyo8NcPMPmHhz+m9wdpa5LBYq2f9EfyoT/xwujFXrVMMkci12ePr/5RQ2cVlzdpBSveSfHh+1ZbAA2crIV5BEINORdgXV2E8jYZJX9AGY58LNTx23y1yZtdcV1JBDNMmzQrWMnrxM6ivYQHspwIqOxBGQEP3vmuJOU85DgTkLr9L8fEfXnmeqJgtBIoUoStH3PZFIvsFVV8mD0yXlqJc0AXUa5gbLQbFaxyfMIHwryn6I9q3uYnZ1IbeLFPYs/Hm7Sr7oPng4yflsF5Di0YGb1ADK592jGSRiGWdlaoxT+UzGfhEhRp4xeWT7Qotxa9RAxBFZmA89LLwOk2A2cGA7j+Kr46YQ0Ow4HzRA5+zx66VM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb3a91e0-7f5b-4ced-f4f9-08ddbfc98cba X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:52.7581 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tiNBQrUDPIGcFqLL28XBeKg/6sle8F5SlMZYQ2+u24GnzKMuY90aw3X2XCN9WmNTw8+oLM6RDZRI3hiK0GhtK/zmsSUo3kNNeSd+RNzSy/U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4996 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-GUID: trVYHsqmyrj6eaZMg8Jt04butXi3FKhe X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX/CRTjXSzoQ+0 9c3OV3nkCxQA0ninfoseWmgF7R8w04zvpJIvitJPGDFHb6LkZKwT9oeps3kPeoVz/sZoM/FDY5J h2kvRzdqERRwVW6orsGV6NEZheF72g7ED09PnnjFiPqZmXgt05Cu3I0bWxMxu4yvNEYTYhsX9ag 9s/Nfaj55stf5FNrGvsXmi05VA6QkfkhdP+qPDUNyllQ3zGGeXWsDyCJhBuEdbHpE6F/7zMXr4q i8CBtvUxiYlSDajemMB89gMVdnTa2WLcKR9W84IYT9tB4jX4YX0d6s3IKZDLLyduxw+5KSUFS4K e/2cqd5WRL5/lVqEk9QaIrKrVm4MdxUJcxo6tZ2fi9V4l1HbVfRvofA9T6rTTCufhFcvBtXrbvi 0fNAfGLGKk2C/kY18gf8rlN1s/swp/PK7HEto+n5INVLRfBo4icIM1Z1ofm4jq3pbsTtKfPT X-Proofpoint-ORIG-GUID: trVYHsqmyrj6eaZMg8Jt04butXi3FKhe X-Authority-Analysis: v=2.4 cv=IMkCChvG c=1 sm=1 tr=0 ts=686fe16e b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=D44BCz6ssmwAkLLrWzgA:9 cc=ntf awl=host:13600 Content-Type: text/plain; charset="utf-8" Right now it appears that the code is relying upon the returned destination address having bits outside PAGE_MASK to indicate whether an error value is specified, and decrementing the increased refcount on the uffd ctx if so. This is not a safe means of determining an error value, so instead, be specific. It makes far more sense to do so in a dedicated error path, so add mremap_userfaultfd_fail() for this purpose and use this when an error arises. A vm_userfaultfd_ctx is not established until we are at the point where mremap_userfaultfd_prep() is invoked in copy_vma_and_data(), so this is a no-op until this happens. That is - uffd remap notification only occurs if the VMA is actually moved - at which point a UFFD_EVENT_REMAP event is raised. No errors can occur after this point currently, though it's certainly not guaranteed this will always remain the case, and we mustn't rely on this. However, the reason for needing to handle this case is that, when an error arises on a VMA move at the point of adjusting page tables, we revert this operation, and propagate the error. At this point, it is not correct to raise a uffd remap event, and we must handle it. This refactoring makes it abundantly clear what we are doing. We assume vrm->new_addr is always valid, which a prior change made the case even for mremap() invocations which don't move the VMA, however given no uffd context would be set up in this case it's immaterial to this change anyway. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- fs/userfaultfd.c | 15 ++++++++++----- include/linux/userfaultfd_k.h | 5 +++++ mm/mremap.c | 16 ++++++++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 2a644aa1a510..54c6cc7fe9c6 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -750,11 +750,6 @@ void mremap_userfaultfd_complete(struct vm_userfaultfd= _ctx *vm_ctx, if (!ctx) return; =20 - if (to & ~PAGE_MASK) { - userfaultfd_ctx_put(ctx); - return; - } - msg_init(&ewq.msg); =20 ewq.msg.event =3D UFFD_EVENT_REMAP; @@ -765,6 +760,16 @@ void mremap_userfaultfd_complete(struct vm_userfaultfd= _ctx *vm_ctx, userfaultfd_event_wait_completion(ctx, &ewq); } =20 +void mremap_userfaultfd_fail(struct vm_userfaultfd_ctx *vm_ctx) +{ + struct userfaultfd_ctx *ctx =3D vm_ctx->ctx; + + if (!ctx) + return; + + userfaultfd_ctx_put(ctx); +} + bool userfaultfd_remove(struct vm_area_struct *vma, unsigned long start, unsigned long end) { diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index df85330bcfa6..c0e716aec26a 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -259,6 +259,7 @@ extern void mremap_userfaultfd_prep(struct vm_area_stru= ct *, extern void mremap_userfaultfd_complete(struct vm_userfaultfd_ctx *, unsigned long from, unsigned long to, unsigned long len); +void mremap_userfaultfd_fail(struct vm_userfaultfd_ctx *); =20 extern bool userfaultfd_remove(struct vm_area_struct *vma, unsigned long start, @@ -371,6 +372,10 @@ static inline void mremap_userfaultfd_complete(struct = vm_userfaultfd_ctx *ctx, { } =20 +static inline void mremap_userfaultfd_fail(struct vm_userfaultfd_ctx *ctx) +{ +} + static inline bool userfaultfd_remove(struct vm_area_struct *vma, unsigned long start, unsigned long end) diff --git a/mm/mremap.c b/mm/mremap.c index 87cab223f2bb..b2ee95182b36 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1731,12 +1731,17 @@ static int check_prep_vma(struct vma_remap_struct *= vrm) return 0; } =20 -static void notify_uffd(struct vma_remap_struct *vrm, unsigned long to) +static void notify_uffd(struct vma_remap_struct *vrm, bool failed) { struct mm_struct *mm =3D current->mm; =20 + /* Regardless of success/failure, we always notify of any unmaps. */ userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); - mremap_userfaultfd_complete(vrm->uf, vrm->addr, to, vrm->old_len); + if (failed) + mremap_userfaultfd_fail(vrm->uf); + else + mremap_userfaultfd_complete(vrm->uf, vrm->addr, + vrm->new_addr, vrm->old_len); userfaultfd_unmap_complete(mm, vrm->uf_unmap); } =20 @@ -1744,6 +1749,7 @@ static unsigned long do_mremap(struct vma_remap_struc= t *vrm) { struct mm_struct *mm =3D current->mm; unsigned long res; + bool failed; =20 vrm->old_len =3D PAGE_ALIGN(vrm->old_len); vrm->new_len =3D PAGE_ALIGN(vrm->new_len); @@ -1765,13 +1771,15 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); =20 out: + failed =3D IS_ERR_VALUE(res); + if (vrm->mmap_locked) mmap_write_unlock(mm); =20 - if (!IS_ERR_VALUE(res) && vrm->mlocked && vrm->new_len > vrm->old_len) + if (!failed && vrm->mlocked && vrm->new_len > vrm->old_len) mm_populate(vrm->new_addr + vrm->old_len, vrm->delta); =20 - notify_uffd(vrm, res); + notify_uffd(vrm, failed); return res; } =20 --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 6B73829B220; Thu, 10 Jul 2025 15:52:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162733; cv=fail; b=kGRup0ScK3MXvWxgRDII/L1ixWZmEhbBs2y+OPoVsGqewvCICgOa7SJ/VVnyYCxoyiP45djyY1DgrGDjk9lXoK/6txawH7qESN+cjfpIAmI+d2f3JvGnRYhRAC3JEesT7WgBrSZHb5y3xDukzOKJYeNPUk/Zc0whItgx9Lc8McY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162733; c=relaxed/simple; bh=KkOGjKdq2IJKxxmFZySovX7PfYXzZ29GwuKJbFX2uVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Z+DKJCJz9Q5qcFC/usZXlTvnuf9u2FPHcqtBr6R9+HjTRZ2+Gpe0G0I7X3pDCWJSOKaRdHtkG62DeG/f8vYtGq46qYZNkHDWNATlkm1bcnGFNi3K1lRyZfMRGnzxNfvpRBCpFIg8+R6jFeC1Z9EnC0nzeU3PQeIh/JfU9eOY74c= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=sAGvH+pW; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=xe8C3sQh; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="sAGvH+pW"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="xe8C3sQh" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF73Nq007434; Thu, 10 Jul 2025 15:50:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=m9G4Gwx4oz0qS31ul15VOYdWon9UAmf5ja6emhAXTZ0=; b= sAGvH+pWw/QlJ4LQNFkKHGahenjh7GClTTYY/J6CyMLAdRpbm7RSVb8NOfM2FGyD JuTkv4VnDAXvrqV2nXMSScxq3B0W0rhHcreSA+3Fdawk2VnpLwc5J/sVzbgWs0Q8 nA5R8lxkMA0Fo6oq/AxKmoUOJcgiafvtJpGijoToWN456CEyoksnTULaWr+jgqXG p1JOpHD/ZrNyzDHB1cqp/VBOLyCO/4SqJCr12Z6GWh9Hz/RkigHwDH7kNRKYbHFb 5KQ0e06pk9nfSx8zWg7z0PPrXjUCy/1C3rusVaj1cxoa1qG+iyjLZTfZcRgXcz9P je2IPgWycTQoJ45VoGrCVw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tfvd0393-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:57 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AEmC7c013987; Thu, 10 Jul 2025 15:50:57 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2074.outbound.protection.outlook.com [40.107.237.74]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgcfqwj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:50:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GwW7xseEr1PHW4KnJUZD1l73ihGMx+fGS+YnUvplH6teNp0mbkkQ9kyLUqKiKOpyL+pu/CrfZVZdOgePYECfa3LSnb3/Sy/0HYW9RVkOHYfZ1g0dWrcXOqfIEHVavzEpSh9jZnzC4aPWxDygqHcbJczfcdZlJ46CwPU7w9nnee1A1w+/kZ1wr/5RmkzC0nO2w1NPuedBpKlwZhZcGkOgL1r72JHoj97exUmMEs5mUQSMivdvFcI4hj9mVWAcRg+CaeZAnSLZLFBh/c/l3XLwdSpy7+2jvly5eJcIE9RGlf27DcE2vzGTT9yKcUm2A0AStpafkkR+CXYsRuDYonEW9w== 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=m9G4Gwx4oz0qS31ul15VOYdWon9UAmf5ja6emhAXTZ0=; b=p306cCJq+cnR8ycAiX+qZdyTGkI3fhJsQmPsnJj1L5/hBioDeCLXdCSjrVWRfSvJOl0Jx9S/z3UIP5Me26FDlB0aWN5BK7G4yfR8zQOas4iHTYNpa8y4sFr5/MNBFk2KJoRM3CuGf4CSP5W5V4ZlVpIMg/mVd6PvT28ozbB/6Pam98fcblK19ibIjA860/TY3DK5vN7KthYeTcWURUn+aq97LGfgU4NdwIPrMOTvQ7Ee8ThLha8VYVhNhZrripCiS8In7Bz18a7LG6J3q9uBxlSZFM4+RLicQJ1dAGuWfpGO6Y0AMbAqNy6MDTCAaWg1SwAKydel6vAWgMm/OdticQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=m9G4Gwx4oz0qS31ul15VOYdWon9UAmf5ja6emhAXTZ0=; b=xe8C3sQhnITAf8fitwwXuhF+8/eMy2uo//4bF9uyLgsOya462g67fcCxWHL1nZH+KZ41TmWPjFz+vnlT6ObBbvAbOh5sls5S+tmsvgZ4vF4DhnZKM1S48lF/ASxp00gWHo6Yin9kq5QCh3EWtyqVojeEHrbpg/GJADOrpKiSkTs= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by BLAPR10MB4996.namprd10.prod.outlook.com (2603:10b6:208:30c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.22; Thu, 10 Jul 2025 15:50:55 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:55 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 06/10] mm/mremap: check remap conditions earlier Date: Thu, 10 Jul 2025 16:50:30 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO0P265CA0004.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:355::14) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|BLAPR10MB4996:EE_ X-MS-Office365-Filtering-Correlation-Id: fb354d55-d4e8-40f4-fa41-08ddbfc98e31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FaxfVYTcosx9HwRexAdT2k1eR0Xs/Zznimx8MW3908U9dmYxSoBNGljeQnMm?= =?us-ascii?Q?s72DOKh+6qtaRMsDJczqYU60UaAxzVkNLeICoGefi45JHSrrEvSEEHjtGjIe?= =?us-ascii?Q?hcIFIIdyC+AAjD6lj+ofKE5v478fL3pGMKBdxPxvHyVTt7wE6G9ghfpEPtlr?= =?us-ascii?Q?mGKZ4bd2ERQkoLu9YMWqtN2d/e6QImqr4+fa1hEevGzqVl69F6Gi928mr9Ya?= =?us-ascii?Q?3Drnsc5lHk+4mI6CsuTPeaUkCgC70iOlAruzVun1R67hHpUVxrKwwQsq14Zv?= =?us-ascii?Q?yRz3OecRCZtPG1yZtbL3yl5cUGcbr4hHJYFnTmaxvreWHP32nSl6+hwNmcoC?= =?us-ascii?Q?vd1aY149cFtHM4qj9h8A4zSIOgWTraTfI/0oiXpfmImmQ6pyVdV2cKnrDeyq?= =?us-ascii?Q?mQUAPdfz4+k8d5Fv7hgQq3dHELR939MN9OAdFcsOEIudYAmaavWM8+I6sKP5?= =?us-ascii?Q?RmGYldN2hROJI4Ee/nWqY4NnPqfN1t2WaaTxJv7AQ7sYIhoFxl1+if6ED9Oj?= =?us-ascii?Q?eH8s0ciNyEYPqIaVPRIRhEg1ixyrjniqKZ+cNxpA8MMR7/5znX6u8karPbp0?= =?us-ascii?Q?dXEd2lKiq6PiV1RKcy0ean0IeKKzC9NWZKsmEB5IPiE12wbeXt4sN0/ihiQ4?= =?us-ascii?Q?TsDfKWrxBkUfRLXucYPbMZWpzeJHHHrlKWz2EvtTNMs9r69tPyMD/6gokfyg?= =?us-ascii?Q?g9BxprbogEbhKVUK/vgbxVnZu9ERLGUjv24JuCFBDWkMsRl/O4jLB8gPonV+?= =?us-ascii?Q?jbbhJO10r/RLv77SsXEOPvZiUN/6cNPHbUxt7zzwZWVmv5Dbra+uzDwvw2TS?= =?us-ascii?Q?bgyaN696aMo4eMZAxBjvEYSIwS3j7VlBnKXQefIbGbjUHioZ7Hu4K/W983cD?= =?us-ascii?Q?4PSaAiomsUKcKD9CJweWTEcoxTyEw1gBauyb8xsqezWo1D/vk5h55M2FaQYZ?= =?us-ascii?Q?Bq31uUGmVMmXvRKVDW9zUJhV9gsETZbJcLO4LN67XTdZmWR3YLuxzy84chh9?= =?us-ascii?Q?SCF+8JCFB8zGSovisJIGQsJ/mTTl8IUhamVRxB/nnPPY1uboJ2DLyLSYbIu8?= =?us-ascii?Q?P2rKmYRlMgPRSt9REsuUxrm6vdZ4uP6hF18IrTA8bdaCzgHoKfGSwUfxuEeG?= =?us-ascii?Q?eT4BGWeVxY5z/wvogH7JDTHP8ribNuKNli3KcZC1JIzGg0WsQpbMzA8nMMqB?= =?us-ascii?Q?lf0E+B+5V5jwYiBqcxpmix2Gur+UHk1a5NdPKqI7xmKJBav1T3lIUwaOgpQh?= =?us-ascii?Q?+IpcBu8MyNLZwXZI7Zw3YrayIuFvKBaZK52M88JSpUUM43Myg624zVK1s9xB?= =?us-ascii?Q?GLuvKqBNgkIAqHSGPLDplqvhisUJ1Fg4Z+Nanno84tNGEPx1n/AsfV+2FHPF?= =?us-ascii?Q?1JnsK/1yttbOTs1VvRMB7gr+RJO1qTfFyKE+DvOgNYLUNI6sRS3M0WO6LLZD?= =?us-ascii?Q?N8hdUPYrPG0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HKwI5/GmPUtW7ghDrhDbMGhmuniWHBZHwos83OTni93+4kVh+bL7+hTlD+z6?= =?us-ascii?Q?woE93aiW7crHM3bFSal/09grvQBQbZVQKn1CaHdn/6kYRjnrwhy2MhreYeRh?= =?us-ascii?Q?DhRgFhx8g7QpFOnKZc3fiPZIoKFLKXa3N53tCphVgyeI5uSZogvV50yHXigi?= =?us-ascii?Q?yWGKdseTfVHUo/R7csgvcMy61sNhCCtV71qOMavBmraY0kcKPMbVfs+QA2WC?= =?us-ascii?Q?b5f1hnoNTvfFoyZJrprwebhGtdVt/hWoAN3mFtqj/ZwxFrUJcyx5GaIuTh4b?= =?us-ascii?Q?IKnb1+WTtydZDjMDHqEjtdglGJ9ZSF240o9vxbtkiE+X3ijHu1doKxuIxQBP?= =?us-ascii?Q?yDveQB2S7xfaT02SO4UV+6kjsEWo7bESP/OCoT03F3s7Uh2pVc0gPzTffSLT?= =?us-ascii?Q?PJCpiHf9yhN4KBavcp7cyc7LqpiNu2UWmG4XLp1WEoQj1K52F6k8i+d/m4yN?= =?us-ascii?Q?eUAsmKa/Aq0r4XelrQUBtAhH4Ae8MyXfuGNReuTpirT+oWgX3Zgst6UUCLe6?= =?us-ascii?Q?fsP8i+XrWlTqCIDws9/KeNBDGYCMgKn1jKJ6VOAQRrcXfI+s7H1avNUkpk0+?= =?us-ascii?Q?RrwzEo2Nmgv1ykrncMbEOWtfyDE22dVOQtghW9SZ5fLJ7EEO1g1Hh4z7YAdd?= =?us-ascii?Q?IHPll13CDXgKHdK6Gvsr1JwDnN84eQpHCxThS4au/cHSw+12NW3Q2knjbnEV?= =?us-ascii?Q?uwDI1SNzWqvNtovacnnIGLAAcMZZLmtlH4KY4NFzag9xn3ikwEEAJ24CYISl?= =?us-ascii?Q?Sj9GrboYp40/H/AcNT1Le8xXcsPXmyTyrsbmut4NXHf1+MzxZSfVBxdcVBcT?= =?us-ascii?Q?O7HHyHY7VXpyHwZGGMER8lU241wEu4xtFByEsfEl8acFcUWRvlTz2ZEXJrfy?= =?us-ascii?Q?psuWAWUe/HupziMz4CytELy8uHGo1a0LSu/uiTACp7ivALKIRCi6xvKWJZwZ?= =?us-ascii?Q?HbQ77SfNtXV6B1AxNth8FlU8j6b3xGB6FvgRfiZvrRv3P/+qxV6axD5AZfaI?= =?us-ascii?Q?1ksxXXTslNQYdK3SFpLdYhT5N5EGkIQ/8NSQ6AXHbbhtlIjf0UL3a1pm0C7+?= =?us-ascii?Q?k2r+8p5doRfjbtf//mymXBt+4HhgLN0c6awuLNvssTzgJDF5HsvgIaKoPS0m?= =?us-ascii?Q?yChrfQaMK7QdivTI/jMZEneZ6BNMbFT19YIwPpT0Y060RqvAMcMjpYbDQ/Ep?= =?us-ascii?Q?zK1OpXaN5cHx9yEztjSc46FciLHukGGD+2tmy25y4EtsXP5USk0Ck2bXTz3A?= =?us-ascii?Q?r4XWiIWJL3BXS2swRxdbnItDzxSy7rIrdSezWd7S5YgIMmemvLbISsFSvCsU?= =?us-ascii?Q?ZNj7je+emDJR0Z6q0kaR+Cu1NeFmL3bCK6s2/05mHwzmU6epJeZkKQ3MwhNB?= =?us-ascii?Q?mZGIg9dVsBvUBJ9B/zQzfS4N3dNQ4BfwrOALRyPXVSCqFY8h3WDSnqIC0uQZ?= =?us-ascii?Q?jPQlWZ5rXgdH1pShb6sa+bI4FgDfurFeVdmCVYFK2r2U6BrwJef+5XIQjbjZ?= =?us-ascii?Q?wZPkTAHBCn/z4OJfmeatqyj/bc8ROR8YQfEHFEnth/uwh8Vl3l5G2qdxsrd2?= =?us-ascii?Q?f/oYo+2p9RBKexBzWRUdszHchFnSzxWLj2gSWiRkTgI58R6K2/VgsRUsaEKB?= =?us-ascii?Q?3Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: i85+FIJ/zW5i4CX554XIFq0xzIrZC2U3enFtRmTsDy8M9JNnDCPFcfp8RraT3BFICrVfTxsTo7z67hGJ4DiFkcHsrnRB2NcdkTvpYPMQm1BhqO5GwX0gGPU49tVfavPQ8smOWDQbbyizt+cDHxrwHjlba51ffR1swv3ofe5H7tL2VpgmN0WSmFrJzLNO69q4dK9Svs0zUjxXxwmuy1G1HBB4EkTe9U7b2ftiR25cMlCHXo8Sxj/vWqOGbA6jVjBtem+V7wmc0y21LQWJJdRzosESHKzWQegclFPipcG3xG0/Rk+xG0GQc8R+5k2hMumqsXg3Wqx6MadMQDSWWvrUrzzt7sI8LWVwmb4ZosGnxhu4i+et7D3RUknhVOZh7ruTJjKXGL3IdH34s4TYHprBEvDtn1u8AVHH9G8T50y8zt9tLjMFYZ8yFi9JGmP9yCtMf7vTh9nDgoApxRLPLbkvswiP6L0kSpRd3GjehBnyhvhTFel5v38EbAYxzFGlNcSmYLTIZieAUL7RUJYrSe11JGTpK5TcOf9o0EeRnCo1KKjZWFHBn4tbi3IxvYghEP5eLie7vyVxAbc3ZoNzpJOf07ycBSnBLLSBlD3erX2XdBA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb354d55-d4e8-40f4-fa41-08ddbfc98e31 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:55.2144 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XbG6l+ACTcFNYZHnkd7t9YOLByvXo2xxXkv9+wygPkAnnIpHjvpf7Dnp+Ltk4qVxajrNekotNMxPxkUKQpL8n3Od252rksOaKPbfMjJ9iKM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4996 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Authority-Analysis: v=2.4 cv=Ydi95xRf c=1 sm=1 tr=0 ts=686fe161 b=1 cx=c_pps a=qoll8+KPOyaMroiJ2sR5sw==:117 a=qoll8+KPOyaMroiJ2sR5sw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=QQFbvnUwB9Dxs2rSiigA:9 cc=ntf awl=host:12062 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX2xVV6h4g/LAn 36d7taTWXYoafVCO+aC7Z2UOGCao4kEZibKPPzaCvCqbj/1Ggk6qyX7AVL1Zwa9HN2yQeIaa5nS mL5hcckE31qa4cKugPERutIvAwLIjoU5pg/sRNaOrEx7TEe/YPzDcljCj5TvNqxcmJqxy1t7f30 6wkv3zcwx5Shxzu83pDUxp4ckd7slzfvEHDotwi4Iw/phzM1dCMU/q5RWdULm5IcuROuQTnYRUZ gL2mpBWz5tCdqBXFj9qoJgTG0Terf2qI760zgm9M9kwqCciIc8EeS/xpmbJYuYBu7s2xv3yOLX2 NQ4//F+OTXPSouZ+rmyh68bXqjFGFKI3OhTssVubBRYScqMtJ6aMbYQ5DLboIDA23vEp0Awt/ll g8j/UkZ2nNJrstdEz7RxzQGcvrYuXD7mAr8LAHusUfPcnOgIpv2TxdXBJMCPS6hWYee5QCQ9 X-Proofpoint-ORIG-GUID: -0Vo5SSMIvdBSrcrepKw0r-Q5Dh02_DX X-Proofpoint-GUID: -0Vo5SSMIvdBSrcrepKw0r-Q5Dh02_DX Content-Type: text/plain; charset="utf-8" When we expand or move a VMA, this requires a number of additional checks to be performed. Make it really obvious under what circumstances these checks must be performed and aggregate all the checks in one place by invoking this in check_prep_vma(). We have to adjust the checks to account for shrink + move operations by checking new_len <=3D old_len rather than new_len =3D=3D old_len. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index b2ee95182b36..116203766ce0 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1345,7 +1345,7 @@ static int remap_is_valid(struct vma_remap_struct *vr= m) if (old_len > vma->vm_end - addr) return -EFAULT; =20 - if (new_len =3D=3D old_len) + if (new_len <=3D old_len) return 0; =20 /* Need to be careful about a growing mapping */ @@ -1445,10 +1445,6 @@ static unsigned long mremap_to(struct vma_remap_stru= ct *vrm) vrm->old_len =3D vrm->new_len; } =20 - err =3D remap_is_valid(vrm); - if (err) - return err; - /* MREMAP_DONTUNMAP expands by old_len since old_len =3D=3D new_len */ if (vrm->flags & MREMAP_DONTUNMAP) { vm_flags_t vm_flags =3D vrm->vma->vm_flags; @@ -1637,10 +1633,6 @@ static unsigned long expand_vma(struct vma_remap_str= uct *vrm) { unsigned long err; =20 - err =3D remap_is_valid(vrm); - if (err) - return err; - /* * [addr, old_len) spans precisely to the end of the VMA, so try to * expand it in-place. @@ -1707,6 +1699,21 @@ static unsigned long mremap_at(struct vma_remap_stru= ct *vrm) return -EINVAL; } =20 +/* + * Will this operation result in the VMA being expanded or moved and thus = need + * to map a new portion of virtual address space? + */ +static bool vrm_will_map_new(struct vma_remap_struct *vrm) +{ + if (vrm->remap_type =3D=3D MREMAP_EXPAND) + return true; + + if (vrm_implies_new_addr(vrm)) + return true; + + return false; +} + static int check_prep_vma(struct vma_remap_struct *vrm) { struct vm_area_struct *vma =3D vrm->vma; @@ -1728,6 +1735,9 @@ static int check_prep_vma(struct vma_remap_struct *vr= m) if (!vrm_implies_new_addr(vrm)) vrm->new_addr =3D vrm->addr; =20 + if (vrm_will_map_new(vrm)) + return remap_is_valid(vrm); + return 0; } =20 --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 5CC8A2E7F39; Thu, 10 Jul 2025 15:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162740; cv=fail; b=iIt2IXzyQGTc1yvfkK99mSsYWrVQh5gQ9/xz6PXqAx7IDeT0MrmOT19JOt4qGrkE90VZVdrWgCo/RWKNxvMg9Qxgub9qhkoa+ihw/OY6Ta/jJKso+CD6zfvkm6rBw72GwMN4eRVLPxD3mAZPIyYEkxEVAaqQOgL+rrXx+rs6dCA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162740; c=relaxed/simple; bh=M+h6lQRtOP9BtXSSjt3ZQdXZJp3t6ZmzBxqtOdNQWE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qEtCXiJzMPgqyhAOONzDmn9Q6oQkh1wpXlf603yrBlhh5rJuOwtJhB2ngI8p+GVlzFithguX/uLorHcadbbnJ511OrIF6GlZVd7Fh0a7z4E+2ELB1HHwIdMYQdNxvQZaNMBdifqFLFwG6E8E0t/HlJGekoS9LhK4mOeQ1qlyPvc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=m29GxZlp; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Kd+2Wmuk; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="m29GxZlp"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Kd+2Wmuk" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AFVpro024073; Thu, 10 Jul 2025 15:51:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=b3xD7vw8m0RO/Q6K5JRIt6mRvTK1wpxk31Jp9CN8r84=; b= m29GxZlp+uGqDsMkipFWlBOLSoQE5pznHhzOkM/taGbft27w7IiATPRfFaprJB4c hHtHNkVEUfAWSHCDF+HtPW5Vymi4n0SOXhfANY5lkVZWRGAdNybjcA8p8wpwcDA5 nMJXOirwx6z6ZETIqZ8TyFeEOWJsR7uHMZ5caDyswjaKoE25ajIOvXabTydpLl/u pXZg8TQr0ugDz/AWsZWiOMoMhjK6CnPmHLfYXdzSDwicVFoWKoyV+Ie9kQ0BdCZE zTbgFsKzARdeVxq/keEIidUqTiAfvda8So+bPIBxRH5rMn9Q8BnX4lsSgg3LG2uq luF6KTjanXcOUXbW5O6jDA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tg84g1ky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:02 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AFOOlk014362; Thu, 10 Jul 2025 15:51:01 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2075.outbound.protection.outlook.com [40.107.243.75]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgd8053-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Wukvdq3YZMBXizOx44NEepYxgEq6dutp0JY56jhQ2pBCKgwJmXCx6bSlR5BeNLZkRKqPaSOZteoSw6iL0HDpAcZDpRv7Q3fNpRe8tIMqetVwPxcWuMO8Zuc4rIk7qdQQl1O3Md9TlgPLJGVvxSP7Mzp1LpB4OZk+Yy15IJg09+QOa/0oR++2zkMbpywdWK4Rg+yJEoF+74j79erMz6nqbBzkiNwLURsip/F3/EuvNdLKv4S3F1AW6OtRKghShGKFkirqUSO/Wuw+hSSr/s4OPvddE4LoLmVz5DY4mQTFDnp4Drzmx1rY1mymL6lWqlPFYUvz5gCKzhIuuXkFlIQWQA== 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=b3xD7vw8m0RO/Q6K5JRIt6mRvTK1wpxk31Jp9CN8r84=; b=KsQnTWXLT49Tsz7116h5z1cJ+z4Dalg8oRZjj9AKl4L9Qia0Q4yIQjcIeRHphCB2kvrZqCibMr7iCseiUtPfSp3me+Txo+NcOYx7YcKTOjcdc1FP254eIG/HnuWMqigRcaRvNlmspPbfste9ZR4muJzrr884YF6c45FDVXecmQ8dRjl4ZEug6UrkdHzD28yaY+B+R0/TnFZ81WOohIqpZXTg/i8nCxCsSEq5bNWHUBzE/8YAwX2ds7QY4btllNQm/0EUYVOSiYUNkYJ5Zm4sn8eVl5CBBFJwbvGwMpI6cTQAGCZzgX9bMTvjmjPe2I1fj4amQeqYsYMGpVxswtg1iQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b3xD7vw8m0RO/Q6K5JRIt6mRvTK1wpxk31Jp9CN8r84=; b=Kd+2Wmukb2eZvQheO7DxVgJUEtUVUvK0VIhkCo1lTqwO22FbbI651A/s/Iz3Ld/MJLFXLvmgiDEjlqA+LM5iHUyGOSE62RinmsRbfuQtNBEz5qaf/55q3Y06Q07CPNJ8lNYmiJONpOGQXhSbp/0k1fEs5YllDv1TwCi0pLnvl8o= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by BLAPR10MB4996.namprd10.prod.outlook.com (2603:10b6:208:30c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.22; Thu, 10 Jul 2025 15:50:57 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:57 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 07/10] mm/mremap: move remap_is_valid() into check_prep_vma() Date: Thu, 10 Jul 2025 16:50:31 +0100 Message-ID: <093fb54b5dc0c4e21abcfebb57060f9a016af216.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0492.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1ab::11) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|BLAPR10MB4996:EE_ X-MS-Office365-Filtering-Correlation-Id: dc41ae75-4ffb-414a-bbc4-08ddbfc98f80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2uPdzyTLBDPgAmF3WWDjT6xDa2W2PUGNNLpupSunjZodEGrKXDRnkITrsTy3?= =?us-ascii?Q?GCgGQdEb5yOKuuL52tt0hKroLwBc2si3c1TYTUvbWXqbSu3eHtT5K6sMHjGL?= =?us-ascii?Q?xndpNmqHfyyZkqgE2FQZ45ohCF9+dtv47DFPpMzaTAUnIlfCBTySdXeW0hL2?= =?us-ascii?Q?/7TU+qcdMy41hT8Jn297ds1YQv8gt+xXLf0v2CcrENbifvvorDPlhAZ9nwhz?= =?us-ascii?Q?GBfIaJj0Yg16TG2CNBdGP96ufXUfrmQAa/u1kCn0hyc4Cp0BBgDfqcux1g7B?= =?us-ascii?Q?aDSrB3W1IfqLuuWPMw177TAX064dgGwQf3UToK+w8Fd7b2JEh/R+RTTdaBM/?= =?us-ascii?Q?parQMgEqm3OU5ITWz43u5llx8UE7d0rfI1baaqPFJJmNRr77BtGXjb6sF+H4?= =?us-ascii?Q?K3RvQUTiK2Na28GgnJER/LSlHcPAgBHN/svOXnk4dFIqbqMDjkc0AkjQVlEf?= =?us-ascii?Q?RsfGhT0cawzq8TltwRn8/NZd2RKt4qFS88g49LWyrzKzi+TiCa3D4YhdVby+?= =?us-ascii?Q?CGzJ5bjcOObmIh9TFFHys/jtsJ+PBQNp4ecntsfynZ+vCazSnkg9MPWqc194?= =?us-ascii?Q?BX26Ki02lK7C7h5QUirkfDcxZ62CAM4OcIaGKCfTJKa/yIrWtWgwenHi7Bti?= =?us-ascii?Q?qlSlbO57J02JcX0PmOQHOGVZQ46bPGjbKWTmJ+ZdUZrBjy/9nQWSEAhS0VJv?= =?us-ascii?Q?tAsUH1eKpjrSehX0D78HTa6mPost1VjyfmUo8Ek2mJcIheXJbXRGNvwH5g1X?= =?us-ascii?Q?RhFfVFtsOEUo3HlFgY+wTp9fIjCz3MEL4kLcsGbNggasaNy0IcmzCzI4megE?= =?us-ascii?Q?rEzfLfCrdgqjdUVn3mr13KMT7KIyoc25MlS186DAQYizWTF/9f57+thnFKwx?= =?us-ascii?Q?mV7dqJM7s6rVy6GMQLtyNIBP9EJuP8yWcx0Q1ZWBwh+4ThxQMrNaX2iLLZzE?= =?us-ascii?Q?K7djbIYuMY4b4Tc5TyNeNI40l3lUzw12ezzcBDlh29A4MhqrflCyQCRS9bV1?= =?us-ascii?Q?y6PuR04K34nLYAgdbzMHE9F4ONhkeg7bNRbV9HcuT95l0SCfFH+yvnT9cO2/?= =?us-ascii?Q?jT7XnD7mpb8zmUsyotf1Rp1TtrRBep8DmTqcHht/nYWdgVF8eQFJEQImjmy7?= =?us-ascii?Q?Ra3Vme5t3Nr1Ard5wLGIro52UueSRvhsWoU1kFlmfzpEos0ZMPkxKM1yq4ET?= =?us-ascii?Q?9OpvSoCPgyCiCn3dLv4BFgsYeqTJeLlWw9AcLOUMQNMwuBP01HXi5EwKKkLX?= =?us-ascii?Q?YRubX5A/M7wCnYaC6hQ8XygmGWx6dQF8E5i3XR60IDntMY1rXKsU3sN3Wrpo?= =?us-ascii?Q?stL8wM64q9QaYBRdTsle/vw/q16rwGagKL/qLuqUZNO1G3+Omzw0iNtrX2/I?= =?us-ascii?Q?vaZyrQB5HOkls+/qZlRN77JRc0Y01Wqz/Gp1qidWsazpl4TCilfKOUdLwUJk?= =?us-ascii?Q?sgUJYJYzrW8=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?phdKExDwQpqQ7bPHyeAVoEuoQlDZ1izR7EjBhIDZvCG6E1izzRpxKX5890Ar?= =?us-ascii?Q?fr6ak6B80KpVhnNeXLmQqOld5Q/EoLZbRHjrqlvKU+6nt3qgQLMBk1rymCqC?= =?us-ascii?Q?+GlYXO7uU7Xktj61GhnBS1vzgmfNve54HUJO/pFxbtM5pYy44is3p0bkjN0o?= =?us-ascii?Q?1DxRELxQnbd9hzJW6n4wxD6xTVQ/ry4t+O8+Jghptd8qZ76dtVp5xnpjrOMi?= =?us-ascii?Q?7IH0ZmluTtunGdqG4oh9x86eXeE3fwtnBR0xelaf9SpvGuCkugctA9HYf5Ja?= =?us-ascii?Q?SaxhEhT6mV0TdzKKqJuinn+mrxlmxPynbub4Lzv8QHsDDfbhCAoGuet2t2D0?= =?us-ascii?Q?tHJVbyOELRF3WvAHmfvja7oxaHnCKl93pb8yPaawHTKIRhgi7Bs/QLUmbadU?= =?us-ascii?Q?XRSzH0pLynhka0YD8n9l9UXK3+FLSimRPdwjx52tIaI9RSdKgsIThlVy5Qzk?= =?us-ascii?Q?pnmGwgraJ+aYn85MMNMsq6Dlr+20pxSgQM0Z/591IlVpl/aTsYIbqJ+pJElX?= =?us-ascii?Q?xkKFvqoolRyI+2MQ8f0b/7tU5r+c8x4RJZdrRTWyZLh/3Y3Q8WKcPq1kUvsV?= =?us-ascii?Q?DZYEG/eho/UT5+bqO7pKQZYnzBEv61c3LNe9wgokm9As637YY6XEMCxISQ6S?= =?us-ascii?Q?v1vHkrH84p+DCQvLvpRGP0MhS3ildneAvpq03SPX1pem0YopOmlLj9zRbfEE?= =?us-ascii?Q?wDVwg+UZ6W3dVfjhP5EYl4lY0fht701bTRSIrAI45lLcqrnVlE0havc4z+WB?= =?us-ascii?Q?X+ALJ0BRG7H67C+VRR5Iksf8t28N65r8H0hS1RLLsaGUIQEwwhlXu3o4H0zJ?= =?us-ascii?Q?gajAQNctkQBIqTZe0Wwl4c9Wx7LD8mos4GGHl1w+48q32uBOLoDbmfuu0enH?= =?us-ascii?Q?3wonafPRs19v7/UiW3AHTmPsUmC+oI1+gHDx49raOcT6E6sz2ONBG2rwsFbC?= =?us-ascii?Q?pK5cFM0/5By+SFcnl0UdNvoomajhTCJvp7wNtAG6qJy0tkHUJBif2//8D84i?= =?us-ascii?Q?7ehDDlrm6YCE2hZwzcH54pIDjgAxn5hDEK/kvj01Qt+2M5P6VZNVeOzdFHAp?= =?us-ascii?Q?SU+B1C2FOFstabq/fr9olcxY+02cccH8t2GhKD2iP/8gzjkm+Hq866qj5KKu?= =?us-ascii?Q?vTlIATOEhLNoGPiBG6B0OVThjL6ZhacEeZK1+Y/+ZD+ouHmBegfNTFnK/roO?= =?us-ascii?Q?YlS2oxXypd+kMhaIuvEcqO4pVcJP553UYUCd6YPiHS0cB5588poeEzX6V69C?= =?us-ascii?Q?RhGzDfbM3cvEvatKLWJW4rJPkkjD8GpbOh3PbkhY/cfCZj5hy6wIEAhXW2a4?= =?us-ascii?Q?4xC2m2A/8aibxX+h9TxqMQUPkWZ9AocKbc4z7HA5jAd19GOZBJzvFp5iUsJB?= =?us-ascii?Q?X4kTszNn/KX/aYNWv/a4bU0WeIck8IMo/ORXMFCqJZyKa6dIsqgqyYtKffA5?= =?us-ascii?Q?VS6B+oFLoA+rIiyuCk6us6A+qeQKv+PCA3/LcJkex/iyHjGSfCFNAcKrShQg?= =?us-ascii?Q?+uXBt1nUIzyo/31dyrDmne4kI9zvKbgs1UMHA4DHW9Uojli6WvQVyhbGw8pT?= =?us-ascii?Q?v1vwAPoXiDn+WXgD6vKgFzP8FCh4Qo9Qf15vY/Mz1BYQUfMqlTENvjDoFrPX?= =?us-ascii?Q?Hg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: yu6zeWWv5WjsEPl4wED9ssdhS7UGSIr4PkSLKzdDLtrwKpy3q8szF0fJAUllk9plVasKNnWPNClQuTT34rCrUt6Mh9/TD8Ppr9OkJbKcE1A406BB+xmD3waPzW/TZ03WtxfHvEMxLjgYI8PlD5m6iWT9JFeJ0wHfah375ZPcAlxWer3Zo2Ie8Jga4AV4EIBrG5rdd7E5EIX57mzSzBnbk7PHo4hxfBVf4Lx14812OPe1rp1bb6Hhb13sPHwy5yqeR3o9ouXGom7JohZmXPOT1y0E8ihVCuYtyKEvs/jVMUMMkcdrFxm9bM53o+muvlhHoLG7NRsGevKEnogKmRHF3vLgr/TiwBDytHF5yBkmjFH+bzFU+klgiYF1xIE5jyMhsSCjSmRecqLAGUSPIz4W+uRrSI9D8SGPB4U6FaaM9nkODSytaWc4XDgKdDie3HEjvvJeuAsS3Xt5LCs5l9iH4YqM8x3II3pVVjx94YJltUWsf5fnxWuoQEx0iqwtjGznW9stHZk91u5RTTBxJPwSFue8OYWUnTwn9vkHLkuz7/+vnY4xqL6PTq0M60eID0C/RscR4xGuqVk66Kb0/ErfMZpC1ri1ocoZy6Fl6bYyyXI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc41ae75-4ffb-414a-bbc4-08ddbfc98f80 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:57.5072 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o7eO1B6M+JEpsOsxcxVKY86wl2tZE8MbNqaorWHemPERD7ygCpmsEBudF5iieTfnCWV5sRqYJHS1oBn5RUk5OxE4g0g2E1s60eSbIESxY5c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4996 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-GUID: vk0LbvcJzpBh9VKIrDMk61mazqIeMIke X-Proofpoint-ORIG-GUID: vk0LbvcJzpBh9VKIrDMk61mazqIeMIke X-Authority-Analysis: v=2.4 cv=X/dSKHTe c=1 sm=1 tr=0 ts=686fe166 b=1 cx=c_pps a=e1sVV491RgrpLwSTMOnk8w==:117 a=e1sVV491RgrpLwSTMOnk8w==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=JNHyDlmCLAJVxX-Ft_0A:9 cc=ntf awl=host:13600 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX2BH9H48Q12Tm /D+3LCNEz/7LLqDedx4Zvf6ja//lJKc0t0rZdUXX2Vm9i9Fmo8RSys/a2JoKtg/KK9PA50YhLgD d0swSYUDt50qu3c/XRleFO+tZmOFiA/fV+3oa3mYDMc99D6gNPKVrCFlTZJkrFswOv+F0x93gsw uGRX4vaDGj6NTQiJHpbuX/LdfShzrAifINggtZjM81M/xe/EtqbrXor85hCqOmU8fJgTflU/4Rh sN75gO2pyNxNJTrE8Clj/oDnOQTVR4vD9RHBKkQfiBqEMQRNuJSEmXhaEh4p3GVTFdMy/C7nkA8 Kr4iQ/b9YtLqxH5q/Y7xzhfIjltFbMauE2lHCzWoHSIr/dMJAkYMrzo5F57FWdB17sg2T9hrDyM msdQIM7h9vYGGnEEc+GxaK+HibRnGCoVaT/QdJLH8fqPr9sDlgOWC7MfwZzfcM4tS8nP5FHm Content-Type: text/plain; charset="utf-8" Group parameter check logic together, moving check_mremap_params() next to it. This puts all such checks into a single place, and invokes them early so we can simply bail out as soon as we are aware that a condition is not met. No functional change intended. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 273 +++++++++++++++++++++++++--------------------------- 1 file changed, 131 insertions(+), 142 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 116203766ce0..3f8daa3314f0 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1308,64 +1308,6 @@ static unsigned long move_vma(struct vma_remap_struc= t *vrm) return err ? (unsigned long)err : vrm->new_addr; } =20 -/* - * remap_is_valid() - Ensure the VMA can be moved or resized to the new le= ngth, - * at the given address. - * - * Return 0 on success, error otherwise. - */ -static int remap_is_valid(struct vma_remap_struct *vrm) -{ - struct mm_struct *mm =3D current->mm; - struct vm_area_struct *vma =3D vrm->vma; - unsigned long addr =3D vrm->addr; - unsigned long old_len =3D vrm->old_len; - unsigned long new_len =3D vrm->new_len; - unsigned long pgoff; - - /* - * !old_len is a special case where an attempt is made to 'duplicate' - * a mapping. This makes no sense for private mappings as it will - * instead create a fresh/new mapping unrelated to the original. This - * is contrary to the basic idea of mremap which creates new mappings - * based on the original. There are no known use cases for this - * behavior. As a result, fail such attempts. - */ - if (!old_len && !(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) { - pr_warn_once("%s (%d): attempted to duplicate a private mapping with mre= map. This is not supported.\n", - current->comm, current->pid); - return -EINVAL; - } - - if ((vrm->flags & MREMAP_DONTUNMAP) && - (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))) - return -EINVAL; - - /* We can't remap across vm area boundaries */ - if (old_len > vma->vm_end - addr) - return -EFAULT; - - if (new_len <=3D old_len) - return 0; - - /* Need to be careful about a growing mapping */ - pgoff =3D (addr - vma->vm_start) >> PAGE_SHIFT; - pgoff +=3D vma->vm_pgoff; - if (pgoff + (new_len >> PAGE_SHIFT) < pgoff) - return -EINVAL; - - if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) - return -EFAULT; - - if (!mlock_future_ok(mm, vma->vm_flags, vrm->delta)) - return -EAGAIN; - - if (!may_expand_vm(mm, vma->vm_flags, vrm->delta >> PAGE_SHIFT)) - return -ENOMEM; - - return 0; -} - /* * The user has requested that the VMA be shrunk (i.e., old_len > new_len)= , so * execute this, optionally dropping the mmap lock when we do so. @@ -1492,77 +1434,6 @@ static bool vrm_can_expand_in_place(struct vma_remap= _struct *vrm) return true; } =20 -/* - * Are the parameters passed to mremap() valid? If so return 0, otherwise = return - * error. - */ -static unsigned long check_mremap_params(struct vma_remap_struct *vrm) - -{ - unsigned long addr =3D vrm->addr; - unsigned long flags =3D vrm->flags; - - /* Ensure no unexpected flag values. */ - if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP)) - return -EINVAL; - - /* Start address must be page-aligned. */ - if (offset_in_page(addr)) - return -EINVAL; - - /* - * We allow a zero old-len as a special case - * for DOS-emu "duplicate shm area" thing. But - * a zero new-len is nonsensical. - */ - if (!vrm->new_len) - return -EINVAL; - - /* Is the new length or address silly? */ - if (vrm->new_len > TASK_SIZE || - vrm->new_addr > TASK_SIZE - vrm->new_len) - return -EINVAL; - - /* Remainder of checks are for cases with specific new_addr. */ - if (!vrm_implies_new_addr(vrm)) - return 0; - - /* The new address must be page-aligned. */ - if (offset_in_page(vrm->new_addr)) - return -EINVAL; - - /* A fixed address implies a move. */ - if (!(flags & MREMAP_MAYMOVE)) - return -EINVAL; - - /* MREMAP_DONTUNMAP does not allow resizing in the process. */ - if (flags & MREMAP_DONTUNMAP && vrm->old_len !=3D vrm->new_len) - return -EINVAL; - - /* Target VMA must not overlap source VMA. */ - if (vrm_overlaps(vrm)) - return -EINVAL; - - /* - * move_vma() need us to stay 4 maps below the threshold, otherwise - * it will bail out at the very beginning. - * That is a problem if we have already unmaped the regions here - * (new_addr, and old_addr), because userspace will not know the - * state of the vma's after it gets -ENOMEM. - * So, to avoid such scenario we can pre-compute if the whole - * operation has high chances to success map-wise. - * Worst-scenario case is when both vma's (new_addr and old_addr) get - * split in 3 before unmapping it. - * That means 2 more maps (1 for each) to the ones we already hold. - * Check whether current map count plus 2 still leads us to 4 maps below - * the threshold, otherwise return -ENOMEM here to be more safe. - */ - if ((current->mm->map_count + 2) >=3D sysctl_max_map_count - 3) - return -ENOMEM; - - return 0; -} - /* * We know we can expand the VMA in-place by delta pages, so do so. * @@ -1714,9 +1585,26 @@ static bool vrm_will_map_new(struct vma_remap_struct= *vrm) return false; } =20 +static void notify_uffd(struct vma_remap_struct *vrm, bool failed) +{ + struct mm_struct *mm =3D current->mm; + + /* Regardless of success/failure, we always notify of any unmaps. */ + userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); + if (failed) + mremap_userfaultfd_fail(vrm->uf); + else + mremap_userfaultfd_complete(vrm->uf, vrm->addr, + vrm->new_addr, vrm->old_len); + userfaultfd_unmap_complete(mm, vrm->uf_unmap); +} + static int check_prep_vma(struct vma_remap_struct *vrm) { struct vm_area_struct *vma =3D vrm->vma; + struct mm_struct *mm =3D current->mm; + unsigned long addr =3D vrm->addr; + unsigned long old_len, new_len, pgoff; =20 if (!vma) return -EFAULT; @@ -1733,26 +1621,127 @@ static int check_prep_vma(struct vma_remap_struct = *vrm) vrm->remap_type =3D vrm_remap_type(vrm); /* For convenience, we set new_addr even if VMA won't move. */ if (!vrm_implies_new_addr(vrm)) - vrm->new_addr =3D vrm->addr; + vrm->new_addr =3D addr; + + /* Below only meaningful if we expand or move a VMA. */ + if (!vrm_will_map_new(vrm)) + return 0; =20 - if (vrm_will_map_new(vrm)) - return remap_is_valid(vrm); + old_len =3D vrm->old_len; + new_len =3D vrm->new_len; + + /* + * !old_len is a special case where an attempt is made to 'duplicate' + * a mapping. This makes no sense for private mappings as it will + * instead create a fresh/new mapping unrelated to the original. This + * is contrary to the basic idea of mremap which creates new mappings + * based on the original. There are no known use cases for this + * behavior. As a result, fail such attempts. + */ + if (!old_len && !(vma->vm_flags & (VM_SHARED | VM_MAYSHARE))) { + pr_warn_once("%s (%d): attempted to duplicate a private mapping with mre= map. This is not supported.\n", + current->comm, current->pid); + return -EINVAL; + } + + if ((vrm->flags & MREMAP_DONTUNMAP) && + (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))) + return -EINVAL; + + /* We can't remap across vm area boundaries */ + if (old_len > vma->vm_end - addr) + return -EFAULT; + + if (new_len <=3D old_len) + return 0; + + /* Need to be careful about a growing mapping */ + pgoff =3D (addr - vma->vm_start) >> PAGE_SHIFT; + pgoff +=3D vma->vm_pgoff; + if (pgoff + (new_len >> PAGE_SHIFT) < pgoff) + return -EINVAL; + + if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) + return -EFAULT; + + if (!mlock_future_ok(mm, vma->vm_flags, vrm->delta)) + return -EAGAIN; + + if (!may_expand_vm(mm, vma->vm_flags, vrm->delta >> PAGE_SHIFT)) + return -ENOMEM; =20 return 0; } =20 -static void notify_uffd(struct vma_remap_struct *vrm, bool failed) +/* + * Are the parameters passed to mremap() valid? If so return 0, otherwise = return + * error. + */ +static unsigned long check_mremap_params(struct vma_remap_struct *vrm) + { - struct mm_struct *mm =3D current->mm; + unsigned long addr =3D vrm->addr; + unsigned long flags =3D vrm->flags; =20 - /* Regardless of success/failure, we always notify of any unmaps. */ - userfaultfd_unmap_complete(mm, vrm->uf_unmap_early); - if (failed) - mremap_userfaultfd_fail(vrm->uf); - else - mremap_userfaultfd_complete(vrm->uf, vrm->addr, - vrm->new_addr, vrm->old_len); - userfaultfd_unmap_complete(mm, vrm->uf_unmap); + /* Ensure no unexpected flag values. */ + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP)) + return -EINVAL; + + /* Start address must be page-aligned. */ + if (offset_in_page(addr)) + return -EINVAL; + + /* + * We allow a zero old-len as a special case + * for DOS-emu "duplicate shm area" thing. But + * a zero new-len is nonsensical. + */ + if (!vrm->new_len) + return -EINVAL; + + /* Is the new length or address silly? */ + if (vrm->new_len > TASK_SIZE || + vrm->new_addr > TASK_SIZE - vrm->new_len) + return -EINVAL; + + /* Remainder of checks are for cases with specific new_addr. */ + if (!vrm_implies_new_addr(vrm)) + return 0; + + /* The new address must be page-aligned. */ + if (offset_in_page(vrm->new_addr)) + return -EINVAL; + + /* A fixed address implies a move. */ + if (!(flags & MREMAP_MAYMOVE)) + return -EINVAL; + + /* MREMAP_DONTUNMAP does not allow resizing in the process. */ + if (flags & MREMAP_DONTUNMAP && vrm->old_len !=3D vrm->new_len) + return -EINVAL; + + /* Target VMA must not overlap source VMA. */ + if (vrm_overlaps(vrm)) + return -EINVAL; + + /* + * move_vma() need us to stay 4 maps below the threshold, otherwise + * it will bail out at the very beginning. + * That is a problem if we have already unmaped the regions here + * (new_addr, and old_addr), because userspace will not know the + * state of the vma's after it gets -ENOMEM. + * So, to avoid such scenario we can pre-compute if the whole + * operation has high chances to success map-wise. + * Worst-scenario case is when both vma's (new_addr and old_addr) get + * split in 3 before unmapping it. + * That means 2 more maps (1 for each) to the ones we already hold. + * Check whether current map count plus 2 still leads us to 4 maps below + * the threshold, otherwise return -ENOMEM here to be more safe. + */ + if ((current->mm->map_count + 2) >=3D sysctl_max_map_count - 3) + return -ENOMEM; + + return 0; } =20 static unsigned long do_mremap(struct vma_remap_struct *vrm) --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 D63ED2DC32D; Thu, 10 Jul 2025 15:52:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162736; cv=fail; b=pfAJtZ+Fw+vWHNZC495C5fOU/LA/I/n9NEbimVyosBJvEs3WL3lbCENAvXRNFJaRfHgusPSsUQyl3vmE2NVitaSitADO0QbBXfpx7vQuw8LAUclzRdM5Ggq4cggNtcJVk0kSwfRfOZqfK3PBDe+NVK+UlnTZzOu+rMivCoxek8Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162736; c=relaxed/simple; bh=w9b70YRhR0J4qe+E+GHuc75O5MEpHjZSgzYvp69/XTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=qB5Xf+SCCHn7qo5KfK0NDLdRCHl7hIS+KElaE9+XcfEf9OME2S7s3YWDgGKoeOvpsSTpH9yusPsVj5AmMLtD2aDQwr5Tohl41h6MfKxLL0/q3mG8rY+y5zbJixyA2on0Qbia2T0t2bS6gxqvxfNlXe8rAu64CDCBRwXr9lbShzE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=aGUjAAr0; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=N+Kl4Mzf; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="aGUjAAr0"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="N+Kl4Mzf" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF1g5O010345; Thu, 10 Jul 2025 15:51:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=UCQQnsa42MIfPSuuBqL874zdUhwmLlCZBFO5rTr+5b8=; b= aGUjAAr0nuGz/aW/KZvXUSSq6R/EnHV3CyfK6KsuyI6gUhidpUiI8/wPh4A6r8WE D90hresOTOct8EmqhFbLVAeDMmtild8bYC75x+GkA2/Or/rQtln70jZsJA6gdtr+ 3rWorMeCXd5kE22pGBiST79MJaXOLZNHeeYxY2XHQ/xdssKtRI93WJ8Wt60OTfEU jkSMjoZgQ4xIjTEO6eLoI1Q24c3XMTgE+UXXK2wrBLX+w3WqdEkV9S73x8IW2tMN rtfbByyFMJ5LU2ksgCwXnRaNCfui7Jpags/qMOQyMz2AKdvw2qRfgZSrYhrryltO oVtCnsfiQN8vBjNGv7kxLw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tft083tj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:02 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF0dXZ014184; Thu, 10 Jul 2025 15:51:01 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12on2059.outbound.protection.outlook.com [40.107.237.59]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgcfr16-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gL7PqAM0srLli10XQDNJv9q5fmkzwoNKB3cFJw/FmlJEWa5pDvZvXt2nob5e96r/a8ii0ibFT2DyZrjw/gJd4No9bhA7RNeC8Q6nzzntCPgdwsdWR5VVWk0eFmesrZq+nHOlIPboiT8qA2EhDv/KedUDNCfjeOHn1MVHQYnNjk9NXlpgfYGvr6dP1ypX321EotCt+V2BnAvocUZKpI1B9Sn/bgFCb5i+MAbireH/cLfehAQJddGTBdJaatO3ITn+G8anbrDpsbAK6mUx6Eet3xQLWl8wcxZ8/M7VkYezVTlo5PsX8LcN3t5QmDaecjv3h+3tCdbt+5SkA3sVPynQoQ== 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=UCQQnsa42MIfPSuuBqL874zdUhwmLlCZBFO5rTr+5b8=; b=EyeF6hLZxgXtpER8YnDCLxOXJrPDSupwyyQ03wCA9T8/CJrQviC6BBP5eZAAJxaqRuyEA1NPvGnuVFw27dVlXFkyAw6AOhXASz6/db0PL9fb9markTpGlMIy70lsKM5wOE6RIXZMROaDT6g2Uk8+IX0VJFHPkqPpMTlZ8ngsRs+s20D8+rVIhcBv7VSiGsQh88o7FRQg2gqWGZ46EryavGn0WIDJ/YrV5M8VxH7yHJlya7Xu32vckrcsiAHQFXhsvVj10LCgegjZTnLTAdMy3868QzehSypnfEKcvq2O0TLry3mNHsSmiTfpv6pTmvPX6Hnqjp2QnvBWIxrFVHMSNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UCQQnsa42MIfPSuuBqL874zdUhwmLlCZBFO5rTr+5b8=; b=N+Kl4MzfivwRUml9oFzdjJmDF9srAl8r1gzkdOHBdSkqF8rZRND7wvyn8FR6BU8tZklbdpWYOpwCSqKevX0P2JPA0D6Jxou4iqbUO+aFJN9iHvgEJyiT65yR80eiIHhCS03OXu6CL8J0xzsqLnjXvmOpm3L2CNM55GAlsptMC4c= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by IA0PR10MB6769.namprd10.prod.outlook.com (2603:10b6:208:43e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.29; Thu, 10 Jul 2025 15:50:59 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:50:59 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 08/10] mm/mremap: clean up mlock populate behaviour Date: Thu, 10 Jul 2025 16:50:32 +0100 Message-ID: <26d2af0a6dbbdfe839b3b09d3a8ddd7b10d4be7f.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO0P265CA0009.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:355::20) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|IA0PR10MB6769:EE_ X-MS-Office365-Filtering-Correlation-Id: b929259d-64d1-4d2f-1786-08ddbfc990d2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6IQrz953sRtoV7PJQgRw63YbsHPFNcikkhl+MY3AZfmTwo1w1N5PVrkAfX/O?= =?us-ascii?Q?2NTTiTr+GLlOLg0W2dcBDyz2fNs4cQVBzbJr5aVFLbexhtq2z1BQumBIsWI2?= =?us-ascii?Q?DzyQslDRlMyJYKqwhOSkmCOvW5k6tfPH37YpgSVptppoIuQNZoOhilXawmkV?= =?us-ascii?Q?AeZ8EZlccZ3Nw9keWEmIBBXF/blaNaazFOPMHWa5P5yuyoZrabjEuh9lTOR+?= =?us-ascii?Q?ppC/DqiFfIJziPuJJqssPEqspUEVlMp/9KJCq+zLqk2rWx1aQR2V3sE0CkHx?= =?us-ascii?Q?gxYlD8g8zCCFh7UKwVCReaosuBEjmOWb7BnHsF3dJz0FukgEke48IEpkhX/g?= =?us-ascii?Q?/EK+/s6k64u6dvUHjKqch/ZjjniLiOEekXJ+jTl58QIek1fTI4IJ1QDf0DzC?= =?us-ascii?Q?Hg/MoYaZG+hUszf3kJ2kxf0sX7YAmBsRTH15Xmgr7j54cVYSAgxolKtABzjY?= =?us-ascii?Q?PGMLjXdInx69taXOz0xdpyVhAdoB5EGKISlMmx/LqHphHc1TiFCiPEQsaswN?= =?us-ascii?Q?Q9vL47iH/tDUz52xICwidPReJYNuDvobXjoAoxHrakp8RqgnCiGBQnzLqs3h?= =?us-ascii?Q?at6eZqiBeWTUUScqF8RCyG4yJz19Pm6CeVx3yyYETa9RAlSO94JgTFSxtcgx?= =?us-ascii?Q?Gq79L/VcqdsDHG952xGy9QnXNZFjnZ6USzzld8PuslRY6Ly+YZxu8xBaBZ0D?= =?us-ascii?Q?kFbQEmVGMm1necT5bdQZ0JKfHwrhiFLm+Rm2UdGBxWBIyd5hu49Kq0t0lafo?= =?us-ascii?Q?dxItKx4wn92Ld8Cspv/+yVmotRQgwzfU175P0ngy5wK31zV0vdl0JQ6bmHON?= =?us-ascii?Q?AswhfU+jI00gii3ygV1nOfOjysKz/8ASu3eV+2SR5aGNnxeWm73T4naisWSj?= =?us-ascii?Q?bfSicWs36d06HWBgbi2/Jn7kVjRSLKnuLqxNFAFcCO1SPIgjkMbr9lJkwdXR?= =?us-ascii?Q?TrQGCk89oLdcJdqw9CDpvFsMe+eCjAd0dnkFSlQaqmcn0nm6f8YqJAGwRhBh?= =?us-ascii?Q?pHDd2Jt62WgZ/h9hzaL1rxwRwKzHmkt8XoZ3ZuVQrOzKmPEyX5jJX9zVSBW5?= =?us-ascii?Q?udTTd9MLw4uCecV9n3noOaI09jfjRYS9iRq+AQ9eOLHHFgJWbOikAUcJFfsY?= =?us-ascii?Q?XXoCK7MGHOK5QStqoRy33ucvnK3AAqlDbSgCeVmT8Uv7Nz11AGh7Px8d2gfF?= =?us-ascii?Q?GV3BX9f/1M2BvVdh/U2nCbEto+6bJ/x5SKWw4tWWI1EAJEVm+35Z4X+jMlt+?= =?us-ascii?Q?Wn//pMKFt2slGPRmuq+by53VYN+VrQLnSxzF9vDMJHTZj9Hmole+20S5mG2y?= =?us-ascii?Q?w/fF5g8GE3a+X8inmcJETFGDuQ2yndNsqjSicvZih7AfWVfh6t8vY0HgG06O?= =?us-ascii?Q?qtb3yDrpghWYMbfex2YXnkG5Tgz4NfJpwUX2bzs8ZgVImIV3haG1g9SfIv8O?= =?us-ascii?Q?LttskRstYfo=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4ZRZMQy1OnEylJxXIwYkghBgCQlak6yhiQiDTYY1pDyE7gHASQKYkLuw6BLI?= =?us-ascii?Q?viKMKJEbLU7gCXcRnWK2GBfXsiIQK20R0OLQSouSRPWPdDvww1wi4hoZabDL?= =?us-ascii?Q?YHFeynTrIg7ocDBjtdWKLdOQsTEZfWV3p/o66/2ReazTSaX3addbaUF2lFb4?= =?us-ascii?Q?gsdMkpsNN9zQckBhgutZgl/Cvdz2m6SGcOKP2eUWpdjT3a7Ge9Ca76xXsq2s?= =?us-ascii?Q?NJu6tdI16sEDmQ+kz7+gTQQGa+OOcYlYxSFlWy8plJKNhz19lnAqzzf6P8Sb?= =?us-ascii?Q?6pQAfmtW3GUL5pKxL5elY+TGC4z0CLxIKZyJpn3gc0ARTr/KO0+rOtQR2ReI?= =?us-ascii?Q?F1fCONRxS6zm16pQY/ylBK7pKdz9W7cunYfRghbW4B9N7H+FbsU+TED3SKDy?= =?us-ascii?Q?JAuzf+4NsGg9zAl+QuVOIzP9kDULUHUueA5R4xgWYU47NYMkmmyw9JGkg8xG?= =?us-ascii?Q?xyJ8b6STjYw4N3LTYdQQ2/kKZP+tPYaVIvOVtz9ECbS8RYeDNcCAJnPtqOmf?= =?us-ascii?Q?eX+5ai2IuWXspYv4IPefXWgVRDF8UfuYJNno8LeRn6YLu8aQBCd52fTDzD0n?= =?us-ascii?Q?V/F7OgVlm+5+U01tgfUDYMJQOxV2gbEZHo+JIi1zoxFlsrl9xHZArlloQGyX?= =?us-ascii?Q?Dt4iw4fYtz05TZgSUiZ9UNemejFk7vN1WWfHzrtgOJlRDl8uLaXrPM62dase?= =?us-ascii?Q?HdwCwCEByZgZX51EIVLUdQZNq1F4RMxs091dVZqwNcCfc9e9u6dpBBunSvGx?= =?us-ascii?Q?TKvVkn9vjUZH2q940aBuuJAcCEllAb7uMvDFQK1+4w+DuTXuTY1t+lNF22Kw?= =?us-ascii?Q?Nh7FO4A5unsHHT/aTmESeoFyMYYAn10Mo8bDcSJCIFlPrwp19detTAfrWc2U?= =?us-ascii?Q?KB1Ir8KzqRxEaxM4lbcnU33slm361MrFG84amhEKuE0oXrco+TwMSJ8hybzq?= =?us-ascii?Q?BQNgxLumx5Azh8bt8+KwoBInNINiWsnMsZ19sjGS8iVWejFHdaF261xo6dQm?= =?us-ascii?Q?I9VyCu/guRkj0Iv53TJcGtEbIsMzJX0YFvjUquOIH2dGbkdHfvcsvqFys67H?= =?us-ascii?Q?c97z74sHqyEEfCpWtn4Oyu+NtunXX7++g8ICcQMdRraHOi0oQNxQWI9ylwol?= =?us-ascii?Q?mp/MoorAcyijF6jj87jVlQxluSFgHOEjMloldnthY34dEfXFQh+37slUUO4T?= =?us-ascii?Q?nXorKJzQhBPxqoUfWwKC64s32jdAkA9Ldi+O25vbtlXCZEVggd57Qzi6Df5l?= =?us-ascii?Q?Wwes8PBebF4dF456WnuEGaiwVK1fpbRY0RyhUCvDi9woTxPnIAq2D9QJKtcu?= =?us-ascii?Q?QteBAxdEt4gMPIopdT2dgWMubgIZQwX9UVdl4O3t5N9u6FC0tPd5V4sEzuMH?= =?us-ascii?Q?8yzA/A8YBSsTGjmLB1AS/z4eD/j39Lc+znPQ1hioLXPIRRN0zyOav1R+VmjU?= =?us-ascii?Q?+H7NawNSFG8Rhil3g9qVNc8JZhP76/ML/cUw6LAyoc8vH+Ixv6xuRp0vMBOW?= =?us-ascii?Q?9jd7fRYdQ7JReBNT9USK1tGl+R7kA4yP2Xl7xJWNDw/h+oAzCjySsfAUWFEu?= =?us-ascii?Q?anLJRW8SMtImJcM9BwoL1quU4rswdLKccJcl9PYoEhz6zrZSuGgN0OHmnwsK?= =?us-ascii?Q?Rg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mDacA9D0m3oe1bi1GsoiaHxTC+N5nvlQa/tnuQjdVXVe/48ocADCGo4N+7/pFR//CIjQytB90YXho79lgf/Sk+tWD0JohjHK3S51YJKrWz/LBhyM3liOXOxjy49EnLm6zpjah2atb6QS1hEPXwBleDFozNi2f9Ug82JMJDy00FwGD7mAhbgvunbhu09QY4tFy723x1gebniMijcu8pD7VKn1PNl26lQC84VKWdOIgxYl/Gu7ZZjEnkeLcKh3Zdi5jCSmFDJ2WjjtxfgvqKr1l7cAwWKMTnM6Esrfnt6wlfHzg3ELugNZJ9NbG0LUFK+GzzF7ZgYHkK0vK9QNWtJsnPaJUMAczUDiqZOsbs9j4oIeFkII66wdh+5XWHYkLL7tb+kUSyPRA0u/TqVXMGEuyk2ZEk/oFhETKpRFpsRLslxJN+ZNhQo+0596+Kxtt2z4Dk+PoZd9K7Lrmk4znmP/GnBfL1uSw5r5l5cKCVKJPAnC/NiakSrj4gVg9b7GBlJIq6OA05kGXAocbMwmimqmYsE2iCwMcIdIi5+GSpMEGHRKltRqE/a4P3rDsqCTh2+qY4oJKxRsNmXa93z9szUQMVK1i6/ACB7YNVl6+2y/nHM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b929259d-64d1-4d2f-1786-08ddbfc990d2 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:50:59.6135 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LaH20A/DcjOXTpTQuI2PmCyIVR9/m258aHV5W3yqffpe76rlD4XjrJS32XLhYqt8/WFcHaGgTL9xIuRZ2EBOXexpDKkzguF/WBEtWpIY+0A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6769 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfX2FXup6Pgubru 5Bn9CL/KA+94pBS+iitt7TP6fBDiFPOjjg3bsK164pIWeRtbbwvVz0vADixGCcJZC53sv/U7aVo Cy2IBgw9iv2FBx8M+9njvqU1YpTLY9sG65x/39/RerwH+MszgA82voLiZnhh9OAT1hVIbRqMjCz jZRJRQpjAd2shY+4hTQCV7mXRtCt3dao34FiIGjMY9bHBGpYpbYoY9I4NzfM567AWBaJ757cCP3 8PVX02vqgzfNaoD5UjKPPwKry9oyvpTwCGg7cpOob6nkyddm30Afp39vSkTYlQh+9m8Yrg50ycR dRhHVmVwegCIl3NCaC2yJErWScCYHLCqrvHQMfObijt43TDNhHQceyuYNlmcy9JS07KZUXZAwPK 47HNbEW63GLq91GeGTR9m6+eUmx6RgDqvaOYkhwI90ASDqdpb7/j/8r8Z+OC+O3nR3dr/O4+ X-Proofpoint-ORIG-GUID: 9V4IpfKOd6_Zx_EsSWkVPigVbrb3cPlo X-Authority-Analysis: v=2.4 cv=cvybk04i c=1 sm=1 tr=0 ts=686fe166 b=1 cx=c_pps a=qoll8+KPOyaMroiJ2sR5sw==:117 a=qoll8+KPOyaMroiJ2sR5sw==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=vjQNCPEVpfjC6StvhboA:9 cc=ntf awl=host:12062 X-Proofpoint-GUID: 9V4IpfKOd6_Zx_EsSWkVPigVbrb3cPlo Content-Type: text/plain; charset="utf-8" When an mlock()'d VMA is expanded, we need to populate the expanded region to maintain the contract that all mlock()'d memory is present (albeit - with some period after mmap unlock where the expanded part of the mapping remains unfaulted). The current implementation is very unclear, so make it absolutely explicit under what circumstances we do this. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 3f8daa3314f0..8cb08ccea6ad 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -65,7 +65,7 @@ struct vma_remap_struct { =20 /* Internal state, determined in do_mremap(). */ unsigned long delta; /* Absolute delta of old_len,new_len. */ - bool mlocked; /* Was the VMA mlock()'d? */ + bool populate_expand; /* mlock()'d expanded, must populate. */ enum mremap_type remap_type; /* expand, shrink, etc. */ bool mmap_locked; /* Is mm currently write-locked? */ unsigned long charged; /* If VM_ACCOUNT, # pages to account. */ @@ -1012,10 +1012,8 @@ static void vrm_stat_account(struct vma_remap_struct= *vrm, struct vm_area_struct *vma =3D vrm->vma; =20 vm_stat_account(mm, vma->vm_flags, pages); - if (vma->vm_flags & VM_LOCKED) { + if (vma->vm_flags & VM_LOCKED) mm->locked_vm +=3D pages; - vrm->mlocked =3D true; - } } =20 /* @@ -1655,6 +1653,10 @@ static int check_prep_vma(struct vma_remap_struct *v= rm) if (new_len <=3D old_len) return 0; =20 + /* We are expanding and the VMA is mlock()'d so we need to populate. */ + if (vma->vm_flags & VM_LOCKED) + vrm->populate_expand =3D true; + /* Need to be careful about a growing mapping */ pgoff =3D (addr - vma->vm_start) >> PAGE_SHIFT; pgoff +=3D vma->vm_pgoff; @@ -1775,7 +1777,8 @@ static unsigned long do_mremap(struct vma_remap_struc= t *vrm) if (vrm->mmap_locked) mmap_write_unlock(mm); =20 - if (!failed && vrm->mlocked && vrm->new_len > vrm->old_len) + /* VMA mlock'd + was expanded, so populated expanded region. */ + if (!failed && vrm->populate_expand) mm_populate(vrm->new_addr + vrm->old_len, vrm->delta); =20 notify_uffd(vrm, failed); --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (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 3B69F2E889C; Thu, 10 Jul 2025 15:52:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162741; cv=fail; b=ZzPohKctE/54apEWa5N0VoJ1SONKIBb/CyjntCHTJg54IIw5atqOCwkFS4FlVmgRFS1MXwVEV93vmcCg2RD3LJJaOuBRQPMEPewph+9k/8qinrjTTvzgN3m/PRbwPbZrGB+/hJnNyb6w0Bt7izFQDFn5duWODeGGRvlUQEuicww= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162741; c=relaxed/simple; bh=WjIvaaak3+a0ZLQYpZMMIIPF1jwippv2MvpS0SDzK8E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=XfgO92qSw409kkf2pg+tlxEXSFDSUYd9Jg1fnKyy2hZoHXzisPYWTsq21SlPU3mK3I5JRPxtQM7Bww9KQDArAiD6sZ0bSKRfATg7TNy/4fj8wRRJWk8lePC1XV9Q8b4BcGjK0gRN08HhkkF/Xv6/5jXhpWK39vgUqfUbcDD/S6A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=UyL8dIXq; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=su3C3OXk; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="UyL8dIXq"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="su3C3OXk" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56AF2txB011988; Thu, 10 Jul 2025 15:51:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=wLrC+vwRdPPXcPBcFwBvNGSjcZqJaEwUh3SicxKQA40=; b= UyL8dIXqJuPG7YMJXUCruIaaOW2884nz4/ZxwUWqw9xsqYqTEv9JT6jdqUzyTujU QxFaq15iBocikohCIdBvxgBvOZ01EqXwPRtcM/0/Etz6Ei20Kzwjzo17Nio8IWXc MZXC3D/5629pT1NsDQnEgxFvehWzhfFHKQWkl5MBJk4R7GzRcU4Inh0cykSFWJLu pJGH5SMlySKrp6FgMK73YDmBbKeyEDYmsM5At6A5mFqFoMqPKdwc2+0rFog4fkzy gjlH08jv5a+PaltDDUCwBz+x8DqAXiw52e0uy5tgKa7/gjRH6k9KdnSgiDTSZRVd iGyJNCL0LBEtAv15TAGaEg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47tft083tx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:05 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AERUUJ023626; Thu, 10 Jul 2025 15:51:04 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2070.outbound.protection.outlook.com [40.107.243.70]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgcpwg8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C08thwamT5TPeVsX6VhUi7M5bEmGeNlcZPeYcH/Cj9YRzlIv8PSRye60iiRuSbN9gEgL8y1CYKIRkU7gSa4NS1v9IVPVv+jEguQds3Y3tm41eRkaf34jESGgpcLZgVj8HOLhA5sz/e5Qa/SWGbSUsWKNJbFmmExrrVXfBBg6gQPcN9ypbuLDQaF3xS/aC7+nbaFlQOZf6J6fmysKUjunA7PkFICD/HZlR4dORJzohvO3Jpqt6Fu7ORMPGl/Q+Q/dwW1bAIUZnxaCfeiW7y9K9wLDxroWcHm31KTBEa1UewSlZzs0dUgxFksfK9LSBW9mvTQdYq7Yk5TdIKZeKAPBLA== 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=wLrC+vwRdPPXcPBcFwBvNGSjcZqJaEwUh3SicxKQA40=; b=eWoN/u+H67KOC4PMfVaT8HfAf5erpOyKSLZqMrS7LTfqfSRdOMgmdj02EEQKZQrvYeCFEF8keBh4WUzF7I5mcgqyIHKZGRXnZCT3Ky0demc+pNl5wXhQQo7n5va4z1xhAADtbrsukoM8uDiYCB/jhli4uob08WOjIG2HwBD/Pe7B1PDb5GnOAPcByf5HjG/7kM4czCZ1y2idkt0UPfMoajriPH4c7wA5RyJ10H6aLlWk470F9pP1D2IsF4KxK/8XJp17ilRnPolekJKiyQMBr2oQTr1I+oyQSO/7d7QgTqxl9wr3hTroV68btiBEICKha8kPJaPIbPWLznzbS4qahg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wLrC+vwRdPPXcPBcFwBvNGSjcZqJaEwUh3SicxKQA40=; b=su3C3OXkjvW5QcR1Lvl9q1Te8Am6Egink5xuYAs7gp+OLiftarJ7GPzkA83TculdN3IxnWnXNenVdzsHQRKoGzzBY7G+cu/vrHCO76i1u5pHoLoRjks7jHrkjW5JWgSP8YBaslJoaLS09GWrRrIh0AtGsEd/9gih9FvdPejB15k= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by IA0PR10MB6769.namprd10.prod.outlook.com (2603:10b6:208:43e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.29; Thu, 10 Jul 2025 15:51:01 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:51:01 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 09/10] mm/mremap: permit mremap() move of multiple VMAs Date: Thu, 10 Jul 2025 16:50:33 +0100 Message-ID: <6fe9dd2a366c7f55201320a81412f789ccfd675c.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0156.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::24) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|IA0PR10MB6769:EE_ X-MS-Office365-Filtering-Correlation-Id: 76e16d6e-74df-499c-8640-08ddbfc9920d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vKM3iuMqKv5Gdy6PJPPFaUReTyQElMqLEqLpaAxWukB/B7mleUVYr+SN9Ya2?= =?us-ascii?Q?+wT6+d3e8IDih+hkD1K42uHwcIfasUAn3lInzKTaMjbSYRh9WP/d1QJou5Ge?= =?us-ascii?Q?b9UepuFAg/gCBubLA6gDmZIv9jl70iundtDXtj0IZQXpfr2yda/4vxjayJmx?= =?us-ascii?Q?0FtOVP74dtm5eJz0c4z9wfmNpICQSlBTylEyP3udWt8UiaHTOMnXuEJbFDrL?= =?us-ascii?Q?d7GdkI/39nBWZbeAyXSO/fI1T3CL9mmdXGszXiBcaf9s9yqa8SRt14bYb6ZG?= =?us-ascii?Q?0Vp4k9Ww275iqUrnOCTrfPBSR+QrFoL033zKiiePmwT2bEOE1JXjdIjUA8ga?= =?us-ascii?Q?de4+Wr5OJuLaXMDcHMlJr1OutalyfC0G7pZZRN70Q5dw3kmvPpklnN0exLr+?= =?us-ascii?Q?C3UxqPbfCqLVe9wjfYyGXczU5n9HRkEXjitMJ3yBO6H65q4p6o7gqBEzGTvz?= =?us-ascii?Q?7++g8XeCBZfEHQXYVFDqNEx80DSJSpRUSS67u3C1A+GGBrAnjqgl1g0iu4C1?= =?us-ascii?Q?XPRM+jg4sYwWsC3eZY7d3IxT2Qei/7k6XTz6zKHnPHjI9outbX/zYHuodOqy?= =?us-ascii?Q?gz0OtQcqVHXMvkleAQGSvZLGXhOpss3TSqQdG7kTUfOIX830PRhYG6cggm7b?= =?us-ascii?Q?AMGkVlinnOTYz6LL2WIblyRqUoW8EWXWDz80vFeJko4ugd4QncvttgcbAc+S?= =?us-ascii?Q?jOhtUsSMEB6+BOTwV2UZ169IpJXrXRxda9gZbERgptkpxpeBSIPkt6tTh77C?= =?us-ascii?Q?ttcXJPMj85lvQGPObHeN0pbtLHnUd71z2m70cLVbwIHWRrcHo1Ib0Ssp0Bwn?= =?us-ascii?Q?6kwpWMAk/6VNvcqAcauQ3hy80AKAwsGfnMcBWiHCWiuPC4z37vVsSShLLHvh?= =?us-ascii?Q?dpKQ8ebtyHSEujKDeMZ4Tr20yf8AOCb5Ek3cQ5x9F45OfPIol5oGJ+ZSzLPR?= =?us-ascii?Q?RHSWNe8EwvBXB+xq24TYm7EqpqjAv4MF1wLS47EBmHYF/sHbB2NEmGgzoadi?= =?us-ascii?Q?olfpaWuG0G2+oKhCdPe+GPh6Hh10X8kJZeNdlKcCs/iXBSV2fBy8fyPoL8K3?= =?us-ascii?Q?ST761D7D1H578dPPPsphtX3jQ9zLhlu5pUUTnoOPyNvfpkvjEDlc3tapZ/IS?= =?us-ascii?Q?Ue9zwKkIUteut7uv3I9ymEmY0/0as3KdcfOcvP0gIeXpX877jS6/iJZJ76RW?= =?us-ascii?Q?dMFTxlhQJtloVhOlPI+87WV0gFfRzw/dt/kXEnU+Dx7PExegWFaVS4r/1rRd?= =?us-ascii?Q?oLNtz5TmymMcrVRTZ2k7vAKrz/GhXA8oRklXJ6ZObekla0NBJZea1C/XDUSR?= =?us-ascii?Q?gQyatIjtSbCWdPigdt4rx1dgcd5UqUCSFY1pTEvzlCgHNmo2maM8Emse29j7?= =?us-ascii?Q?pIIJrdbwve3hO6JsZOoij74kGNqipBu2q+XkJ8neBd4rZf38+MboN+h9BdxK?= =?us-ascii?Q?iGTZk2BIIRI=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TeoV/f380GvW+vBw9sNG3/VVM5dgeKjEsvR2lr/0z2P98ejUbmdv8Jqkh1A0?= =?us-ascii?Q?NhUhYop5fQtkUm96kUt9le2X5V2zL6Ae76cOCemB72dpr4sLpHsbOH7SlEcj?= =?us-ascii?Q?IjkHUUWUBCx2t7Kbp3dmIoktpFaq5oSK9poPbtA1u7wG9ZmvAH2/Tw2z9o+F?= =?us-ascii?Q?bwBIDABkPo+TtlW5izX86XLWq02H6IzUeG7deypwyDzF8KVjX7YcZ+cpVOQ8?= =?us-ascii?Q?+6sWhrYb8BRAo19Et26HIHHchahqH6dvKBkqxzBgwi/kXZlCEU7fpOx3yn1v?= =?us-ascii?Q?PFVB4sjroxufuzegcSvrjTPLBMc0YtqJOCZ+GNV9tiFyOjzOhrWlIT+bGEGt?= =?us-ascii?Q?w5AeYXS0zDuHnMoN3f7kMJZaVIe6kyRDPVfEYItu5cpZvbzObdDYMSLep2Hj?= =?us-ascii?Q?f/pxQ8n4dln+3XYrMrqgBpNDpgoekfI2QYVNTqRRJoyntpicTCcxvT1ziW8M?= =?us-ascii?Q?T9NUZCsSixxTx+jIue7nsg3YY6U9IFqo+QNHUtQ5vg3Td7jSyr/9wHc7qQCi?= =?us-ascii?Q?0peRhID06PbXFyMZQRGdmi4Gff2oHJXLiRuAEXHA4IinGIc/14UEBHoPd66u?= =?us-ascii?Q?jVz/WvZJm46V0qn2QHKkSFr0V3muWsWy447u/zh2H8mIMdfiegiJc0H8AYc5?= =?us-ascii?Q?d3lkDL4Ieq3ryju2mKY0RCuS/G2SMh9aAktwmorlEBKs/UJXKj3258iIs+x7?= =?us-ascii?Q?WE3f9X2cPjJMfylf0KdZBlwdqcjM4kwKJSox1BW3udMafrKTsNFiOxE0dDhh?= =?us-ascii?Q?+8LrSTvhu4XeVyp2sjtb/hTyDwg79hT45H5FAfdI79O/sKN7fnDrrXV0gfTD?= =?us-ascii?Q?SPWO2dQlM1E3ryuHhZajst3QovE5eJcvBBtISGVzH9omV3psYZ54C2PFU+k4?= =?us-ascii?Q?oSNEt/6D2PIJpH7pQSMJYBRY/sejq8WEeV4D7qC65W/x6XY12ybCKP+d4Tny?= =?us-ascii?Q?oGAMbj5TLL0Oitjg1G49bjqi/ClxZIEqi35FKgwxL9cI20X2+0uD0W1gydMW?= =?us-ascii?Q?BsLsGwJiYZh7hujgR9cDsPAV+6AUwYUSiw0+q7ZS6XR9pTU8AjJRdz6jSYGx?= =?us-ascii?Q?R2gJmpV+NKXZwM0ky2uNCmsyGn0d7OF5DIcPCx05BcZpf8hJWzyYe5XlupGn?= =?us-ascii?Q?5J2XBTchYoghWu0WuAVngC+uQ8Jo+HV21YgQuoXsyIKduJi8DsxiDMQjiG2T?= =?us-ascii?Q?syGLICT8Q+GO4zg5Zq5cgW1OxytuHneFExIZtyy67NpkTtL3jhFzZ2iVYop7?= =?us-ascii?Q?gAtZSSr0H7yli4CYdrhdF+ywhNb/BACNXm2CtGwGgG4TOUEhu5jHoCtzPC3o?= =?us-ascii?Q?gxBX11wknX1dyZ0HYLAcp59bGiMv5+ZG99/hcDyUdhvQp+LIYcwiZLtKF7mW?= =?us-ascii?Q?YXpQllrJYaQp52UAd47Oqnu/8tWXEJydPdRJAO4SvJQ2nszU13Kc9XOeyuvh?= =?us-ascii?Q?2ynhnSPxzm8kYFPm30yUZ1rHi4YrrA4AmELiIwwyQWVBM+LeZQpaLIjwfku3?= =?us-ascii?Q?Iq4UN4ap5HuaPrz+6TyZZ/cejgEQ4YKNkVib6YAXrwPgD4MuTpCnN/MM1iEX?= =?us-ascii?Q?sxLAbrzthqhcLVmmxUFEzegsFusXw5Yr6OamAAf5LJiMK4om2OmvmQtE7mvy?= =?us-ascii?Q?SA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xiwNtbpYK+Tk3dT2vU8CZ6b1lLENGW2Ik1S7qUHUUp+cInlqP6NP/NHzjLI4F5p3hgybuuWUZxxjDnIR/ovfnGYaP1F9ZCwwjDaqKf2gd4ty5yDfcnTcOrO0SV56piOh7le3as8kawnUQEW7I5/rXHdHkG9qGfSta4YDHDC7rCfp7fz/FPmr0Z0DDI3ImEnM7xBNCAhq09khglx4Jbg1dj7Isib9t5lvxSzqZOSe15UCv8Gy2Ydr6OzNaioBo0nN+PmSGRFsMNKxrJT7LfqokkOQbQrMOiVOgX9K4/Trva6n+d3FwNmmHvb3AwDLh2IFhsV+TetXFDo5JaUMBrpx6Uj2alyTG0xE6DlD8UT+oDtHA26q0kvOStcKb/ZDM6lp31gV9bQDGC2NjlqgJu60WQ5HpZxYFrHSvRNY8mB14yHViMoA1az+yw3O/aIIiZX5iJicG3gJvciuXP9uYlAbhKzfm2Yh9zY4UwdpX58llhMNeN/xXOyIO2Ft3EhXZwYW/oFN5QME8GKsbagSwgFv7e8ll5Wwm4Jx6Eowy8RzuIiCe/TIrChvHcsZ9/R5yPanSfWks2auoUdA/V0QkzpdPzRmPlYSwlmdz+EFKd7MkKA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76e16d6e-74df-499c-8640-08ddbfc9920d X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:51:01.6876 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q3PqZzBpGu6Q7j7cSFHuYKsh3EUWUEcA6fpgLSE9c2iuaVeinegivICLnAS6xS+ZgjMHAr6VTIL5PI7c53tJE84gvnwMh60NwzY2H/ymfI8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6769 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfXzvC9fYH+Rsb0 kzaayej4gYr+qUbBua2AL/C4jZmB4kIckaqFvpyWOyPHYsC5evFDckJTYzG4XFMMZi8qQXq5sk5 hnFjq4u/kK50X2w/GE39ZuKPS7T9lQ3LC+8P3WbsWLYJ1aew2CvzEqFFFYyQIUxRW3gEz+qz0mR +M9eRMoQx40Fnl0JIaxoQYPX4xl07X7R+PJ+keQGzhMD9iDfz8uAT28wrn5gpCxoD8CMyDSd6xn jhjg1fRQ41gE+Y56aBnjaetozjvSEbaXcV8hU8lpzS59zobGXjgoypAqRBEefquHygmc6UzsjOC Wp1hfDUsnusyQEJ0WjI9UKXLKZ6JaHgKu7jZ6qtvi5vRO5wJvmKGaXEQB7Wl1mc7yNJy1im4vV3 ze4ilzjaDvWHMkrhZtbVef4O2ms/Tu5gkkOFxKK9WTeqTh1FN/lLYRSZPUfmIAOXO/q4xKIY X-Proofpoint-ORIG-GUID: kUeBEkcXRU3p8mWPi9oFXUp52VGiRov7 X-Authority-Analysis: v=2.4 cv=cvybk04i c=1 sm=1 tr=0 ts=686fe169 b=1 cx=c_pps a=WeWmnZmh0fydH62SvGsd2A==:117 a=WeWmnZmh0fydH62SvGsd2A==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=0r5cTyXUqGrpW3ZitcIA:9 X-Proofpoint-GUID: kUeBEkcXRU3p8mWPi9oFXUp52VGiRov7 Content-Type: text/plain; charset="utf-8" Historically we've made it a uAPI requirement that mremap() may only operate on a single VMA at a time. For instances where VMAs need to be resized, this makes sense, as it becomes very difficult to determine what a user actually wants should they indicate a desire to expand or shrink the size of multiple VMAs (truncate? Adjust sizes individually? Some other strategy?). However, in instances where a user is moving VMAs, it is restrictive to disallow this. This is especially the case when anonymous mapping remap may or may not be mergeable depending on whether VMAs have or have not been faulted due to anon_vma assignment and folio index alignment with vma->vm_pgoff. Often this can result in surprising impact where a moved region is faulted, then moved back and a user fails to observe a merge from otherwise compatible, adjacent VMAs. This change allows such cases to work without the user having to be cognizant of whether a prior mremap() move or other VMA operations has resulted in VMA fragmentation. Having refactored mremap code to aggregate per-VMA and parameter checks, we are now in a position to permit this kind of move. We do so by detecting if this is a move-only operation up-front, and then utilising a separate code path via remap_move() rather than the ordinary single-VMA path. There are two tasks that occur outside of the mmap write lock - userfaultfd notification and population of unmapped regions of expanded VMAs should the VMA be mlock()'d. The latter doesn't apply, as this is logic for a move only and thus no expansion can take place. In the former case, we explicitly disallow multi-VMA operations on uffd-armed VMAs. The mmap lock is never dropped in the move-only case, this only occurs on a VMA shrink. We take care to handle cases where a VMA merge has occurred, by resetting the VMA iterator in such instances. We needn't worry about self-merges, as in those cases we would, by definition, not be spanning multiple VMAs. The overlapping range test is performed on the whole range so specifically disallows this. Signed-off-by: Lorenzo Stoakes --- mm/mremap.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 125 insertions(+), 7 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 8cb08ccea6ad..1c88ed7eae0a 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -69,6 +69,8 @@ struct vma_remap_struct { enum mremap_type remap_type; /* expand, shrink, etc. */ bool mmap_locked; /* Is mm currently write-locked? */ unsigned long charged; /* If VM_ACCOUNT, # pages to account. */ + bool multi_vma; /* Is >1 VMA being moved? */ + bool vmi_needs_reset; /* Was the VMA iterator invalidated? */ }; =20 static pud_t *get_old_pud(struct mm_struct *mm, unsigned long addr) @@ -1188,6 +1190,9 @@ static int copy_vma_and_data(struct vma_remap_struct = *vrm, *new_vma_ptr =3D NULL; return -ENOMEM; } + if (vma !=3D vrm->vma) + vrm->vmi_needs_reset =3D true; + vrm->vma =3D vma; pmc.old =3D vma; pmc.new =3D new_vma; @@ -1583,6 +1588,18 @@ static bool vrm_will_map_new(struct vma_remap_struct= *vrm) return false; } =20 +/* Does this remap ONLY move mappings? */ +static bool vrm_move_only(struct vma_remap_struct *vrm) +{ + if (!vrm_implies_new_addr(vrm)) + return false; + + if (vrm->old_len !=3D vrm->new_len) + return false; + + return true; +} + static void notify_uffd(struct vma_remap_struct *vrm, bool failed) { struct mm_struct *mm =3D current->mm; @@ -1646,10 +1663,29 @@ static int check_prep_vma(struct vma_remap_struct *= vrm) (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP))) return -EINVAL; =20 - /* We can't remap across vm area boundaries */ + /* + * We can't remap across the end of VMAs, as another VMA may be + * adjacent: + * + * addr vma->vm_end + * |-----.----------| + * | . | + * |-----.----------| + * .<--------->xxx> + * old_len + * + * We also require that vma->vm_start <=3D addr < vma->vm_end. + */ if (old_len > vma->vm_end - addr) return -EFAULT; =20 + /* + * We can't support moving multiple uffd VMAs as notify requires mmap + * lock to be dropped. + */ + if (vrm->multi_vma && userfaultfd_armed(vma)) + return -EINVAL; + if (new_len <=3D old_len) return 0; =20 @@ -1746,6 +1782,84 @@ static unsigned long check_mremap_params(struct vma_= remap_struct *vrm) return 0; } =20 +static unsigned long remap_move(struct vma_remap_struct *vrm) +{ + struct vm_area_struct *vma; + unsigned long start =3D vrm->addr; + unsigned long end =3D vrm->addr + vrm->old_len; + unsigned long new_addr =3D vrm->new_addr; + unsigned long prev_addr =3D start; + VMA_ITERATOR(vmi, current->mm, start); + unsigned long res =3D -EFAULT; + unsigned long last_end; + + /* + * When moving VMAs we allow for batched moves across multiple VMAs, + * with all VMAs in the input range [addr, addr + old_len) being moved + * (and split as necessary). + */ + for_each_vma_range(vmi, vma, end) { + /* Account for start, end not aligned with VMA start, end. */ + unsigned long addr =3D max(vma->vm_start, start); + unsigned long len =3D min(end, vma->vm_end) - addr; + unsigned long offset, res_vma; + + /* Merged with self, move on. */ + if (vrm->multi_vma && prev_addr =3D=3D addr) + continue; + + /* + * To sensibly move multiple VMAs, accounting for the fact that + * get_unmapped_area() may align even MAP_FIXED moves, we simply + * attempt to move such that the gaps between source VMAs remain + * consistent in destination VMAs, e.g.: + * + * X Y X Y + * <---> <-> <---> <-> + * |-------| |-----| |-----| |-------| |-----| |-----| + * | A | | B | | C | ---> | A' | | B' | | C' | + * |-------| |-----| |-----| |-------| |-----| |-----| + * new_addr + * + * Now, new_addr may be altered even with MREMAP_FIXED set, due + * to e.g. alignment changes from get_unmapped_area(). + * + * So we map B' at A'->vm_end + X, and C' at B'->vm_end + Y. + */ + offset =3D vrm->multi_vma ? vma->vm_start - last_end : 0; + last_end =3D vma->vm_end; + + vrm->vma =3D vma; + vrm->addr =3D addr; + vrm->new_addr =3D new_addr + offset; + vrm->old_len =3D vrm->new_len =3D len; + + res_vma =3D check_prep_vma(vrm); + if (!res_vma) + res_vma =3D mremap_to(vrm); + if (IS_ERR_VALUE(res_vma)) + return res_vma; + + /* mmap lock is only dropped on shrink. */ + VM_WARN_ON_ONCE(!vrm->mmap_locked); + /* This is a move, no expand should occur. */ + VM_WARN_ON_ONCE(vrm->populate_expand); + + if (!vrm->multi_vma) + res =3D res_vma; + + if (vrm->vmi_needs_reset) { + vma_iter_reset(&vmi); + vrm->vmi_needs_reset =3D false; + } + vrm->multi_vma =3D true; + prev_addr =3D addr; + new_addr =3D res_vma + vrm->new_len; + } + + return res; +} + static unsigned long do_mremap(struct vma_remap_struct *vrm) { struct mm_struct *mm =3D current->mm; @@ -1763,13 +1877,17 @@ static unsigned long do_mremap(struct vma_remap_str= uct *vrm) return -EINTR; vrm->mmap_locked =3D true; =20 - vrm->vma =3D vma_lookup(current->mm, vrm->addr); - res =3D check_prep_vma(vrm); - if (res) - goto out; + if (vrm_move_only(vrm)) { + res =3D remap_move(vrm); + } else { + vrm->vma =3D vma_lookup(current->mm, vrm->addr); + res =3D check_prep_vma(vrm); + if (res) + goto out; =20 - /* Actually execute mremap. */ - res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); + /* Actually execute mremap. */ + res =3D vrm_implies_new_addr(vrm) ? mremap_to(vrm) : mremap_at(vrm); + } =20 out: failed =3D IS_ERR_VALUE(res); --=20 2.50.0 From nobody Tue Oct 7 10:00:50 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (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 5186927A914; Thu, 10 Jul 2025 15:51:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162721; cv=fail; b=FK91eiRfKTwNZwUG6XKELeQA4oxVBY3NIqTK1mF6npTac222wPmiqq9e0inhePhWc1ij+SlJjuxb918DgxzPV52yDw4nDWwk4lVEatTAQCRiumwV3BKY5GMgjFYFAZFYGyeLxLUqdZBMZtNOiG8bmyU/QuKuz45P+xiW0YyEH7c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752162721; c=relaxed/simple; bh=eX3Bt/Q2HgquhsnAvOucKRuVpaGYip2k2QEYy+Ssdtc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=BtPzN14PAc3C5uZTG+qorZAxWy5x78QabfGxoasmQABCU3oDEKrF83ONjhExVqPYGYOX9MiOux+WEd15aZCAdHo8Kd64KnJVZMJLD4Go/Huw4WWB/JRVb/e2Pv3qm4XrC8W/U/IuqLOOk++LcvhhbTTk59zgEUW3og9lehnq98M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=dr2UFHxT; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=SjyfsLQz; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="dr2UFHxT"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="SjyfsLQz" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56ADHFmQ019859; Thu, 10 Jul 2025 15:51:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2025-04-25; bh=cEMKcr1TletxdCHvl0D07RiYtYzAexLFvYg3R7snJ/0=; b= dr2UFHxT+Q2SxFYYrs+EN0p7k0BASql0bnbqUitzAn2rtIMK8Hao6fkPrZ0uJ1/q ++iO4GrYkoK/EFyafhuraG2eOCGacUDg8p/LAJziRCajbTca1yn+0Xp32j3R9M5t v1rgA3MnvtsBKr3vs+s1EPmLnke2tPAYp8GCNk6PebK8/2BgGICGAqCsRK8bhA08 30v68S7wjhDRixwG4bn2aYjn9X/S6zEiU0D4cnzwioj/68W19FC0iS+7cIzIxNRB RC4TPflWtPIIc8idVYjpJkiojmDFy6TzTkobw+td1WgMA8J8ZZMPvKEqHxMUtqR3 ZCmUGZZCeMRmYHHz0lxOOg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47te8w0drq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:08 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56AERlYn040590; Thu, 10 Jul 2025 15:51:07 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2079.outbound.protection.outlook.com [40.107.243.79]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgcpk6s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Jul 2025 15:51:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jFzAkKBZePK92JHDkLAMrftF+VlWCeXdLUlRAc9CH7AKA96kHO86k5Bvkqr63nHZ7mzW/9soR6pQdB9Pn/rt9LvRb2X6MTNlqbt/tRkCfN/erSB8Uv1/nwZxtBQoUw4W8MuUGzRp2badYe6OtcVipkl6RJp2GyeiHVAs8rQhPw5CHlRSyoJ6QUkqZOrpIvbgVlGrxCwAjB47rzfam1XHJsRvpXegiU/OZmxSJrjkWSLYQpl+KdVepqgIIwJTsunTjcw//qeppsv6hDLR8BodMQ+t3sVn8nfmg/oxgyqbP0UxKFsgAf6zkDdkS32ci1P9wJ0i6Etx8fsjZTJeP6Iotw== 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=cEMKcr1TletxdCHvl0D07RiYtYzAexLFvYg3R7snJ/0=; b=S2vI3T36irlPWYi1hS/rXEwMEbre7VlKE6WkloRRDKfO1Aw/5SctCtv9w84IA09Ey+L8Nzu6aRBfp9mfEyQDR99ETFgyXUuLDwq3qAknizR7iC7GTxZzxJ4xvHzQq1dZ+vTpHDTnQ8+D7/G+4xliSCIl4hzRFZTjyi7gALoWfiD9yx1vs8ly9UtenMG6YnHQ78xUVT+g/EtVNHNmM0/6rObbTzdSiyn2mMr09OTccULuua8MHw7bQgRX0AzQ8Q9TK40FxTkPq/VpRS0zqnxFADwbztkP0HQiFNBRYL8uBtXBfl56JlKHDq0oo8RCWabiIj3gqfmEu3TDcvyy2aOHJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cEMKcr1TletxdCHvl0D07RiYtYzAexLFvYg3R7snJ/0=; b=SjyfsLQzBwOQS3HFR+ffg6X9sAOVOq0KYhuL2rCSEBjXc8AiS/jjmG4PP3+RZbgMIuAZiNZOGjvSbL4htep48qc//WWZZoZnH21xx6ECav1WkJa2nJj/xXT81bZFFqg7AJCIZtH+M605TwN/FgpCU+5KM3gDzTw7QwomIrvW1To= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by IA0PR10MB6769.namprd10.prod.outlook.com (2603:10b6:208:43e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.29; Thu, 10 Jul 2025 15:51:04 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%6]) with mapi id 15.20.8901.024; Thu, 10 Jul 2025 15:51:03 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Peter Xu , Alexander Viro , Christian Brauner , Jan Kara , "Liam R . Howlett" , Vlastimil Babka , Jann Horn , Pedro Falcato , Rik van Riel , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v2 10/10] tools/testing/selftests: extend mremap_test to test multi-VMA mremap Date: Thu, 10 Jul 2025 16:50:34 +0100 Message-ID: <7acabd9cc083b48b9a9b5fa2a4d66a2d1c01fd69.1752162066.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0118.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c6::8) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|IA0PR10MB6769:EE_ X-MS-Office365-Filtering-Correlation-Id: 01b9cb29-fb13-4575-a655-08ddbfc99356 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JcfVWoc8SwdGIp680n8VsL0r6RY3k7ZDC1APdpto6GbRKdFicQPmWzhkCItt?= =?us-ascii?Q?d7Zlu80vJuCf/ZVr/84oTumF3am6yglq5WCGwdcfbMkZIij+V3x4NcDoyUFM?= =?us-ascii?Q?cOtmQeedqSxz0c80G4pBBxOR4mkV+NdEVw663RvmVbZKqdR/KcItjb7t7ZEJ?= =?us-ascii?Q?z5tBJOJdiAyxxugD0WGCGJka+VTYZef5HOhQ0PFRVsnrkGVVNF+jdkFX6ceS?= =?us-ascii?Q?YGrMpkKnaNssS+6ZQf6adtmrI0+LbqZhu57Ze8R/3LYSa9IYrKKUaa2SVJPg?= =?us-ascii?Q?XY22MtHYuev8Jc6gKdaP6IXoES5Xe0HabOqp4wC12oJCcPfl+7qoxDp22TP/?= =?us-ascii?Q?wAQAt7J4F5Fu1ZxorPeskyu+ADbDEBzAZ+0Y1Zm6iRNJ0UTsYZNL2pBPcv3v?= =?us-ascii?Q?x7mWmcalcndqIgWWD0OhkVRp5A1sWzTmq0WhtKxBq0Hi01I+YPA7cnbnmXTa?= =?us-ascii?Q?kkSULE1AKjx1gsUJ1mhegVLWrO4IuqHtJYlK7zoTcIbErmYuAPYe4+yWqkNC?= =?us-ascii?Q?xk8x0dth8N+3TOFx7rVQ3KCxgTbpyKJlcAx7dUMgVNONvz1SqLTenCA6j7u5?= =?us-ascii?Q?EdfIkto82vy6bK1zhbnbSR2nAiYbfBXBWqokOjZ9XU5WT1YrKP52aWWKEHuS?= =?us-ascii?Q?kR7DMXR4b1raPn1d98vWEJlfYYkSJDGB/9bIeCHhCl33sSOWrFBDP5Z0mB+X?= =?us-ascii?Q?3MdhEcvVGqAewYjATIVKvTecuUXK1gmJdB+a7bi2dMrICFXQ5xNStgGrxDdO?= =?us-ascii?Q?jTjcmX9A9VceVgMn9UeX/8UdzKsBYo5aUhgnxWn9aTLUUZca9gB0nfaKi/wM?= =?us-ascii?Q?fncw+ZoQLGFqYkUM5VOJq8EfxoqROBW0/jeuD5qGyFqYGQibrB91a6mvk5jW?= =?us-ascii?Q?1wY9myDxgu6wEq/AZPj+ZS6jKG65ZS2rC/RCvqokKUdqecw06LsadLAqsXVX?= =?us-ascii?Q?TEgK+CfhShSjVXzg4zfXz8n6bpbNYHW63VxKEc7w+JrYBqyK+vb4kt3YZHhc?= =?us-ascii?Q?DvUnXo14PZBwG+LTbRP/YSxV2Kv3MKVnesZgm6tHjeSGOpMcXjBFrSWmAKLD?= =?us-ascii?Q?oLCa1DA1zb/9q6NnSihMLYGJmCEDU8TbsmKCTjMleEr/olGKdej9TUM/Gfwr?= =?us-ascii?Q?A3eXi0HQ4wovsnu0aRoazjirDs86kuDfJN8UPKJztZBPOvwXErDPur6ccSQD?= =?us-ascii?Q?tdr8JUb42Z6/CuhWHiVwThfpg7gdXYpy8NkowfC1MRE0JPfOr0f/LmWzE76z?= =?us-ascii?Q?OFMh9L9YeBU4OH4+v3prhhq3mr0dX7xO4fT18MwrVl7zXkd87p9pBgf3NshM?= =?us-ascii?Q?8XpvUC+NSizVdFn5kklQHZe9CG+T5uOS/NghEoxWHdhCpADDARIqNf2LqVnB?= =?us-ascii?Q?uAnaEMqUk/apuk3RP74SHX4syvt5Q9ZKfpUHIEClvNezlYiK8w=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xCIeqNnYlNw830w4/+fOUYE8AlmprLkH+7PNyauluDFs+ZXuICIpcGuDcTrF?= =?us-ascii?Q?q0zXDbt3GjT0SMVHzSO9x7TtTYcDb5EnKaroz2Nvx6t1RFm0PTOslS31g6fq?= =?us-ascii?Q?BexXo4XnlVfrfZu4GOuIpcsvZZP/djX+htAccc+prFw0NUAIEWEXqbR0Pdl6?= =?us-ascii?Q?O6ZX2lgz26ufBNtyg5CZ0jhD7J/1LUP/HolM9aX1GivSMnUeIBwAjSZskoiE?= =?us-ascii?Q?7gVNmfi3rQSOp48KylhnkQfezSB7T0Hq6lXyCx5zVCpHvqja1Ro08Q4inGa4?= =?us-ascii?Q?RcHwUCxKii9Qv59egWr1P8qLEGPI1c9JUlZPYrq0RX8YgnTAk2slWTcPRc4K?= =?us-ascii?Q?KnO/b6R/JbhXojqSquYG61JZlWgOOfIfV24M7PEJ4xSeEv/avjh7ntLaoeJf?= =?us-ascii?Q?rMrOwz40Qdj6XY7WY2JnC/zgG53OsIbt7ECcy+jo7rRaso9NDtz/9/b7aogM?= =?us-ascii?Q?lXdo/jd8pGOuD3hlbOeOo0UBi4PcEehP+S5BS0m3QYmJ8pYrpgBdLBUmNoqB?= =?us-ascii?Q?FL2JdYIxoGMDWt8LWm/zrzSNFipAYt13G64cPZjKC3sqAAYaleWGH29+naPv?= =?us-ascii?Q?iHFiIa1DMF5z/XTVYSwJAx/iiv1B1PwsldXMmc//tlya6PTR2CrC442T30Xr?= =?us-ascii?Q?lnT1D63D3uSN2aHO/WIW5fzJCji6YyiON0dHuV2lx0JBCK1WDE7nmcXuSJdJ?= =?us-ascii?Q?UvcB3UkkE7uv/CEgIpUgM5MrzbKkWRnCDZiDGYjIvYbU30l3leO2PYQS1QDR?= =?us-ascii?Q?Qhtu2C+lKzflgJe5J17nU5DIRgrAgxcCkhbd7b+4SoQiUkPCKXOrFGg1DZlW?= =?us-ascii?Q?wjElqRHInn7jtXCv19jN8zkKqVUxcDJaC80T3WK7i3Re2EN8KekXpkuIdhUR?= =?us-ascii?Q?1YUWry9mgcIarbtYfo9XMZlOta0xSx1UNinn6UVo9mI7428+jgLkICah75Jl?= =?us-ascii?Q?MLcTR/Vs9yJ3PZF8wkIXF7tROT2uHbwniEYzH/pu7NRAmp1LIhNTJVXR36rh?= =?us-ascii?Q?9ZgCZrY64WEqwE72Iwvy2toQBx4/lFqVtKFnZ57r9Xe/2lBmD83rQFQIDdkx?= =?us-ascii?Q?sH1tGghgLg7t9TrRVKvFM2j/8DxGCmttVcB1ThgpUH1+2l5Dbqwh/QUB4NKx?= =?us-ascii?Q?/AOQKfFkGW12bH56Qho9fqaL2a6rDkDoHBhRzWgufozUJKIH95wS/mB9VEnW?= =?us-ascii?Q?wzNmsgBF2bhhB2gZsgawz6Q9q80k58Ii0aFZOydO5K/mGMDCkR42EnKfTiJS?= =?us-ascii?Q?fbvsQTMzgCIk6LqgnMsm1Y7wMsAzgizcZFwI0cpXpeOHRKPS8coMW6jhHj6J?= =?us-ascii?Q?uEfw/Xo/Ft2sYUiVJ5oDdOfoQJFD1WxGykwDlPFPly6hShEi0ayG4lkRVsdQ?= =?us-ascii?Q?kKl2qQbMLxroysmiQ32nXFxIaD0FUWTa+wp1z8fyi1qr+p5kI17yM8f6Tbt9?= =?us-ascii?Q?fEuOekZYsn3F/ZQpCRiZo/Wca3Lvlbos5pgfu8b8H1YFvniEww4uulLnvDQj?= =?us-ascii?Q?kbKK2vVk1Uir+2xxyC6katqfw5XSzxwOffSDfSKV1prox6bgIV0YYHnpU1IH?= =?us-ascii?Q?k7gzHEJ6nVDMObmkvwE8uaq/Vcg25qhiHV4D0D3SSN/pLz/Yag+K0ZHCZsXD?= =?us-ascii?Q?dA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: jMaff1csFmefAo6SwGQ6k0JNd+5+BN1j/phXUAo44O4yDCz5oDdC1SkTmXkC1xPU6hUQ1BoBmK6nrht//KmuRz/pmDrUN5XhJbhvLbxzEO6AutyaV8tOXQCGmwaJdvynXlBOwVIkuLNTCxeQ5Ew5SZbehYhJ1wxGZQHH+M51fyyZ0+FmGe1yAHAzarNfnbphyk4Xzs/D1/fGxnrNXwn9fm6kpT0Vo5YgQ0FROa4rZaX0wwC4Df7or+YjBD+VIqi+YfwdNI5kqdxBuE3X0BZlRTe7aE21geQJYsr+2XT1Pr35M/Ma/nRPb3Ty0QeCNEIkOdv52cD7SFRNkq2bZ0F/1Gt2+kiexrnosQZsd8fkmSTJL4fr0zVJLDNhd0tMcyWFFuspmdLaEeMBKxn9YmfDJhtjRl69iY/bs6QF5EMSTKhdrxQLIwN5uaJwIVL02AZbkDmQuSyYVkGD4qsw/O5m/8wze1zPZv9tJ0XBy2ZL5jP9M/JDty8NoMb/6hcvhZL0jEtNWZrTlf/xHnINKMh3Zlt291VFVq/Dpb+QYpzMtSxfMq7GbeSoYmSCyjM7M4GMaRiZaz5pGbKczyCM9ywNf92N+WEWXvmbYnSNZLG7oj4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01b9cb29-fb13-4575-a655-08ddbfc99356 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2025 15:51:03.8534 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BztOTqvIvwBt6JVq4/5npZMaGuqcmgIt5oKkm0iOp2ITbZbqI9mazKouSIQvhNKLHZ8+7d8Q9lGGG+fZZyOrsHUAhPs73Q9SByx5k5T6ADU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6769 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-10_04,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 phishscore=0 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507100136 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzEwMDEzNiBTYWx0ZWRfXzD/+TOFDawX3 HuvYBAlR9LnjUhvx+CTJV4H/Mn8//lqwA3By+SPs+XS7khGOZe+YbkT33+1PSC49XvpMsHeWUge jn0VxDnIsjmsEFba5zcNvjswOBRYSkEvshaBRoiNa8rua8YdiGzwK7StPTaFV35WVgb8As7XBHn UvsakIDhalCCl1+HMqdPUdfRBDn6rAMcLpRZjw/Adk+F906vvM4ARtheYwIREBXMqBXYMu75hl3 lDzpSdvBiYIPKo7en+QRQ5UB+LVdWxSNFf/MvWAto2wuZp1ZKKKWxOQ1IM4aX5omvkvM3IZS61M ++DI4CK05ipYXH6J2u17mq84AmYLATBdHXVoAddTXq8tcAAjAJgroaU9MehFiPhzsw6zNNjidph I24IMnz/cFK1j4iuMoXTrQNvviVyeO8zfUxkRy4Xyujd4baxz+eA7qGiNgDitTIvRLlbEu20 X-Proofpoint-ORIG-GUID: TNr3VArrKhsT8p-0KFqHngAom4KotUw7 X-Proofpoint-GUID: TNr3VArrKhsT8p-0KFqHngAom4KotUw7 X-Authority-Analysis: v=2.4 cv=O5M5vA9W c=1 sm=1 tr=0 ts=686fe16c cx=c_pps a=XiAAW1AwiKB2Y8Wsi+sD2Q==:117 a=XiAAW1AwiKB2Y8Wsi+sD2Q==:17 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=GoEa3M9JfhUA:10 a=yPCof4ZbAAAA:8 a=GuY5gsdr9MwsYxRlPWUA:9 Content-Type: text/plain; charset="utf-8" Now that we have added the ability to move multiple VMAs at once, assert that this functions correctly, both overwriting VMAs and moving backwards and forwards with merge and VMA invalidation. Additionally assert that page tables are correctly propagated by setting random data and reading it back. Signed-off-by: Lorenzo Stoakes --- tools/testing/selftests/mm/mremap_test.c | 145 ++++++++++++++++++++++- 1 file changed, 144 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selft= ests/mm/mremap_test.c index bb84476a177f..36b93a421161 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -380,6 +380,148 @@ static void mremap_move_within_range(unsigned int pat= tern_seed, char *rand_addr) ksft_test_result_fail("%s\n", test_name); } =20 +static bool is_multiple_vma_range_ok(unsigned int pattern_seed, + char *ptr, unsigned long page_size) +{ + int i; + + srand(pattern_seed); + for (i =3D 0; i <=3D 10; i +=3D 2) { + int j; + char *buf =3D &ptr[i * page_size]; + size_t size =3D i =3D=3D 4 ? 2 * page_size : page_size; + + for (j =3D 0; j < size; j++) { + char chr =3D rand(); + + if (chr !=3D buf[j]) { + ksft_print_msg("page %d offset %d corrupted, expected %d got %d\n", + i, j, chr, buf[j]); + return false; + } + } + } + + return true; +} + +static void mremap_move_multiple_vmas(unsigned int pattern_seed, + unsigned long page_size) +{ + char *test_name =3D "mremap move multiple vmas"; + const size_t size =3D 11 * page_size; + bool success =3D true; + char *ptr, *tgt_ptr; + int i; + + ptr =3D mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + if (ptr =3D=3D MAP_FAILED) { + perror("mmap"); + success =3D false; + goto out; + } + + tgt_ptr =3D mmap(NULL, 2 * size, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANON, -1, 0); + if (tgt_ptr =3D=3D MAP_FAILED) { + perror("mmap"); + success =3D false; + goto out; + } + + /* + * Unmap so we end up with: + * + * 0 2 4 5 6 8 10 offset in buffer + * |*| |*| |*****| |*| |*| + * |*| |*| |*****| |*| |*| + * 0 1 2 3 4 5 6 pattern offset + */ + for (i =3D 1; i < 10; i +=3D 2) { + if (i =3D=3D 5) + continue; + + if (munmap(&ptr[i * page_size], page_size)) { + perror("munmap"); + success =3D false; + goto out_unmap; + } + } + + srand(pattern_seed); + + /* Set up random patterns. */ + for (i =3D 0; i <=3D 10; i +=3D 2) { + int j; + size_t size =3D i =3D=3D 4 ? 2 * page_size : page_size; + char *buf =3D &ptr[i * page_size]; + + for (j =3D 0; j < size; j++) + buf[j] =3D rand(); + } + + /* First, just move the whole thing. */ + if (mremap(ptr, size, size, + MREMAP_MAYMOVE | MREMAP_FIXED, tgt_ptr) =3D=3D MAP_FAILED) { + perror("mremap"); + success =3D false; + goto out_unmap; + } + + /* Check move was ok. */ + if (!is_multiple_vma_range_ok(pattern_seed, tgt_ptr, page_size)) { + success =3D false; + goto out_unmap; + } + + goto out_unmap; + + /* Move next to itself. */ + if (mremap(tgt_ptr, size, size, + MREMAP_MAYMOVE | MREMAP_FIXED, &tgt_ptr[size]) =3D=3D MAP_FAILED) { + perror("mremap"); + goto out_unmap; + } + /* Check that the move is ok. */ + if (!is_multiple_vma_range_ok(pattern_seed, &tgt_ptr[size], page_size)) { + success =3D false; + goto out_unmap; + } + + /* Map a range to overwrite. */ + if (mmap(tgt_ptr, size, PROT_NONE, + MAP_PRIVATE | MAP_ANON | MAP_FIXED, -1, 0) =3D=3D MAP_FAILED) { + perror("mmap tgt"); + success =3D false; + goto out_unmap; + } + + /* Move and overwrite. */ + if (mremap(&tgt_ptr[size], size, size, + MREMAP_MAYMOVE | MREMAP_FIXED, tgt_ptr) =3D=3D MAP_FAILED) { + perror("mremap"); + goto out_unmap; + } + /* Check that the move is ok. */ + if (!is_multiple_vma_range_ok(pattern_seed, tgt_ptr, page_size)) { + success =3D false; + goto out_unmap; + } + +out_unmap: + if (munmap(tgt_ptr, 2 * size)) + perror("munmap tgt"); + if (munmap(ptr, size)) + perror("munmap src"); + +out: + if (success) + ksft_test_result_pass("%s\n", test_name); + else + ksft_test_result_fail("%s\n", test_name); +} + /* Returns the time taken for the remap on success else returns -1. */ static long long remap_region(struct config c, unsigned int threshold_mb, char *rand_addr) @@ -721,7 +863,7 @@ int main(int argc, char **argv) char *rand_addr; size_t rand_size; int num_expand_tests =3D 2; - int num_misc_tests =3D 2; + int num_misc_tests =3D 3; struct test test_cases[MAX_TEST] =3D {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; @@ -848,6 +990,7 @@ int main(int argc, char **argv) =20 mremap_move_within_range(pattern_seed, rand_addr); mremap_move_1mb_from_start(pattern_seed, rand_addr); + mremap_move_multiple_vmas(pattern_seed, page_size); =20 if (run_perf_tests) { ksft_print_msg("\n%s\n", --=20 2.50.0