From nobody Mon Feb 9 19:25:20 2026 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 39CEA165F09 for ; Mon, 27 Jan 2025 15:51:24 +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=1737993087; cv=fail; b=ZwHTSsQXyPDLSUyFL31wrjdjr0/qfouO+XUidhH0FcgzAB4hFVCgHFq+2yZu4NtpDuIOL6lMtOKybtHZF2+J6NSNPwYC/+yjMOusBiL5GRLOK2JNAG7nU5XnlJhqOEnoO45wFh7SORuBJnAwE6umOpY4EHzagsrGaBrIyITRB3o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737993087; c=relaxed/simple; bh=WyKrkamTMQWR4YaXwPCuIKxzPiy+AoXy/T/nqg6mAY0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=jS0INZFNctTTDu3/fY2fIar8Y4i74qY4sr3cS6xISd8CvIHzXU6Juxh0rMH8YFK2gY1vp4Wf+umeJEitV+E9PXO4lHXb/Q8OpKxx83n0rnz3dIxG5/uauRufNWcewamz5ddK/pwUc2EkgrVgE93A5aMw3EKqFXttGhIJcqRbt30= 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=EtljPBpJ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=yx4dmS/Y; 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="EtljPBpJ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="yx4dmS/Y" 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 50RF7DYx009169; Mon, 27 Jan 2025 15:51:09 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-2023-11-20; bh=1Mpx68EWduciawJBGblFrr1WVvICto8g1LTm3oOxpWY=; b= EtljPBpJIgyLT2ZLRdNFxcj1A3tzCKJTjNL9yGgkswzILwRs3H7sqBYYYOgYhHZ+ jo7mWhHwJizpO5u1IBvWZBRcrnGjRUH6YEfCmZkI5Owv44HWO00ULD0+D150bIsu 1RsgOICyeHHveVJbULkSK+vBKfT3Ngnu0PBQIYuMpZT1g/xul6KRT1pefRAJyYWZ 5lCgkDLmpEPLN4LGdsOb8qoIZwe6SJJ2w2zIHpFr2M1sqV4a0A2UvT7Gd9IpwiBV /dCCgpmTKkied1jzy95JK8gFUcpOFiK/6CfHAnxE3+DuTBxURbvNgy4BsBR+SN4y kooBcHbxPFi7b947hLiu+A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ecgf83qh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 15:51:09 +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 50RFSOpF005390; Mon, 27 Jan 2025 15:51:07 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd75syr-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 15:51:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bCE3RNG1Nd5N0n/DpMCdnMpWgdMh9dwwfWaRlnuMUXv9BMmWhVglKZkTpOzKaOi+IWvWj6B3i0zMVFVMnNGxyuAG+f6eeK3EQ3NwhutjRLxUvwvG1fOZkM8n+EO/TQdO3ig3sssFGP/Z8e+rhbfe8ecQNyyd4My5vYFkT1qMLD8VXNLzaenJJkP4MqFSsgopVvEdEIRTvAoBImedCoEbNGnzEmj19wxy6jPnwK5SXXhFFOr1AtN0UewYD+Fysn3Th9S2I6UsvjeoWqFLerwh3P9I21fIfhz7xExpv9ysxwq3CVLOPrkbzUnVzm0dFAenkq1z6EuNASy2TO/oAD998g== 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=1Mpx68EWduciawJBGblFrr1WVvICto8g1LTm3oOxpWY=; b=SdQWAyHB7oMQrYy4zfdV8vzx7f3KWJtV8IZ+oo23cYkR2cLay351MNKAoSR+HZWq+WKKvP8hOZ1AV/dNAaBnUl60e67a/5BoMfuorhUxXwaLw4taoq2rEbu1YNlIx1KJq1PI1cLnQ+ys31IJZ7wlDadBObvcdysgA2BVrc4/CtgbkHj+k0vb8sf7tNq37jkVp6xeWDqEUHezfqoJ1zzd8kfbEoCiuODg2ySbWkdqK33mR7IxyBnvI+n0V/zRgy++cvlBMe7jYXjLsthzYKhVtQ4/+J7IWvYsZajUPopk6KcK4O8buyoGU3cUmmIQhDOlCNxq4cO/0TuHaDgZWrgeAg== 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=1Mpx68EWduciawJBGblFrr1WVvICto8g1LTm3oOxpWY=; b=yx4dmS/YKKPxlYDmXmJFhkC1I+757QSONbzcqZtiK4t0AYGMERuqFbp12/64t/yfMMnYn1+f7aG+1F/fOLeyLpbICyDvHCqFXlKmdiHIRZbyJexP/fWbjbGFDXguZNEi879UJylDvEwOQBNxiwP/8STm/4E9lt+yQEX1T4QHemM= Received: from MN2PR10MB3374.namprd10.prod.outlook.com (2603:10b6:208:12b::29) by SA3PR10MB6949.namprd10.prod.outlook.com (2603:10b6:806:319::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.18; Mon, 27 Jan 2025 15:51:05 +0000 Received: from MN2PR10MB3374.namprd10.prod.outlook.com ([fe80::eab5:3c8c:1b35:4348]) by MN2PR10MB3374.namprd10.prod.outlook.com ([fe80::eab5:3c8c:1b35:4348%3]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 15:51:05 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: "Liam R . Howlett" , Vlastimil Babka , Jann Horn , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] mm: further refactor commit_merge() Date: Mon, 27 Jan 2025 15:50:41 +0000 Message-ID: <0bbb2efbdc2ac2af2f6d73679cbb0811544d0647.1737929364.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.0 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0426.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a0::30) To MN2PR10MB3374.namprd10.prod.outlook.com (2603:10b6:208:12b::29) 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: MN2PR10MB3374:EE_|SA3PR10MB6949:EE_ X-MS-Office365-Filtering-Correlation-Id: 94d045d5-3b3e-4444-11bc-08dd3eea68be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tmLS0eagWC/8n4hLGwUxsxnK5EMLZk/HA+AVXwQPUpdh41PeYKTGPGMGMzPQ?= =?us-ascii?Q?PO6SOqsMcTCehA3eLSv3puQGk+HV1yU/3e8u5eMSWxHNTAEVEy0DWM29426J?= =?us-ascii?Q?zwu1mcXEjFivKkeF0iONTckJ+g4oZrxN4cbOc+f7GnTETh49xb70UPX32o9u?= =?us-ascii?Q?Wnm6Pii5NiKheq3Akex1XBCHoRT5k/nMOe4BUeZ9ahDTF0NzVfaPlJ1qmELj?= =?us-ascii?Q?l6cwxgoLgp8NdZwffgTO/z9bo85IO6cBdd/jSgLPOqO32OL/T0Te8tNhXA63?= =?us-ascii?Q?7X9wwXVdACt19X8l0lEWoFlmyPGZcr0UyjWO4x5oSBkzB2BeyR5/Ctx/AdZd?= =?us-ascii?Q?NjGvos3n6hhOGPLyX3qptvC1hLgYFTPthQUNc9x5TfDg8By4e+MCTd0wTc51?= =?us-ascii?Q?jTB93O+4cOgYwpZoqygZgPhxIYxHYzb5g7ilckAtzHZJYNRUT/7jvWXaBWIt?= =?us-ascii?Q?9z8bq0aZJ+nx0kw2Lj9QyRKkIaa7YOBjN/im4bwQxSOCF4jVBzJ+47oBy2/O?= =?us-ascii?Q?qEuxtaCh1JPGffq/VfUVg/4sD7c1VRfosGp0xcXR6cdoh2yVOzpHTLGaespz?= =?us-ascii?Q?YCSW/xa8fHa1fXszyVsu8h9ut+i2utn0JUfCwPyoZYWSPAbASbtzZn4huaEl?= =?us-ascii?Q?US29QNtpt5/NrXoXPf/fSJ9/gJat9JV8n+H1fW35ax8+srKJr7LmLw5ujn3B?= =?us-ascii?Q?kHJ2qT9hnl+m+zyozxtzKpuIU2/DeJlnf4n0LBKAKW2I4eBahIbG3I7OPaCG?= =?us-ascii?Q?R8vF7simk8l8Ph/dWfJ6q/Rvyo68nl1Vi+g8aw23Cwo77uowfsDKRmh30d2m?= =?us-ascii?Q?s/YDB1zKbdKJnGErgcsIZ4AL6W9VCBHlJbiqOQiCgdxkCtBySVPawhH4BFab?= =?us-ascii?Q?jiilWP3rMB/9+u0bPGq4Qklt2a6gLn34bjTuNZHcLXQYzCZyqMktNuGUeBo9?= =?us-ascii?Q?qlsDCynaWrW4Hy+Bix3dBxoSPsjs4GHSEQIaGkl6yhNL1d0nk0VTz1RQb924?= =?us-ascii?Q?fUk3kbvObJ281ONXXrdCaqyzCzE1Z5VODav0AIfbtu8HOnfYe1mOJlLY9+yH?= =?us-ascii?Q?cGHvX/hssXAFIrJD+3vqya4KrWHWJIHRBHQvhAYuRoDoCI+hdnZC0tC1XND+?= =?us-ascii?Q?OWY3EwcaGFIXUrrijr6lZ2fGiZ+c10ssN+UDwq6hTXFvoBjHja5BV0yPUasq?= =?us-ascii?Q?6ZEJC4P3kObUl6+genjfeckGxOouffmFRfAU6Q+nNC/u2i5dGJ+FLkxqUB3X?= =?us-ascii?Q?ngXOir82p0I6PzOxpb5r+iW1z2Jz0ZjQ64Vy0abt/uLFil3mneftErRVGcfl?= =?us-ascii?Q?sNEZ0d5/OPShq1YSp2HoHBAbbsRNKiTnfO3nTI07QTQJnR+XVcW8vvuoJX0A?= =?us-ascii?Q?oO7YpXiXc16PAiBE57ekNKW5rGiY?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB3374.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Y2GRUHsaMmiSmCn9DUIrx5PYKtyMW3Su6wkigFoJZQ23OXyvYXh+bkKdOnyz?= =?us-ascii?Q?vuPYu34Y6YGFlEo7jWjWf7RGa7nyo2tPHtgFXLDiCLHnvz0CIGsoV1REUiQF?= =?us-ascii?Q?ijlnieEO20nZKkK+EoF0MTPx46wX3FsNAH5rgG2NGRVxmBDAHH6WqlwMWmsp?= =?us-ascii?Q?BVsNLOmy3ilEOyQN6nqAMhneU0CKC/dvGOVka4PoLVHvLCeIGo8Em/SjAOtv?= =?us-ascii?Q?gYo3vAbhYhTiaW6Q4brXD/1w3hxd/G9jewJAGdGJAY8rHxfWE2y+/emPEQSx?= =?us-ascii?Q?ImzpS+fpWHA9uYcHDMC6slOelAyzz2bWDsa18FRjXEUP4aPfZ5qqlAP/Wb7o?= =?us-ascii?Q?RiolyFQBCpFaN+DVVKCaAh21HTqXyC8IWrMqeARLtS3EaJamZzClkVp4FSon?= =?us-ascii?Q?G/QhPje+yOquH8k6ud3IX50RaE6Ygyj0mxZxE5M1wl5jb6FAzZpX0/bvcDfI?= =?us-ascii?Q?3qk7ZuXs2ao71KrIsm/KuR40pXCkgHUWZb77sLStOwwrxpPywv7XvnyXyQ0A?= =?us-ascii?Q?gLAq/VzSh38OGUkEthz4XRHRqUq914noEBtvjWYl8ujAFdwKvzzbC74Afbam?= =?us-ascii?Q?AG0tbXVSyMsDTxawp+0uH3Ntn9hjnVLS7zsSnv+hJvdxjCQYju+tygY8C75Z?= =?us-ascii?Q?1Iw1A1X9P5oQsPGlqc+rET8kkyZlasFhZBPFis+dbQTejY0oWW2rOv/a9mdx?= =?us-ascii?Q?oJ58sF6jt4ZtyKwivIrnHSFW+iqZBU3pE2MIvdxNGaquKtnToisLrRvl6rJ7?= =?us-ascii?Q?XVvXtpfnsmR7nRiACxMB0UjKWPFAbjc6hx20BwI1QiOzpqHA+XdFVyGPg0OV?= =?us-ascii?Q?5LPybhnkyb7BH1Yby1iPJBuFiNbM0LS8ev1kE7bBmrf1w31Y49tYfKZv2fw/?= =?us-ascii?Q?7iGhkUfcpIfzH6lbGVtEpkg1uyIZBnSeEy/7Q/7qAycEVkRQznz2yp6zQbHj?= =?us-ascii?Q?mzw99xFseUt8YaBHQgbryxyz1b37zsFE8/ZQERhIStO9droPg8qkmYyNd2Zc?= =?us-ascii?Q?gI9/cjYTKOgtG7ZQvQcvuoK6bz9b5hkqNWPkr2KGKFjLpUXByE2gI0+8fuKz?= =?us-ascii?Q?Stf1qrRCFcmT9bqVzm2cSiVwqMpIpO3s0GEwGpPO08x9Zq7SY8QEWvb4R7ul?= =?us-ascii?Q?S7jt046itdYwLXWnRskaPkNfiR/sUOSOxMyHCrShjlNJ8f0vS+0eqQYWqKMR?= =?us-ascii?Q?j58+mKWlnIQb53GNQz5gd78Ng0Lb3VInUelejPqBhUHPHWURYh6xmqvulfMy?= =?us-ascii?Q?eBWZJ77do/glnpyhWvxBm5x8J56LtY6z1Elg4V4niM3u4rqX5J0SsWXI4qUi?= =?us-ascii?Q?bnuJ5eaIDPADU5QETkL3tJHs9qxaQ9YZvIWJ+esHAkDsjibIiqOHLFJSAN9g?= =?us-ascii?Q?prc88M58Yc9JM+8CHKtnjH/CaHYr9As9a0ta4HRao93o4ULf4OtlT5plEOty?= =?us-ascii?Q?SpOD/VMH7+buzYD4vxN1sJ8SXvUnmdyyVOBd3LIkUZiglQ9++Lj/UykYtcS5?= =?us-ascii?Q?IksofIwEnAxYeAWtu9kgYEKisaXlYDTslW6/d8VE5mP+hL3v7PAswEOLddzS?= =?us-ascii?Q?/Fs1xuEGjSnsOkOknKxCqEl4PNZmw9Y8n1+KbOda7IfgcudyyyPjX6s15Ew5?= =?us-ascii?Q?DQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5UaaQ+jS42s7RSjFk+x9JQgE3uTdQ1LEO3I/RuNxJt5XyaMPKxo+FV8WcaYyceEyOGU6mskRavhb88h58KUwP2Cpi2fBw/WSb7bNRXyhJUeqycj7tn4Hdn5VhBDQtVLAglSVTSieChuSkQ4FF5qGHyzmdpD47dvbSTPuUhyhPS8mxeiDmkqFnw8TVNtVlY0FNJpksqcGgfUrRDyhxT1IFqDYVDoijdxWXJIhVMuKE1IUULZJJfAa1Wg1jukcuJmyyu0Pnf4J1lptiBHY5+Cw2On1IFXAhqIx/8qIzr+nAt6VZTu2JYRXW17A6lHOJJ3daYqrLywY6T9v5k6W4rLh9b060X5V/VBVcITtHQpEdRo5N8BbsaHDrE4BqFdbb6MgucMkTeOi5nwHrQYOsHJEFqGXE/82FZ7ncEvvus2Mx/R/W29NJWS62eRsEmLQ11sraWViy4KuWyZGHNUimmS2NbYtjlQrva1Rcg0UZPPs1n0toYSRL24gDUc/MMadE5SaEJRG3nQBWV4CF0vbp8SdUV+6/zXOKX7cmAkcGOGjGynmtoQwhc48lR03POh10Sov/wvvyVfRgB+YBao3QaqLA2LZ3kz8yvyPdYxPn7KnuUc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94d045d5-3b3e-4444-11bc-08dd3eea68be X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3374.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 15:51:05.8284 (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: 7bB5fU0aLhB/y3RLSTc/r355B4Bj7YmzNBFTzo4RkqH3yxOT2q7j8LeyoMOzj6QYm2B4A4oUxw57jPQD21UR+4oQsnqysdkP4SpU5nvvTQo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB6949 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_07,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 adultscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2411120000 definitions=main-2501270126 X-Proofpoint-GUID: miA__8bdjv4EOrO_16t3WpT8iDY42JOv X-Proofpoint-ORIG-GUID: miA__8bdjv4EOrO_16t3WpT8iDY42JOv Content-Type: text/plain; charset="utf-8" The current VMA merge mechanism contains a number of confusing mechanisms around removal of VMAs on merge and the shrinking of the VMA adjacent to vma->target in the case of merges which result in a partial merge with that adjacent VMA. Since we now have a STABLE set of VMAs - prev, middle, next - we are now able to have the caller of commit_merge() explicitly tell us which VMAs need deleting, using newly introduced internal VMA merge flags. Doing so allows us to embed this state within the VMG and remove the confusing remove, remove2 parameters from commit_merge(). We additionally are able to eliminate the highly confusing and misleading 'expanded' parameter - a parameter that in reality refers to whether or not the return VMA is the target one or the one immediately adjacent. We can infer which is the case from whether or not the adj_start parameter is negative. This also allows us to simplify further logic around iterator configuration and VMA iterator stores. Doing so means we can also eliminate the adjust parameter, as we are able to infer which VMA ought to be adjusted from adj_start - a positive value implies we adjust the start of 'middle', a negative one implies we adjust the start of 'next'. We are then able to have commit_merge() explicitly return the target VMA, or NULL on inability to pre-allocate memory. Errors were previously filtered so behaviour does not change. This patch has no change in functional behaviour. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/vma.c | 83 +++++++++++++++++++++++------------------ mm/vma.h | 10 +++++ tools/testing/vma/vma.c | 3 ++ 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 68a301a76297..955c5ebd5739 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -120,8 +120,8 @@ static void init_multi_vma_prep(struct vma_prepare *vp, memset(vp, 0, sizeof(struct vma_prepare)); vp->vma =3D vma; vp->anon_vma =3D vma->anon_vma; - vp->remove =3D remove; - vp->remove2 =3D remove2; + vp->remove =3D remove ? remove : remove2; + vp->remove2 =3D remove ? remove2 : NULL; vp->adj_next =3D next; if (!vp->anon_vma && next) vp->anon_vma =3D next->anon_vma; @@ -129,7 +129,6 @@ static void init_multi_vma_prep(struct vma_prepare *vp, vp->file =3D vma->vm_file; if (vp->file) vp->mapping =3D vma->vm_file->f_mapping; - } =20 /* @@ -629,22 +628,40 @@ void validate_mm(struct mm_struct *mm) } #endif /* CONFIG_DEBUG_VM_MAPLE_TREE */ =20 -/* Actually perform the VMA merge operation. */ -static int commit_merge(struct vma_merge_struct *vmg, - struct vm_area_struct *adjust, - struct vm_area_struct *remove, - struct vm_area_struct *remove2, - long adj_start, - bool expanded) +/* + * Actually perform the VMA merge operation. + * + * On success, returns the merged VMA. Otherwise returns NULL. + */ +static struct vm_area_struct *commit_merge(struct vma_merge_struct *vmg, + long adj_start) { struct vma_prepare vp; + struct vm_area_struct *remove =3D NULL; + struct vm_area_struct *remove2 =3D NULL; + struct vm_area_struct *adjust =3D NULL; + /* + * In all cases but that of merge right, shrink next, we write + * vmg->target to the maple tree and return this as the merged VMA. + */ + bool merge_target =3D adj_start >=3D 0; + + if (vmg->merge_flags & __VMG_FLAG_REMOVE_MIDDLE) + remove =3D vmg->middle; + if (vmg->merge_flags & __VMG_FLAG_REMOVE_NEXT) + remove2 =3D vmg->next; + + if (adj_start > 0) + adjust =3D vmg->middle; + else if (adj_start < 0) + adjust =3D vmg->next; =20 init_multi_vma_prep(&vp, vmg->target, adjust, remove, remove2); =20 VM_WARN_ON(vp.anon_vma && adjust && adjust->anon_vma && vp.anon_vma !=3D adjust->anon_vma); =20 - if (expanded) { + if (merge_target) { /* Note: vma iterator must be pointing to 'start'. */ vma_iter_config(vmg->vmi, vmg->start, vmg->end); } else { @@ -653,27 +670,26 @@ static int commit_merge(struct vma_merge_struct *vmg, } =20 if (vma_iter_prealloc(vmg->vmi, vmg->target)) - return -ENOMEM; + return NULL; =20 vma_prepare(&vp); vma_adjust_trans_huge(vmg->target, vmg->start, vmg->end, adj_start); vma_set_range(vmg->target, vmg->start, vmg->end, vmg->pgoff); =20 - if (expanded) + if (merge_target) vma_iter_store(vmg->vmi, vmg->target); =20 if (adj_start) { adjust->vm_start +=3D adj_start; adjust->vm_pgoff +=3D PHYS_PFN(adj_start); - if (adj_start < 0) { - WARN_ON(expanded); + + if (!merge_target) vma_iter_store(vmg->vmi, adjust); - } } =20 vma_complete(&vp, vmg->vmi, vmg->target->vm_mm); =20 - return 0; + return merge_target ? vmg->target : vmg->next; } =20 /* We can only remove VMAs when merging if they do not have a close hook. = */ @@ -718,7 +734,6 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( struct vm_area_struct *prev =3D vmg->prev; struct vm_area_struct *next, *res; struct vm_area_struct *anon_dup =3D NULL; - struct vm_area_struct *adjust =3D NULL; unsigned long start =3D vmg->start; unsigned long end =3D vmg->end; bool left_side =3D middle && start =3D=3D middle->vm_start; @@ -727,7 +742,6 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( long adj_start =3D 0; bool merge_will_delete_middle, merge_will_delete_next; bool merge_left, merge_right, merge_both; - bool expanded; =20 mmap_assert_write_locked(vmg->mm); VM_WARN_ON_VMG(!middle, vmg); /* We are modifying a VMA, so caller must s= pecify. */ @@ -846,10 +860,11 @@ static __must_check struct vm_area_struct *vma_merge_= existing_range( vmg->start =3D prev->vm_start; vmg->pgoff =3D prev->vm_pgoff; =20 - if (!merge_will_delete_middle) { - adjust =3D middle; + /* + * We both expand prev and shrink middle. + */ + if (!merge_will_delete_middle) adj_start =3D vmg->end - middle->vm_start; - } =20 err =3D dup_anon_vma(prev, middle, &anon_dup); } else { /* merge_right */ @@ -883,7 +898,6 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( vmg->end =3D start; vmg->pgoff =3D middle->vm_pgoff; =20 - adjust =3D next; adj_start =3D -(middle->vm_end - start); } =20 @@ -893,17 +907,13 @@ static __must_check struct vm_area_struct *vma_merge_= existing_range( if (err) goto abort; =20 - /* - * In nearly all cases, we expand vmg->middle. There is one exception - - * merge_right where we partially span the VMA. In this case we shrink - * the end of vmg->middle and adjust the start of vmg->next accordingly. - */ - expanded =3D !merge_right || merge_will_delete_middle; + if (merge_will_delete_middle) + vmg->merge_flags |=3D __VMG_FLAG_REMOVE_MIDDLE; + if (merge_will_delete_next) + vmg->merge_flags |=3D __VMG_FLAG_REMOVE_NEXT; =20 - if (commit_merge(vmg, adjust, - merge_will_delete_middle ? middle : NULL, - merge_will_delete_next ? next : NULL, - adj_start, expanded)) { + res =3D commit_merge(vmg, adj_start); + if (!res) { if (anon_dup) unlink_anon_vmas(anon_dup); =20 @@ -911,9 +921,7 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( return NULL; } =20 - res =3D merge_left ? prev : next; khugepaged_enter_vma(res, vmg->flags); - vmg->state =3D VMA_MERGE_SUCCESS; return res; =20 @@ -1076,7 +1084,10 @@ int vma_expand(struct vma_merge_struct *vmg) middle->vm_end > vmg->end, vmg); =20 vmg->target =3D middle; - if (commit_merge(vmg, NULL, remove_next ? next : NULL, NULL, 0, true)) + if (remove_next) + vmg->merge_flags |=3D __VMG_FLAG_REMOVE_NEXT; + + if (!commit_merge(vmg, 0)) goto nomem; =20 return 0; diff --git a/mm/vma.h b/mm/vma.h index 5b5dd07e478c..ffbfefb9a83d 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -67,6 +67,16 @@ enum vma_merge_flags { * at the gap. */ VMG_FLAG_JUST_EXPAND =3D 1 << 0, + /* + * Internal flag used during the merge operation to indicate we will + * remove vmg->middle. + */ + __VMG_FLAG_REMOVE_MIDDLE =3D 1 << 1, + /* + * Internal flag used during the merge operationr to indicate we will + * remove vmg->next. + */ + __VMG_FLAG_REMOVE_NEXT =3D 1 << 2, }; =20 /* diff --git a/tools/testing/vma/vma.c b/tools/testing/vma/vma.c index 3c0572120e94..8cce67237d86 100644 --- a/tools/testing/vma/vma.c +++ b/tools/testing/vma/vma.c @@ -154,6 +154,9 @@ static void vmg_set_range(struct vma_merge_struct *vmg,= unsigned long start, vmg->end =3D end; vmg->pgoff =3D pgoff; vmg->flags =3D flags; + + vmg->merge_flags =3D VMG_FLAG_DEFAULT; + vmg->target =3D NULL; } =20 /* --=20 2.48.0