Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Liam Howlett <liam.howlett@oracle.com>
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-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?Oowv80GqnMboYgf/gjq5JUk4U0DDCKcEwBUKWPFRiMMShaDY89nAVonSFm?=
 =?iso-8859-1?Q?C+MpNA5Bhqic86WiIwfCqnuFNXCprCAiB7mvBYHpVwMmWoFBKx5gcXzrvV?=
 =?iso-8859-1?Q?P19Ex76MbaoHm8lZgAV+Sy2Z1R3bpGZUUtaZCC7xyPjXHEKanUACn6rguF?=
 =?iso-8859-1?Q?m2mfNp1wbb7xCqtOfnMw0CexA0U62GxpqKhmHUU9gtKXbPnXnro7nUaySz?=
 =?iso-8859-1?Q?gpYkle1OQ+tCiubpa79a3TL9N4VA6uKnDTXwg9VaToe0ZTZuj3bmTDz4PV?=
 =?iso-8859-1?Q?bQCz5+LcYl3CSGPCyH0Uea11kabGyXEerEL2Ohj/AsQt4Hkym6DtTFegBo?=
 =?iso-8859-1?Q?3e2zQ+yWPsjvWIbql2MOVKJYLLP5a5SWIsTiFF20ZkzUvopKpmIBkfkK4B?=
 =?iso-8859-1?Q?ajNIqUyrAWK4jcMZrMFSbWBlTvUwqIsKxOKq+iiZgxhUefkrrENh9/jsaL?=
 =?iso-8859-1?Q?Tkb6IK3MZ/qaRio+7/7/f9e6IH2T86rWBdolpYmKhVGvwUEKUOIJYmOj+W?=
 =?iso-8859-1?Q?p13YLPGa5ee4BRDoe/fD5AyzEZ48y+5Eb/oC4h2ZIGuuDKKSJTQVft2VjQ?=
 =?iso-8859-1?Q?7aNcW+A4tH272Rqf2WTpcg7WJjiYzgpdYKeSei6hUT857EF/nGnmOm8aBy?=
 =?iso-8859-1?Q?HtzzyHzELeL3uIcYYXZS0PPnqpXGw8W1Y1EQkC16iFID7p/mw/0wbOPEeH?=
 =?iso-8859-1?Q?qwyBLSgGaxGC4DFSf9nxArMLnohmUjzFVtSWYCwwDOoxWYrbLroBmxxmW+?=
 =?iso-8859-1?Q?t86mfcr3eBiPEbnYEZsygoJOXBSqzYsuCHppFFznQvPuQsp0Vu4QBP56JP?=
 =?iso-8859-1?Q?eoO/tzIcp2PS/nphRnUKzEuvR1Nyr7FOs7CsP38aPtky0X/aN+WURcSJa8?=
 =?iso-8859-1?Q?iaoGPO3aud7FCc29eYuOIDGi1wjV8jbDTA3RsZnjsP8FgGFAph8qYEghrp?=
 =?iso-8859-1?Q?uIg09Xg5xeu/mQ71UTl4ibV97IgZ2nM4rj6OYqRkf39d6/ca+m69kvDj21?=
 =?iso-8859-1?Q?slOLxddl2TaeDV0VmpIUL5CQyuwYhhCECcHnuZA5iZQlQrArRsSt01mrOw?=
 =?iso-8859-1?Q?JVykEVPCwBiLnuxEkFC15UgXZVo2KA4n3KtpZGcmahq0qlwfzkD7ywFSCR?=
 =?iso-8859-1?Q?7As/YvxqepP5pGmvO8EhVTZVho895+yHcq/ExCQnLvwbBr8eAyKqkbXO5I?=
 =?iso-8859-1?Q?1AqpM55bGWo/Hv3ai9VpMoE/2qF1ouIZqDR0Tik1r1RMFE+rHT0Znw2NSf?=
 =?iso-8859-1?Q?+oYge0PAsxHhKRiC0kak/c2xbmhnZC6KUCqFybxBC7cWM/YaSb+ChGZtYn?=
 =?iso-8859-1?Q?9EBr1IIdHT16Zy1l2WVY9HaR2jGJJRCHZY8W4/bVcFRIj54yJ8By5xa2TO?=
 =?iso-8859-1?Q?BTAMs8K3tMI7i9BM4ORTjTT3PmJkiAufpGfgE2Vk4ZBZO1cAsx2CvdvQjc?=
 =?iso-8859-1?Q?l1yNBpygFY17TT3LbtrG2u3ivUBHks9vf9A9BVoAmX6RyaPch8GeUTcJBQ?=
 =?iso-8859-1?Q?JfTFEev9vkTxw3ydq30ndbL1Qm+AjjklWwMj4UIk9tbJkphdbkYae4zB2V?=
 =?iso-8859-1?Q?zWGY+33Dry0IOoGMfkTJOCYqG+Q3Ge44ZkahQk/N6z5Box4YDMYb+HEHXV?=
 =?iso-8859-1?Q?vnSteeK5qFk/KSfkRZsJCx6xrXuA4qnHXWPbEtBxePzsAj6JCd/1GNWg?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

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 <Liam.Howlett@oracle.com>
---
 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 =3D addr + new_len;
 			pgoff_t extension_pgoff =3D vma->vm_pgoff +
 				((extension_start - vma->vm_start) >> PAGE_SHIFT);
+			VMA_ITERATOR(vmi, mm, extension_start);
=20
 			if (vma->vm_flags & VM_ACCOUNT) {
 				if (security_vm_enough_memory_mm(mm, pages)) {
@@ -1033,10 +1034,10 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsign=
ed long, old_len,
 			 * with the next vma if it becomes adjacent to the expanded vma and
 			 * otherwise compatible.
 			 */
-			vma =3D 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 =3D 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 =3D -ENOMEM;
--=20
2.35.1