From patchwork Thu Jan 5 19:15:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13090493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43406C54EBC for ; Thu, 5 Jan 2023 21:25:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C7A28E0002; Thu, 5 Jan 2023 16:25:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 577238E0001; Thu, 5 Jan 2023 16:25:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C94B8E0002; Thu, 5 Jan 2023 16:25:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2ED128E0001 for ; Thu, 5 Jan 2023 16:25:38 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E2B4E1A024D for ; Thu, 5 Jan 2023 21:25:37 +0000 (UTC) X-FDA: 80322027114.27.A69501B Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 4BC9EC0015 for ; Thu, 5 Jan 2023 21:25:33 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=UHllwHGB; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=LHGWNTBV; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf22.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672953933; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=22Z6OpYufdBtzxSvf9B3LFJ2NyY1sjKM0+x62TTuiWc=; b=6su6MIzgIH3Cw8Z6F/FEctAtH2CrM3EGXoVSfLx2QJug0zDnBnMgDD2gMW99Vn6J/LnY+m eMDzTgDuDO5zYoIUs8Jl2rmfOJTx+IcXrxtxrLxY8Rq8X6oG8zk28DmFhdE4cjnzU9S/lK Xrou2NfL5okQZCEb1tGro2f65CwEQ/k= ARC-Authentication-Results: i=2; imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=UHllwHGB; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=LHGWNTBV; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf22.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1672953933; a=rsa-sha256; cv=pass; b=UUpKkbHUu4ZJlSZzPZNbMo9plF3dvCXnhy+6fNSoe44xMNNqcqcQrlBDkY66RJdqUDW8dq 2eceQac4K0VeaIPOT8gKQtmyM1633KetsluJCqSuo3ChPHk95Rx8pB1Q4cXlmEVGOIvHGU M1ifBxvvJzYzjR5X3UWPd9TbFQMPbTU= Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 305IUIHl030165; Thu, 5 Jan 2023 19:16:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=22Z6OpYufdBtzxSvf9B3LFJ2NyY1sjKM0+x62TTuiWc=; b=UHllwHGBwCQ+su8LmWECIAESoIoOfC7Yvqq68MG8LTpJTfl+89RncQsiW2LBL6qQtozd gvyBA7sTUTa2+Pypgz5+3SR7UhRK/ZI11zwbo4roFmx9wV994MR/B+HTwn71WKw8Gt8l 17LGe24Cb3dUB1reQ1u0CbjNqL4GTdNJrREPwK2iny/8DsUEF+aCq2AHzuW8jCpy1g4F 3lu6H7LPFSD+MTMOsd54ouoM1A9UKKgelnccS6mx1wgGRbcMsXmrn6seppat8cwF+m3N 6XGbP3Zc9racLgmFZnqhnKzPoKtvhf61fkU2h9QFCBpYd61UyZkfsQ1XYkuNg2dxBCvl nQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3mtcya9k9w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:09 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 305HgaKV033879; Thu, 5 Jan 2023 19:16:08 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2107.outbound.protection.outlook.com [104.47.55.107]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3mwdtsj1fk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 05 Jan 2023 19:16:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OGnGaSW9WJS1HBJN+9jNPXHhuq2cavmfT23kS6TCWQRXnbknMniacJsOYSv7kL1eaumqS5MwGydOqgYQnkz1ChE/EmLpHuJwmmTpfhkreQuHyoQXp9JfBruC1m/ZwJKSC+dEtt68poNbbC2TbI8SkHVl4/FiLvjtl5JVdVv2Y0ZrQ9UZfOCrSW/3sxcAwV98k0eav6WsWDUZZYi5fdQ/ou25Q44CzLWN6CseWdZznXKp4f7MHT14Fsf9bPD4CDzHkzcnu6ygFSCHaqHdeREYL4337oIOPoxaJo+HhPNdjDMtYKST4EZdDNNlJAJW/L5NrSzMnzQ/+XoTKwscEF9nww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=22Z6OpYufdBtzxSvf9B3LFJ2NyY1sjKM0+x62TTuiWc=; b=dj0SZTnrMZVvY7rlVUi3cbdFnYXtzjBXxAeHK0MjR2RX+ih+h/jX2E8+Comms7ehUNM9mB1h9XL8eYNJRIFnA+rDE0V3xfaSnBc7XghQh2lKJNak/ytKIHMHPKLkw6F0ReY9/XGVSyyhQYqaag/sQTjAXE/VyF72hcHU+zoxFscCBs5aPegDTohZOzlCeqBuqBQgFTO1WTJO4UMNm8qx6heyekC/2LsVsO5qo1e91KJ183tg3xrBmz3dE43BuqB23wqyWH2jA4MygXYkaUGOObMZYtIXpyPh8OeejqwGbMBjZXsyMJihFX7U9eWVqAjQ6Bp/Am7nWNLieOj86LIfOQ== 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=22Z6OpYufdBtzxSvf9B3LFJ2NyY1sjKM0+x62TTuiWc=; b=LHGWNTBVLLuyUAf1FdW8F6I8S4RM5DHei/9wDurDwysKj8JtCEd892buRUqN1KcLZ19zAd3tLMcSSYBjFOh9sl5u9KOPJ0NNH/27i/z/n8Nz+BJe0Wf+gsdEdpmkmwerJ4cvSwtXrkgjTBqkueqIPyhwAwkBD5iX85pDDd0nae4= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by IA1PR10MB6075.namprd10.prod.outlook.com (2603:10b6:208:3ad::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Thu, 5 Jan 2023 19:16:04 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682%4]) with mapi id 15.20.5944.019; Thu, 5 Jan 2023 19:16:04 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Liam Howlett , Liam Howlett Subject: [PATCH v2 24/44] mm/mremap: Use vmi version of vma_merge() Thread-Topic: [PATCH v2 24/44] mm/mremap: Use vmi version of vma_merge() Thread-Index: AQHZITokYKyF8+fOxUGqtQvwBErbmA== Date: Thu, 5 Jan 2023 19:15:59 +0000 Message-ID: <20230105191517.3099082-25-Liam.Howlett@oracle.com> References: <20230105191517.3099082-1-Liam.Howlett@oracle.com> In-Reply-To: <20230105191517.3099082-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR10MB3022:EE_|IA1PR10MB6075:EE_ x-ms-office365-filtering-correlation-id: 809964ce-616a-4ef2-1066-08daef514a85 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uxudobpIXKnLqcIoxsonSrR/WTmSQP2P01si8p21Eyw3taKauEVi4RiXJRXbQfp9KaM7hTO/sCEO54rkysGo1FAglX5z/SQeCE1SFzu5azXyFfnjaJJiwMPL4Rn39MxNMGjEj43O94C/vlVLbDTU1rZyhiOzC6pscRuHu38RkijWiJhaFloo1nC+Zk8JZaBf0gF2BzzAI2DLXXaGocgujcHW2Lt2lGhDEEm0Q5gNcmDnfWyN7icye7XWA8eKHyJv66BkVMnICvoM6FGul9ARiZUm1f4byKUXO3Ap805m0JGxRDcma4uTZ80AsbyANyUKIGL4k0l+2oRPoOhlU/6LwfooXe0Fi3hrrFGBdgaF2ZnUcP47tOrO/JWLCWYF1ntSs4E45FPJqSprVR7prmUCz+J8+QBummKU7XePD7/Qi5Iqk/FlFiBqn1P149oq1SyL+q+VQcqYyHoC3Jdm36XWGOH6Xe0Knhde0KHnPbzcJEFhl+fV0XQ81SYuNmkDhi5BdBjZmgflRI0HPfO1/uHnz5Jp7e8xfqbUkrvR8Xl1n2lUSyRlWDRupZJGc+/wyH9xGIXvd7LbZv5hzVvP/aWVasDHZiyaRCqb5uiW7rzB/+NoXsNwR9VwHb1ucMbUkecL8dJi5x2pmvI+rRiKElEtX9xgYkyIXrMcGrMtkIAl4PztFx8pl9/RufhdCGQOWkghpe3BjLwT6Qen6+bq1z65Kg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(376002)(396003)(346002)(366004)(39860400002)(451199015)(38070700005)(122000001)(91956017)(86362001)(38100700002)(8936002)(2906002)(71200400001)(83380400001)(316002)(66946007)(41300700001)(5660300002)(44832011)(64756008)(1076003)(66446008)(6666004)(4326008)(6506007)(107886003)(186003)(2616005)(6512007)(66476007)(478600001)(8676002)(26005)(76116006)(66556008)(110136005)(6486002)(54906003)(36756003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?Oowv80GqnMboYgf/gjq5JUk?= =?iso-8859-1?q?4U0DDCKcEwBUKWPFRiMMShaDY89nAVonSFmC+MpNA5Bhqic86WiIwfCqnuFN?= =?iso-8859-1?q?XCprCAiB7mvBYHpVwMmWoFBKx5gcXzrvVP19Ex76MbaoHm8lZgAV+Sy2Z1R3?= =?iso-8859-1?q?bpGZUUtaZCC7xyPjXHEKanUACn6rguFm2mfNp1wbb7xCqtOfnMw0CexA0U62?= =?iso-8859-1?q?GxpqKhmHUU9gtKXbPnXnro7nUaySzgpYkle1OQ+tCiubpa79a3TL9N4VA6uK?= =?iso-8859-1?q?nDTXwg9VaToe0ZTZuj3bmTDz4PVbQCz5+LcYl3CSGPCyH0Uea11kabGyXEer?= =?iso-8859-1?q?EL2Ohj/AsQt4Hkym6DtTFegBo3e2zQ+yWPsjvWIbql2MOVKJYLLP5a5SWIsT?= =?iso-8859-1?q?iFF20ZkzUvopKpmIBkfkK4BajNIqUyrAWK4jcMZrMFSbWBlTvUwqIsKxOKq+?= =?iso-8859-1?q?iiZgxhUefkrrENh9/jsaLTkb6IK3MZ/qaRio+7/7/f9e6IH2T86rWBdolpYm?= =?iso-8859-1?q?KhVGvwUEKUOIJYmOj+Wp13YLPGa5ee4BRDoe/fD5AyzEZ48y+5Eb/oC4h2ZI?= =?iso-8859-1?q?GuuDKKSJTQVft2VjQ7aNcW+A4tH272Rqf2WTpcg7WJjiYzgpdYKeSei6hUT8?= =?iso-8859-1?q?57EF/nGnmOm8aByHtzzyHzELeL3uIcYYXZS0PPnqpXGw8W1Y1EQkC16iFID7?= =?iso-8859-1?q?p/mw/0wbOPEeHqwyBLSgGaxGC4DFSf9nxArMLnohmUjzFVtSWYCwwDOoxWYr?= =?iso-8859-1?q?bLroBmxxmW+t86mfcr3eBiPEbnYEZsygoJOXBSqzYsuCHppFFznQvPuQsp0V?= =?iso-8859-1?q?u4QBP56JPeoO/tzIcp2PS/nphRnUKzEuvR1Nyr7FOs7CsP38aPtky0X/aN+W?= =?iso-8859-1?q?URcSJa8iaoGPO3aud7FCc29eYuOIDGi1wjV8jbDTA3RsZnjsP8FgGFAph8qY?= =?iso-8859-1?q?EghrpuIg09Xg5xeu/mQ71UTl4ibV97IgZ2nM4rj6OYqRkf39d6/ca+m69kvD?= =?iso-8859-1?q?j21slOLxddl2TaeDV0VmpIUL5CQyuwYhhCECcHnuZA5iZQlQrArRsSt01mrO?= =?iso-8859-1?q?wJVykEVPCwBiLnuxEkFC15UgXZVo2KA4n3KtpZGcmahq0qlwfzkD7ywFSCR7?= =?iso-8859-1?q?As/YvxqepP5pGmvO8EhVTZVho895+yHcq/ExCQnLvwbBr8eAyKqkbXO5I1Aq?= =?iso-8859-1?q?pM55bGWo/Hv3ai9VpMoE/2qF1ouIZqDR0Tik1r1RMFE+rHT0Znw2NSf+oYge?= =?iso-8859-1?q?0PAsxHhKRiC0kak/c2xbmhnZC6KUCqFybxBC7cWM/YaSb+ChGZtYn9EBr1II?= =?iso-8859-1?q?dHT16Zy1l2WVY9HaR2jGJJRCHZY8W4/bVcFRIj54yJ8By5xa2TOBTAMs8K3t?= =?iso-8859-1?q?MI7i9BM4ORTjTT3PmJkiAufpGfgE2Vk4ZBZO1cAsx2CvdvQjcl1yNBpygFY1?= =?iso-8859-1?q?7TT3LbtrG2u3ivUBHks9vf9A9BVoAmX6RyaPch8GeUTcJBQJfTFEev9vkTxw?= =?iso-8859-1?q?3ydq30ndbL1Qm+AjjklWwMj4UIk9tbJkphdbkYae4zB2VzWGY+33Dry0IOoG?= =?iso-8859-1?q?MfkTJOCYqG+Q3Ge44ZkahQk/N6z5Box4YDMYb+HEHXVvnSteeK5qFk/KSfkR?= =?iso-8859-1?q?ZsJCx6xrXuA4qnHXWPbEtBxePzsAj6JCd/1GNWg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: O0w9AOf5wsq8C3nOCVAprFQmJrJKbu8KV258k30JQX5QqhgLEBvkHp4IlUBv6zVTyG0OytheZfu5QyhFbh65oDRI+qhVwlG0W++3Ff5pk880aE5y7MCmqnoZfBFyNPfZnrE3XDibzwYA850kLSrVDAm5qy6fKItk2q+MgwtCH1Lf1z9fiHKJgbnPmMdo4vEbVsc3TGHB82YDKeE2r+EoqskeP+7/ue48U/TR3NIySJZHEANTpIwEN4LmP6+DmTfHfOV41UsfgrfOyuFc4x4j8REOn470B+RQBqIMVPBwa4Q3vgBUtkC4Xn18eMIMBEXxWGh4LZUBfh98kMXcg7+gIkEXvZAp7cGI5gGkF8a6r+stGAZA2pcvOskW9YhpsR1zLgZuUpqFC3JmiJzBT9B0t3njk4e2wNiiM1b0HHP94nYryxAavFjlT6G6+iyQ9IqDd9c6Rd5rVSrc1btBC6SKOzdf/dE6DIgliPombZWWAsiafKTCH4WRdQjlIY6iiJ60AGtQxcPbTngWriYH5eXJ2n1l0T7lVxVEClj0Y1MbBXmAan0VVEgQSYkbDLInB3rBJiow1tf2QEGahCYl84x/f1Tf05WRyS0gGa8nVPWPwta+p4zEAt17l8gpS4zBefSxTRDPjA5wWe2bcS+YQ8qSFztgNr1PKdr7Td4MuaulNFWUO7q1Ms3NUsLRLP2Ahy8DEh5NoGSUPcsgVFp523SZR1UgZmt2AKHsLt1vS6ocI3rV1z7n/V5v11MC9escVSdddTQpNgs2LaIO3IczuUYrS/gITjEr5penJWo+Jc83+wkW0Rl6ZncIat19Rx09jJ4e+UyWSFvxUpze22K1jVPKbH6RwTKri1JgT68je5gHg9SoTtbt7xVQslUgSk0qiyE+bvWS8EjsUhVapzSWSnxuuw== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 809964ce-616a-4ef2-1066-08daef514a85 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:15:59.6098 (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: Ls3FUOhliOeZcUWQYyhLrvjiDEdvIB2r09+BgbEHdHYLPN8VJt5DhB2z7qe53XTTGcp7s1Y9mCUisyGvoGU0fw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6075 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-05_10,2023-01-05_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301050152 X-Proofpoint-ORIG-GUID: D2pqDMu1FnEKnhcOXtIM3phW9N_hCqTF X-Proofpoint-GUID: D2pqDMu1FnEKnhcOXtIM3phW9N_hCqTF X-Rspamd-Queue-Id: 4BC9EC0015 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 5f3d6tghow44xz7cg6fp6yiem9p6mqk7 X-HE-Tag: 1672953933-585929 X-HE-Meta: U2FsdGVkX19IWI3c1eaAFjKRHSJw17x3WdWaBhUO6Om0R166sNE56rvu+RGsx49tUaexdi5OHNhjGqF0k951J60xQfSCnzBwACP2QXQSwEx2qa5K0I7SLYDapqKEixBxT/Qi3iVIprGzjL36Ky4uP7CXlRSbKWVgCx/S+1lPWON4SczR4T7m0Wcfcse1s/DwDvZzqAaqa9Cucab67E1VgoHUe/Xoqn4rCdoqQsNcr+F4bJEUONGCT2jzP2S0YepSqW6G+Dfzz5U7sIUa/Lf+1RtytU9wu/W9qJcW870JDgSfd+pOkHy0NzylGZbzWv4/ZxWZeoOBPo5vLOuvGoz0szchFlRKUd9goTLQNW0nF2hzMdkBqgNLeSe+htiIcL8umrXWtP3RRPG0XcMXObAmWzEtnKov0WjtT+d1UVM/+gf3u9C5B/muYqsR4y6KKsnIKDrCD5ysQMTZ+D9XzwoF9o30R0T5nGtvtX0rE5dM+g4IkBP63CGXzWG8+EyHVjpPbYRVnMiP9r0pSgVr1LpDf4Y83qEGaGtCR/hsxm4emQVO8Eu49EHfRTgFb0L/L2dYzuTGTYohzuuwyqjivUdbWotaXwbHBEnFjU/tzCaPGymmlwZLpKrgwTOHkdrbNKrMjPkeB0vroY00kzyvYDT4nSAEzaPXPfmruj9x87rL/pj3UVFUhlfYPY47KMSTdPzWp4TyzOS9c95T7inuyiW7jCFAMhbcOBXK2enxDc+YLiiwevtOxr4HjUHOEDTGBF5H0JwcXhAGDauGLmfusTwvqs8NdxU63V9Uh+cI/TwEvhh+42txuKT5xRKF/f3RSX4sVHJbORzR6v4z+HwdbldZwPwVXpYuavsDIkpNnHhePdOVE4pdM3f+VFmPV8I7IMTLPwTXIE3d59UmcpiLhOoE3HaqzO2wATo6IfdBbTuRPlFVyFCJXYFgf99i7wBjmR3ytuvQv1cLJ7D9h6pvSz3 MqwYkbyH N0pEDHr8RMWs0H++C40ETK9SeH0tf0HIhdtJLPb65NU+2w9i3kEedFZfZkWTIZAa6f/v+lySNE6Pnw8be54tD1EiqN7q19f5RIWaYObwJcc/ps8Uio5AIdGzMqO/4Shhx1ZQM4fOVEIHuYL/InAbOQ1lY+g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Liam R. Howlett" Use the vma iterator so that the iterator can be invalidated or updated to avoid each caller doing so. Signed-off-by: Liam R. Howlett --- mm/mremap.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 94d2590f0871..4364daaf0e83 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1018,6 +1018,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, unsigned long extension_end = addr + new_len; pgoff_t extension_pgoff = vma->vm_pgoff + ((extension_start - vma->vm_start) >> PAGE_SHIFT); + VMA_ITERATOR(vmi, mm, extension_start); if (vma->vm_flags & VM_ACCOUNT) { if (security_vm_enough_memory_mm(mm, pages)) { @@ -1033,10 +1034,10 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, * with the next vma if it becomes adjacent to the expanded vma and * otherwise compatible. */ - vma = vma_merge(mm, vma, extension_start, extension_end, - vma->vm_flags, vma->anon_vma, vma->vm_file, - extension_pgoff, vma_policy(vma), - vma->vm_userfaultfd_ctx, anon_vma_name(vma)); + vma = vmi_vma_merge(&vmi, mm, vma, extension_start, + extension_end, vma->vm_flags, vma->anon_vma, + vma->vm_file, extension_pgoff, vma_policy(vma), + vma->vm_userfaultfd_ctx, anon_vma_name(vma)); if (!vma) { vm_unacct_memory(pages); ret = -ENOMEM;