From nobody Tue Oct 7 08:15:41 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 D702528C016; Fri, 11 Jul 2025 11:39:51 +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=1752233993; cv=fail; b=HGZoAutTEDesC5h+Fp2xnOrDaWSCFRToCe2tQHUMSbZB4K0h4/6rrwsAebFd1OZW/KmEvnjNQrwZSNqqsD3kdafRMbxRSqA4hNqV3fts4t+pkkOBpKg9AS/4saXgzH5ygCUICTznK8+64mi02n+HBMePIQW5YmlAkUcwCwkcjs4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752233993; c=relaxed/simple; bh=cisWzDU2iFtIt6FUQ1W1YvM+txcg7SRqIjlmvnJPMls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ltqoUD8iNthrCmrR9kgqOXrSVAgrvaiRPUT06PfMFa/oe5hA3Q3fuCDmFqZXWXDYrJCiuSea0toXV+xQjp7Cq6lFCHXJZhX86pmuF586eb3Z83Gs18WKuoI+mYz12UpTZn7wU7OKDP9H6WilRDEVtHR4ZCInm+jCDLec+IUqXq4= 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=SVLtIJBJ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=y5CO2VY+; 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="SVLtIJBJ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="y5CO2VY+" 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 56BBbiDT015146; Fri, 11 Jul 2025 11:38:37 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=vUjSEGUcC79WeBi6shJU5SuFdmA3I9hHcZUIsxE30AY=; b= SVLtIJBJawrNRzkBwGdkfRwfuksH759dNoq6D5/5Blx2l2rsQmVvDtdgSUHa8vOa IpRiy195m4SyxUFoJBHhEdR8SeD0Qut7YJFkE5yxKO5/Qu3V2wL/2XbtcV/JV9Ni j6RJRH+g6RPeMnI2u4o79+jRgTyfLSRt8YFxCPwHPUMD8e0VFzKKw3fAP9F9GeC7 FOkws9XkNL7LoptCNp3+8QhV6Pkak+9xxISn+sPud6Y53IL8T89su0JDIRcpPzW+ wWLR3c2iQ7ZAr+6s4FTUlZXgG8n7FktxTvjZ3z7+tPfftreqMeNaAVvuRKRcugID HuBLXKecAoqz2tNIdhkoKA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w1g01s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:36 +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 56B9VEPw040420; Fri, 11 Jul 2025 11:38:36 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12on2065.outbound.protection.outlook.com [40.107.243.65]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgdpjtw-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mWR7A3YuoSz5rcTDyWvADSEq79oS5/GlFp/p7pFFE8lF7o7Om82Wt0rEblzfQI941z/0VL19L6Yl/Z3qZmRwUxv/YxFbttK06NhJll+nIRjZRFi8/BGwUBjvZ7IiSUOzRsTup7LKNkSSuFV1j3v7Hq1YOEYRtG5bW4HmUT/56iVfHOWqmSea1mGjQ4ZOdw/iqEasvnC63OeU92nWlMJ8JIE8Y559TDW2S1dp55egOq9Kup0TyHF/amMZhp45sVDQ4m0N36xqJgVKHC1CVQUVQu5t5l0yijZ9zRkBo/f3PgG3ajxknSwCWG4/q4YWNQdTnIb4ckwvaYLCtD2Kg+LSgQ== 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=vUjSEGUcC79WeBi6shJU5SuFdmA3I9hHcZUIsxE30AY=; b=HFFoppcjBVKDR6bwjtFk2hJwm+CjaQE6fW/9Da4sy0kae3H+8up/My6s9QJJoSVbzQDBTO1qFTm66NOvimZI8l6QWasp0KV3AYsJIVG46SeGemxXXCpu2e+WJq8lXs4enPkkM2IetsxNLWra0WVVUxygFt/qrChPQdXF1cMCcsU1aQVWrb2O0ccntAlziB0haGBDiNKvgIjefc4hOa3YbddrVyXmIK4TM52s3xmPtwtPQhSdkmmYNczF9dnMbY7PJwEBVMBMaV1g/UFNcD97XK2muVu+W4yFp1Hthv6wOWmkRTR851B1u/gBgMjsfq8bhtOOyFhNFfq0hUij+Ek3vA== 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=vUjSEGUcC79WeBi6shJU5SuFdmA3I9hHcZUIsxE30AY=; b=y5CO2VY+QyUdselgUiNdVBzSigBT9L0UT9d+r9eNRg0mXZf8XcZN+z83KWqzZYy++byV6nGZKa7kSLroGhC/bKvAC5PHcPPa9FqH0skDk2HtQKhAFJP4UzayiPC+l0fZMoUILRi20DmHx0IvyL1el8CwbkevqcLPW+NH1lXivGw= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by BN0PR10MB5174.namprd10.prod.outlook.com (2603:10b6:408:126::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8922.25; Fri, 11 Jul 2025 11:38:34 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:34 +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 v3 01/10] mm/mremap: perform some simple cleanups Date: Fri, 11 Jul 2025 12:38:15 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0090.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:190::23) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|BN0PR10MB5174:EE_ X-MS-Office365-Filtering-Correlation-Id: 50eb3ce5-f387-4df0-8343-08ddc06f77bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MjONIqqwwb+tYcLNXvjrLl/kOOTfvQWp5FAn7PAUTft+q6Of3sYS+4pIrvCt?= =?us-ascii?Q?LS/dTWjC4lzBJepLOtDwlersjwr+uuCsB2C/g6NB3v45SbT+qOxOxvKIelQE?= =?us-ascii?Q?/HRi7Bwl9wy85b61TvwVAEBeucKVfvQl/0pdIzhBDf0RnP3X8D0DfXQb/2GR?= =?us-ascii?Q?Qb1oNEEn+ijwWrVW7Ldtrwlas9uZxinYiBVuZicLMJMf5pkt94VxK215jes2?= =?us-ascii?Q?X+7vVAq95FdMDcV9tmspUrsydRBJZGrUtlLB+UERxv24U2QcZM7o3JdicwIt?= =?us-ascii?Q?mE5CoQTXRfxjLbvpxorqTlgjknbnnWSF5mqPmNbq2Aw32O4/994cFLMX4SwW?= =?us-ascii?Q?ms2mJ9QWO075TFGeAQkLkTZQEW9uey5+Af2rIBlEcHunDAavfAgTKqk/7pNa?= =?us-ascii?Q?2N1sAP4Y5jGS1jXzRdB9fVgSB9qU+4Nn1mUXePJTB7A/Wc5oH0UcrSKigNO/?= =?us-ascii?Q?dKs1QFS19X9On9hnSscvA9qSB4BwYKpr/+1BaKV948hxRYpE9pguZjJrIqQU?= =?us-ascii?Q?K4Vm136I1cAQRzqWI0eh94G25IcN1m3t5eUag2suA8E3CzYvnr8M+iJ50AD5?= =?us-ascii?Q?EHbvF4vMoL6P+dj9MKGDj4KcgKbiYg/yeM9/UWpZ5UH6DZiX+R3HiHXS6s3J?= =?us-ascii?Q?64UgUNu2V+upQ9zrGRqXjIWqP9t9AdMfGBgGbBQxdZ/HH+IyZvfR/46RRgS4?= =?us-ascii?Q?KZx+c9tYR14YoCrcnnaHmWq4I14o85M0lM4py+xAp2jJOyonTn1SzuPi8e0a?= =?us-ascii?Q?W4+wmjHVF2C8CdUpwynhWYcEdVR583O39PmfoM8NFzE16J5MI8wnlGG0Y1C8?= =?us-ascii?Q?mfDmmb0238o6FpCXwcfSmERLFHi4S40+38eA3dKlTaNXkQPXMcO6ZKzOS6Bw?= =?us-ascii?Q?yYRRVc8bIlACvA6RTi4QO2dWMpKzA9Mu/hGkjnhQlkA5W0HGszcSfYKj0wZ8?= =?us-ascii?Q?nqIzVB4mT6eAqfDc9vAfRlOtbFTRGd6z721Xm6gv09xQZd/AYvpVdJVJg4iG?= =?us-ascii?Q?PEdi4xdbhR4iS2K0ntp7oC/zHH0UjvqAxzW88UPJ0Tgh+sv7Hd0v7ec3a7yq?= =?us-ascii?Q?kdNlNNH+prt/W64I2cSS5XWkHWRt0YJfRJApuDp+irLDhHPDpFIpSRbg/r9p?= =?us-ascii?Q?5ACmRLK2qDmFVi5T8W/mImLHoZp7fg1Q10wjaSuVb8XFKq3pa1BsUu8p111q?= =?us-ascii?Q?rm/5IMevMxi6nrJDJfLROpYI22AQeVKBdgpaOZHLOS+lVC9VO5F4mR7rFmGl?= =?us-ascii?Q?nl3M7HqVNWOQWJu0tFCh5bhfrzfT2+8YqE16kcQpDDHJmluNWH+LqOi/dvFe?= =?us-ascii?Q?klt+MJg/84nc3phjc+AfJPTeTuTluED7Z8GJtetxag6Il/WjQOg2NFCIyNDh?= =?us-ascii?Q?30SpeZerOg8vkb5RDNbT/POZDgflI03Y+HXqCNprcJWl5xHWQ5XJ1SP5n9Ho?= =?us-ascii?Q?aah2cWiM3hM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LZfZg5Mki8zvdaUK1SQ1+gE/efkY0O+cypwdOSFCPvXAhpv/0B98RhnL2dXn?= =?us-ascii?Q?9gGdmQnC8v0cBNhsPr0eKtYJuNES7+EE7LXMn04jSlKRbD/FW47TMdX4PLUP?= =?us-ascii?Q?YSSXBabLTwb1HT5oeBHzH6czCwARpPMMKrQSD5ENqGG/VYN74LXM/2JCh02S?= =?us-ascii?Q?brziGnPKDZQsGcRkoZM1h9vC/D9RFc0Pwk4gsTb9Yt5iJZ9YSUMRoQL3DcdJ?= =?us-ascii?Q?jPiSamKRoSUFQLCIw3ofcpW5860rqW6rf2rgGd7E7lUs5wq7CxvQfjf8w+Py?= =?us-ascii?Q?GajVkFSjfW+MhlX1azNT7NLizdR1lzZIegY/iP5iZfX+cbNwFG6eY4IQV7D5?= =?us-ascii?Q?IESuUiC+U41OfuVb3EtNSELJ7flSFSJ/1XSrVqoQb2I5vZ7IZ1Topffaa0ZN?= =?us-ascii?Q?05wjW6MYkXaj6mHpKY5DxP2CauWi+LdUijUOrgFq47UD3Bjx69/X7NYfFImV?= =?us-ascii?Q?/FwkM32Wkyqojyjg8k2OH3bdfdfnpDuFv+gDWg2mq5QyQk4lANKH09EzEQjA?= =?us-ascii?Q?Dywaz3+6RpbdRU2jtQ+rwL6PeX13YhXuUpJcuvluFvjSKv2iz++38SqQPNmt?= =?us-ascii?Q?FAk9w6mXMCEsATTLxoGw3GRwNTqx5xVTDJ1Bw/p4qtEef5gN8bqe+8Hfdrrw?= =?us-ascii?Q?AM+fWWekB5zTcRxR4boX958emgMKMAJE1VRAG6HrYbHaV+RyADmXI2+f0xxF?= =?us-ascii?Q?V0rvJo7EbrZEsBEo/jBrBdvRX1fBCJgvhDF/3bIJYec9/ypaQ3+oCHLm3Z7T?= =?us-ascii?Q?/ZXmMkU0MsXPsYzJFAHQs9RP6HZAomRLhY8NHz7kMIOlpA95T+Hj4qC9++HM?= =?us-ascii?Q?W12MZljqUnzLOpZMfRnKQVlUtfIeDGTAk4pYe457+mJ9GxohaTKLmWYahi0d?= =?us-ascii?Q?87264XIlEepntXPchyvVBWEy5SUV5621AopTzA3ejfNgWi5CLEieVpX1SSkY?= =?us-ascii?Q?ZfwLIKaDEF2TCzaIhuee7/UzpZKEJ+167vZYW9qMn3eJGqz5cNDxIAruKysd?= =?us-ascii?Q?lcL3qBBlei+KEX5y9DkcojM6nQnJngrZD23gDvyc0KvE4CilIbU3GUOXxCJZ?= =?us-ascii?Q?D+D9rzj2lHWrt062I2bKU3zt+DwOh1aKMaNZb8iP3MXMZPI26LjKLipUw6rh?= =?us-ascii?Q?RdoY6Se5t5nnLjdl5uAP4qSW1VN1WrKvfVIT4GZWqdaUqbw5lXVmyQGMabpg?= =?us-ascii?Q?/5+zt2FaSNhixSytVAVKiZ0XELevDGzotKiBTfz4fS3jJ4QqIk4rL5JIPxme?= =?us-ascii?Q?WSxTL5q/bhYhOBiUQ4KPxOhXamS1fHftOW6RLcGF1KeJgqz2tiyDds6CS1KJ?= =?us-ascii?Q?vqdmXWDY1bUoDuvu7Er7l3fCpjRa5LhIiI4v4NUHVpP1kCKylTipJ/OtkrUd?= =?us-ascii?Q?DjvbgKWVwY2jVyTaTHItfgJwblUgRnqEt4CvxSBLHg7DWjMNVdjirhuc2ffI?= =?us-ascii?Q?77v4boPdT0fUgQ6FTP9hSV1vL3gh+y3MfHidNNfpI9zqh5/WQBYamWdq8NQp?= =?us-ascii?Q?NPJT6XNtVYP5+hMLuCylbpt0Q+yd8nRde/HhZGQ6k8lbH6rnAwmOSQmsA/xT?= =?us-ascii?Q?BeO8cXttxSsqXR18GzE6mdnouxZSu3NsUDFEQeHiOfjLIIipIBq6ODRfDXD8?= =?us-ascii?Q?oA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xiRh69dbkICCfmyRSaOVXLeywgZm+DtwqFlTqCeIUQ86bs/MubbArazojaVCob2V9P4kwqXOv75yCTtR6zOkLSDz03r09bFeyBPucwrGMq8BkG3K+4cVle6s5IOyUu8P6lNZmeLQOPkg0wMbaJNJTLzi0AL211FA28N4PHPa7nBd2n8lxt1SYv1zFZ+1FdydJWFsKRe/fCi/Vr2qKkW5jdYbNRYzFWvP2AdPwdmvyv2Mg3pleCXij3Do4OdBpEODrozXKQHcrLMK9uFwhMpIQZB0VN6dRfC8TOvV9t2qjD2nkkfIOeRooxwQde7GnQFTA+TJWDM/mZXVSOJLIMqCvlqu7WjAvi01WyG5sMNxlp6fY9XZKLiw0koS6wMvvfutcxXbWee9SGPa6GfrBI0akkz6WET+cIyGnACCqe3xeKO8glLDv88FsL2ZYsKtv4a77WrtukBjRKdttEbDFyV+tbPWTFZzgDh+5jDgimw+xckghXK08VGC7GmtO/Jbg36+KU960nyni6J2qCSoTac/w7jstr5swM5U0dMn9scG0EOr907hh4NKAYNxdd8wE5MvsWPYvPy+nEUrabFzfvDkwjhqvmKuYhdXbPSlTxpzcxg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50eb3ce5-f387-4df0-8343-08ddc06f77bf X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:33.9902 (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: x+kqLchUEJFb9lVtzGegjfDgayMbavGyJQz279G4UFOLKzQpzAmkWlEOJHetdN6MtoAERTay2fIx2hLdXKxgpL7TPNdz0b/zHtGieYRJljA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5174 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-11_03,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-2507110082 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfXx+2EnxQ0TyVK YVf+3lXYD6NFLUMxkwEAJ8zh1m2b/0lad+USWgTRj2Lv6g2StP/qYOTmEbYXLAxkNJjWZiffP0g pZbbAdHOLgvKBbB3GfV0o4Mp+2JZ6UFaaQmI1wffFonZInPndRDPN1JGKzjGVIGPnEW6KcMyzuB rp2TMSHhyh3KJp5vgBbNRpFSaKpbeTZCJocgiHiFT3X0iETA19j53n0CHH2ZWIBugLExsGOmEet SwlLo/8HkP1PpXU7Eu8nGb8EWfe8neGfqT6QXCQdyNwD0iDoVoaQXvL7d0R6kSO7vg5SV4bjlGH /nc1eRViQEGC0Dhkuv9N621Q4sgFWb0BHwCc04k0Qkdiyi7eIA/C0HABdXKUnMXYmtGKqpru9L6 sYeesTJtZDaMDCww93XjOnAZJFzpOavcLUGi0Eztr+XzGZe81MMtFUynOXca/CLZWCXAL+e3 X-Proofpoint-GUID: HEaPUbU6c33VxHQuf9B_enGQdzhzZ5SI X-Authority-Analysis: v=2.4 cv=FsIF/3rq c=1 sm=1 tr=0 ts=6870f7bc 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=-y-8OK93jEFqfRmHsx8A:9 X-Proofpoint-ORIG-GUID: HEaPUbU6c33VxHQuf9B_enGQdzhzZ5SI Content-Type: text/plain; charset="utf-8" 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 08:15:41 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 95236295501; Fri, 11 Jul 2025 11:39:54 +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=1752233996; cv=fail; b=AH2vCF+5eesKr3wdeDwpijxv6AJ03czTvBG4wWIhd7VVFR/qRj/9zNAqvew8hGwXQmkBPEFh6V89iGqR4kAnON3ZK0ID6U5+ly1piQQsBBYQZyCrLxslSPgfamlfrZNON7VVHPbDvw3TTBCxs0ZDLeYJcyv/Ub+QlOdDsK9YcrU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752233996; c=relaxed/simple; bh=ELCWTjVUKWu9lWDsxrGyIqbVes+UQrULMHIthnl31p0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ssTkYxZ4lbemslslhDhktpaKMhAwKFuHFt2kR9uALp631KWXdxTvzJBBtpvUEnHQ5KO3SCB5dzfZXNENoFM+3mjayDYnpEP4KSPWw0bxZLT/PRmUFrvuH9Nqm74CladRfDc30LXQNcQIJD7xmpE9RfW2fZAUWG16aTVfe68rsrM= 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=Cuieq75W; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=lZ7Bvtqx; 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="Cuieq75W"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lZ7Bvtqx" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56BBbENW018547; Fri, 11 Jul 2025 11:38:40 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= Cuieq75WRSXAn/wzu4OrYazzmB1Fmwfa1ODB+0Rv19W2wsezC6jzAyR+0Q9ykbvH PlBLXCTY/9Y/DoWRK8+Hq0FKr7FAYahg8LiQQiU2de3uqMz0W6w/D1JdNgjp1xa/ Jk6yoo/v3ghyv/R+obzt8xA0uR5kgl2809hsY/Q8xZzi+Gvo6GnjL01oZU9iRgMn ttnF+STqi+cCnfLZ74OY3W6DbmdCXYNx7piFkA1QA6RyjW5FxONX+GjtnpV04n+c lUVRZW+tv0v524Cisg5HC3Z9HBRY79TOWLnfg8F6MygeSH9cYcb8GBQ7O1QoDE/i T+P3zv741/SZbPtSD9A/zg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w2g02v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:39 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56B9nqUQ021432; Fri, 11 Jul 2025 11:38:39 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgde6h5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vWCuEt7CoWcEw7Yxb9VWF4R5ZcmDKEzgYCldsXGbevMW3qI0Im0FhJPylb0haWjxJDWEHS2hcewPUeEALAZtrzYjHEdChjtk1L44p+8v3YTkmOOObmOdubahNDL2Ax2As4aOgy3ILKQoHnX+s6lZkESf0+6tkQcEwvbFWELlovzug7fFN0fSco+6mVbN76BzIUtu2ZDb2ryt/r1jZUTrquXD6HI/j4fTW3e8lXm6UhQhng6EkdHAfNafdkGgFgQuXQdNHakJud9mDlIkMSZAcY8gY7yqzLnNIbAa1zI8O7ehKsIEY2nrRHJ1Wj4gsNtu1r5XMM9gN+wtftNxvuU2sw== 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=lj3bGUw/IpXnmYjJWLHCbgQkQPNmIqAnq7ZVJKMRlh+ULEseIL16F3dxls0MtipIlDdiWZwLVi/EHPaWD+oVabQSi7Ep3ZY/a/Jy0U881SbpwlTTeOYadtkxv8rcqx7UIxuMFzTzRGevoA5OcI45CSZ/qnGwiKBmCbznyeaw7SVjADES3yUDVAUVb9ZCAXh+PZePyFkTADQVTaebAXeV+Rp4/sCwdMhNOKhAxnrTVN0keVIGSOlQMvOXicgkOBaHnTZ1LyO8w1YgVtLQesueIS8nKRCKupL/GMviq4S6rzYvu6SwCSFhQToVUY4uQrXP/SoaUrhr/SVsilRh9d8ibQ== 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=lZ7BvtqxMHw2MdI2hG0zOnCeCv67P5nchTCaSFZWORQAnCctMg/i7XI93QUUWsxPioVrGI0bLUdgVgzHcHYWujHxj7U/Opv96GPf/zguRSKw0DjSwzvRI/BcCHKM97d3DoY2+xyFL2WeLRNw2YYEeiUMd4U19FaTWzDv9QpxzWE= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by IA1PR10MB7285.namprd10.prod.outlook.com (2603:10b6:208:3fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:35 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:35 +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 v3 02/10] mm/mremap: refactor initial parameter sanity checks Date: Fri, 11 Jul 2025 12:38:16 +0100 Message-ID: <87f17c67a4a477e92645189bb2f67049a6973ece.1752232673.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0349.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::12) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|IA1PR10MB7285:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f5e9246-b65e-452d-5901-08ddc06f78cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MIGTIoVuxMJEXYSRRE3Q+1kw4q2aQAN5jq5VXbMELJUdp2wqWnLuIWeR1xAa?= =?us-ascii?Q?PDm+K4a+4NllF5gj4FCi4tPTSv3TzAeOHiSZAoHgCPTbG0yiAD2zFlAwUsjM?= =?us-ascii?Q?7OzRj6RAvhyDH9qYj+fSVUNNxESOPvggFZr4KoNpcKKiMdGTgv4cAsfdXvRL?= =?us-ascii?Q?LfR3ykUipcP9dOgjP3rB51o2a9Ju/f7H1Zf/C/3YsQXn78yY1kvKo8Mb8gNE?= =?us-ascii?Q?0FsNoEpzMY+W0LC0SwEx+f49UYSnHPLkki6rHSV3tU6cvtMhVNi8lwikh7aQ?= =?us-ascii?Q?PnA5X8bs8gpWIiwBaFuDH+ph/rvBH4YVW6HJjsDyvWsBrbKvCXQUeV8lR01z?= =?us-ascii?Q?aD43UkoNsOTAVkHnLtYBWiNmjyBFCdK+nKnTS9wWqoYaYr27jdEkagG7Azv8?= =?us-ascii?Q?QywzKi2bK/9OknaBndq78/kisUJb7SWwuexDuwm2H0s8Cw46N9V/FmL2E6+U?= =?us-ascii?Q?xGWqvGqQTpWgUxTFHRcnQ9Hk7+fMy544m/ljd2mSGCGuaL1pfO2gdbbPuOge?= =?us-ascii?Q?/eSU7cFEaiLi8jl6WMBlS4q7hSOj/AN1L4ZcneAiP6iYE+VykeQmtopLPoyj?= =?us-ascii?Q?j7TXwrGL1MyVUbOlZx1uScKPk1XBO/wFuX6COUyivxL23IKT/2QoJmc5INV2?= =?us-ascii?Q?dhS7c/iPS2pfVZamSY0Cotjrc3xKFDoJwDOX9pi2K1fEZML6YxGJ5txLLfNf?= =?us-ascii?Q?CBkKARIllY+PN9tbrT6so0EO3SSa2ic0gUKUyPBXfFBpiEEm7YPhC93ZFnEK?= =?us-ascii?Q?KQ6nuu2xfgSEvUK/1m3kt4cLXS/3RxrgxkeREhnFr/RrZ8tA0aDfTQrUU3LR?= =?us-ascii?Q?SLE/jdoJYiPlxTZeqaQ7jFdXiw9aLmBxfED1bc9+XrVimqI4Fs8OGZjZfu+a?= =?us-ascii?Q?7DGlcLOs4h5TRMjgPWThcntFGiz1KuXtCqdg2f2tf5zr90AVbRj9oOXwzvzH?= =?us-ascii?Q?1DzFp4eWlGhSkmnVqJAlTroBsJ4XYSgN93vi0bwE7q/CEnAMQyQxh3dWdTZm?= =?us-ascii?Q?R4x4GOu/a8EGY/OiReIrScebVxrn6i9Hrvo39uqxJUn/WPclWZ4kri0/jx9X?= =?us-ascii?Q?7mAEutZ2tgCcmEz4OlKxfr6hFSXKfhXldEjWSWx6XLVvhEJ4jjb+EtVqjU5q?= =?us-ascii?Q?/eYU2k5EggkDjIKJ4HFq3NDsw0sPeF/WwPyZRcR+tmq78/JDuUyRKxrd51ML?= =?us-ascii?Q?0zrpthU/H9RlLGPzbulgnHftNRtkv//flVRP6N+PUeOAqob/KzG73U6vassW?= =?us-ascii?Q?09nNMIO1cLlOu5RrHM/VrpG36HSFSmP44dw+TRJh6t3pn1XtWy2oc04n/sjR?= =?us-ascii?Q?5mYu04hOwTKImqjMEiTLTHvJgC29EQ03vMgLF/js62dJHYNI823NkiWf0EdU?= =?us-ascii?Q?iltGpwBBrueGXGYX4yXOdsax3+DKDLANq0f98688uZyglS6zHWpYr/Ebebn3?= =?us-ascii?Q?bUTv0leTuNE=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CPL9FdPKYLil95ly/rExIXUT49q9ovq8zP0xfocC/Rkjvw6eh+1IBS24PDdm?= =?us-ascii?Q?vCncuTes1ZKM1ExAHa8NhHjXyHPRXExrXURcNqCWOOMjAlIqq+vfNEWc7Sjc?= =?us-ascii?Q?A6awucfRatpXZZS8yb94T6o/a3L3zlKyiiO3Ye1POrDUC4uoHE14kK91wJ1N?= =?us-ascii?Q?AERBvorXwHEuU8lsy+IjE1fqfVGq0Peir3r20nADeqNQVNZ06W4+ccsVmzES?= =?us-ascii?Q?CUSlnaLl/Cr+EOjHLaXdAW/NMJ3alV0aQ1oozsQr6vVST6YTtrJFVBlI2IHY?= =?us-ascii?Q?2GMaoE5sfITfiBzdLAiy/QjGvtJlmzwns7M/Bu2fFgKU+Jb9zKdkyTai2whh?= =?us-ascii?Q?pG5s8vRs6hfTUlBeGBnqLO08Ht0F4YsES/YMOui9ytKRtcMuum36gI96hAnp?= =?us-ascii?Q?sl2O+RqBKS+bzPAPWz3zUdyUGMQP9Q2D4WHeGXIi08WzvyCNlEjXhU1OFdAZ?= =?us-ascii?Q?j0/dv0XFiI+Bdv3sqz8RqVrMm/THwzE58l2BRKZyt/GqvEA9oONgmhsvIUx3?= =?us-ascii?Q?Wl3OEmm6+j+zEHdd8Q3hW3F6irD5s0plkrPcE2vFMjPBqrZoxg4JOGK/1n+a?= =?us-ascii?Q?gOs83ZsrxXJTBAwIeIR0SPyg034Vv+tnpAqHWTGFKsGRvnrk8o6IoNZsscUX?= =?us-ascii?Q?SK8v3Vete5EphRde6H6sIaS/eMANdpmhIaikBAaZHOoWDWh3ZlLNWmEOMSwD?= =?us-ascii?Q?g1uHfI/O/+n6gPbc90oEZh6zHOm+6ls4v3K/2WPcb4RAwaYBkiMVY/oNePbc?= =?us-ascii?Q?UQy1l3qfOrIDtV4hS/efMOJW0On2yIPmmHBx/XcwIdoifrJO2DW0KoUlRBCR?= =?us-ascii?Q?ONpdnY2SHz8wL9K9gSQYl2q6rtBOrs//T8Evy7jS7dynctb9Fgu5SUJ65Cph?= =?us-ascii?Q?z0Erp4imcwf3yf7qQUkpxX6e4EgCcTUDku4qn8wsZR60MqKzwKxRvlaDyVCE?= =?us-ascii?Q?mtotB9qP8pIe7tjK5U3eEG/huH/V9M2/zAaiA3pwqHRqjbIyHcz25z/5E5Y8?= =?us-ascii?Q?nmGJjopvh/djbkm3TTpre8W7kotPzCqQourf69EaJDllZUyjZOSIRbTyspUU?= =?us-ascii?Q?vLqvaIM1DnocZFQaBd8r0VKlekb1dMzp1ikgv6lAqHQuBGr5d4ERrHOoERJa?= =?us-ascii?Q?D1AUfmITktP7W3L2GSFu1NC0i5KzwrxDdG/D/YnKP8fVLMZxykJaz47NC56s?= =?us-ascii?Q?Vf8W0ymWaNSiuaxjxXPvZ3oJecrIGZeh883vbrKyAYU5gwzlZxLGjCvlS7s0?= =?us-ascii?Q?V0m1h2iqwuID1TRFtjuuFqVe+mBR07d0nV3RnObWbXXAnD+APZ72qaTZVDLP?= =?us-ascii?Q?mNkVRkB2qK+Sp7vHZYcOHCZVzSy+THfFWuT8ShqXKBWQmbvKfZaGIM9c8+g7?= =?us-ascii?Q?m/65uY/Hza/2PZ+3nBjA0MUPwV9q6X0tHKDz3SOGhfETYGywtWqvrgRHf1yk?= =?us-ascii?Q?3mOWn2eYKHQOyHU4Mz2ORAu7XU2TsTIsIBCpWkDzy9l4iDX5O2N8LcZfQs/F?= =?us-ascii?Q?z9qsSabHGaDMHWIw7TUREqoXYLpk8CwVBdH2/OOTRnopVLjjzdgt14TlJsxc?= =?us-ascii?Q?vKH25LrXNxBGuU8OVNf8iUQndIGdc4Wqliy4fHmwwm3/qE21ukPNY2t81Mcc?= =?us-ascii?Q?1A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9X+rDR2gDkZGS4c8IP3675cNx6t+8+e0GcsZzBTezJBtcCbcb8JWZFDm3mLiPNC1dTr2+k9P0cVVmzENEvs1FMFOcjoKpUKiR/hGjkob1P5D8P9ipbmzvcqGtP6lgSsFhIa/NO3KuJQJRcbqpP+eiUxeL6XNlZfm53Tf2BBeHxNaPOqvR9catqNWozsjMMowq+JnFbItHRJHKBdwKr6DI28LJQNZHs5mLWm8E8OHW3KQPEPs/WpKHkqZt0oI1BMu+kRhxwj3dkLCX9e2cZPCAF9ZC4gt7BtflKaeI/DVCS4NKHeTzR3aPOidgyr/dx12ZVk8hzXnQ5FIO2CxK5adXXrSHhdM14lySMgRhS64emC3lxNWVsGrDItyNveqgk+IYkm4/w6MSQMXfajzT5q5V1p5JASmFras7L/Go8pgSYFeRxjk//8MupZ6YImxUP5JPCHJxnrns6j7aohPdKJuSeYxkbDGJShB11NnY7yA1f+neJLChXs/SBjkQoh1nQrNsOGqkmzWXa3KLEhwB+cn5OYdU8U5lyxtPAVklBbJ/75BjrYRedo2zLSnFN8zOahpKfclGRK5vvckbqa1ZoP7ZOUVSkLMdBFIL0//lxuhehY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f5e9246-b65e-452d-5901-08ddc06f78cd X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:35.7624 (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: ugux75u1s251y+8Cscvh+pewax0J0/31y8pXloeBLjKecxF8LfBsWXey61yzMNYpdHB5oU+0YqgxYRTiszpoaZu+mS/b44xLwUJVZ1m3rcc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7285 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-11_03,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507110082 X-Authority-Analysis: v=2.4 cv=X95SKHTe c=1 sm=1 tr=0 ts=6870f7bf cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==: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 X-Proofpoint-GUID: ooi5GZPXvOf42gdtT7gSV1rmxkTO7YGL X-Proofpoint-ORIG-GUID: ooi5GZPXvOf42gdtT7gSV1rmxkTO7YGL X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfXxOew3WpEt1Q5 6LRPOOvVjJwg7C4jWHHzbDowEVVb5oIqRTNJUZv3hdnexK7TG9L4hiL5bwV4c6UqEVSu+TNLk8K nYJ9M/IbB9La9b+UjnDi4L5seFBRP9bJ4qeoBa2NTPo5uM+YFzR9R0Em0mcucJbE4HRxOPTO/jS tjzxOiOIgZ4nGcvzCcGjR0RaGouCk8fTvyPbnZbad9g7pWJM5nJci3kQ3zct27zW4BTkx8A3+44 U/b0WDDYlymi69eXtMW1zwW9BjKq8eL3ZlkHbHPS2JESuJIiwK0MR92rAQixh8yW7Hu3fMoQe07 1VDlhfL/lr6yNTEbLnicTXFeIlY/aSpbbbdxWgertGiPJ7h3Rwruj4lEBOffXOKqGmsaEm5fD8f gOCy67ISiLZ0vUQEqcv++pkTLD9jHEAXK5lATk9qyDVck4uIyPVQLH9DI83eKYJL9dPLFu8H 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 08:15:41 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 72BC2295DB3; Fri, 11 Jul 2025 11:39:55 +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=1752233997; cv=fail; b=ncHvyljbExbimyW7Bdn+V+MsB9o16hEp36ugRbDcDwA3mk6qGuozq9yfN7BC5DSo8eJ8aob5853kRvQELrM7f7WtTGa3GP5SC+yS69HnFy2ftuMPRU7HqH6rB/YfJvE/k+Z65+eR/L5N8LHIs4qvgQtYok/Yl6SbzrXotmEm8Uk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752233997; c=relaxed/simple; bh=iXvm+GJzmq+6aRoft9XZMiELUBoxj1gUUYDdOebwrr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=YZuOd+Rt63MHTLex+5F774dQo58+mIQ4QXXhWCbPKjnulELTg9siMB44JNMc6u/fHXGT7++p5auq2AmDfYrlBT6dWIrVeEqEea4BHveZXYH34s3dQZVtUU8IUzZ/UyTnka3REflEg5LNBUbxeZ6kwz2OJso5f90ZRI45CRMjChk= 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=HOq+Lw0K; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QOccjnS0; 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="HOq+Lw0K"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QOccjnS0" 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 56BBbiDV015146; Fri, 11 Jul 2025 11:38:40 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= HOq+Lw0KZiyHtjmroJagq2vwlp/IomCLIoUD5rZcJjnO8Cn0Jt47g/J+D2w9+KOQ EQiEFP6YbGc6ADXOi6pRcDdcAuw9KX9ARDzA37H1ULQ/tLnWgVkTfkpz1cWPmtwk 8W4X1VVNR+Xw3jcp9tnam0bb7EBEpzQ0a57PkP7ZTGnTeZ+Y/FCJZ9j/aFggLSQ2 7kMXo1WOlEYH8Ru3nnbrGDnIXDTEWmK4Ysu3CIH2T2+VNQaDR19+FTKoSj4xidFV 2TpPOeZUiy7V6h8yEIOfEPh+kSelNrxQAAQXr9xvuA1gaa+WRTppzyHe7XGRvn8Z 4dp6IXK/x78YFeqvcMKkYA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w1g01w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:40 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56B9nqUR021432; Fri, 11 Jul 2025 11:38:39 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgde6h5-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K8kR+Be/7qYthlkQzLaDllVTPrK+Kf8f2sqDzKh9GRuzPR4xXze1fv6wqKNmEZRZXhJ5f9yFZ9lUqYqmlz+uBLQSgtq+4P0Gr5GMTHcPRO/gqxk5iz94v2Hu6gi49pHreWTd3q2ImrWIjLqss5kw33pYlwGeAxYcWgabYRfsP1yF3sGB6LLwNfY0F0BR0X+coWWGAtGj9hKWLsQHJ52bmaVIwS2Lz4w5K50jeoglW8ahVlo2bprRK02WAYeSHO5iJdtyEXNcDCZr9EabZy8jGNbE3QEqr64X8ze78/qcITJuapyReiIu2bZ7kjYdbs+IrjyeSM5OuX/i5ktjUbuUfw== 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=AF0sXh2CA4//7ppTsUOz0aIKtJPvN65ThtuWtglLoQgLCBYfX2Xe+X0d2PueGzDc/QUkc2wpfTbPMtipyIBJI9XCcXUTl0tT5yQ5JTRmRYD08L0CQCiezVt+RlW2+l+LqHGDoFGSmoK4pmt9jMUPgx6LA8/AxoZL2WU6ETIJuEj6h8cP1hWbJBTfH9O7BRgQ55D518UIFuzlWnSErohmBJ5aJn1v3G90aohUE3eylZjl1EmWi4DlF9k7jDuP/eLO+sLse2aYKurG2O+hjKfucy1QNe2DsCOWCHDtKadqODkU04N+X5PW9NqHIaLv2CzIDSEaV49h0mNXoJhHcMbbiw== 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=QOccjnS0lDhM9+X4FlseonloVPbP6d6biw6YIH648TfLjEMMGBWVAA2mqL/JO2TBCLWSN//hiUrcifj5wwtYYWWKQ7iZ5pSPQF8lhG1lLvgCodR2Q4O/Dzz8d1oAb/UTVnr7fIw8YJ1ePL6+Cmr8WwEZ7nPMs7ShpF+ll5emdfA= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by IA1PR10MB7285.namprd10.prod.outlook.com (2603:10b6:208:3fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:37 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:37 +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 v3 03/10] mm/mremap: put VMA check and prep logic into helper function Date: Fri, 11 Jul 2025 12:38:17 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0661.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:316::15) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|IA1PR10MB7285:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bf0766c-e4e3-47d8-de19-08ddc06f79ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?G8hnPSPjMf11ISpH0O5HKAIOcwhZMwSmZOUGwj2LBz5veKTIu6+dfPCWVyWR?= =?us-ascii?Q?SH4X5LlBSG4HofK+wDX4NkWI2r8KRkSU9cr0VPks0sQqb9Zm8yf2trIjeRAL?= =?us-ascii?Q?ll8BrG5rzmSEBz4jax9fZOhPmMpjy/8sFIQnfTql9rzFYMJpv1acCydCPyl+?= =?us-ascii?Q?muZClbx/a26Z+xoYhK93stxZIjIESmA+QpF//G9FfDuY+gsb1o/6kxCn9ALY?= =?us-ascii?Q?lLXv+or6QrVEceNRy96K5sOI2fMdXaoNR8AMtsf5VqacDX/7f161Ielzo4OU?= =?us-ascii?Q?y5KeYCRmNN3WCYYBT95zT5RiXrXenPFsUhy7FKxOWhkMC4CVaM76kpcQf8Bx?= =?us-ascii?Q?1FDuieUOEzKXK0gmnORqiepgXekmminap96NrPFzHa/WYMLYm+Z5AttyebfQ?= =?us-ascii?Q?YGwGzuoHant3MfW8Ov+bVXRqEs3/qnqvRc3qtXlhMorFNy4Ak1EmYCJxJxNT?= =?us-ascii?Q?CJu+77yJu1WwzC3hCAcUeLNrIw2MLPKrjU94ldfu14HWm8GzfjcbXy7H3Mq3?= =?us-ascii?Q?YqPFbs4A6aakNbD2VNWVZXCtGl5LhctBuUu6cRZ5Z3xKKvftgHdJ9Id47imA?= =?us-ascii?Q?0OUd6Qd/Yx2skjxlC8MRcf0XjzeHxBp4q9GlBn2LEZxZCoZD4H5NAn9Nu6Ju?= =?us-ascii?Q?Ty2NU+KpDhMcDpG9G/HoZTGzqd4HqDKvm9/SUkJ9+HnJfVgZIRiKJpYJs8Fx?= =?us-ascii?Q?ePKGqp5oPEAYRPPeR/9NxEsB0jTJyJ7MQ/jo2J5+WI1Qb/9oc3orodj9GbNf?= =?us-ascii?Q?Ir1Wda18zZ6fnqB1Y2avl3Rr2xLtgy35KtV3RD0CbFycnIbKIB8hvJetPa2J?= =?us-ascii?Q?dt9brGis6nxSDPotCt2iTrZGhwvEe0OnAukqL2NEWQL1BcKDYhbpG7QxOEUA?= =?us-ascii?Q?XtJ/plzClRLiyju19Q+Qjcnk49myJ8SPgGlWsVOKzbflIZyZ71I+tngBap4t?= =?us-ascii?Q?WmTWelid9bWJ6Qt5luh9Xt8I+olzRJdyiu2kgQjz6LXQnXDwM982eoLuZ7X+?= =?us-ascii?Q?ziRu67SnRjebzq/7N8oaNyLTdmc4GN4TY7yXZ0VkGWrdiVoe2dwsy/LALlnM?= =?us-ascii?Q?blu5YHDxl1Lg9DxWSEx21eo1FI/++LFrmKCFRsy6/0fSRr6E9HD8E6fxw5nJ?= =?us-ascii?Q?THFudY1NiTu+OsTSqtT6iF7g63NYp1nbfAHHX8b8Ual6e2ZU8DL5BDjvIBaa?= =?us-ascii?Q?6Jv3Vpf3wkUiQk4DRz4/GRSLtRyPmEirsV76wAQNee0ZJxsFINqbHbv/pD6w?= =?us-ascii?Q?3oDgwvq66gcrCMdT0whfPqAiy0GBEfW2pXyLcGNGtVBMYJVL/ODCCyw9VzQ4?= =?us-ascii?Q?x3b6RvHIEfH091Kz4pk+Mda+PKw8tavX0lFQtbI+1tgvaR/8C4XuO3OvXZwV?= =?us-ascii?Q?V6YBQKPRhbPYLsH0+sQ5fDNw8lLxfWj3KAt+s2mwkt6l5Km1KYQfXtsozrqd?= =?us-ascii?Q?io0wQAV3rDg=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wcw3jldizyN7kt3zvRaySXLnZQIiPDuLOAENWHF+mek2Qvo2iRBgXaUG7QVx?= =?us-ascii?Q?WQFwtBAmlS2nvLKVf2fYX2Zm5DpFOyWyd6bzp9hyZ0Qb6zC0aGrr8GJUBT/t?= =?us-ascii?Q?C9nvVKYcpaHUvdZqr2XaWIlsTSuRCWEWZ4aqqu82iUVVjzfgR/lnsRD8Nv8K?= =?us-ascii?Q?yPmbcBZA1d0AGmdZLx2TxSlIfkcySLzDDXv3a5oiiMsPFWcV2Ice2Bvb13ur?= =?us-ascii?Q?Wub1ddAY1yb5YOSJzGjr+vJWpGMWE0uowApRBMgHpJ7coiql3oOZwWfmDnaI?= =?us-ascii?Q?48ARLR3AXMacNCw3PaCCEwbBrZKXO1b1LEc9s4fYOpddASpkr5MAWSpbn5UC?= =?us-ascii?Q?uprRtxVEm6srqxXJwX/AGEfKTleoFrXl5mDrrUwcYaNyV2HiCIbh0MIp4ngy?= =?us-ascii?Q?/ZiEL71wnSJ3oP6rGILofQZAF6+f28fm63o0PpfKKKcO1PGtyrfBsTTS+hmy?= =?us-ascii?Q?c9F+Frh7/IrgD+JVKzu8nd3Ov6mQwoDig/797Xc3EaqxR/aIwPc9ViZmHOmz?= =?us-ascii?Q?2kYPkuxNTsAy+Gc2hqAu/ydCHGv3cuaxC+AjLWnCbOVnPgsmZXIjlcfecxoO?= =?us-ascii?Q?XNCO2ptUvedpZV5RT5rXzpsXHPpeW9IwpITR33UKwCHvmTj9JmiDv4t6yYe4?= =?us-ascii?Q?pI/VgTfqh2KHUPK/5WYNILfw6X94Wz6KrQLkgYdHfeycZB8lkgVJ1DOEgtDD?= =?us-ascii?Q?xPbJ9Awxs4EPPVgjc9+A4V4J1HVrU/b2gQml9vUfzgDP4KVZkr6X6b/vd/y/?= =?us-ascii?Q?Gls0cQ3VvIPCXprnghplk7wtAV/KWBU9AQ9ztpV7JlBEhnXhQtc6BdpFPPX5?= =?us-ascii?Q?Eihd8rDAkon5w8dew+lIq4LMvKMpqfQQcZZUeTqcvAgQQr5vu122d6KqpNst?= =?us-ascii?Q?T3iOIMTqTTK/drl/Pm4p20xWOzCsF51zKwGK2/odCKFG/HMarDhiturRkZm/?= =?us-ascii?Q?SmGL8EL3MbhTQWlnWLB1UKWjYi6w/r3iMM0BjJ03golkcKxkfcx/uY7p4ief?= =?us-ascii?Q?d9TNmL1PERPoQ9Z/ovPDn4RZ9uHFgnYiuW3rWcTJ6PTpgdPrCru0Mq/2Y6DY?= =?us-ascii?Q?6FYoE5SbczVvjthSqK1maMcdnprrfAgwc9Wp5g0MLILOMD++hF9WrPX8Oqy0?= =?us-ascii?Q?bR8Ild+HGmNJEqO+zTCtm1JKxfJ2bFP3KC+7uT50r/mw5aKkTi1q6aqh0GBK?= =?us-ascii?Q?muUYHmwFw75ey8HH3MJye9k5zDQTmrZ4aAwRetE3rRv/AwM/BHgYMEw+jdoc?= =?us-ascii?Q?scTZQX3OVRe7VtkcDmQutCvLfPKo2bp873MhlP3j2g+60XC7dJznccHgN2S3?= =?us-ascii?Q?15EXSGScF8/YVAstjH66vqUqN4vQAGmh7EqMZI+OUYRnWceQ+OV6DCnQ7613?= =?us-ascii?Q?WBVUIK2hudnnS6K3fYn6Byvie+3Bl+vea4FeowYZNz2DwM2SKiUSwarYv3dp?= =?us-ascii?Q?uQk79l+51iIA73aaiHr0b+5hzvkg/fz6KGfgt4GNjcptzS5VR61yjSRnwBTb?= =?us-ascii?Q?9uqiaHTZHvTDCN2uieYKtnqLvAQF9xiCuteU+rp5xdRvjeC8z5oJpT2C6/Lr?= =?us-ascii?Q?FjB4sDjtwIvZzwILRgfofza2nHTp7gvlJe/H9yw19BQXwShkQQ6SNV+bgkd/?= =?us-ascii?Q?wQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9ESmXMkSIAvaqYVwMJoqtvmhVodsHON9B/lCVxdKzpxHZkN52Wssl50c0dBluXc/OGNY0+9tYK9iS3GKVmd7jgQrgCHuPTYxRD6oi3A8KEs/t4svYouFUzMYOAEKZ1eX/t/Dcu0lIQFRciUQMlkoZtO3LvzA7dCqQGAgR7Vfz9wdPAJzL2AmvkYGbmu1KiNwfRawDnOTgi7cw75zJCxMl4kaAx4nFjm2Pk8iJ28eODKZ/ULEY7Uf98AZg8mFz5mqhgjom782H+L8/zpAgnC1InumSGPKZK2G2VoVAZC9I74nZnMcWusXbVJbNsvOc1NQMd8g4f87i+sVECxjM4U/eAU38RPbwcgaeg4x9Di2jborCZRmd8lELpTVN/Ky7LZJRA80uPBPsGkTE5Npyw1phStOjnSG+4PY02rRgFBZrQxur7gVOLfE/tglhOwyZgYTRo5Z2GfSQj+6ocLIBJdyQUHMM/m2uVOqWx7mB+LOLAxz5umGp4OZl0xrGY7JN7io+3fVuAFVVROxf6PDTa8+HrcujSK9Fo8gkvugjeWz+iPx2uqctXL5mp5WT34a1U/WMDAy4V9JTg+bnuJ9EO9D7JrjQdxxUwE8ceM7TLUcRFg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bf0766c-e4e3-47d8-de19-08ddc06f79ed X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:37.6511 (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: 5tZ0y1pNqBD2LA6QeXqTBYj3hS7n3TrI1i0RASOgoTKLb3LemLBeetFucwI5uuH8B+mQXjIDOy5p+O25CGL/k2W+AfQZ0RWQTrhLSXWoEj8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7285 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-11_03,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507110082 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX854cJl6reEI8 vfXeBvJTo1dtJr80HLT5EwIjMSdxd3fLxVENjj8CCYqdmWqS3QokjT7TNTp+YvCsbN9Vo2XMeVZ ESDpWQCFqMbj5o6p24N0L19gkUXGmGcLrc/UaphycvidkWQwlgrAMLasbNBkegMcFjnFopnyPs7 aa+cfT/thM6DZp0TZrREwYV6OcIgffjhvwKWAan3ycam9E0Pm4gvC+nwIyqCpiEC/f7vbvuTQlt sbqZn4sDvgD85JnlmhKNXqq1dC2LhOBQuSftvtxJzXz0K88xRIQgBJPOJBJi39HWpuT8XuQw9Vj gm8+NMUJEvAGTROBdk8xf7ggPZwoMldQ8lSdRvD0r85n+XDu4ehJFJuA9+8lHUP2+HLKXzJJmlu vgedfKOLTOHTQ520rwqEKrBZ3tGsttgVhu4DCwuOmzX6yyBtFWXGN0nSktGTF2zUDtiR123m X-Proofpoint-GUID: B2IenEawMZLe_dPN3oR-Cr67u0N3uLK_ X-Authority-Analysis: v=2.4 cv=FsIF/3rq c=1 sm=1 tr=0 ts=6870f7c0 cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==: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 X-Proofpoint-ORIG-GUID: B2IenEawMZLe_dPN3oR-Cr67u0N3uLK_ 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 08:15:41 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 7AFB229E10A; Fri, 11 Jul 2025 11:39: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=1752234000; cv=fail; b=uproCuSWQYQ32e3SCYFmR1T6GHMfqpyHKNaQVhUowIq7v0mwp6unwbBpzm01BsdDNYrswtMOQpecvOKbyKqZ5YmeCvE6K8c9eSfk4uBNzVVryQvDyoiuNzm+1jbDOliXP5sXj4f1ZAVDRuZoTQlKnUP8o0+h0qpbp6B/6sLBG4o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234000; c=relaxed/simple; bh=x2WfqaXmOANO5D4YO5/TRIo5NHLzlQt9N2l6zLrb9o4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=uwUF2P2wCQ5WX2xrD4NEewIEBtL2txDavKTaf1PXK1hdatafd+3O3Ss/Vq+PMHQtYEV+YYdqXIcLcFyUlVGxMPpD3mbJRQkxVoKp0lWUP9ltGztF1rRowbJ7q9EBRUpV+y2FsJsgQv3UjCNvw9J/YjvkwGnhlczm0ZmXsu5vw5A= 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=PFHXvn6v; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=uWfW8UyQ; 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="PFHXvn6v"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="uWfW8UyQ" 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 56BBbbXa014552; Fri, 11 Jul 2025 11:38:42 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= PFHXvn6v7HOzC17uDOUPKvDO1q7L7KZm8ZgRg3wTeu0boYQfugT6QyPlMNRsuFYA yxQ0rG2tJ4Tbt4PgKVjVTS8PzMoUF+HLDI7F94ksXx5KelXWga9ZLshOPdyTJ+va j5ccIeSM19S+WkIdJNFBzgVucxiCwhJiGRBkjCSM3KkiDmpLrwkLQSnns+yYfH9i kSUEwy0ULQblxQC3OXfNLXbKRHpAuJnnioaUNt5FQKisNyuW38ezpaC4wMBkxwWv mdoQY4r1Yx3Q4gb5GSLJDEoFiFt42m3mv2byEqAza8wEPKbb6ywRDG4Foow211vB 99GXOX7ruj+6jm4oGO2Zwg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w1g01y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:42 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 56BB5CNR021609; Fri, 11 Jul 2025 11:38:41 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10on2045.outbound.protection.outlook.com [40.107.93.45]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgde6hw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k/bXGSGz3hQDmT6ovdOKHiDQ83Xb4Lbt+EZ6e1e9fuu6vUQuj40S7gnLqV+7phuiEh2h8+F9YkbV2PgantsrfE8B85xE4ufazkTGWFZiBkxHt28BZtx5MXE6Z6N2wSC7bATCKIYQnHGPANW1dTgjPgQN9dEvwn7Olua/VMpFroINftfjvhDEElDBSZkiP9EzmXkApskwXF7gKJSNYsM/Zpugm1OSqHcrIKcKHd7Q+YB4ENC/C6Ow4wN5/27mLRKXYAZ/mWP0EdMElGnoY2p2mLJOXhN4Ast52mpb1lh48ZKv8CRyRav1nzkhs7oRzmXmdL7jhVnDi1sXnwVxVGjV0g== 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=njHjHLaJe1uqTHC5CVpsaSc9cAp3ABcegdChII09n9rFATnaV7Osn/+j0jMpVORzgDeqg8dMiRmfA2SqF1aEbSabY3NPnt+dLMVw2t66Fob+Y6IloydFPCQmOT5QpfrXE2kaJBrlT05xZv9N7LgyyGO30pUwWp2YvT7hwsfzWOlah1dHaIlriKpjkGa8Y1EilB2ubuKmlGRcMEHS1BCp5Z+P16aOXHFeRSnaTDd6UV5+XaAQDQbHho71nWCZHRUiny20GAS5qcbsItfPJ8dIUGtYyfldCvCWNX0s/Lkud4TiOScXMTnpK7Sk7vlZ8nkmQWTBQgVWGEToRZ8apM02pA== 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=uWfW8UyQXTHs/13YJnN7/8RVlCaJ65Ito372EXQEJNTjTV4gp0NhzCQNsSQE1OndV+h6om6w9MWlFXuSnDuyVfskoYLIGGscQ9/FGzNb2Dv5LF3mlK5wRl02HO8R33K/hiFuP/euV8ZSsVAK0po+lnaDBsRVjHeLB802C0Jogks= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by IA1PR10MB7285.namprd10.prod.outlook.com (2603:10b6:208:3fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:39 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:39 +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 v3 04/10] mm/mremap: cleanup post-processing stage of mremap Date: Fri, 11 Jul 2025 12:38:18 +0100 Message-ID: <27a8583cdfdaf065dcb2d16202ce540dbbc6da1b.1752232673.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0689.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:37b::14) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|IA1PR10MB7285:EE_ X-MS-Office365-Filtering-Correlation-Id: 93b7f5a9-cd11-403f-8749-08ddc06f7adf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?QKy1k9zFGkqHo86uG4WfgKrlFtZhMQz6GhLxqMSVfxDmy+9FZp5Fa286nmrZ?= =?us-ascii?Q?WcZx+0dSf5ec9eKRYBu1MblJl0bRJog61/qA3JiaN/5gFCoFn2khLkeo12xc?= =?us-ascii?Q?OOk47MoOnPMti25MubPF9gvPVxIaNtiTF+3rQ+48qourdTtKCIe0CqW+MW/R?= =?us-ascii?Q?o7VlPL8ip66OWv1xV4+inO72Bf6D2uAXG/xKk0qCuqh9k02LTuyPvT6dzNcN?= =?us-ascii?Q?qdNeXdQrdNiZ7DYJ9Pf6VehU6QbAcp4eWrntm3iAyEfMu8Dd5eOT1034/j9v?= =?us-ascii?Q?P/Ykyej+W0OLsOI3X3q56lHvOIWcwGg/s9cvWIJeg2B6ecnTSPx17JK/iQpX?= =?us-ascii?Q?fWmA7wOCk0XzGYc+plvACBjRvU09RNmPwLrKInvhY5amVr5DQG1Ujrh17pPx?= =?us-ascii?Q?+PnuyUE+fKBf5hyOgvO9ESFydIttt3nApOCSWAdVkxdZmL7SYt0rMXJmw537?= =?us-ascii?Q?PawfLPOXsRcJ5nTgEKwIiVMmHHIjqgaCrxPK7fOBO1aVMwr/uh6pTIWNRCVg?= =?us-ascii?Q?Q8e0MS8Y8HTl0XQ1ETuYiajyawq+3d4wQg5OUTyPzL0mspKYC532v8kdBTlP?= =?us-ascii?Q?dL1XLB/FJieyr+fbrnH6Wx+Z2kOdw/p1sjh45fmPFBoTECO/kwW7S01oXjLF?= =?us-ascii?Q?Yg6J0ro0+TEQESfjPVAq1Fo08J5KX3mHuz7IihW29fgazGrL1YmvGYtoLm7w?= =?us-ascii?Q?iLcgSnaINn0vRjsK66j2U8O2UmitIyl/h2/iP7mhUEFDdnGFHYNZuvGI9gIz?= =?us-ascii?Q?si1eorsluZ/5riypE3svsTM2WagZgSIvXEzlYGFVpSMkdja9Uq1CtvvTobp8?= =?us-ascii?Q?HJdyzPMXO7rMz1UtC/b3eXtF+1I0S7PuVVPPRw1V/PQCCasPV1m6eJqVq+80?= =?us-ascii?Q?ObTsco32+EgEXdiRNiVOMgGW7/XicOP4X39Tx7xXKGCZl71mstDL/p5EE2nY?= =?us-ascii?Q?TgFuP4G5d9m8tFquw2ierW0KQOJ4a9+u6kLuJB6HyBXJLut8O+NLios3UlWr?= =?us-ascii?Q?Vbafz9iciybrQngHt0IWd+DyabpevSaM14TagD6ARvE+vnWgaBAXWF25ftKy?= =?us-ascii?Q?UycwJ18PlI1jxEPyy4DdJC1gfqB2/sVexf0f0SY0Pg85CDWq4HsuT+bZQRzM?= =?us-ascii?Q?71d1eSyeuwVKoJQ1Ob9bvewFbIgvmaKHZaEaNiOvfGaSXck+Kl01KxkGVVba?= =?us-ascii?Q?dnIV5sx+tbFMqgeWBvqMvhIhmweCtAoMmdBiUskQ9sJTEUqSKA/xBPBbUPB/?= =?us-ascii?Q?Qm50rGGIgp3w/OulMeoFLufnJXKZNI0fDCup6bcJ9IQLp4K2uJuiPtEHEdlW?= =?us-ascii?Q?Hm+vsOcnVJ4Ud5KaXdtGH4rxVMpSpjICmMNJ3jpLzo5PeRD7OUoYl9RUqC4G?= =?us-ascii?Q?UUfjMKNMT5nWz2Q81gZ3CvzFM+gKQmzx18CymVHZ813XU7OEowH8Mt0yfvP0?= =?us-ascii?Q?qxCrbzKtimQ=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E7mMS37WKZeaKG3iImlA4fRFWyCzSB1NVpvJUb8lAbtJ3YYQJ3OiDEfnsOVF?= =?us-ascii?Q?c+CtiLIaXrS0Yzz1X4eqtReHYoB6VSnYW3KPLMcKRHefRY7RpIQJ/qKNwrID?= =?us-ascii?Q?PCaLaLZvW7Cai3hI3jwlsHT8NyjVFQSytkl+udsEdy18MTnif8RKqLElGpGX?= =?us-ascii?Q?Qwzg1TEUZH8RfaVSS1a9GbeU3QjdYEryhYKYZ+5eINS6D1UjNFNZF1cJRSOO?= =?us-ascii?Q?xywMQkZgCAhy4twh2Gn/1Rbnx8LUYqcPCVu/Z4Ux8YL34xxssNXoUhmG64Bw?= =?us-ascii?Q?WfDZlzRWOhA5zHgGCGAr1iqgtKvwchkh5/UVlmH4VLO0L7zrDreNsfBWCR/f?= =?us-ascii?Q?adxbPFx8OLkv2l8+zjjLeAq7P8JmKR8e2pcbJUqHjFADENN6yp0PZ2Omurpf?= =?us-ascii?Q?wKiOSi7gY7EzohXgWcesyPnWhyjRmiIUXc6qOxjbgkooqwKTnob4EBF5Xf08?= =?us-ascii?Q?oSdVVUazr1M6/sBUztR/k4k5HU+YcWvlKHO5qU/HfyAv7ZNHosjW8Fs3vvDI?= =?us-ascii?Q?9nGsrBVSz8HYAGhKwQ9eJu24nEHLlULtVonhFvuyr9OMmCWoXUYFturpQaXD?= =?us-ascii?Q?Luw10eT1n/LkG7LFUoRuW2rl/No8sRd3g+LKw2dTGuuym+pBF7QBFA+r0t+7?= =?us-ascii?Q?SAeRQwVCMf6xwwdWFVXeeM7zyySSEUNE4Y6dKiqdZ+U3WkAvJRv+wF4l7aY0?= =?us-ascii?Q?F5qIJ8q+OGSH+bX+E8/oaL84t1gEjAyR863qhEykdujNY4COOXiEmCtLwsH3?= =?us-ascii?Q?owZGA+rYRo/I0+du9OC6IHKo36DX3xlDII1UdNFRDZ0hmeuauucw+gvBK1ZV?= =?us-ascii?Q?KL4MQAClpSKPOU6FQ2bO9cmvwUeYQBZySnet201gJO27TCkBP+op2TI1FB0d?= =?us-ascii?Q?Pexg/lqlbefqJSHvhVP51zeVlMbQQ/oHMgOl3kPQ2gsL1+IbURmnvTUS5KhF?= =?us-ascii?Q?+7xZSGE04yLXYQAc09oUqo5f37a9d4FEpmSPaNPq2Ftef2+zqhCBIZcyFMyR?= =?us-ascii?Q?3uzT09m2B49wtMil4+WWG4uxPSDFesNqw2A0wI7o7REK7a6TjNE3GnXFl9zV?= =?us-ascii?Q?D+MGaYPVlQv/5fZsP0OlPxRMnTSPkjXPuBHDen/U85qlp5wouEGNVZudcoxM?= =?us-ascii?Q?gOREgkOpoTbaDtzOWTvgjTXnAdw4kxmK9gFRNqCReaaeEHefqa71IsRIk3uj?= =?us-ascii?Q?0FazsAQtaOyLx/CCFbaCGyv00MB01rXDX/YRIJETleg7Gw11l/aocGz7Uoya?= =?us-ascii?Q?254P9DqRZm/VqDzyawMgPCuMQLCYiowjunAlA/lz12CqMuFXKSd/nATHRdR9?= =?us-ascii?Q?iOamCrDuJdd3axOE9JvPixDBUE3J3b5tSU/viiqA2E5wkW/h8PWOblDr9mhV?= =?us-ascii?Q?oPFZnwWjWVRoYOxmvSjCkfcblfQxS9y4AzPtJBANNNWV1eGYFnO8sLypJDxB?= =?us-ascii?Q?UBZR7yDSQjBnRDAqgD/2KvuOPW9YC8GRfCwdLYDAerQF/8BOwNX0rzKMlSG1?= =?us-ascii?Q?K8Kxuo5dAVB3H1D1g7SepsxgP44bcDl2yaaBAUFEmJDCFgN85GEHXGwKko0W?= =?us-ascii?Q?nUaAh/up9LRlVVYTIKBKxlAxuxtBiG3heMhsBGIkWTdaVk4sX0Q3cv6tCesY?= =?us-ascii?Q?6Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RHHpUnMc24oG9WcLj5jR7pi2/CVZLxx4ZezNPgcEwk1UhMuGqpxPaQ/n/jYdWgimwbcuWvax4bZkrZMBk/1ECQDxedg00Op2z857xOA68E52nk9aBpJ9kD4DFMMCPOGQVUb7Y6rNEVeLQZSP4GIFHq/bSZ/G0L3eUYmsAxLfb57TzXDKEDOSDXurKRNOFdWFznBxnposKVxyLEwcn1FeZ/MMvxmKkixWw6jY1d0OGFQTnmBXMA2Tc/N2k4Yn8b+qWAlT+C/yxJK6NhjitCu8fLYHgj7Rvxtv5F+7vTgp9Xt4gzxwzQS8SoZHQb8PtscxW2JL5fq71im8v1baWkvSk0N+yNj044VYuSWvmFoBbJAHgMsyWwl/1lLkQICbrA6sBAZrF+WGHCj0yADDvbGpGAyv8FFoEFnBWg4Yo7t+xXcM9XMAygZBTxjKNAMK0fxGfNOy+tl8RHvrZi8DqeJH1//RxzgBWg7y64kt0idVsdvMsIkmSHO+Dk1TFwCpC4RvnloaI3HdIQHiAlO2fEr2Ad0l+0edBDEm5IS/yjnpFQkDqf+6hKUETEUpHtN9W3rEOCBq9GrE5wgxBMihuQRn7h26XqaPTJlX1iIA9kRvnfo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 93b7f5a9-cd11-403f-8749-08ddc06f7adf X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:39.2325 (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: /+YJUIIUXia5Kfy80OFgmdSE/lIlKFZFEHo/aIb7pbJGfgkMxfL4W4asjviDuW/JZWeYpGlcwQpRDJuczlWuNb+HYbXyG2ek+QGlu9cDtbE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7285 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-11_03,2025-07-09_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2505160000 definitions=main-2507110082 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfXywE91h/qBP/X aufcGbVL2EdIF6khuHYTk/McgDDEwA6NbrD+i82U0YM7N1v2+KBzxk7kLUdKRg8IYydzk6e52DC 11WmVLgF7qMyC/xbrCfiE6SUOL+fT0GPTrjw4aiiHB55Yb0VCMw0sHnFD3W8Q1uUcKnSwSefZ5+ QbB9CA7YU+CwbNmCb90zm/YoRmRGpNB33GEzM9FeWJHhAnC+b7vnAaDNc/RlG4GvioO+ZUt8ku3 Vgs6/5PtGGtG/xwYjBElhnbfWH5TTJbiCA2ft2gh+1xAYA1JZXQ72MWb60LePErAkk3kCJL2+71 aQGdU2tjMN+szjA8RdAC6E5myGwqYdV7bWBgC0Fs+U9RCShtjOAbmmw2uMJgSB30VK1RvnHZwpk dGhtm0aSXEdHWcFyONh8EUkyYAh09ubqedbmeDipSywu/Qx3i/5cYOK+Kd/hGtTOjTO1ANgX X-Proofpoint-GUID: bjZiND8EdaUm3ni92seQTdgWb5R36B8h X-Authority-Analysis: v=2.4 cv=FsIF/3rq c=1 sm=1 tr=0 ts=6870f7c2 cx=c_pps a=OOZaFjgC48PWsiFpTAqLcw==:117 a=OOZaFjgC48PWsiFpTAqLcw==: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 X-Proofpoint-ORIG-GUID: bjZiND8EdaUm3ni92seQTdgWb5R36B8h 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 08:15:41 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 E125D2C3273; Fri, 11 Jul 2025 11:40:07 +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=1752234009; cv=fail; b=qqDLWdIHrdcolI4LZkf9zPisjo91zF5HD0e5SApj1knAxqlODS+2P+oBewv1ituT15+JBQAtQm7hTfvERweDvQlHhOVun2MpQ1aviwND9Ga1HBz3H5fFalBsB+TmqOG2waSu8AE5vf9tCUsyR8BS0cFapf5PrMU+opkcJnDptVw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234009; c=relaxed/simple; bh=rubp4EBrQsLX31k+bTmrsLo8VzGijXlxPXgX2LPCJpw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=e2GEO+4vQfLS9UpngEBtHInQb4chWcewDSKw3l4JPOthOWozEBdNg5TGF/09SeZ9znslPPGcgDyZ6wWTQT4l/IfXFhAKTXYjF4gaoTS1Abioaj4wa0b/pydJEzQ00AUQ/eUmDXoHlfe1SalydWbt2ygMvnRBXGSDMhAtSIZrJEA= 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=prLZEr9L; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WLzmri/z; 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="prLZEr9L"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WLzmri/z" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56BBbCVm018542; Fri, 11 Jul 2025 11:38:52 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= prLZEr9Lp/kCiw0mElao7deRwCFq/O9b/atTuebCWTlm24mXFY/u64RcbwJqthnP o6fg19MQidB6Xx9g5mTBUvnzWPTV5In1C0dEJxZHk/YWNBaWW5/dTbeXuIQ11pWu 5z2UwSgcekm9Cn2Oj0plc2ZDv3sn6nN+5eIXufBRZi+TIrUGo+XBB/E3KPhFetnU cXn9Hvhb/+xtBaHf2wJdt96uF6QIEz40moh0/5G2GYKIcjlEW41YHioFa/IzWboz q3zNsoZYQz5eYObC6H/Rh4yL5mayA5QzxhHMqh4l4ucVeQcHQnHQ2+KCf7WTAhY2 ukxrh4INZH7BO/l+lsFcBA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w2g03b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:52 +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 56B9RBYZ014057; Fri, 11 Jul 2025 11:38:50 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10on2051.outbound.protection.outlook.com [40.107.93.51]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgdfupy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wm9QJ94mLdfSJZlc2aOsgn0QvGNa/PtinvHHqhRJ7MMY+YbKxUF57PSbkppMNOO2bnLDwj1LfAfNjjJLX2zjZM3WEw0MmtFRKPuSx/UEKp1153MfhqTEk8X+NCLDry9oWWQPgiZOlhaFkJU14iboMk4cb/oMxRIxJV97yHNo4h4DLdiBeOqg1prPzP7x6j9KBt2pNKQHxSd9aQO8lzAmn2VX9DjyBTYTnZt6AcGe5lI/ItMhUMTQzE3dWTZCFrHaBhAd7tAy/K4szZ3Tn3Lu3SbIad7tD+TYWMwBUBUwHyXFU9iDQE8qqIaYjirAPyUMgvKRx0z0xzPWDvGkP6xB2w== 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=xYvmoWHCzS3jSljnAacpsq5XKQuIvN62gO6XFaypHrukwy+ckoTgenfwVaPW+YUEo1iQ6FOxOmQcUP1Dwpg8S2IFfSMQ/LeViIDC7IqBAfvwFWohdrnkvzEF4eSZrqaaqbW3blxffZosak49i0yWpHnSpGlUVTY8cIvovup8heQgCduIIl15JFaWzYSkywu684ETXwDrcSCe6b46S9C1IB8Xicy5v844ZaWq0yO6ZueePX+uD0ZGX4YtbedGfs6bqtNTtgnV1RYG5APWyIPXIpc73CFAkouNwXLuzQop5OEKCxFg6LrJReJuxx4ENkBBTxCK+jqszD7UAJHFj7Do+A== 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=WLzmri/zpI7mI73rNOlkTtEwuhSrtww4xacLwn/20FCCr8TNZTtRu2HiMKe0g3U1B9tFfxLR/YWujrovPHK9qkGkJKmMcN2POl8iirV8h9VK/4wQxMHMbFnuqAq1dfoHeNTvwmnNEAZ2/Y7QRTeoeWX+eFcVqB8mtSHvtIQoGG8= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by IA1PR10MB7285.namprd10.prod.outlook.com (2603:10b6:208:3fe::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:40 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:40 +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 v3 05/10] mm/mremap: use an explicit uffd failure path for mremap Date: Fri, 11 Jul 2025 12:38:19 +0100 Message-ID: <255f9604d3973f85b7d7fbcca396cbb6841a676a.1752232673.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0018.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ad::11) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|IA1PR10MB7285:EE_ X-MS-Office365-Filtering-Correlation-Id: 395fd152-840a-4645-1f85-08ddc06f7bd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CuOlQyhQZGKI+Z28S84mxy253sEghBOdno28T5HP9tC67wIab4zVMKcWmJlW?= =?us-ascii?Q?ELlOeEbD0NryJKdBeTIFkXBb3c1EC548LVfhy6x64WHuoCMxQNRJ2jn2HF/0?= =?us-ascii?Q?jQhdf7sKpMW16yWE/kmREK+pGXPwrr9eaEPuhgeg5Q/Mw7pJUHyGsuwIpwEb?= =?us-ascii?Q?0mdclb34KXZBAnsMqMcow6BOVEFD3OchTHrLuxf28kzbhOrQ+2CAaF4MbWXY?= =?us-ascii?Q?I/kgpOhqCSQKc+AKB5bWYjHSTYnrCc6Fp4ISFy8zTHMhTPpgap2hGhtVW+j5?= =?us-ascii?Q?hjsjftNbJDAg/6QUhU1z/5PvDpYf2lu8ihxrWex1z/qZx47C4+cb1lnNAAFF?= =?us-ascii?Q?ebEbt2wimBZmdhbp0ef16yToXCnp0gLqRf5ZuLT5MMKtQVCQ4zsEI/i1DUkB?= =?us-ascii?Q?atcA9gMoRL8aUi41c/W4CHQnZwmwk9K4WfUOTygGf29gPK29NgEbMHDntqlJ?= =?us-ascii?Q?VEOxH9ODNhNX4ZxhVy/BkXwZ2FeJzz8H//nNQiOkVMPoj0CVrgNR+7BoDYUq?= =?us-ascii?Q?xZY4821TUKmBUawdJndI9XUdfLIORuVDl2VUsg6R8QfH7t1TnlvgN5aMIjVZ?= =?us-ascii?Q?QvDIcFuoeHy5JwrfkcSNWM/nFsEtJ6/75tn+CPpMkjvCWb0OwnFrJTp8TRpl?= =?us-ascii?Q?lbmuSKqo7YYGd7wV8/ccia9pIhLK+9CW2iDE2juEXIDj4ulyauW9PA6heKqM?= =?us-ascii?Q?PDvFCwdgtjnSL73mAYJKqVExOaQUGxFXirgwDRg14TFehWsQvKdELIKkO6t9?= =?us-ascii?Q?+60jsDzOvAZtNr9suOX5C3Gnu+ndOQlA8g5xn3bnOxxpSR0zfFObD8hsT8pO?= =?us-ascii?Q?mdpofj/Bg+LKA8WrHCa0OsnpOuRtOlerlaMo/ZshmwCXbpX2i4lmtwaKG8i5?= =?us-ascii?Q?NKj48trg/G9hYB6Ij/S/hOonhtFXGg+1n3T0WAnRhia6S/cU6ZAY61iSeHPn?= =?us-ascii?Q?bZhPfAJteR+ENCKPPf89QNwRbp7DZpwX31w+gcnCxrZ0g6RrVGMvas1u6nrE?= =?us-ascii?Q?OPP3RMsJ4X5/xaOMczwZkWIoGgi6C4ZT25hii2jRYfi7GdcfKBpP7yyCzeqz?= =?us-ascii?Q?Re6wOCHd2XjdIXDJApXsoyU62LgZOVCYZxBz1lFlqVIc2EIBK0xxecZe3f6Z?= =?us-ascii?Q?XXn4YBSSX12MK287SlmetcdekdmprQT/w60959v/MXP682PbBrp/44zv6TK/?= =?us-ascii?Q?GOdNtxtFXdch8wrXs9WlTkSbzVmScHjQ7NIyCSjpcU7ZYjblOd6YuwUIyvSE?= =?us-ascii?Q?V14M+O0A+taLxUWckApDjbRnDnzj853Q8Y0fUsSbjTJ6B6WuGAUvADmDwYQ8?= =?us-ascii?Q?gOrN2PHikjJs21Q//2U105oBwjeT9qner+CrEYuMb967LkiBIJdsf1Z7Uwue?= =?us-ascii?Q?QeL9sbpQ2piyW7odq6/i4STjaWqKy2NKR+ZY/YcVMM+kEcM1kwKzI3hGXeKG?= =?us-ascii?Q?NjHe8GAJCaM=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o2qAlBvDIfXJeFyHTZ9KO8p/uoaHVjESrT0c92M/FtLH5ybDKWw+qNf65rtM?= =?us-ascii?Q?jvSmiacSA276onbMsRBD6BlFRRtgDK/cLSdfc8yHsh255jKt47fLiD65ezn6?= =?us-ascii?Q?r8j186ZDMyXr4JeEEHCcGFo4u0XEysdUpjZuATyIkXHOPGOXnbv6UShAA+ef?= =?us-ascii?Q?P4U6+7KIKykmZaHrOt2Dma/SPQ53ryKe8FmhlALGMkUP64zrmy9CCgTpYqc7?= =?us-ascii?Q?TwhE6SHicVUQPiSI3dCQwJmpwM2ptHFg3tiTmRE+dPPIyDxtney1o+qeNCH5?= =?us-ascii?Q?MKM0/Xf223V+P2EkoBk9qPfE5/IgqALDwxAobBDUbaPOh54yYISAvvTuhhRq?= =?us-ascii?Q?OpRFman5AYdQhd2rqvwmnPUWrjUex/MeQ9uFWrIJgCCk9zQR8k/WrCu+tv2m?= =?us-ascii?Q?bCBlK8UC0AwIbjgQF7sCmPbYCcjn5KvifAJzamnqw6iUj0H8riBuDtJaszTI?= =?us-ascii?Q?Kv3DTVDOsY3EG/zajLuP0e5Oo+vjU/DioHlO7CumY2WQA9Yw/WuBTSyJ6gl5?= =?us-ascii?Q?fDgaxSyoB6eAY81YwyW/UBvEj0DhdjAK7ySqVyhldZ6OpbSwbchdvVOkMA3i?= =?us-ascii?Q?vfz0F6eBQgJxwEtsE4oEKq0eueluJ7mIhSf2ivoKX2HejjAnQR5CMEQ0wn0i?= =?us-ascii?Q?/B6eY+y8Lfl0KR0l8E6X1l2rQ9mbhgEu4+ilLO6+nVJFvAfjkDokMDcCpH88?= =?us-ascii?Q?QLCdDkcRyJKteg0RZLfDRhFd0HtIrf/cSq7yfxkTLjxn4N/95nYB2dxVOpD3?= =?us-ascii?Q?z0U86oaFqDO+ZyAoqaxqAj3dXupzpY2xoDK85W1gBPLgr/4ZeMLoe666SsP+?= =?us-ascii?Q?rPOPbD/HxWMvXOLA6Kq9B/wT8sXsq8mWyMMUsLYoX9saAl8PUL6e/lDQKt/8?= =?us-ascii?Q?JHRFP0ALd+uaFtIkk+yrDtdnjdpKZKKlkKlBem/XMMiDQs3mCgSZvniQl/CO?= =?us-ascii?Q?4bAjjkdM2Vz1YKzdxdedCDX8D9lh3GBqxBgu5wte2Jif+zL1kPPwL+/m0eG4?= =?us-ascii?Q?wFIF7OnmdWBX6V85dFDD/Qkhnb/DAwLo6dc6rT7HBEkjjuqmrn+Ce4qa/0CV?= =?us-ascii?Q?oAj6mMEARUdWZ304L8WhbcNCbnaKdYEv1I+m9uzqo39T2PwB9NqwKsZvtu1a?= =?us-ascii?Q?8QDWCMzvJORs5NEsKEME/8kcLuf7JJxwP6TAtqpdqrt3Mr1MsZ+eauLG3V4+?= =?us-ascii?Q?Gk+NdfJwAJla8pdbau0QA1hJf5Tyqa3i12dsbHdj1CmMUHrHXtmT6XzTr0Aw?= =?us-ascii?Q?abggtvtsOllbDzrjs/OKLXbfao6K7RpPflggNiV1nm5u0EYi6vwfjQ9JVe+R?= =?us-ascii?Q?34q6WPulRt3YJsFLVrJXUKKHCvVRzHB8WQreBB1Ypsze+bIUmgmTibzr1fLx?= =?us-ascii?Q?Ui7MABIUCBZTaclbhORJ5LYiKScWoz4gDoBgST5q61YtsDB976Y7V04pnC3F?= =?us-ascii?Q?cJ2boxd56mFm707j+qdqvsVSlvwjf4uc2uH+/ImYZSkPOTxezT74Y+FdeUOK?= =?us-ascii?Q?0U0dVUMoXe07H4ZzH7gEmGOc/6BHFlg0dXRz9XREOuJ0uWm1XpkldRBFg/SX?= =?us-ascii?Q?2dbqaGnhjPkTkR0ypbX1LT0phdMAyqdu5f/aBCPXQLxXZjI1pUodGtzm0H3P?= =?us-ascii?Q?fw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rPBSJZZpWpTOt+lz4m8WZY0Z+XtsZcqwM6yr0mmmmynW0bqKiPiOhn+z3jrCagZxUpzbUGKxoL4D22GcqK42dQRZbf6UF1eUxhBKy2Za0dzj8X1LgMu9+5EFYOcbCkMxLWHabZJ6OK2KGn4Ik1BGk9pbxLmwYdXEW1YT1r9KwuYDbBVIVyyR36QrplHPSJQg/wtazGPOI32xihmxtlO6speTN72j7WR5rWXr6fPnWctGLOjGxtaeSUeWSmEB5cQk34O+vE/EqeVwVSGvhpJbjTUj+KnO2cCsq8HwiuFgOH1zbiFj4J7AfcUU2PETs+rbGhbut89r7B3AyIleMxCMUGRhNp8RBgvIJFcls9CqHU894+y4HrhR7TxnWoXWm/fXE1UtNOHK6rAATVeFU41+c15RcW8/AOVKDCvk1N5uGxM8FnGgBArvVDPrPpV1U9vYnMEaEixSHMUFQQ1jOr3hGQ7bBiBk91oCofSiZzPVmiw5/uKLRjoCWJT4xE5xMGoOem6EWH17xrkqauFnXcosZ4hhEPrS44DM38Gg2CR3q7nZe3/GjCEvNObMij0j3AXA8/pT0//u+nF79OrelcFFHl6kMcdUab3z3u9/7PeuWNk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 395fd152-840a-4645-1f85-08ddc06f7bd3 X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:40.8297 (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: ezHcXS4BePQecTfNS69DcFqVgUvkrbcTVa0J/TMxTJJWTpQY8enqvptVBMKas57tDnPF1mXEb9tvs03IhjGuxRU+rOu4vJ7VWxvIaM0ObGA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB7285 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-11_03,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-2507110082 X-Authority-Analysis: v=2.4 cv=X95SKHTe c=1 sm=1 tr=0 ts=6870f7cc 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=D44BCz6ssmwAkLLrWzgA:9 cc=ntf awl=host:12062 X-Proofpoint-GUID: TA1HNTrcV7OV4QAVn8Gz1ik-4Jnluxd- X-Proofpoint-ORIG-GUID: TA1HNTrcV7OV4QAVn8Gz1ik-4Jnluxd- X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX1k72Nyez3ywW FVd1jsOF8+Pwir23qjESk4Uz+FFxd1MtlnZUjmAwMSUS0keDoFihSWegGUaRJdrQ0mA33eoESi/ kQNT5JUOMCCD3hjnnOQ2fPO/+D29jlZgKW+jtsEUdCpSWDnRPdpnpyby+mRWQgQpg4XXxNn003o sM3NwB0neYe+ehc4PrBNWK1YULkA+vg01WqRKqySG4EDDjxSk4TwpVF6eUGS7rANvuiuSz6Xqbb Ucvwp4IWkCvXGbd8lnNqg7iZ8SYCPY/rpU+EWijPc7R7slQkjqHtPt4eEfpTUslU63OX7eyb40E N2A1jssNUJTNwbU9F/ynsyWIyfcJDgZvClQ53ttxI5knqjwL3hFoLMD5hUWjmBgYWDYi6vfUw7K 1EEkiTmggybL88ZsqufvvPmK1dkS5zBfEeI+oAgNW0sbeBTH33im78VzBDKTYKYRpO/g2GhG 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 08:15:41 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 3D32D2BE7B6; Fri, 11 Jul 2025 11:40:01 +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=1752234003; cv=fail; b=HVgZtuclNpqy6VIqG2wrGlHvDH8h+qNMIhWji6gGhef+lg3ZDP/qRQXf5Qyo8T+yd6MNMcF9LcZctziRc40cpcGiqxtjzlEoaoz6ugZMK2aCs18FU/NMNZQdMZYbSZUZI2ynix1J/eEKKMLmULUJ72RlR/KGwEZJwbKkLiQegCI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234003; c=relaxed/simple; bh=KkOGjKdq2IJKxxmFZySovX7PfYXzZ29GwuKJbFX2uVQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DhzrtSdzSZsNhvQlmbMp5LNsIZf9ocMw/yDU95XWlS1Ttp4DuVn4inDzCUjrQNwrHq4IRliTAqTWpf4JN4Z7XozFpLI4V7LV9gjGOuzaH2vR3bQeRyZ3t7fUm2+wS4CFN/a5B8Li+nWAwPofKHuQLhjHOBcisite/8rIvOTSr7Q= 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=kT4kxRe1; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=XTZ063DV; 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="kT4kxRe1"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="XTZ063DV" 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 56BBMBki007627; Fri, 11 Jul 2025 11:38:46 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= kT4kxRe1FDh2CzZWbDdv2bNaQzMLvKhp/agSVHzYXFMECkO9fYJekUq77esl/DlB TzY/S4R7T3WmZlhWsiFadHkhWkpCoJcLdDXMYki7c7+D+lYuP1t731CBRMYk9ifG x3SRFUlpnXsctu2ylCXS4uOcFWMLZsVMhoctNef+RiTKXQDL5nf2ESL/PkAP7NoX 92Y8DraK91rkhpG6JyOq+5A9UB9gmTG1n6wbPt26ld0YaotDDTStGW4JWmpqRTCD SRRP/yYWw+MYM9w8NI8nRDoFFOP3aLva/ZazLdqMnXUi+Xb5JLYJzCKN3nDWk/Vx ejVupLZKZVU29p42LT10oA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1p200kd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:46 +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 56B9exme024212; Fri, 11 Jul 2025 11:38:46 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04on2047.outbound.protection.outlook.com [40.107.100.47]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgdpp3n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Qql8mh38hhGIDXEgKKBQb/rcAfa1jRNxsS97c5euDLhEwSxiLUO3Iqqkv0WorMPIbzKVfkffAb9Jy+SDhCFSaWoG6NTQuD+zLHVJdSLA8dz0pRFLzEEd+ZR40UtGyjjd3kScP99wnzPfBVbj+GjkTN88ImfKqNh32wbsv2chcOJS4qtA9zPoQzxRGyupPjKD6l11WJZfyzk53pjvxTaqHD0xW4V1uHc9pLfHQkw6PUzyO5Y6cqNYpOIQPuV0hOhvu86Wc/UMPV/alQsalAw9MdeMBghgxI/ps7fKjk0mjjbsTWTD3IrRMtmdHcKvH8sNYwqwlQlwFPlTIkOhHuQR2A== 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=FKx1otjyI5yyWFQtoSRIBuq+ru3AoNBTDGYMvLIxPT0fH7hZySb1kK7HXwOJK9+a5Bva9KhmH7cG1Kl01isKqA5BbS6mN6Nkp+fNGc5+fIuzWgFl92YrBXH9vjZQmpsJtNccQR7TRe9zkqwjChz+J4V9hpwzGt5e7uHGrIycyBS3sztUxsbV9CaPmOpbgxtbukZaqRyp4KLMZV/mpCf5kVVNqG44jdEzyFMB94J7u5jXt8BxMWaHstNme/It3T0pGA62XamHN7tUdsF01otxI8MidXYPAYeCdWB7AxQBEUUCdWw47/Efa1fDm26wdnIHU7uQogacn98Jn4NIauX2kQ== 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=XTZ063DVlSQrwJtvIYMblBG+CSw/WTHp1H+1/vU7+zy8qEqNn57eHSus8d90jGbgqvSdzE4bID9GFVBgYE8HV6yivH7tUHfLw0pwPm76mXntAJx2XlgrvKmijNPQ8eUJgrPJajQG5sdI0ofVGKiEmh+fQNtYlZS5StjFam1GNoM= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by DM4PR10MB6696.namprd10.prod.outlook.com (2603:10b6:8:110::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:43 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:42 +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 v3 06/10] mm/mremap: check remap conditions earlier Date: Fri, 11 Jul 2025 12:38:20 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0696.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:37b::10) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|DM4PR10MB6696:EE_ X-MS-Office365-Filtering-Correlation-Id: 507cbc3e-cbf9-4de4-7b4e-08ddc06f7cd3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HR5AivZzz4R+O59GT8cKf4xTERIc2NfwX0N+u+Ag0BfQ7l/9vO6V5nmzqT3h?= =?us-ascii?Q?hVVtBhZzf/AGrc8bb0J+cczLe7CVq40j9Bjq/IqHgPzFIOo2latNvyYBSWv0?= =?us-ascii?Q?IFzB9XhgpdxSSDY+Kr6sSXApaVj2D9gakTpF1KGP59u0gWpnRxMSTuN9cZzC?= =?us-ascii?Q?Tds4P7pXf3LnCZEisv88oohmDho4KqgI1YnVZY4LJ3dBPMOGBqY/l+8/mK0i?= =?us-ascii?Q?xltS7cqfRWEWq+qkObk9cmYcHS0WBEs5j1p+v5L4cDX1ZrCjOoX6CtWU+fId?= =?us-ascii?Q?4pbVWIByGszJZcCGDESAM6XE+RUO5SmX6J+6Qv2hGS3BdVPUzWnQaLetUU4C?= =?us-ascii?Q?8DQWb2L0rPo1jZphpBqY2qrtPvKSqVFshp5wSBbBP37FVBvoJLqbodz5rQIY?= =?us-ascii?Q?rMLHHehU4n4PaEYHc+7BGnXDvcd8ZKjwkQxazNuJUsqC+DubEnsHC99NqyEy?= =?us-ascii?Q?ZqV0q5n9vioyMt78kS4OzS5pCABlrsyUl+Hk8NSZFWN4dyMtlHCRdzN1I9/2?= =?us-ascii?Q?1wg1e72pUBqWDphLp7uBuoAunr8CkQdM96atRtqUQ70FJqO9VJujG6uLw7bx?= =?us-ascii?Q?5SzdfeS0we/XnkCIPNJUg3NrhOoiKNsBtbGjgyXrSXYBFMRU7hyLDaaJ+43o?= =?us-ascii?Q?B8PJRlfYHbkL9q8TiKVxstSHkrdRpeA0nsyexubrZpQRGduKwV6rehcVKJiX?= =?us-ascii?Q?zKVyN5wXQrJuYvIlGmdvG+tnBAeekuLyVQk0xsNw9nHNGvrvmgJY5BZjbRHl?= =?us-ascii?Q?Dbf7+eY2yIsBxZ7EXVDJ/GAQnXo6OXzfv9XZjenRrN5Qow11eW+YLnKaUqkk?= =?us-ascii?Q?wjyZMadvPnlQUSR4VrbghWXVjzqua65sv3IBHj+xJkDPTfC9OdbkReJuOUuH?= =?us-ascii?Q?tXiGBFpdDTxFC/XqUKmyPWmv8TeM6Bshi8F41dTLGjFuDAAlNhh1z9y84Z+M?= =?us-ascii?Q?fCBw/NyHkssqbLMXsWaWxK8XsHQUzeP5tSEGYWDYCj2YP9sbOUqS2O1Xpzqb?= =?us-ascii?Q?JQV3Z8ukVdprHecKqMN+nba6vulCH0Re8Pdusp7LambAS8uyF7QsTOTTPmUa?= =?us-ascii?Q?iz280Cje98gEh44fQMol7IHHPxdZdziTAz7I0rvy3B7clvlRpmJOMe81fCz7?= =?us-ascii?Q?uAJ2F16Mt7fBqE/KZIZGPOahaYMOVp9Gm4OIv1An6hnovGSHG/9azV8e1ofZ?= =?us-ascii?Q?XCNvEwogiU1zgo/v+RFvER0eUOo/xFS+g4of+n6pvQCCuSnZ5jMQDyybqQQQ?= =?us-ascii?Q?LwFnGIhPuy2NZy35rGgxDmK721bUWH5DUEFVDS1lYnxqowrdUxJMn02b39Fc?= =?us-ascii?Q?BkXBxmWdSU6q2MJb7xfvJu2ird//zVflbkndfA7twTqTE/dE1w8/6bwQzgnz?= =?us-ascii?Q?MvuwavpdbSdHDwESoRhuuUFPcMzztoSDNfb2fBSZqEjsThvv0cPmBE5H38QI?= =?us-ascii?Q?Jdqlc0/yeeY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WwMO1HhTg176tEKPfc3mWBESN+j7ZzXj8JxB/Nlv1a1+paJOyw1YQ+v4nnxZ?= =?us-ascii?Q?RElsiKdWzNNRQGrvMjiNBImiv8LJdrLKJpwLRnu+QQUnw2ip6Su61dtKdNm2?= =?us-ascii?Q?eZKasBGo+J7MpTvfCxXcTOFCKCXzGrTEb0WBiZg0rLdASvARtCPnpq1rsej9?= =?us-ascii?Q?+CcnCAzm3mDkbcI88DdTkp8zUn9RRw4nJlB0JAPKBkKEguvPDZb2jmyvee14?= =?us-ascii?Q?j0sjIqoqNzu1PaBi5ta40Rpfop2qgTIpmqUijgWC04UpsKoaDyWOueBx6BMY?= =?us-ascii?Q?kBEO/gRRTGmWAhLo19CNv1J86unD3exVgyal67e2SZBX+DNgkfkgkXzWfuPm?= =?us-ascii?Q?Vz++ZPLam+nL8HXO0tHkAWo9ypE+rBIBR0tCmVzWzc8GgO6HO8AOeri6k/a/?= =?us-ascii?Q?yhdFqo3SsWAMjtzbgIrD9+nFmkPbL08j2HePfdkbdBWN8qVprb/A6OrLDr/u?= =?us-ascii?Q?hykIRBbXxeDaFyMIxAKe2hUEWtorl9hnyQiv7OOAaqrTY6gL76SreYnrNxoU?= =?us-ascii?Q?wYPmUDD3ri/3zJcogiQToFAz32a7kI0GL9NGD+63QRVFB1AUKVAM84/TNB8a?= =?us-ascii?Q?UwJOo4ApFPSgEO7oxk//n8Nk72i5V2SwAdzY0rGVNWQzlb55Q+fmtb6vLvFQ?= =?us-ascii?Q?v+liLFKjYMaxwWD2aomzDYuloKYNAvPDJM3A+u3BG3k4vptErWRsTktb3d4S?= =?us-ascii?Q?cnNJwCQUsox446EocnMBIBB8jLI9lJcC4tZBREZMMt7bgEmIX/YpC3+JSf6V?= =?us-ascii?Q?XGPrqZRMWmV6/oIx/n2gQ/lOSzxs0YZmBgT/W7Navt2cK1gEEEmv9ScDY4mn?= =?us-ascii?Q?u9NyJ8IxoyPvdswobTbHmg+1FLbEs9PY9JuppQ/q6CLyBbFhynaTXOC+gARh?= =?us-ascii?Q?MmQQFuq/C9+iBYM6vIZqWXVPEPSzBjLgPBbF6/9GEZmPMNArXzM9vm9FYhr5?= =?us-ascii?Q?cfTDLc5I5P6uMWXfkbBgyiVmcq4WJmJwjvJ5uEpANQDrgAvtYy12sDfHYnP+?= =?us-ascii?Q?Bd6CjP3WOI6PYEXI0+4RZNNIeXQ6Wt62r16T//P+MJRZGUuWhjsypomscTsf?= =?us-ascii?Q?37d7wR2neNkl5JChweVcw0Lxnrzkbglm6PRiu+xPOj1EGBv9KL5lLLRhSNua?= =?us-ascii?Q?Rxndwy+avhCzq1yMjqv6vwgLWH+SLu65qAFOQdtpgBFNpHx5tmhDgHIYLi7m?= =?us-ascii?Q?KLRsoo/QUeJ6lLA0OFucgA7y329KJo+GFP2cDb8x4G8Tld+oXHVhFvrbo0qD?= =?us-ascii?Q?1dMRBCKUDCNytNvDH9RPQ4C/TRnBGmBYSg9H6Xc3ZeioHmIgYM3A+8keRA/0?= =?us-ascii?Q?gBz1h+J4JkAappvIu6o3k4TDlhjCQU175BHhiclM2KprdUdMMeBZupVC1+lA?= =?us-ascii?Q?/QOCillXDmSv7GD3VzYl6On7mPTCOAp/yQp7BJN40UCbaYwKOU2ZILpKVkwt?= =?us-ascii?Q?Zjl7iD7QCLdr9R1j8+Tlmsom4YcnerlVwztZfeL+YmXM3fA7CdV75OaHIWGb?= =?us-ascii?Q?Xqp8qMX1FqCTzzPMMI59ijWi00Xa/+jPaxugfl0LZJxMZE6lvCtpHIGlvx4u?= =?us-ascii?Q?cCPsxAxNq4ZCbJFasKGTLgUq182/wd0eFt/Hss8rVNW20DcqTM/worCikqiZ?= =?us-ascii?Q?xA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: wzoaAAfSH/4GxTYQQw5VUrOCUfvSe1FiMHG2mjScLw5Wb58eaZWInjnRU2e0I77E623mBcrKPuQJ3Vq7d7J5Bv24zBfFYohVdXwZM6DMN+d/OaX6TQAFag983KI9IKlt04iLCpU0XmYe8yxbxIXgK/y+0VF2rl5YrP7kal2gJ4Uzz5Rn4hLWjt4bZ8X1mt6CBWuxO/gN/chVNjBz+Io9G0s/lQBtDQcETDhcFECKEOGIoL174bJH6vLfVhZEQs4PmOdF4z15kF5qPLDtMdlyHMOmxiFIB+GsHEMcPGtEWD5stDxTtvR4ZCZ2lsUxeQlCQN5bvYI6SFGCsWSPPbA1lzWk/R3q+Hwm6AMjjmM/ypBgEvpRGrnJfQvvLMEIsrn2bKGyodmxDRgtZAtiHqlbAAa+J/jICxS82z2BuvW9lXKgA6xqIOt52Ir1rlqkAIqbaI1PqcyDjQr2A6g1MxBUTFbYeAIUILl2TYdzDyafK2upgLqqTP+cqYvMVDJwIjT3MFtMAFungkgrV9wBe370AnB29sBfSF+iA/xfjHNnNkvegINxiUiowHe4VmK74bXUrbgIIgFU1tNDt2tEVhIZU8ej5pgt5OkCNnirxi6CwAE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 507cbc3e-cbf9-4de4-7b4e-08ddc06f7cd3 X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:42.5177 (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: 7ehZItZ+we5jLrwyFrrVcWGVxzdE6dmG8bF6qZZyK3WpQZwCjwu0T242XoN9jiP58WZlVVecVhVG4AZ8qO7CmiklgLhFZvphIeD2PC+H8WU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6696 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-11_03,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-2507110082 X-Proofpoint-GUID: G_YMDGz2Yk7UCYLMEKpXvlImlinoHC-4 X-Authority-Analysis: v=2.4 cv=YN2fyQGx c=1 sm=1 tr=0 ts=6870f7c6 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=QQFbvnUwB9Dxs2rSiigA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX6LZf/qYjuJyT IaFIHpretZN+kUewqbCkLSu+z3uYlMmbzYB6C5y+3xuDU7qpXpc/NS/lI8ziRPYfuFYAOi9+SDv Q3lYz6gf5YG4Z1ocBiQ2Msl5BihDiLPnAExn+1GV+mN4FjYRwY5dJ2T/+iU99SCaFOlVbXMkZtV amDO4MYIypfEc0nB36Mk7RgT/kDkr3KYJN+pwPC1xbQEzq2VbUpv9QQaDcsNfBH3wHgVXXeIovr kptq6YLPMzruuo7DX/HxiaaRIohZ7uyAc6c2TO8G2pxUK8ziWc5fNsL0zUELYEzw+rulD30wy8I tlJf+2b0GvOau4j6jmhBYupw2r2PInAeBcV6iexAaAYMlifKxIbvRVgsny98+EkPj42a70U2Ne+ veS+JGfvJUD8qXBcKuVnT67ivzLZEvVrdB41khvrBPMVfBPTsrPBrwYslh6WIufeLt+waaPl X-Proofpoint-ORIG-GUID: G_YMDGz2Yk7UCYLMEKpXvlImlinoHC-4 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 08:15:41 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 6A02828C2BE; Fri, 11 Jul 2025 11:39:50 +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=1752233992; cv=fail; b=ed9wlW9aySuVJMn5SY/5HkvZ2mJpH57rgc8xi7YOKLMIq7cQsE7wmTSkZ4ZFELO7cE+P7nlscDkbzsklD7xRuYrwPpxe8dYdpBNbKO8m2oWb8wol7J0T715/4w4qa49Iy8p0oRcUjFYtbcbvmPCE+swuFTLiHX5Xr5wI+b7yki0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752233992; c=relaxed/simple; bh=M+h6lQRtOP9BtXSSjt3ZQdXZJp3t6ZmzBxqtOdNQWE0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=itnUAq0rSZfw6CdwUrlrHiRbKhBk/1nq3xRIT02u37xnX6QozHz163g60wkGMyAuiKE5TZQlumeW8ltR8c7vQi21Mo5I9QegntS9ue2lxMUksIeumLICj/tzcxynQOmP1yaH4XeE68D1isLXXJAFuMpFBDnr4EUPslonyQeiU5s= 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=XAOwDwfx; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=O8nLAlXu; 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="XAOwDwfx"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="O8nLAlXu" 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 56BBbMNT014301; Fri, 11 Jul 2025 11:38:48 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= XAOwDwfxF7Vdhlfdw0r40QHSEyBQsxP7YavSIrKFNBdryqStNz/lsC4ItKUZZx9K NrclVXo8vbCselLiAABHkE0nMpPZo2RJk+Z2PyR/gsTwOXzBEZe+VV+lpD40s59e 9aoTksw/gVbopoJ7xhpCE6jIbLe/6tWajNPYS6Z5ZidBBgXAk3LSnEdoTHSF/odr DaUdh4yiXxfP20cJa465F9n3wMgcC5tc9dPD6ajqVFD5n64DutxmhmAwJxqaga6+ r0+rVH8eEI7c/FgYTxrz7f7cVbqgWuQ/Lwve8OdCes25elShYNADNgR7uzThprjI ReB1U2IQogjqsmJl+8qtKQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1w1g023-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:47 +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 56B9exmg024212; Fri, 11 Jul 2025 11:38:46 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04on2047.outbound.protection.outlook.com [40.107.100.47]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgdpp3n-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BukwZstjP5tPQH3KQjVpkM2WTfkNSoK9ef2IHHIlVV+RGLfX+D+UKy745zBqe6s2tEuzA+YiuasKfhTPvkSDJ69TDA2yz3OzOMit8B5Bvm9IWIU52MQ2zIMVltqWFa+rwCqIpvvmQqejonyW9QDn97kWUVgIsuu9lkTz37XhmauAreo1GDGA83AzLXr9H2tTzKRzBHvJ/q/J4eXEeJhPWP2ULiVcfuFlFC37CkBMtJ60LcX1Rf7y4n6adf4zJS/4jgHwkaBO/0LkmfY3SQAuVFjCt0SF/O4cpZaX2nAYpa2UEbG5/hElqzX7elB5QFQTbZ3kQuMmsXV5J8nYIfGgyQ== 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=uGdGZVCzP9jkZ6GrroHniw0ECIPTswbnwNZpaiQyAgxzEJC4n/LYltRlErd+eYZu+tr4+yW7F38iLQOsf1raPpd0GGHmtcBymYpBCv4FFncpd9mC5YXUsL54mM9JZkAbxbXM+pBGgaTU9hqKTHXll+rr6WZK0BBp4jHiLD+zjCGzjlknRf0NTiKMTZoIh4gOYNo0dL7dlanVaj8Jxm6oahRmYOwJgwGi6jTiNp3Z/MUsO/aobYhKNo/dW8gyy8C/ic6s7e0G+rFJufKtplPsdcRg7rzdk/CsfckggUcEs8zam6rZGTitohi/s/C+oNIgG9KyTGpbamOixSA4ZdRabQ== 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=O8nLAlXu2QWDKCOxrZgvpmRkeG3umLOH7zhG8jYLj5rULECNBUHMHiJxD7tMsTia08tt3i9EtWNu8zxpfEE8cyoB5teiGDAdeX4KQGlJY3YsO8qs6jk9ve2AKrco+Z2W8c9JsN6pg4sC/AMaYjtGxISrh3hWw7wmrz0zclj16qs= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by DM4PR10MB6696.namprd10.prod.outlook.com (2603:10b6:8:110::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:44 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38: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 v3 07/10] mm/mremap: move remap_is_valid() into check_prep_vma() Date: Fri, 11 Jul 2025 12:38:21 +0100 Message-ID: <93a21f09b6f6e1ddf07eafd19cbb7a328006e52b.1752232673.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0022.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ae::14) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|DM4PR10MB6696:EE_ X-MS-Office365-Filtering-Correlation-Id: 143c988d-8cd3-4c32-ef32-08ddc06f7dda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DACXgG2lFmZwYkQVGuN6iWCphSapDtbvq4oFTRXLApuRmuN/IYa6GaxnwDpO?= =?us-ascii?Q?FVWhkMsfVv54xAwXk+87o5osjlFjtbZJDAMe5oVKrfwjbPEBr16rTlXZOPL1?= =?us-ascii?Q?ooWUNqDAbN6OiBsokMdh92qBwOqRCRivcIIPJ7ImZ1cF66koCGK9NVklcEsc?= =?us-ascii?Q?yWmWbBKdaA7J9xQZAlpDMV3FgNhf/fl3ZgLjTZ2pR4gGj6pYbbS/giSzGBDq?= =?us-ascii?Q?VRmvWAYaSfNnvz2B8WA/Hu6szTBiG+nLqL0sNnLrx6uu+bhpHLFlWI/BkMuZ?= =?us-ascii?Q?NaNDoPFH2w3boD3QmY3cPRTLaK/hCbAPBWbLbjLZYWsThdGJ4hmrsW5iRsIS?= =?us-ascii?Q?mK+ezdy58dQXkRgAm4Lnxtc5wzXD0PDSvG7nkBPqYFUW9KbZ1mAIRvKwlJLX?= =?us-ascii?Q?Zy3sBOEBz5K0eX5ez7uYnAv7vuq/5rbO6qF+Nb78+1fw6EKnkN6atKepIP/n?= =?us-ascii?Q?zV75HbLoL8BlV1iqfTrobBAFHCaOVk7xe8Pqc8k0zLT365dk8ahVzRGPVfkh?= =?us-ascii?Q?bRNniUi5nx+FyU3f2EHMaQ98ssgGc2YIc4W2Jt0gaFb3Q8IRZW1Ug+zgFdPS?= =?us-ascii?Q?upD6l1MEs//lD70KRKHRp2RH9Ekt7b/3QDFNInt+tNrrozFLEw3C9k9uMYb1?= =?us-ascii?Q?kF2YBDcxiAqOqkYHHOgotD/LWsBPezqv5T+rojuHfGxOjWl0N8Lb40kuH2Vc?= =?us-ascii?Q?HYkYasXsYTRwMZutGj+lY6M+z018JptXdngZHUqsjbNgTWmfMsxGDVE6Yymh?= =?us-ascii?Q?jzPIdu77UmT0XO12X7GgSIVasSr9Xv5Yjkvyd4GReculYiwOtT8u+5ImMXm8?= =?us-ascii?Q?v2aU5+MzsbHVm19jhpAuy+RhdVsf6X3Jnc5Y2+cRrHFhuizI9BQF31fg41E2?= =?us-ascii?Q?Ayc6ajnfrfgIS1Y7cNJ4FWgUqi04ydDtMkT6deeUBkYdAR3/DqC8xI0e/rWl?= =?us-ascii?Q?+Jk191hH/1SatL5Z6h5uSqkZF2w4hT/0UagHBWK2pttXx6FKYuvwcgLdP6K0?= =?us-ascii?Q?3h9Qp5ccB4lKgGk2/60CG3Mf6K10ITpsLUPR4OqTSgn0ZU+9rxaeJew/1J9F?= =?us-ascii?Q?OdomwwS2FEvzKanudLExWk19dSsCf0iGcMfvPf+quilTg8/G869OJ4xI+T7K?= =?us-ascii?Q?Ht8F78y2P6frQz1SaMJWylrVBH/L2R8UQG4FfOLHzbxU9Y4q9j8UaRsXfCUi?= =?us-ascii?Q?nTAaKVKX+j79ir4zHuDxW+3O5F/7JnkRdF/vBuEv0xsRHdvs/ezg7QXgVRtu?= =?us-ascii?Q?S+ZFgM+vCUTs42mlU1hPeyiOs5U30O+ehNs6aR7Fi4IeTuw/5H6rAldDMydz?= =?us-ascii?Q?ICDBS9hkJRBGyn1mhC4M7zgdBwbOtB+AjjucuIYv3fUDGBH5MM/vDgrnyJao?= =?us-ascii?Q?zU5PDq9j2q598qR/YXIb4fuANK9THTxvPdEgA4BrwWbE3TaTwlFA4E/1bnjz?= =?us-ascii?Q?+WMSKuyGAcY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g63TUS5z9ryxuZ3G4gNuVT3L9+HN53X5gRwDQ7XK9qEryNTxm1YRq4chQoW9?= =?us-ascii?Q?btYSEj/irN170KFze73+2FlVhSsptGaP/ooWAjjhaAP/pOEw00N4bp3j15FQ?= =?us-ascii?Q?muLn5Swa7T0R2DMu56y3uyy4oG2h5v58m+eugIRX0No6EXTyvnO/gXoPhA/G?= =?us-ascii?Q?4n7/dlMdf3B9AuBL42jUYBC8m3DnlB7sBBM+o+RoSo49Yfl8nlYFmjYLLlli?= =?us-ascii?Q?HdV7amSnl0tA8iEx/K2KoNHPwO1xvRsPteWNekIQXj9LjUoaHd1AURCBoNeO?= =?us-ascii?Q?3Fwd5FMUumtu3cI8N1Yp7CyhsXy7Va5TVd1YO5vYMVpGt8wsoTJlXwKC65V5?= =?us-ascii?Q?MMu8L4asabzxNQ60d08CP6Ty+tMjsUBaoAHB66eji1AXuyir5zWCA73ZVl1D?= =?us-ascii?Q?RSMXSYz2FGIYshSTn41s+QNiM2kdEULjKDodDrUtX1cwp2ZnU33Do2R4/Hkz?= =?us-ascii?Q?XYsOv63zAT4vhmmt5+FjQDZOjx+KfU3bhA0f8HqyRRABnOCdGDralbp1SJjK?= =?us-ascii?Q?lHgPFwMG3H9SHcznleUk5Vgb3MvJH1F1dre15OG4PO1ju/26bmTv0pUwTXU+?= =?us-ascii?Q?TvGsWFgy/5sewZ3LARsspt/7xfIjZvfCC5uRL4XsEGX/pwTYEyQEIw5Xcprz?= =?us-ascii?Q?kkwVOCTzlN7T2gxcxPm8HgrGEEkiiPLAZ1MJkeVN0h0ZDfT2FMxw12E6jJZS?= =?us-ascii?Q?QhpKKnUvo6CgDSB9gO33ZkRJpNir5u2QfuaclCyDrEswSVtjUCvchSvLt4kV?= =?us-ascii?Q?9xu6CAw1lNr2t5R9Dg8KAl+errK+92hRjpbTNHacgDL8mN+kdEbp+zvYuM97?= =?us-ascii?Q?uJqAgs444liVm312cpmWKKBTzaC5c2z0DhPtSMtYROUACTNHgZhbiGr5jsmr?= =?us-ascii?Q?ryrWRdavIThjSEIRlvMrfIRZOuOq/qopnhBcqrT0n6fvdVQCLaYXMe/b0Gq0?= =?us-ascii?Q?Y8ewxlPOc2qDMHjKNqJ4FcJXiNdFPc4KF1MKp8BC5BpNqhzpa9rVBrTVQzpU?= =?us-ascii?Q?4E6T/9wuokvvKj2IciWvSMukiJxXjh9iploWC38TurgJkFqe7Za4cNNZiOW/?= =?us-ascii?Q?KxEdV6v0p2uRDMWKTzclJBQ8dVNTTqKB77fWAjEl0SZpKRF1tzcdCm2gScIg?= =?us-ascii?Q?VeX1Tsq4xYK4MyZB1HZ+H8MYY0DUM85hI7FYCTqlH5a8p2Wd5F0t1Oxe9c73?= =?us-ascii?Q?KSMK2U4LzSBWGNwWuNTVPJBbt58CqbClXqRc+xifXi0g9LyzNRHs9EYNT3Bd?= =?us-ascii?Q?HgoxGyRP2wAsVwTZNQ614IXdvFfV2lXj7kRoNyR5FTgZGTDtCvdZbagJrBOW?= =?us-ascii?Q?qeCWhaEpAfGsr9UhthNFlR51ug71jfmAZ1el7Gk/4JF3vc2ccF3Ku9d7+nOo?= =?us-ascii?Q?onZcKJ4DHnuOOJxfzh/iu0L5K+gb9GrB/1skSGAIi0mea3Xr9tsZx5G+yIuO?= =?us-ascii?Q?GfpOf1eBhOreJlwqIYJUELF1gw4z8OY/hcPLcV1KiPjZdNq9hc30/ZCEBn0m?= =?us-ascii?Q?XmM0JMKLXK9Ed31DxS4m6l6UyIHC05zrsE0tXBDl7vi4uBD0w9N0Vi9I+Rol?= =?us-ascii?Q?s9UjiltLANd8sOXykhC3o3pVnc/SQTz6+CqEC98J5WRpkTPr9x7hrK9x41Rv?= =?us-ascii?Q?Xw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: K3zGebgVxXgo1aIq/nbze4G8tzQVXpGRPzZyA03FC1cLhc+9jg0QQ1t9ywBIeDF0cyC1hzi+KPMJ7pj647HLSslntqiYfvKmAApPu9cPoTnyjJKgmw7lI5HKShtNdJEdHMMiPbZMknrvLDqrZBBM2jHx+yo3hEwyJnJ/CM2sE3sw9L584hCigXTgcJK09WQK3z7gDzizEiztZUB05/wpsxPsE+YUSPXw/5hD1qzzw9rWHjuw0e3R+Fz3UWnrmyQQV88uGPjxlSlg4O0nx3e9qkbjGeLZxIqmqfmfLdkncsUCnO0704iodOwJG8iwRzSXXiRoRf8BxQJoFwMXqS+cbAPbzW0pmOkI7Z75zDYNAz1jMhbWQ80INEgwVJcLMfDtv0pdjJl3bcZChRnM8oq3+kReoFmBm/mFCApl6mnZXZt8H82liWUMZuZzfSdmYbGZProa4xK8pbWWsAQzbmTU9H+uxUVLvv/5wGKvb5xEIe+bHHF21CD/WA1Qqa5CgZbgmb+I8g+MPlk+37OpJ3I6NXalpWdM4YLd0JLGcCeHsZ6LcTVnNECvGalEIY3MXxyFD6dpttqA+lHC5F8iyPbjitRp4CNDlmZpQtBZYTePXkA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 143c988d-8cd3-4c32-ef32-08ddc06f7dda X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:44.3077 (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: lTlQcudTIs8ZrkQ7jP6QriQh3ID1MnHVi69/zseGRMBsMN765feqJQte8LA0WWkv+Q/E2xQ+/thBh7HtXesuyToeLI50aeSMSKWIJySrxGI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6696 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-11_03,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-2507110082 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX+gZSTiwSFzea qiNA+mzXvMXq7+JRia+3C8yo+Wi1HavF6yZvgsRsJr+VyBSFMYPMHUr4zcxu6lC4lf165hwRplW Miret44lVMS5Awysy4Radrs9HJGV+39CFakoM04+2uqRZI8ENXBWbmzRCA2gi/ZG+9K8YScHL1R 5Mt3vC9apaYL3Ygisi19j9UM7lvEe6JwY3bJ8EkMAgjotDuyF0b+c/J3180k1PSGwZtLPxhNR0P kfZy5rXkVfHuIpH4Iy7e4uk2HyKPewOoy95Q80u4brLBAFVa5d+5CvxmfNCTHRu0U3i7iTVTJud WXRd0Q/LpDbZAQoTd8I9Zc+8fvZe3Y+EEjOgnvW7/0+BQIbwLfN/dqV7FQHTIxRdYfc5rrsEPT1 2fMyu++nuAppUh1gUsB0Et3aXgv0hfo3uW1Bz+4ycsArVV7al7mvlwUSf4fKZ8/hkD5f8Kom X-Proofpoint-GUID: 1njQdwj9e6kUYy5kgPXbu16D9zlMaoKn X-Authority-Analysis: v=2.4 cv=FsIF/3rq c=1 sm=1 tr=0 ts=6870f7c7 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=JNHyDlmCLAJVxX-Ft_0A:9 X-Proofpoint-ORIG-GUID: 1njQdwj9e6kUYy5kgPXbu16D9zlMaoKn 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 08:15:41 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 04D8B2C08B1; Fri, 11 Jul 2025 11:40:03 +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=1752234005; cv=fail; b=ojoCQIhOwOpeBgWv9kLMD7YKqbTseMOpSCR96lgGM42ohbhOSPz17BDYlZSyTxx91aix7TnyeP/ES2gHoav+48tjruPJh5157KBvGX/vTLjquRdTbfroYielLaRToz7+2h/uxjQs/dFq3g9BVqD1wk8vkvPI2N7qEAaDB7Y6rX4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234005; 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=PNUdotGNmdnzwGW/ZoFkHEUMLa2dfdJPSEWuqVJ3+VUgtLqktD+W1c2QEt87lPyv/j1IvpUMLUjSKWXDLlsRwvoA2CBhFIjedjDVEJX2VrcAaoWARLlx8DiHe4ZeZNWCjYBPdi+IHVQQSXikkPvBUWGuSoQbSclFMJGtPU+cuUE= 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=rVEQlY64; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=wElts9IL; 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="rVEQlY64"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="wElts9IL" 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 56BBNXnu009386; Fri, 11 Jul 2025 11:38:49 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= rVEQlY647YiCWhRDAQM9vNpyP2OKkXMUGFudaue8I4CyvKa8AU/uUiqLBuwSH+cR IO0xXMH5GyEuW4SWcj1BZHNSfHfoxGCikphzsakXuluVNpFOqwh8AHVR7nQ6pHi8 llPD9vm5EVbabzI2lvQp2IVp5/QdYnC4rcVHb++ytrA+nwcuULfHzCtO9UQIkVk5 0G1Pq9Hzu6XWk/GC4qNEHvMo0zlHvCgStQ5OahXeS8hmHvSX2qFPo7DqKhwyJeAG qa9E5dLp2QXpuMJqoY0pKL1bZV/Pi7aZ7crtJFKlBOFJqnSiBSinmRwWAdsVWVtE RsbvzBq8DYmeO3pakChTqg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1p200kf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:49 +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 56B9N1tc014260; Fri, 11 Jul 2025 11:38:48 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04on2079.outbound.protection.outlook.com [40.107.100.79]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptge84cn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bLqyGGVRZlIPextzZhhQamqVhxIxmnDiWTx0Pka5HjvNoAFOFtd0hTnEYbO82hce/Jspr7fE6hf4JirJH1/wqitXVLlS8hjv3e8/Dt2szTgprv4uIbst92sn4dPDS0z55vkUoRgKtHZ4RwhWySKHJJuo8ISCr1iL38eiVjG6/MBj1vOzoAKLvWy2im6EIpsNTnwxq4Ru2j/7R6n4bvUymvUdEKnpsbPPIPCH0OLcGE9N6e0gvgJDOfFejhZkQtASOZIWTg8HMI5nAXlVt+zCR0HdvMSJpJtjuhMESMdTPJsWpSmipzJUls8jDCCMjWnuqX9V1Dg57gJza/DVemurBA== 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=yFXIC0WxYwkA3r2n8FuyGVPzGym77XTM+mCSiosNzX6y8/Nsm3l2K6NALtDUJ8j84k1zG2y10RDCR4YNKdqiG7pu4B7FzusWpopLW01FMH+r3xKN1dGMDxpBZuX+ozBNNJ2Td27TiMAf3sJctHkSybpHBL9yU8rJG6oYZOqja2lIaAEKPtpU9Bhji4GQGAdtgPPxtk/w02KeqLqdxi2c5kfYrX84vYNn1RnsPgV0JGpFLUJskqIvCowG22Vj1iJ6XVLWV5rONxESuyx/aHVZRPsoiQqw9M4l3NPBLGBJEYEYFdU0HZGD3yMbpsSXndtARldXLwvoMvTvsL/jfCbbog== 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=wElts9ILFQBaqNLGPNwcD7SMxQDx14MHJvaogJnVsB3ynczqUmEqOFpMHHCKtM0/BogGxrk981ecGdyMAvtaD2E8T8K6pyDozf7ddYGpyCsXa4b+ftiGWnB4f3ewFxVYBhaHBRq/9EYCKJm+mD7QTLwlnyj8aqunQ0WF+2wEM9E= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by DM4PR10MB6696.namprd10.prod.outlook.com (2603:10b6:8:110::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:46 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38: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 v3 08/10] mm/mremap: clean up mlock populate behaviour Date: Fri, 11 Jul 2025 12:38:22 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0286.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::21) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|DM4PR10MB6696:EE_ X-MS-Office365-Filtering-Correlation-Id: 11f67b03-2a57-4f18-52a9-08ddc06f7eef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rrywfhuI+fZ+4ft+bY/ecKeeWGVAwLz463zV2WIyW8cweES+tZCpbnSwW/KR?= =?us-ascii?Q?L0/Qvo1/JjbA65met1snLFAgcN7LAOHQPFmJodN7vncfixuIltukmIZuM/68?= =?us-ascii?Q?24lPZlatpbo6FysVKmCWy7Gic2PT36bTljQWbJZPnAkD2ibnUwrW41Tzh9ko?= =?us-ascii?Q?vVcyz5y0q0eHxpoECmkKzhLXgpzLvIONmK7N0259k2FJl/RSD4zNjxP1BIJO?= =?us-ascii?Q?m6ZlPtlQ28hKQbxV8SgdPM4JM3OI6VQHYmoPL7bHuB2EAadqVuYYbYas1sh/?= =?us-ascii?Q?NdK2baQPRYOhkD2pjLFmd+7jVfAkRso8KtNIomDISjfK25BJ4FMqpQY8178A?= =?us-ascii?Q?hKWRLVSIpIJ3IAmgk0tcRJR3mzZ7bg1gKIGqO+9fh/jntN7q34lWGTJBsB0y?= =?us-ascii?Q?Qd/1FfsXb13y1SwOpUeGbJN8bOtxTilXSSHMuDIeeRXWbAPP25VQoTOYl6NI?= =?us-ascii?Q?IdGFlC+O4Jz6r2R6nsP7h8kwo+uu3xDPRLVI2vkGBFExoWL08Zgj+6i1/FB2?= =?us-ascii?Q?53unP1Tb2AzB+5MYbP5WyhDG1lCvdAWq65NPpxjnNPnVkHu0ulduUCk7FdZK?= =?us-ascii?Q?ukeeo9VKLNTunGsrrzQxyKSUYEr2+DPhPw/43HKjLKujmuy3HXQR9EtX4tZi?= =?us-ascii?Q?Z0+Nl8+i1PSG8b3HL1u6aWSNRje+GwIQJmuKktPpFKGFv1vjT6mTnYpXKJD8?= =?us-ascii?Q?9l8L/atLSXKEEhhSopriLL83JPBrEZ+fOxEd6MTwH6UnsEbukB8uVPYW9Byp?= =?us-ascii?Q?I6sbQE096wEoqlqyGSCReYdbnO3LootiuoamN7IJhId1bHrCPlcAszOW9iWw?= =?us-ascii?Q?hUUaA2Pp211JBddtWDTakuS5NHgX0FBTR2nDeRaSZzY7BA5TSNbdZMDFl0Dn?= =?us-ascii?Q?0+2nnOVxTX+1C+q8FccBw5t2lIVXH+DbqTkmIjnMILybrGH+3dWSkg3GmOyR?= =?us-ascii?Q?Iy5aPj7srx+0Za99QW0iys168dzAZ/Q8tMPsPVeVjwNb+Sb1ggcCbguDEsMu?= =?us-ascii?Q?X2HKKYohBUWFsrUafea8nQguVQqXZXA7o0VlVgxXgE1lh29DTCe1oocZ1m00?= =?us-ascii?Q?h0McZOsoBGCKDMxWq2DpN7MZ4vehYl/AUVgQq/zqdF7/nZPSYu2cRf+SikKd?= =?us-ascii?Q?FaPihmcJaxlEEsVSOkkYaWhL9GmlhtTDbVgd5IPmM3wf0fX67okMNRD5+nox?= =?us-ascii?Q?ENOp2xC1THZXF96xXnc7H1KOYGKP+nnGJ201Bb9DifzXtkf4h+/6ww3lP7KY?= =?us-ascii?Q?xBR/8mKhtlfQdIhYIJNyUm4ibL6tl0xzwMV9kBO7mkG8zdgburaf0m2RVmq6?= =?us-ascii?Q?i/tmoueM2HLwAR7uHMfzZr3P0CFcJ0+2d/3LAAgXz5ge8Tb0+1kFcPteHn5A?= =?us-ascii?Q?rKKl08+6yLVsI9aqCasW/5AN1cXXouNCAbDkk2OaUMbylujivryk2YfUcu7g?= =?us-ascii?Q?tfoOUUE5MZY=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SKWyHe8Out1pZ18f+ZS4WLLTI4AnG+endfpOUMiXuI6iBFDTEm9ltH8b1Gpx?= =?us-ascii?Q?YwH+zPgyPh66Ff2Tywmd2Owsz1jXeA6WNIsDO2oZs3SkuvZCWhYJop+vyXZ2?= =?us-ascii?Q?aoFDjNa4axScRGb5OaeLs8nns7ktVRgBsWeIMM2/pFMx9JqdV0RvyCfygEte?= =?us-ascii?Q?cEjBI3lry95gbq4cwYhQEy05KUYNRls0OBNFjhUdzR5UZcLQO1uY0jq0I5aR?= =?us-ascii?Q?QvJrvIehPqmtLiIt7QGrQYHQFZYmIdJplUS83b0f7WU08FPdbWk0wF2rYXKm?= =?us-ascii?Q?PQql+zkPyhpyxF9rcFjQ1PfmhjrN2z8yWO/Y4sNbEMcj+PPURJ6k1tDPS3iL?= =?us-ascii?Q?vwIG1vCrP0TV0h3PKObQS5F7ybkH7xZveG9Bic051oHI4ev3jZRkJfAUL6OR?= =?us-ascii?Q?HrudUNk734VvOsen7KvtQIsWW8zJHLC84w3PfILoVvrSZ2eHggSz9P64PC+e?= =?us-ascii?Q?2flJFMoal/LYK2evvBlQqMTmfbOupyWLMXrRGMlI3oepVowrZsjk4eGsxxjt?= =?us-ascii?Q?jzaiUostlldiywOjswb+7RnQ+kjgHLQWhdVarVCLb96XOMscklgW71YlOMwH?= =?us-ascii?Q?QpLoUw1qWQgVM1vSHEqfpcSiHWmMP6l79tO4uz2gX3eTcP/HVywvVo03kNZW?= =?us-ascii?Q?SyGRgrouaXPmelmodwrqdcMGR5kq58AHUuCNFFpksj5h4W4X3PFPXZ8/uJrH?= =?us-ascii?Q?NShB6V3vdj2TJpl3/hrhs+qkK/mX+p0I7z283Wu9rhKUoqFL9Y+tQazrdKNw?= =?us-ascii?Q?uCT6Cr7Af7P+k/nDPcsT7vGY8n0dbsmuUts2cOwl//yNe0TWZynCBWdRgLAI?= =?us-ascii?Q?UQ2dbm8oboxVapudYdaP3IuW89NvE+Z8kPmI0Mbh9GReLWCvxcd7qDKs3Zjj?= =?us-ascii?Q?ho/6aRpx0RX3qkAAnStkh4Qhh0zQo7lv4FAO2KUHFhMJmO0leRVP4ErF6+ix?= =?us-ascii?Q?ts4/U6GQByDH+pUsZTZAz3228aFK+kl6twWYUVG6MuKyOLr74Q5RPNTGEru0?= =?us-ascii?Q?q7TxhJoyvM9AV5brSOd1GVtNr9GacIiS1xDXhJ/Fe5rM6UqpjXEOhMqSPa7O?= =?us-ascii?Q?sT4ZW79PCd1gi9UCqdTGUI4QULBTu734I3dsvPWZniQ1y6lhiurmKf0T8R5Z?= =?us-ascii?Q?xGn0Lj/Ip2/EXW9969i7PjY0t89oIhtSTv4HwnqL1/EU8hF5VWjlUAcSkxWW?= =?us-ascii?Q?9dKNv7UukUApWaBXY8CbqcRMJxNFBtJq8EdZMeGo7eXqgXcvx94W63vVmVfP?= =?us-ascii?Q?rFi2AGVkrPhngX0Vk6cKfJvZ86uxIbbTj9tHAbRFOKI76ozL/HwKTwQ63tfA?= =?us-ascii?Q?2D2EZPMOXx8OzpdQb+0xUWP+oo/9d4gh+CWmsHbxtt+2mkjAsOuyRAEPSW13?= =?us-ascii?Q?ISQEkUT+NqDPJLC9p/t06TDjna/gjGlvc5hi2onSNb2ckruM3zOE7aMPdr52?= =?us-ascii?Q?YHr7VEZXyuh2cMnjl9mxJ2UnposQAhBQpc4CPrBlTvDaVHu+vY/srkvWdnK1?= =?us-ascii?Q?lUqzq7We+Ev3EXnHKXcxPBPqIQLfXnyFvL8JKDKWCI8TKhEm8fA5MM04WTck?= =?us-ascii?Q?FgF+gg7hL0eEHOKu5eppV2xBAIowDZ5d0FNNlJfIx1SdACWw8Axb3B69THXZ?= =?us-ascii?Q?qQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1gKzWPZ2Y9NopJrJ2oia6YK7MPHrxmNggR0IBJRY18zuitfCFCjlN4AU5MdNCXyYyjKPxuwf3wTyQelG0N8l5kAkjQk3WjROm/1HQwgXQxF5fOmiNYa1g9P0P7FXZrYzYEXu968y7aNfwrij6UZO1uDORYQl6qI9kmyJLFuoEGVBOS5lNF5s/hWRyq9E3me5FH7X6pKt1im0SyDR8PivnB2Z2sILhr3tq3Dp4sFElPIduR2FMH15mVdunnDnMwvmVPbhy5irc4/AvD1msgPI7o3xjmBIJ+E0XS62h026B2gcn3IzCXid7ecThxW0kNH60v1BIJSPlbo8iweDzN8AObyXosnPeWZDxj92Q+Z5JRQs8Wui9bNSYKNyS8eOa9uMVfz4YBzDAEmgEVLRJAmPRGfXBVwOpJbggSvWZLAkr/OzVgctoMZvvtagZ5i+qZmgXnVEFW7PeM94mDPGWmnvdvj/asGPUAOxfzYI7vkRmqacZGmFjuCTv/jLZNv9pWE4tUx9VV81XAn8XudGLGZDA9VxD73jml1pQrr9si8qiiO4Z7O4gUDzyxATCQMo94LQuPVB5Yi5oOMdGLf1jofKUa1+otAfGKEr4QIvclqJGWw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11f67b03-2a57-4f18-52a9-08ddc06f7eef X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:46.0523 (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: IWXOI3s+7elVK7xdeotcGpmgSa+Nk39N47aRLrKVmGwBkwWpq3auHmir7+IqEZxox84udR4JCwj26ZHR2pYankslwonFTbECn0YeTUYsKoQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6696 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-11_03,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-2507110082 X-Proofpoint-GUID: Wi1Oan011IhdWXxSCNvr68kDfNomV84k X-Authority-Analysis: v=2.4 cv=YN2fyQGx c=1 sm=1 tr=0 ts=6870f7c9 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=vjQNCPEVpfjC6StvhboA:9 cc=ntf awl=host:13600 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX0YP8w4WVCKdn QzG0fV4zYakxMUdpR25qjoZPBGbMr2qMifcCHL5sa/CsPy9mqScPrlBC56Jo1Ayitp1RzU0G92O YlcqDa7LVuCdqTvE2YScGsh4rhbYvAXmx+DxIdSM4guhb5ibXL5LYbdJ8zC0GASGbwfsCVmQGyn E346SdtLd2jQUSA/n5pPjUlPAF9F4MUzpiKWdP754WhFAHVmFkog7GpiyBXPwYbh/aGdt5U9rpL Qi0My//GFgu0l2VZxayh/kX7eQPSqMCaMnW/byQaADirZTkyRBoHRzgnMej1PXMmor4Q4oiCkXA 3mjj9kRfQJ1Vf8HANgNyO/HWKPVdofCprq21Z1F+jbb1kmy36O3Q8IQeQlLtnYLN/HZapKyZ0bE zupTsCDGmBjHGupFMNSi37CY6EfH567y2EBDkybcinIYCVnF2mNy7ZZr+9OW7Oexr0IFzXUV X-Proofpoint-ORIG-GUID: Wi1Oan011IhdWXxSCNvr68kDfNomV84k 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 08:15:41 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 890602D0C8F; Fri, 11 Jul 2025 11:40:07 +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=1752234009; cv=fail; b=PhkCvfw8vrXU9yVsX5M+DJoxM9Nj9sR4nCOQR4aJsniv185tQGNJ/JCOSgjVivvT8333O9R+s2nZUJXK+lgKrU1cRaJvMwRMLMPOdGQZxXB9sx78xr7arY+TaRm0e4O86924A9gzTrmg6QVi3H9wPqkAOVWeo7UafR4Cn+i+bNI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234009; c=relaxed/simple; bh=sFZT4EblRpt0eH25CEUzgR8m/nCDRghOM1XxqQRF9II=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=W/PFCQzbM3WTlZNAsE34l5SdbLFuYl1mlQsWvxihfiYoANkNLoaiV7Jv9Gef1O/bRicEJz6IdVc9BPTUqi7LLDKdVZ/Or31YYzEPX8Wr15b/6bwmt4nmyIC8AbnATDqKFUuaGTcDwv/wiFvb9AG6WSgnLhTN31VWkI1NOXaDjqA= 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=Ad/Y8a4I; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=c5VUUAaV; 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="Ad/Y8a4I"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="c5VUUAaV" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56BAvEB1005892; Fri, 11 Jul 2025 11:38:52 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=llKJ3LCOeO9Brv+R38YbDXfXDFNtAQPy+2QvxK/YSjA=; b= Ad/Y8a4IB0ZbkI/blUS5qAnbUxeaTj91R84hRKPGtRY5Tp9iVprE1emU+lmkXMhF drMGDE486gLiCuWdjSscLya0YgyYscwMVHoWkhog/NPCUIEeygCxMDd6ctTzQQYT pbJwNfAlX46CXBSZ9mz4FTT3PDLSIBsetAovdTdZBmrFway2eH0ZXkde+htUvQxo X2a8UyLAMR+5/dv9Kxzx6EmIoNBVDjWOdbdQpZ99MulCpw3aob2QrokMAI4RbmVD wGTP92ioJ7b/WFFq3zIndFHJJbQiGxPx8To60dDkt+5pZ86my5wyHqBi3p22f0b3 GAq/bSk+/a9eBQCmmm3JcA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1abg1q5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:51 +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 56BAXZaw013560; Fri, 11 Jul 2025 11:38:50 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04on2052.outbound.protection.outlook.com [40.107.100.52]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptge84d8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PAwey/Pk6d8/OfBWj6CEAbXya+vr7XsBu5WdQFK/dxV2KcN2Oblc/cSN9zxunKdKx8rkpRPysH7Cht/kCqphNmNa2E03hHTX4Z0LMFwZix/f2RdPKaZWrBrzF9uHVEuIAOeMSucX1Y2EOXIZNRZhsDJWm+emAyaTACQ0OHstIGgz/uk2IL2YHybRzDq7baG98sWgeyz/W+90cTwpcU/8k8vS07wN+KetWhuwhhGVdC2xhnbDQ4+BqzYKuHl+jHVaLaECyxk7pb8rGDoACRGGJ5/JM/LFFL5oFFt/UPP/e1btG+x7xwzs5YXN6rDLZ6IcvHKZ6n/f9LzdqFUQeKWPpw== 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=llKJ3LCOeO9Brv+R38YbDXfXDFNtAQPy+2QvxK/YSjA=; b=iEtl0JhrueVRBCSPMMIZUx8+VKQfaSAL5b6a2jSsbFVpcA5JaMep9mCzuzRUh5tpXf33W3nC4BP61KyvqQhmbvFep3OgmKAzsY014D71VUwfaMJcSy+F9/HEyuh//7Pxq8ogtxdlP24Bd1xNyLIRF//pI0am/6IX4gWNqEDuVn0T6A8geCIMgkSdzF4NukZ30tMreU8xQkYnat81zYVUbyD9e35MdSS4nB/7hOkHAvyjRuaPkYE2egonp1pDjAsmHHRKmZrsddEwlRobygmOoY4QX1JMgc0atgGGyGCxrmlUgZ6+SRpfxVWVyL8cQe41cQezvWo5EtIqU/N3WgCQcA== 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=llKJ3LCOeO9Brv+R38YbDXfXDFNtAQPy+2QvxK/YSjA=; b=c5VUUAaVIB9BkvrjkVhGbqwXkCCiIJqsLZxvXKHkh3Ikaxz9AkcGsVEcJwwRXqmEGGijwwJVCS9iENRP5WNCHFVEUyTdypbdyYOaGOXYs4q6GgRp4bDQvPDX/hNEVH3A69aVAIli/sHJjNNz8RO4VFspgff+7XxfO2y9hDnNV5s= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by DM4PR10MB6696.namprd10.prod.outlook.com (2603:10b6:8:110::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:48 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:47 +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 v3 09/10] mm/mremap: permit mremap() move of multiple VMAs Date: Fri, 11 Jul 2025 12:38:23 +0100 Message-ID: <8f41e72b0543953d277e96d5e67a52f287cdbac3.1752232673.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0021.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2ae::22) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|DM4PR10MB6696:EE_ X-MS-Office365-Filtering-Correlation-Id: 83e18bcb-93f7-4e7d-2418-08ddc06f8009 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IV3KHlii5WobaydzlXxLTKFYNG0GzA4//WIlVN4WEIH3ekY0t6EaUkVpSz9R?= =?us-ascii?Q?BI4vJa3pAWejNx3oZj7MmLE04QDvsyq5ALEemrjKKTlxADxoT7Mio6WRPq2e?= =?us-ascii?Q?KGQqr9sd2phCoXP2JHslHFSVA1agFTy0u8EtTBoPmPH49wOVJQn/ZYxxZWb6?= =?us-ascii?Q?r/ehZNEhgd8RwLklbD//7eGefOpTMnuUA1Z+jBPqC2b5P1z5qlaGX4JLlrAd?= =?us-ascii?Q?n3JM1NVLmfDd0JOTEG8jwgFO24wxOEEWX69+jDCBPhiy3G1T70Xr306I1LRz?= =?us-ascii?Q?mb3nTYIIgiT251d+ePcHvqBCu4yaVpkrV/aKfI6NhnftFGe6l1fg/doEfF66?= =?us-ascii?Q?owmNgolbgze4OAFTRSC4cB2ZDswgBuL+DejvbYL0WrtZFoy2ckpjIHzPWpgc?= =?us-ascii?Q?JyTFhGetaUErovlGvZrOiLoADpxXDsiZPK+H9XvMIC6pjA9c+/sLScL5SBui?= =?us-ascii?Q?9/VSBWYfrdRC9Nk/gbRhJiCsdMTGa8C8jGHG4P6c1lbwADsEuJZKMMLb+If4?= =?us-ascii?Q?mUTffaSh1dhXfx4ZQU+qP5ez6VK/jqOaegm4+qUz3DP0QPHi4REqUaNYxy39?= =?us-ascii?Q?E8qufgJWz79hO3+GO3x4W+cS9thkt9+hVrXvojrOenuEQtxl87rh8d3cUztT?= =?us-ascii?Q?+C467ayC1R+3phnd98l22SPAR3DqPM6qXOjToLRpzribYsTuaE8ok6Fpv2tE?= =?us-ascii?Q?OKw6o2hzvvn9BgNM+LojOiHV18IRZ3oTQlalbwvoQuWIqbmFPQtViWmo9vXP?= =?us-ascii?Q?wRYV4xApqObc49Z9e33bDgy1t6qQLRaSWX2jqQsQwejDkm7GTfOmwqR7aBjq?= =?us-ascii?Q?ysqE7uQa3CS9GugD5QtuxnOv5X2KQw1s7M0yXNf2aNy7cMu+t7irrLKlp8m+?= =?us-ascii?Q?VzXmi2BD3Z7vEkj4PawOVsk+nB45M2vknl8zHOJcNiFfD2imvJL6JjIlpC2R?= =?us-ascii?Q?WemJ3mPTC5tVK9i2JaJks72epAxM5soPIMut84ty4GqHFtAchklSQ+GKOZKC?= =?us-ascii?Q?Fckx5T5GO9Pu4wveNB02Beg3PNALKnJNss1BcGQOJTc7i0+Y/BXwXNmHtjYy?= =?us-ascii?Q?Qcx+1OLqtt3tJsPD9gQogrzdtMKn/Lz61uOFHaNQa1HliDgPJSndQIhV5ysq?= =?us-ascii?Q?HQtf1gqLjZwC1MlE2cDEe7IkVKaWAudDGksJm/UJ18Qpa7DQ+be0+tKIvKxE?= =?us-ascii?Q?Grjj4VNCLebQCP6TtGbRGCflXKc/dgOnuQZKPl6gYWbmJfTP1feBqmKbflfd?= =?us-ascii?Q?SS4vf5Izi9lx6qU1cObqCZrGN3tUtw7PVJ6pYxSz3bJqJOI+IpG0x0uxpQ86?= =?us-ascii?Q?XWNF6lId7vgv2XSB5lyTFlfRznzqfChf8lOBJpg0sf61Tn8yvWeD/UIlcDnY?= =?us-ascii?Q?rm9JSE+XxUPfKzq7MVY6hVsWgDC/LEMVUW/TydAaGvKe7ZOXFjSG6MTHO8mJ?= =?us-ascii?Q?01YolXDm0/A=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rGsq7o4duj2IL13QQefmFO4zumPbeSBfuWkKW37OLExOZUSUTcZskltswj6r?= =?us-ascii?Q?AWOUogAspMa4yqhbZfKSAbsSddq285pMghsKO5UKQDX/75OzgkN1VL9RikZN?= =?us-ascii?Q?SQiPsbK5sFOMCn5AcXgyPBXOoqHzkhsQAZPlvyJ+DAKKWyK6erbrMtmn9YFK?= =?us-ascii?Q?I20iAKpCHWZmPczfYm2++lguwyNuplas2SqeF9zfOigEXBbwditCaitpbuNj?= =?us-ascii?Q?JP1BpJQ42YPV+4oOcIBm7Vf2FrH+jSntQ0kZBg8Sd7wfqgVx8E1JM9uiwY1H?= =?us-ascii?Q?5TCU+1OIyXeKFT2R9IffPe+MBVaJOR83EZoET+GL5FOvqMELYqMDGu0x6LB+?= =?us-ascii?Q?T5RM2uzRwjymnW6pqzRO8i/nSXatAmWkWSf2la7ZzDlKUJukg+udbzDZphDQ?= =?us-ascii?Q?jc1LFqj+qzE+glrZqHucpfPBJhcIPMr2QwwIp7gks1gJaMPHDGChZXgOT9kV?= =?us-ascii?Q?byQVSZx15KkbIE/zJXC42YwcYIBfn6LTLOagJQMfvEY0/oo+JTmoR8Cl06z8?= =?us-ascii?Q?RhmbNtm1r4wP1r/i9xywAzQHNO0e8p9EMQEd0+6BdZ5ySyfBe7euv8HGsFr9?= =?us-ascii?Q?ERitA2RofviY93LWZTATnJx0ABze2+nFN9eeKKvs2gKak3cBkHjowA1LikDg?= =?us-ascii?Q?aACES6EOwoxgfwW4M/Edu54DPWM8kFnhSy8vxRRspSE2+Gm4VGGv0nrknJ7U?= =?us-ascii?Q?d3QrSQ57/9B1/6ySgApc/qwvmw6P01Zk4IP0B0DEIWsyg+lXEGuQ86dTWhaG?= =?us-ascii?Q?k65Gqo4xgNw76MKfQdqlv/HsRv9gfPrcx+8kCgAQCZ6fCJAudFtvJmyNMThJ?= =?us-ascii?Q?sdnOrtLKjJT4W8PPLvNrYAdAPvuGIbB6MalqygiaY7wqO9O2D/jzSSygsUNk?= =?us-ascii?Q?rRmQobIXogJQZvSITm615HIcBgB6rZvAddgizQVEEQQrhRiTUvCwzZ3m+dfs?= =?us-ascii?Q?T1hDKYYsNUAzJ0mF5bd/Xmly2Svo5W52EAKxOsoj4jIzZ8uMQgjoIrl+uQUL?= =?us-ascii?Q?aqOFB3rNQo7C9UGmuy1BTpXqEfxBZPn4calqvTutNb6Z4S74ykwLtavsN797?= =?us-ascii?Q?gwLYFOGfkIn2RkGy0Cl3WoXa04epyMNu2ErlEoxGD2F4qXTIF1KjSk5+imZ1?= =?us-ascii?Q?lsloBjJwmIFoR7W8jtpN34UMx8pMlbhRiSMEqCFNvE2NnrSFdAWlv/M62BLk?= =?us-ascii?Q?MEBYroB5rFaymWpuglMGoNbdjw/GGEo0JQnNHPlBCo/Dai3DAg+cH7A/OKm8?= =?us-ascii?Q?AWzdgtuGX5NbgtbVr9C7luAhZTf5VMjIo3ZdQxd0LvZzDTpg1zWDasH4MciC?= =?us-ascii?Q?7PuRGfEdO/1S3i3NMvqdXJ6rYG41yFByL6PQvZPFT3+sJlmHlmC4dapJihzT?= =?us-ascii?Q?mU9ACvwVb3+49mSwrpNRnISiJIksK3+SAT3xzyN9wM9XYstxQX7cvoO9luWc?= =?us-ascii?Q?keq2+MRrGhYoPfN+syBVTy3VOKr9Tk5C59UEoqSKoaPc7c7k2Sucdq6oj9ld?= =?us-ascii?Q?lJVeOXTNxjWq6VctbQVgtyvmj/cCZtKzZGcHUEOxmnwf4avtNW+HxV1ytSYM?= =?us-ascii?Q?abjVXdREG5mC93Q8MA6sjnG1cFOirt6hIuVMWYqecGisaTlwHj847wLD6rEH?= =?us-ascii?Q?Mw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: SHzHwtHAm9w5V5ZjH7Pdt8getKP8PolKKAZ0YwNUJDztKo2sN/0EDAVLKuzMGaF+ROPCvOsUP+UIVZMMwejxVmKkbW8wDAf7tcm27uJcjwTglD8VH3h9aB7MlJv0FI2Sex5s+b0wfKd5bxqUBlaIMRDofJv0Jkq2Kt09AfayxQZ+/GKLvW3/SBKTt+npvucRE3RQaGFUYmjD47RG9azciaXvyJkkHnwk1IQC9z2BR/WzncptLj4nxOruWpCK/I99pqlqCqHG01Nvsz6xVTqravX1oHWFoK0tcQUXtvhKWvaq7Ls6aYmgO3aE5l1WZ811wSPriimfiwWiAQKEGy8iM1L3h6h8sOSZhUd2B/+k208mDeHly7RKGmpReD8StR7bHeIeO7gVJID1J1lI31Aa9A/nuxQ6WB9rq66ib66vfDF6Fvev5ICfwGAorna6ulhzCuKl1m2386C3F/SrCy1W9XJnGd0hjw7VKU7spSsdOE6fEsTj6iOzsp7yno8nGCy8DbiedLzErs4llsGm8WIHM43jO7B4JhUYc92XA3X7W2SYqH4zxW0bd+TJg2Tct5KoGI5CNB9Zm2S8phgJKWViWRQ5Ke5W7RTThRgnmjWJ1Lk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83e18bcb-93f7-4e7d-2418-08ddc06f8009 X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:47.9728 (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: MqID7cl3vM+kJ+O5xR1CIkHghTTutxOemIMsjho3wlvtOztsU+mMHntyKA+33T21ALpjd1+nFV9bZJMaglWXSS8mtHeAGU/89G9Fj+5mK7o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6696 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-11_03,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-2507110082 X-Proofpoint-GUID: eCwRDXvVmtS_uS1OoufwRMtUHRup2iBB X-Authority-Analysis: v=2.4 cv=JoHxrN4C c=1 sm=1 tr=0 ts=6870f7cb 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=QPPSmYMVllzkqR6fLOwA:9 cc=ntf awl=host:13600 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfXwS5/rhHnQZBj lRFyUE+hLLQti7KNqSHzVCxb7isdUSDlVshLUCBbfbYvjEkXBD+Tz2cpDQd8ly7cz6CPTR7DG7Q /2198tyUP9gEvzKx5x7WqRvLXruGNjvyHGTEKTCPflqaXFcQdbGKLI5tP6QcikL1xWYrBaXe2SN vo3jhwNP5R5z1L5tVrT178N2hfI/ANqOR9up8xpNNOtagvab8u3/74LDj0/k2Hv8xKTP14uD9v0 EIc7BTf5FPrm/oRm9MjcBa09eEaN/tQnAYEjTLKEOdooPZsSChfPp9Tn8efGn/QxsMfcfC2r4yw QM+w9FH7vg5G0ywxHul+u6W73z8TbAfMTRcq+kf6Ig61t6zJ7wMPdRp3rYnTu4KftFA+qsePsi/ dDKFfRSWKWF94zwsJ5TPFxgdyZo4sv7TE+FqovfWgNW+ZJpE2DQtuQ2oOgUs3JMheVXPIv+3 X-Proofpoint-ORIG-GUID: eCwRDXvVmtS_uS1OoufwRMtUHRup2iBB 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. We only permit this for mremap() operations that do NOT change the size of the VMA and DO specify MREMAP_MAYMOVE | MREMAP_FIXED. Should no VMA exist in the range, -EFAULT is returned as usual. If a VMA move spans a single VMA - then there is no functional change. Otherwise, we place additional requirements upon VMAs: * They must not have a userfaultfd context associated with them - this requires dropping the lock to notify users, and we want to perform the operation with the mmap write lock held throughout. * If file-backed, they cannot have a custom get_unmapped_area handler - this might result in MREMAP_FIXED not being honoured, which could result in unexpected positioning of VMAs in the moved region. There may be gaps in the range of VMAs that are moved: X Y X Y <---> <-> <---> <-> |-------| |-----| |-----| |-------| |-----| |-----| | A | | B | | C | ---> | A' | | B' | | C' | |-------| |-----| |-----| |-------| |-----| |-----| addr new_addr The move will preserve the gaps between each VMA. Note that any failures encountered will result in a partial move. Since an mremap() can fail at any time, this might result in only some of the VMAs being moved. Note that failures are very rare and typically require an out of a memory condition or a mapping limit condition to be hit, assuming the VMAs being moved are valid. We don't try to assess ahead of time whether VMAs are valid according to the multi VMA rules, as it would be rather unusual for a user to mix uffd-enabled VMAs and/or VMAs which map unusual driver mappings that specify custom get_unmapped_area() handlers in an aggregate operation. So we optimise for the far, far more likely case of the operation being entirely permissible. In the case of the move of a single VMA, the above conditions are permitted. This makes the behaviour identical for a single VMA as before. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/mremap.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 150 insertions(+), 7 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 8cb08ccea6ad..59f49de0f84e 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 seen_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->flags & MREMAP_FIXED)) + 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; @@ -1597,6 +1614,32 @@ static void notify_uffd(struct vma_remap_struct *vrm= , bool failed) userfaultfd_unmap_complete(mm, vrm->uf_unmap); } =20 +static bool vma_multi_allowed(struct vm_area_struct *vma) +{ + struct file *file; + + /* + * We can't support moving multiple uffd VMAs as notify requires + * mmap lock to be dropped. + */ + if (userfaultfd_armed(vma)) + return false; + + /* + * Custom get unmapped area might result in MREMAP_FIXED not + * being obeyed. + */ + file =3D vma->vm_file; + if (file && !vma_is_shmem(vma) && !is_vm_hugetlb_page(vma)) { + const struct file_operations *fop =3D file->f_op; + + if (fop->get_unmapped_area) + return false; + } + + return true; +} + static int check_prep_vma(struct vma_remap_struct *vrm) { struct vm_area_struct *vma =3D vrm->vma; @@ -1646,7 +1689,19 @@ static int check_prep_vma(struct vma_remap_struct *v= rm) (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 @@ -1746,6 +1801,90 @@ 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 target_addr =3D new_addr; + unsigned long res =3D -EFAULT; + unsigned long last_end; + bool allowed =3D true; + VMA_ITERATOR(vmi, current->mm, start); + + /* + * 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; + + if (!allowed) + return -EFAULT; + + /* No gap permitted at the start of the range. */ + if (!vrm->seen_vma && start < vma->vm_start) + return -EFAULT; + + /* + * 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 + * + * So we map B' at A'->vm_end + X, and C' at B'->vm_end + Y. + */ + offset =3D vrm->seen_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 target_addr + offset; + vrm->old_len =3D vrm->new_len =3D len; + + allowed =3D vma_multi_allowed(vma); + if (vrm->seen_vma && !allowed) + return -EFAULT; + + 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; + + if (!vrm->seen_vma) { + VM_WARN_ON_ONCE(allowed && res_vma !=3D new_addr); + res =3D 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->vmi_needs_reset) { + vma_iter_reset(&vmi); + vrm->vmi_needs_reset =3D false; + } + vrm->seen_vma =3D true; + target_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 +1902,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 08:15:41 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 AE8C82D3726; Fri, 11 Jul 2025 11:40:08 +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=1752234010; cv=fail; b=tmMC+R8leKlGfz1HJnTPlvO2u6aN0SssqXQ+IPvdezj01aX1z3uXG0U7Mj3cIyMSCSiF7omeJBzbvAyw1Xy9T13gw8qaLw7ijWB9p5OH+B0HGbPgrkN3ujQhymnc0K1HH19QkW8bvAQdstznLXaLU/38X1qxlYYhAw8pNa3lBp0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752234010; c=relaxed/simple; bh=qvDeyu2j/V+3Ww3PP1EeZ8gUvslOVXxC1xd/HHIYyto=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=R/JR0cVvXwlN1hr8ATIc4CUmzSmvVyTlwEKkmcLJKdUbBMg6F6Su4KhW0Z7Mf4XwikURQFsA0Vri3u1yMNj+mZI6Q0Ygg1Tffu/XtH5VQtf5vQjDbL+EaSEnLoQkLP7E8UEYkVHaVthTZDpTSYcuHNewphc4U4LWmdaTgNyCmOE= 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=XN+Lzez/; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=atB3Buug; 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="XN+Lzez/"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="atB3Buug" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56BAvd9w006757; Fri, 11 Jul 2025 11:38:53 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=2spJPZHboE0uUrbzUzBLK2KsaJH71zkyXMumgVwJwlc=; b= XN+Lzez/GHKhlwziIwajRI6BUwBHt9RWrFIZLzs55v9y6HyCyuKbpc/YtebsO2qa PLdPaR/PuHWasuXm2lM9Yl3u1xhfXJGBv53LD3PFCPX5vIeX4YZApyAIALru5GtC 8WhUbiQO+QIzgnqD+5oIyZiRp2qIO6SfDwz9saIn+lLIyJXdG3gVXcMdJpOfML3o +ZKKnw6ZOLxLgRkipJ0s689Lq9vyB/yOxDo3Q+LJW+BGuqNd1RCNPua9sYUkMkI6 ciFw7IyLyzOAyb3fQFzrkAvEfyRFOn3ItT6sE8fr+SC1VI6uWta5k6W7naKUxslx rpT+0pvWAb6oJLSMyziaiA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 47u1abg1q9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:53 +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 56B9TxDP027448; Fri, 11 Jul 2025 11:38:52 GMT Received: from nam04-bn8-obe.outbound.protection.outlook.com (mail-bn8nam04on2046.outbound.protection.outlook.com [40.107.100.46]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 47ptgdf06k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Jul 2025 11:38:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fkuCkuCsCJQu2igBtx08hHFhfTKnOmxmQp3i1v8UNovMNOrbC/EgzkYmET0vzm0Im4trikMNk2bNba17Ze1yhvrJNwGYKGD/3twICOLP2mwnMgo2D6S/W65ghBAsT93N1xgKnBZB1yD6uUgJ2QdvZCbuzV0ErWlAppUDmHZICy172Ha3CfKfbg/Wc1leXo/GDBQzBD8RuUrQje83t4F97r71qhgxx6tT5nQMzU4HgCuHfxVbcE9ngSOZugcM5xUzNc6IR9agxhSMjiHEW7lUjb1TVfwqhKDP8qFwlPspHtsTWLzGdDT5ghEeTRcsX3CEZzQGgvHoJ8K1xcM0SMDPzQ== 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=2spJPZHboE0uUrbzUzBLK2KsaJH71zkyXMumgVwJwlc=; b=iQoJa7qj+5EW6LtTyV0A/v2VB6/PbCpirjLhB2gIS7rBAb5s0jmIZ+aGbQEjX+7H1EKTXxHUaJN9N9Ej0CqSzamtZYPEsODqpCITlMtZmr9EVpZvir0iALTbERBID+t7YO3gxyIWvoxh+ipLJyLARlqMHP96uojDeqlfpnYKA5PEXORTKGcEFAqpSgp6CPtEEKGuNToxNfiTh71YIQJiJIPFb7WMhIa5DnIOiXVS3UgKAtY9ktKoc2hJNd3n53XJdSmTrYgIGo/pjPV9evCZSQCg3T8GuNucu7d11f2BaGJncCg8Vtzs75chnrhHNQ/Ec6w4rQbdN4SLVS1h6W7OVA== 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=2spJPZHboE0uUrbzUzBLK2KsaJH71zkyXMumgVwJwlc=; b=atB3Buugx9wdY5WKz13WxjHb90iPIWB+8UfvsIf8hwps9w1twlkEslskqGyeiA1CZECc4u7u0Q8zA4EnDSl/xEqDhuetX3n8+AQEOoCv/3g1LDBeTmoBK0udd4/bd6qD8OUthCmImJVs1EobW85bcS5bF1OhJ8vf3eRTOgSdXi4= Received: from BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) by DM4PR10MB6696.namprd10.prod.outlook.com (2603:10b6:8:110::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Fri, 11 Jul 2025 11:38:49 +0000 Received: from BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582]) by BL4PR10MB8229.namprd10.prod.outlook.com ([fe80::552b:16d2:af:c582%4]) with mapi id 15.20.8901.024; Fri, 11 Jul 2025 11:38:49 +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 v3 10/10] tools/testing/selftests: extend mremap_test to test multi-VMA mremap Date: Fri, 11 Jul 2025 12:38:24 +0100 Message-ID: X-Mailer: git-send-email 2.50.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0566.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:33b::16) To BL4PR10MB8229.namprd10.prod.outlook.com (2603:10b6:208:4e6::14) 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: BL4PR10MB8229:EE_|DM4PR10MB6696:EE_ X-MS-Office365-Filtering-Correlation-Id: 853f060e-df67-4da0-5df0-08ddc06f810f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kpXOoccrclVl8wyIbPPc6fjetHd6VioKPZEp3yeBONKB69PXP0TjcPUHtDuS?= =?us-ascii?Q?NmYFhrLV8DT4nPLe9E8IYcoS//776oCVgdIcSHaJdct/i6nMcRwcBSv8qmuI?= =?us-ascii?Q?6gaJSsNa6l+J0zjrb5ftSb/kaNXz4INYN1VSCmLNWPTbtdE+cDpjVe/ugXBm?= =?us-ascii?Q?weQ40QHNPg0GJHEFRHjL05/z0pdK+7oGW5WTny6ACvNKMygg9BD3FuULNSDt?= =?us-ascii?Q?J9d3QndOXZ07ORlE+iMTsRLcMYqSRZ/beTRLUD+IGSF7aVN/7V54132j4cPi?= =?us-ascii?Q?SOfZRr+7RyZVNTB3xBWeRLfgW7v00PpNOZyJUw1EUOOe8CeXsgLUv7fJeuAM?= =?us-ascii?Q?3i3i3y0STk4GaSuYuoPTf3mtL3tV6h7htnir3Xczb8tOYE9frEiHH8ZzD1FK?= =?us-ascii?Q?x2eeikn2586QCDcz6FOoZbqxTDIu6s5I3mGGpsXtrdBIvnigqN/MaxHJ2pEd?= =?us-ascii?Q?ftEooAhq0DCDcNcNMhZZpRXGK8JbZifRLjalz3tAt4cFnPmxtfpZTk/cDGqB?= =?us-ascii?Q?yX1ZODDAtLMrcGxez/euxPVySydjHOTpUti8W0uYgwnYsj8HzGClP9kXkjvK?= =?us-ascii?Q?jwlA+LveH3ewgnOKHK8yC8SZwz/dngwa5UojIMR104RsmtsIb+3NEACvq8gO?= =?us-ascii?Q?YCiBhlcKEb7ex1iN+7ZPcRFD3uzpgqd8ozhHJlFgrro4rdjx9qC5nbnJWPKU?= =?us-ascii?Q?9MidZcE/JMGi8BlhKRNLshntp03Le5ffv5H2ZBGMAbPgnXbekvz4GrfkQnwg?= =?us-ascii?Q?eOYrJLCcXxdfzgqkvyLBpz7QLs6HqEAaggGaL0BiGe0/y7UPbP6322mXtXc7?= =?us-ascii?Q?3U/Rc5mwlwrwCTEPC7BxjGQhovUR9yk5hk3rYePby4bc03P2f9eOl6cydTs7?= =?us-ascii?Q?D9nFEfu+X8vBf2A1xo4DIWBACuElVkxxt7/A+9tVELb2QufAx8MCYAOQx90k?= =?us-ascii?Q?TUGMY1L0i7b+jSzn5GeMj+7j7ocs7XXZoSUy+EMB/TVhXnWL/bZld8g44Crr?= =?us-ascii?Q?34APZ7LVsrORPOT8R/2CogNWg3hjzdwUMYlSUIhnmCy/8qYrgRZDcN1fwxRz?= =?us-ascii?Q?9tIT3ageX78lhF2Bf3HGQVZoLa8ZAl4eCp6ggHFgyGNIaOBUeIB5i0hixaK/?= =?us-ascii?Q?wAm8TflaLsUOVNgfX0Kw5CC+JBndiHI5JEcAERZ7fwNOFtJIfJUaNiR0F4R0?= =?us-ascii?Q?Bp64sE/dGtcN9bJiWXDYJg9OhvDbJzUA6QhD3byNOXxMJ9XCH12Ia9sCtw5f?= =?us-ascii?Q?aKVKdukuz0PBKmDqjX2Ewxmvt1mGBrlFMw75x9bjaA4sjO9shpT/nfde5vBG?= =?us-ascii?Q?r9/3jfCMa7bF5Hbnp0j734z8NEx9XaQfMN5Qh0rABTuO2+SyB6TPRK0vMvqe?= =?us-ascii?Q?DBNGd2jtZn07yIgcI/Di6ET1p3EkeUlJtMMhkYJ6xhqnjl6ghUcQLmYtyRwp?= =?us-ascii?Q?AzoYI5o9Aa0=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL4PR10MB8229.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NTXOgjozFa0DIDjqi9tFp4u9G6KmcDsVOir/wkZue1mROeFJWszMbUG9PVu7?= =?us-ascii?Q?1UWq4qUv0RomJEI4d5cQccv7S+NNWkNA6Yf6Lr/Em9IFj/t8h8mtkitOglum?= =?us-ascii?Q?vBWKYXDAxmvYMtxUHRC9n61VzvA8FPamBShhMI1ueP1HkMYoB7iIxpWp4TG1?= =?us-ascii?Q?r/gPnxGMEceHtoSPgghkEXd6LDxkcTkzTSyTJBuNWkDd2oYq0BLiV7WE/CqS?= =?us-ascii?Q?0TPXGwru+VExHDwnOW3Zy6YhvpNGyPyPbbB1ctWNpRCHsxrketjuGTJwTaPB?= =?us-ascii?Q?9+Z1lEfyS2fCqpTqBh+h5JwrXMZqoEZrB3RH+yYnJjTYjoyvixdURVj3Fydh?= =?us-ascii?Q?/m33YWZ1tFsK1FJPQJdR3ajLJ1vY4kD2HKh672x5jWNSt2kR3/jDCqBACiaX?= =?us-ascii?Q?2+Vm+l1bXlDpEpgmZi4SFrLCPO6Db3iUZr1LqlfAE1WndUpLdqVDZU0HLswv?= =?us-ascii?Q?2ulpfYU0pVYhVctUGSlY+sWIpdzgFpelxZRJFE26jSZc2f6BufSs6S5Cm5g9?= =?us-ascii?Q?ZQ9ayfvJNUgB+T2RDYdOEV0DP7AJKcDKzpbeJ4MceipGa2VdlB9M50tfTJ/x?= =?us-ascii?Q?hd0SQw2txCVVQOksccQh8YFTP9mW1PUJqdzLMdG5wzyZScIMJ5eIr2b+S69F?= =?us-ascii?Q?hqrEH0nV/HNT98EEwsLUAm9WiJIZkFSI0X+rWaYhgehGMCVxqxRoCJi24uE/?= =?us-ascii?Q?Bm1UyM18Amph9xXKCDbqGD8ZwIRE/GJLhACRJ2GRSoFfE3YzQ/lUO0X9OpYE?= =?us-ascii?Q?fbziNG7WJglvG0TJzrGGHld1aNbBV+0h7NsoYhTqhJNhcuZDLlo5RWPlOS4h?= =?us-ascii?Q?AVomNMKTZu2e8BZtbto/SrMeH6UH1DwXDPvk/nhX1d5qik+JWNFlwTlr/c9A?= =?us-ascii?Q?Rhrr9bASxr/SImocCampX3fUww2b5SjBfSqV6Y8UKa4i8TOmmhyMQoxewhZ7?= =?us-ascii?Q?L9kBFnvw02plBcyLCfzqRQU6Dv22e8K/+jMJN1X32jIYgBVVGn+4lR6lxGy1?= =?us-ascii?Q?yeMHR1WdnTbw4ryM8myZ0BRpyxXapzKfBBf6hlqh/kJW0BAHRTRyET+9bmpn?= =?us-ascii?Q?pHxBcjZk+sFBBLg5W4AyxXhEqJ6l8WePFBxIH12b2VZIaZ0ndqfBvKeIuHok?= =?us-ascii?Q?Yxl5sHHP8EB4YwzqW8o7QxfEUFJ9A5ZaPpGiFwoE5cY6MeXATv5FrxvecJKO?= =?us-ascii?Q?HEvJH4zjwEKDQNWy/uhTZLXXguA/aplkIh6w/gFY9BhB5dE0yTBB4MxAF+/P?= =?us-ascii?Q?v8fwfbKu6orXkrrIe8ewwprHLbafg7koTVCLDJ+g5Ta6z6QwT3e6EFg9AA9U?= =?us-ascii?Q?c0M3Wo7g3epqES3zvYNuDbqn3lqcCn4ofT2bTnnXw4cTQZ6sit/IGAHRYqXP?= =?us-ascii?Q?wzRQPEXgIRit8f9IlPplga68euontaTW6XitsxIpNrzSYN2K5VaeeSDyF9RW?= =?us-ascii?Q?jOzfRUqkHSJE2T8TAWsrScYMFPZUECT12YRT92bZlp2Z7+ShnEMv0KE+QzJk?= =?us-ascii?Q?singfUyUVECo43y7z83T4qmo3KlBgRzLPznD8SQxIbsOBQqMCeLsL879Y91C?= =?us-ascii?Q?UlXJ86PsUj4Ub5OHzCd+tYfjrl0gzWebf8ylrhSs4wG18XdjkbPpBupwSlb6?= =?us-ascii?Q?ig=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: nD8p8AfFdFdPlLdj6rrJY7TD3GNUFr+qLG2tCL58f8RH+Ovb9hU7KKZ1pMWcQoYOP6kgYacP250FTTfCPjGyB4OlXV9kLeRfbvs5px28Rys1XRYkZNBNl5uMfsx024lkQx9Is1YdK+815zq4srWUVCA+pr+PS9EdV2x4Y4z8OCMmnvbNKesXIg4phKj/UuXVDTdaXxL/xGBGdY4KGAnTILKiWALtpgr4I3WHiYHPTduo1+0WLTGsxmLFnumi2nne5wJiER5q12eLb4WBs+ZUUfFSoYEkkpnrszz/Z7ndW1Ovk3BgfTpSiAiMQ3Bjs7h/6xfLfpQNZ81OuYS82vs9W+6CUhdV42FvTKFW1WtzC10naf4PyDXKPzS+JSYr7aSJS6h2IuIoOmfY97sLBP9hjXyAB8Wbdswifyzr1XzULAjK/DsCXGLDM55LMvYgHE2/k2el89T93l2LjWmvXCIdKNnB+5+dgx/hImO8EP8Zv4+3svRfVtx0tDHQhGl3oP2ZiObb8tB6KithrrZE9PDOcyVVFCCztezX4ZlG/jFAj2rsZrz0A3HvSA5Aih+P8boynKi8RaTz9ZAHVMxHdmydLFEyOycvN96q5hzicQpiaeM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 853f060e-df67-4da0-5df0-08ddc06f810f X-MS-Exchange-CrossTenant-AuthSource: BL4PR10MB8229.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2025 11:38:49.6163 (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: 4IlcVQZy4QOAzD9en07gP0uROk3KTJkJf+Pl3ySVtOu3LNRhCMPq87C9dWtZWKLno1e6P4JhskYDJ7N2EOKA2OFIaTeIFYYJyVoBWPAWhyg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB6696 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-11_03,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-2507110082 X-Proofpoint-GUID: CkWpOopSDicvRNNWUpMOK7PRKKsQrzai X-Authority-Analysis: v=2.4 cv=JoHxrN4C c=1 sm=1 tr=0 ts=6870f7cd 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=GuY5gsdr9MwsYxRlPWUA:9 cc=ntf awl=host:12061 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzExMDA4MiBTYWx0ZWRfX64KMgDqb49xz 0ZXW5OHtqBbSiqk+scos5M39vtXT/5zM0og1KCKSPMwN2xkgTGx4yHS61qCtWTc8fTdrwmEYTvu ujWcnCURDawwdWclsoVJzj5O8isXKxgnWit/5mo2Gu13c6ozcQhy3eR9WUpV94c/iJ/GKVJD1W9 2PrZ8FLn0Q9rQ5eWNOcVlAaPZMSIk3+/OG+VmQJq+u4FabNQwfdtgcwbpGNOz0D6F4RtTb2TUxk FQ/VMvfCaoo8NF0paflDXXeIbH0az0ZHjmtPs6xFCvBMzbNb5c+oo1Uqx0kf9smESHCItRvOJxB SuM1sX9ojZgQgKMArDkSOBKPlfkxEM/RsaYenX5v577DWDYMUmNGBglPX03bGU5uJKO+HaxP3ec 9XnazLhy2SdOIBzmmCuZVNwg1hzcnpoRAmiH164prS0Mze4WkhvxF0+Jgcn8ksu+U/vNutKf X-Proofpoint-ORIG-GUID: CkWpOopSDicvRNNWUpMOK7PRKKsQrzai 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 | 146 ++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selft= ests/mm/mremap_test.c index bb84476a177f..0a49be11e614 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -380,6 +380,149 @@ 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; + } + if (munmap(tgt_ptr, 2 * size)) { + perror("munmap"); + success =3D false; + goto out_unmap; + } + + /* + * 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; + } + + /* 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 +864,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 +991,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