From nobody Mon Feb 9 13:37:24 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 C3C621850B5 for ; Mon, 27 Jan 2025 15:51:30 +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=1737993092; cv=fail; b=J2hT3VJARL6Xi5yTOKcHAOwywGq5K29Iaeo0XkGXhJf3J911/HS4G6hzsLhp0X2ICRFog+dtqytwIVzy22DQvG4tR/PHahZLVnUSj0NGWjb/YbY2FCnlkRZ21hU/AoRRyQdxs2oL76XpDXt/Aul7aDU4GMOQEzx4zJnBR+J9Abs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737993092; c=relaxed/simple; bh=8geeIDO9lrrQm+N7+//j6z1obriBDz/iwd3Pn/qL+9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DBAsJ8+gpfxEcq0Z6B2uiA9ucK+AaGf7QhD8nrh1CtPtTTFRonx35JP07KRDNwrWkSbZJw56uaDYPiCr1V+J4UMzJ37h0XUwEklccjOxCrV6f/JnMDKKln0Zeq0zs2nHPD/H0umv4NjzyWdM9NfrXc5ZZ+nFYMoZ5PTAaEQkKQM= 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=V5or2bAp; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=eRa/+cf2; 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="V5or2bAp"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="eRa/+cf2" 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 50RFHK5S009502; Mon, 27 Jan 2025 15:51:13 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=llckhhPabjSnXQX0pplDVCDofcRfJpYOy2ZcvLXG7Ik=; b= V5or2bApcWIzJGvqg8dLefqW7mkDiSyVGztrtH+r4zqTGn9N2PEwxnQIkKx+3YWX Q0zLevHYx9scozsLLibaiGZPO/xsID6aavi+VmOwSTUhrTikG0M5wS1Zhiy/EcCd 2CMZKOVQ+uRzkFXsZ/lCLzjAsimkG6ZddbubrqN7PWo1v0eFnExuRFE12Oiiif4Y 5Yp7g3ngISOHnOGI0IiJ227ye5e4MYl2WiDAMi5UaB6VJO4QcljM53JOZRxope+A rXpf99RfvnUjDFDKKmKgJMdggRuU8Gjv4wQyRAtjfvF1xabkbS4mOkWFdndeaBXk jIxhhCnaW/2wakpB0Lr/Fg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 44ecn502mw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 15:51:13 +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 50RF40N8005314; Mon, 27 Jan 2025 15:51:12 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 44cpd75t64-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jan 2025 15:51:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aESO9ZxnMCiQPieAn+V4Onm2B+jlID2w36TcYv6uYeuPEejwGg4GfR8l71QQs6UvuDtc0jtPVsEUsd/DbYnyFpdfhkilfYINGEab22zdw5qc/gaAgbvCuAOvTeBO3Is7MDfcxpEoUWjdgn8sQAuT7vJaETpeog4o7BqNTxB5XaiJz/DeBSsH31JJJd4bDPlPCgybas8Tnd2ehvlfq6zFPDDyaH4XroGb3ldvz0lGpzxLkclWjiho+tpVJWRyuGf3EZqXtqPz8E9VZYaE72e6Gaedy+33C9tuWaqwmG0kgc4dCnxtDolBa5J34cdekH80L6W57wZccWbrwHatpCxlQw== 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=llckhhPabjSnXQX0pplDVCDofcRfJpYOy2ZcvLXG7Ik=; b=HOJ28pIWndJZY9lguhcOG+lXf1bkBdEY/E+D9OWb/ar2r0jWdYEvBpbB7oYzNHIeKj+wp+AxIt+guHBu99679yNS79IQvCzqVISXVi+LtrFBjpQBtF6ocyl/M/2e6VZ9y8xM+Me592R104UgoQiFkz2XPNQgk1jDicpDQOavULQRgJTTwoE0xvQ6L9SFVQ9EJzj3KviU78AOKhPi/kyAb/d/4Z5Py9VzkmXACRoQnABlMYIIEJhmwpCup2m0IwPtUS/6mTQHjcsB99ONMZ2bpZEr5Y6WC5rBJV1snwCZ6Sppwls2C+R/5VGvgxbKtiJOYhyK5ta+7LWl/esZDnF75A== 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=llckhhPabjSnXQX0pplDVCDofcRfJpYOy2ZcvLXG7Ik=; b=eRa/+cf27wdsdFVwdA9paQYGNSofiQH8MX7q03A/aNPU7SmhqiH2+0nHNZw6cWcgxN/d34K5pQrWd1QmIvNkNfGGjJ6ChfD4/0zvRLAqjZ1KWUpSx3lsQ/DAa4a6vOv2AGWX6NNSDADjW7H62r1BAG41Uujd+mV+AOp4ympCRBQ= Received: from MN2PR10MB3374.namprd10.prod.outlook.com (2603:10b6:208:12b::29) by PH8PR10MB6339.namprd10.prod.outlook.com (2603:10b6:510:1ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.19; Mon, 27 Jan 2025 15:51:09 +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:09 +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 3/5] mm: eliminate adj_start parameter from commit_merge() Date: Mon, 27 Jan 2025 15:50:42 +0000 Message-ID: <335ff27920d96c2a45b9724725cd3be2caf987b1.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: LO4P123CA0013.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:150::18) 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_|PH8PR10MB6339:EE_ X-MS-Office365-Filtering-Correlation-Id: baeaa560-0d5c-44e4-9d41-08dd3eea6ad0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VVdmKMtZkt1wfSNJQvD55OJhwyzN/VrfJbaib50pTxmMHNWySuHA3DYknMlR?= =?us-ascii?Q?XEOHhW536CcxshvFOdL+HC8oFH5wdyxMX0+Zd4nYjmrR67TAxdJLWHwb53cK?= =?us-ascii?Q?yAJIOIhoKX7LgN3dOheZyLoj/kc47YHNS+w7pO90TIPjp3iUucLO3B3tZk5H?= =?us-ascii?Q?Q2zXiwDmHN/ynq1dfjrJhooPY+pDYdLBxtJ/gbF1jjjAqaW+IkHA+kKmvXjj?= =?us-ascii?Q?ep6zKQtp1hz6DD5Sp9ExBN/qedtHrBOB6Z1Dkg98kM6xg8Pk3WcQZkYftqqn?= =?us-ascii?Q?EX15h0NzCPLtOhgkt22pUq7HqE/nC4ed69dr1OZS48Q9VYerHIIfr2PWaSxA?= =?us-ascii?Q?7FdDTOuWQBxCgX/wamtDvNCIqor04lqmc0OquwS5pSsf1KdpBYk1GfNsvn19?= =?us-ascii?Q?Iltk2KIqA5dFfR5h9YS9PAS+CukNiyUcmZYiqD7oqXlDtK7cv5rMJmIAwaK/?= =?us-ascii?Q?+5/0t/AShHVpXQ/rMjLI57w6oE6cgHtAnxFhRAtKd/7sVZxooVO55k5Rf0Xu?= =?us-ascii?Q?Ve1TuYyTOlPtXvXWu9Vzt2WFis704bPc4C/qWC5FbFmEII8xa6c4aBzqbfgR?= =?us-ascii?Q?u2C5YqZEp3WswicvA0NS1ziLaSkL4PiC3dIA7FXj7k6jdCRNs6wnUVivvQ2E?= =?us-ascii?Q?eiS/ITif/exADhwofisT+odlWfZ8jo0x1Gzs9kTLDleeBR5R8NNaBdDjeieI?= =?us-ascii?Q?LM1TrgpM3Hx34PjixrgsgIDYmUecb/8DXGozj32R+8IarZzewSJN4hjSrcMM?= =?us-ascii?Q?TUSYPmfyBNgZDEJ0331xLO0XvpucKxGIpwQnnqOGzF+wVZfHaZhMZTes4MP0?= =?us-ascii?Q?owxI4jzFWYDi2wdI0FSEZ7zRw8H+pnqXrW0mswJ0fF/smvxCmxpz3fBYYytr?= =?us-ascii?Q?Y2FnsvDUwsc04SHgmPGajP0yolB8+c/u6ilCqx9w2RDicqB102yOjxqm4huX?= =?us-ascii?Q?PJwHwGTyYTvkVAsTWZN3prVhYpZl3asOnZZ8KkMbcte91Wf4Eoqe/6nM+Ved?= =?us-ascii?Q?5PdyH1VaSndT/kM0aUWutlvRt7a5ELb0cpsnirFi0T14geQ0KAEm0DvsvSds?= =?us-ascii?Q?K61gPHDH3IKlXCQXUylrD4IBoecpFB3IjtuKQEN0FrQDsnyV/rLyiYzjFnXV?= =?us-ascii?Q?QFe7Eh8KuwNm7GCs9/CxuMmDA3amtlZCpFV+t7BWqRahagtnlB0yRQ9W9uO3?= =?us-ascii?Q?zqqTTAVpSAj13iWkpSTMLqepzVLtAHCQgf4dvszuftRS/okJzTo1Yltoa481?= =?us-ascii?Q?lVoy2kE2GLgfk6BRLSEDHGW3VW3FN0m16mBjaJmeHlnbuxFlAaqfoylxsh90?= =?us-ascii?Q?j704P4unXZYbTd0zh/HUm3vCBpSwJK7PobT2d7JOP3j4WKqaICXRH/NhhJax?= =?us-ascii?Q?9umPjdTyYoB36fxVjAlVuoZGb/BM?= 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)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?anH3BaX95n+YunZyOJLTS13rK9RN4iwiAlarRsthWjLTnhKfCeUUKcDrXyoy?= =?us-ascii?Q?qcse7/swVHyr1JRSTln/wlXbo77nPyNKqEZ5sqEVR+edl8qYCEGgbvpS7r5B?= =?us-ascii?Q?0WhRKV9EZrXeB72AFBa+rOg2JoM5cFeNVwDHLokCmymJ7sf9Y1wqw8VXkcCK?= =?us-ascii?Q?DuJKqFVWfdL39HPspy43NYOJkyp9SkRT/M6aJi+sRz+Y5tC5X/GK1RG4rUEe?= =?us-ascii?Q?3w2hYPV7YZEnB5ModjyvOc/T7XSfA0HUat6jfWsMTL4FmsxPOQ2ht71spIJv?= =?us-ascii?Q?qt3NqfO8nnl/De9q6WY1hKdFP3iomxBQD0jLDWQY51XA+QW2gs+uoaT0ESJB?= =?us-ascii?Q?uUUPHX+08VaVBIxPyN9Lci7GjO0gvJmuvwYbgy0AHRcun8BAOWJFueenFwMr?= =?us-ascii?Q?IzMbCYzDoWBB8yZK0PV7pXw9okdH8XortxNPxHtZBaoxhI9E1xd163bBAJOK?= =?us-ascii?Q?OTwTjAbnWMgP1BrbDHsiJdG7JpNMVeMtd9m1EH4dQl1vYWllFdYPXMoP+T5D?= =?us-ascii?Q?w7N0VPrrXGzVdiqcbv3CKD+KpSRTE7fe2vTlaZfO9btEHozMwJtELsNLH+AM?= =?us-ascii?Q?vm8bRq5+vDpgGBeVonysnKfW1GwI7pOk6B/ifn/2cKoVHx8YhOJxoC0Y6Ljq?= =?us-ascii?Q?wSv/qW5B6R8T6CbHDM1Bb7HVz69xXg6wfTmUZ2SwXgPAIl5oq+pVrDUBZ0Cn?= =?us-ascii?Q?49wxQCsm84jwcyot5YAsRasPvoX02Pr3lREvfHzceoHRKvP6NyzQNYSuHlw9?= =?us-ascii?Q?picu0bZxm3+3gcjulX4Wna8QrtLpSI5Xf/Lq1z+B9nWH09obXWp26HqepMoX?= =?us-ascii?Q?MOCFI7RwGPpQmTU1Fpivm1r7XLV5tMDotYhy4MhmZD4wUWG/S39CHtHC2NF6?= =?us-ascii?Q?JfoZqNNxdbWlm6lF3c3TEIFA8UsIdsMg2M9pB4GNe48S3jMc5mXTk2A4Dtvy?= =?us-ascii?Q?LceEsJIuoKvhHUEM+xJVG/uuFYbtxmZHET5YF/6h3m9iekHK/xdaK7A2f6HM?= =?us-ascii?Q?AW/If+143wFGW5VBgbRSr/vP8xWeoADjZO4kvne6yi9Nrrwoeiv6vTXaxSm0?= =?us-ascii?Q?ZGChug/j40L3ZwP8eBZsvYLngM40AMZGO6FlDXncO9pRwRWHajWuqd6gqSI2?= =?us-ascii?Q?2dKgZGuRcIyWrrTtIcqvb0EpzBX3DEJ7Rb8jpopHmcMJy2+JxXiWaCgrK1W0?= =?us-ascii?Q?lYQ2puED0f8BIlyAvBBc3d4WUG414r8hDZg759h/lrORtl9JlvpNmcZQjoS5?= =?us-ascii?Q?gnrC4CI1uw+cw6B6qnxPpUsCflnGeGa/VXCUNEyMwtUmfqjUt5g0mmEVJt27?= =?us-ascii?Q?8eYcTqakQIO3gvBNtbRcMvxTsYrg53UDIiz/2xjljHEWuDAfJDKg14lv2VO1?= =?us-ascii?Q?zxBUqw2ypVXaOWk/dn06U4E3mVF6iI7B7HVc6byfSQSHEi6w1ITSlCMQPbtF?= =?us-ascii?Q?dXL0rMsjCLqI5pbFhrSoDeNj93EzELwBiYyejId+6n8CUu9qvLgos5bMus1N?= =?us-ascii?Q?higGGUL3DiO6rnOuiLrZDHGVqAR9+DLvc0k+4ZXrnk0zy735vLZGuKZExC4N?= =?us-ascii?Q?YmE4LYcS3F0aO3A9evV8MamRs2wYPpZ3F9rK6NkvCXfCpyRdG+nEaNjg+YYJ?= =?us-ascii?Q?Ng=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VWtM9K/w4/XIF8sL0WBxH28P4WAfdB4e0RtytF4EEf2n72oIjzaqPQLgGP23zCo3cbmz7YXtosJ+CFJK/xvRyXdcWxX8Z1AB7TCOJ0ViDGl0R+DqoDzXF6C0Dm2ItDYJzkYNlQcyNuygp/ErTqkZURO7NBzZ/1S8x69lxO5JH0B1+PB7sbkiFMhK+7Hs1hu6lfaGK2rEGoBIVwEWn47y90Nr19Q6R+e2cvlJ0iGxtkh5gU+b37Dvce/H8CMisQjyJEd90rmAAEpphuoqSj83nkQKDlzS7jJxY1U4lPWEILCBmFw8jU3mD9hykPsL4Ifl6vCqHfrmeHYgropHX6Huf65NdWtPjRy9oAHjqNzNL8vZgNFEjLR3JeiTdAIPVxcQKV5eJdPpA3SccuXsAFxCfS9sMKHGrvwuftUqdLLGqIpHnlY6+LkaQTtRAxPxDFaebvmfJcnSPJVReYG/0nnUdY1luRBlIxVT1x5etEUKMw8hapMycMkQtL/kwzfYf2OGvsVEQenCwAQLCgl+6iV8BUVK6+DwamQE/tyjGtvViT/UfGNaxqJzIwVqK6qGhHjjIRrCQZx416iCl6pMDoQTWBRp7BL4m3zPL1lkT7zgzxg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: baeaa560-0d5c-44e4-9d41-08dd3eea6ad0 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:09.2992 (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: 5/gv3Eui7FGlaFoZuUuFBYwBBOLNvCYYYQ9sLZz+HfNaq1aBxH6Oh9voHtSJgGXBBwBiE0enNm2Jx4lq0xDc2LbRhGrQ3Pc6KKZ+X5p7+Ew= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6339 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-ORIG-GUID: sFFNWuC20WDiGL3ev0qE1q22MbGcreLF X-Proofpoint-GUID: sFFNWuC20WDiGL3ev0qE1q22MbGcreLF Content-Type: text/plain; charset="utf-8" Introduce internal __VMG_FLAG_ADJUST_MIDDLE_START and __VMG_FLAG_ADJUST_NEXT_START merge flags, enabling us to indicate to commit_merge() that we are performing a merge which either spans only part of vmg->middle, or part of vmg->next respectively. In the former instance, we change the start of vmg->middle to match the attributes of vmg->prev, without spanning all of vmg->middle. This implies that vmg->prev->vm_end and vmg->middle->vm_start are both increased to form the new merged VMA (vmg->prev) and the new subsequent VMA (vmg->middle). In the latter case, we change the end of vmg->middle to match the attributes of vmg->next, without spanning all of vmg->next. This implies that vmg->middle->vm_end and vmg->next->vm_start are both decreased to form the new merged VMA (vmg->next) and the new prior VMA (vmg->middle). Since we now have a stable set of prev, middle, next VMAs threaded through vmg and with these flags set know what is happening, we can perform the calculation in commit_merge() instead. This allows us to drop the confusing adj_start parameter and instead pass semantic information to commit_merge(). In the latter case the -(middle->vm_end - start) calculation becomes -(middle->vm-end - vmg->end), however this is correct as vmg->end is set to the start parameter. This is because in this case (rather confusingly), we manipulate vmg->middle, but ultimately return vmg->next, whose range will be correctly specified. At this point vmg->start, end is the new range for the prior VMA rather than the merged one. This patch has no change in functional behaviour. Signed-off-by: Lorenzo Stoakes Reviewed-by: Vlastimil Babka --- mm/vma.c | 53 ++++++++++++++++++++++++++++++++--------------------- mm/vma.h | 14 ++++++++++++-- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 955c5ebd5739..e78d65de734b 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -633,29 +633,45 @@ void validate_mm(struct mm_struct *mm) * * On success, returns the merged VMA. Otherwise returns NULL. */ -static struct vm_area_struct *commit_merge(struct vma_merge_struct *vmg, - long adj_start) +static struct vm_area_struct *commit_merge(struct vma_merge_struct *vmg) { - struct vma_prepare vp; struct vm_area_struct *remove =3D NULL; struct vm_area_struct *remove2 =3D NULL; + unsigned long flags =3D vmg->merge_flags; + struct vma_prepare vp; struct vm_area_struct *adjust =3D NULL; + long adj_start; + bool merge_target; + /* - * 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. + * If modifying an existing VMA and we don't remove vmg->middle, then we + * shrink the adjacent VMA. */ - bool merge_target =3D adj_start >=3D 0; + if (flags & __VMG_FLAG_ADJUST_MIDDLE_START) { + adjust =3D vmg->middle; + /* The POSITIVE value by which we offset vmg->middle->vm_start. */ + adj_start =3D vmg->end - vmg->middle->vm_start; + merge_target =3D true; + } else if (flags & __VMG_FLAG_ADJUST_NEXT_START) { + adjust =3D vmg->next; + /* The NEGATIVE value by which we offset vmg->next->vm_start. */ + adj_start =3D -(vmg->middle->vm_end - vmg->end); + /* + * In all cases but this - merge right, shrink next - we write + * vmg->target to the maple tree and return this as the merged VMA. + */ + merge_target =3D false; + } else { + adjust =3D NULL; + adj_start =3D 0; + merge_target =3D true; + } =20 - if (vmg->merge_flags & __VMG_FLAG_REMOVE_MIDDLE) + if (flags & __VMG_FLAG_REMOVE_MIDDLE) remove =3D vmg->middle; if (vmg->merge_flags & __VMG_FLAG_REMOVE_NEXT) remove2 =3D vmg->next; =20 - if (adj_start > 0) - adjust =3D vmg->middle; - else if (adj_start < 0) - adjust =3D vmg->next; - init_multi_vma_prep(&vp, vmg->target, adjust, remove, remove2); =20 VM_WARN_ON(vp.anon_vma && adjust && adjust->anon_vma && @@ -739,7 +755,6 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( bool left_side =3D middle && start =3D=3D middle->vm_start; bool right_side =3D middle && end =3D=3D middle->vm_end; int err =3D 0; - long adj_start =3D 0; bool merge_will_delete_middle, merge_will_delete_next; bool merge_left, merge_right, merge_both; =20 @@ -860,11 +875,8 @@ static __must_check struct vm_area_struct *vma_merge_e= xisting_range( vmg->start =3D prev->vm_start; vmg->pgoff =3D prev->vm_pgoff; =20 - /* - * We both expand prev and shrink middle. - */ if (!merge_will_delete_middle) - adj_start =3D vmg->end - middle->vm_start; + vmg->merge_flags |=3D __VMG_FLAG_ADJUST_MIDDLE_START; =20 err =3D dup_anon_vma(prev, middle, &anon_dup); } else { /* merge_right */ @@ -893,12 +905,11 @@ static __must_check struct vm_area_struct *vma_merge_= existing_range( * IMPORTANT: This is the ONLY case where the final * merged VMA is NOT vmg->target, but rather vmg->next. */ + vmg->merge_flags |=3D __VMG_FLAG_ADJUST_NEXT_START; vmg->target =3D middle; vmg->start =3D middle->vm_start; vmg->end =3D start; vmg->pgoff =3D middle->vm_pgoff; - - adj_start =3D -(middle->vm_end - start); } =20 err =3D dup_anon_vma(next, middle, &anon_dup); @@ -912,7 +923,7 @@ static __must_check struct vm_area_struct *vma_merge_ex= isting_range( if (merge_will_delete_next) vmg->merge_flags |=3D __VMG_FLAG_REMOVE_NEXT; =20 - res =3D commit_merge(vmg, adj_start); + res =3D commit_merge(vmg); if (!res) { if (anon_dup) unlink_anon_vmas(anon_dup); @@ -1087,7 +1098,7 @@ int vma_expand(struct vma_merge_struct *vmg) if (remove_next) vmg->merge_flags |=3D __VMG_FLAG_REMOVE_NEXT; =20 - if (!commit_merge(vmg, 0)) + if (!commit_merge(vmg)) goto nomem; =20 return 0; diff --git a/mm/vma.h b/mm/vma.h index ffbfefb9a83d..ddf567359880 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -67,16 +67,26 @@ enum vma_merge_flags { * at the gap. */ VMG_FLAG_JUST_EXPAND =3D 1 << 0, + /* + * Internal flag indicating the merge increases vmg->middle->vm_start + * (and thereby, vmg->prev->vm_end). + */ + __VMG_FLAG_ADJUST_MIDDLE_START =3D 1 << 1, + /* + * Internal flag indicating the merge decreases vmg->next->vm_start + * (and thereby, vmg->middle->vm_end). + */ + __VMG_FLAG_ADJUST_NEXT_START =3D 1 << 2, /* * Internal flag used during the merge operation to indicate we will * remove vmg->middle. */ - __VMG_FLAG_REMOVE_MIDDLE =3D 1 << 1, + __VMG_FLAG_REMOVE_MIDDLE =3D 1 << 3, /* * Internal flag used during the merge operationr to indicate we will * remove vmg->next. */ - __VMG_FLAG_REMOVE_NEXT =3D 1 << 2, + __VMG_FLAG_REMOVE_NEXT =3D 1 << 4, }; =20 /* --=20 2.48.0