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 22/44] mmap: Pass through vmi iterator to __split_vma()
Thread-Topic: [PATCH v2 22/44] mmap: Pass through vmi iterator to
 __split_vma()
Thread-Index: AQHZIToky9xKc85E+U28OcnfnQqIUA==
Date:   Thu, 5 Jan 2023 19:15:58 +0000
Message-ID: <20230105191517.3099082-23-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?LY5Gva2z0UL/ZrvLpD6fTOcdrBURcQZbb7xFx2eO5N76Rq3dGaYCNLfj8e?=
 =?iso-8859-1?Q?C8mN9MUxMv1tNqubZPYDJ1Nk7euJn+fx+pt0g79Rbr29ONERqykusuhGGK?=
 =?iso-8859-1?Q?zn4YTiDY22TNSj40Jjd1ArY1dh1wUvt0tFYpaguSFgv0HE0KvZdv0tjY//?=
 =?iso-8859-1?Q?//hhzn5Xvlhvwv5i5CI/j2Vmbka0r8TVkPRAba+qoc1NABFqNA/pf7mK+i?=
 =?iso-8859-1?Q?WT4u+T2g8JmJy4QuqXr46B59ucHE2dD7wi9WDII/RnZitYByIJ8U5NfGAL?=
 =?iso-8859-1?Q?/TmMu+ZHn+xwxchOXX69H2UcG1TIGecA2c8deKCaobJ3MyuTmcM49R3nsQ?=
 =?iso-8859-1?Q?Jg+p+jHImrC8XEBS8Wwt+bEbYc1HezJa0e40kKUxK3v0w1WjDlTHuomX/l?=
 =?iso-8859-1?Q?dQIDgpNltq3OtnwWkZfF3bx7rWy5bJJl2lp8hMu4v+RZt/PBLxeYuN8s3P?=
 =?iso-8859-1?Q?XALYhD3LpEBGk8nfyhJWnP1tFaFT+QDkzE5yA3+3ddSns3z4r5kVDzujvk?=
 =?iso-8859-1?Q?Bn84B1HghipgxipyUjBXN4ENPUxW4gvcvrVvyvBun5F0nOVm5cNkZoHXVU?=
 =?iso-8859-1?Q?Pg8n7ZP/c0YvlypS7rpRfNuNuxmqJ5jgW3hmQFAXjxacrD3N8IeiTh+6ah?=
 =?iso-8859-1?Q?lHNctMjkH3CE//r+Td9tAdpjgBNxy2hIFTgor2+KqFuCDAY61TsQgNh6jt?=
 =?iso-8859-1?Q?peYlIseDZO0CqVg5omoZBrChUcrSKRv2u/ZxlDzvIAsdtMu6nGieY49wp6?=
 =?iso-8859-1?Q?5Fy8PJanvi0YBsJvTVyspQ5rVYHi7GAvdRXNtJdM4uBNd2W2x0HwVKinpX?=
 =?iso-8859-1?Q?LpOa5XDcIaoNZdCB+lRfRwjZPJLsKjg3/XiFq3e3S6737zeGaOecI+cJoz?=
 =?iso-8859-1?Q?R3vXT0AXMgcsjliyGhb/Pe32K1/6vZWrk1/6xJ3loqJ2/xjQF2hpSiEfld?=
 =?iso-8859-1?Q?YLRinL4Xqx/0ao5VCs/E8YuhZMkfUVjGixrFxTpvqfj4L6bvT6LfwV+N0g?=
 =?iso-8859-1?Q?zUuNhdQczwK0+doiaMT8WYAMtyQfUu/H1izp3+VBbH/lW6O8g8Mrd8XZmK?=
 =?iso-8859-1?Q?+uXSisodyFnvrq0xj+bSQVeZZAx2vUgJGR1uKt78SI3MASnxVRSTsGpiuI?=
 =?iso-8859-1?Q?eyS+1nG6wWaSiHG0S/dARwoo5Uze5GE1yXzi87cqzKoeG1GXYrTCfc4qXl?=
 =?iso-8859-1?Q?CKZY/y9chmQVIPPXEpsEUXy4AIh6m83hVCwnEHI8S4cuHuTthnMxSylwBW?=
 =?iso-8859-1?Q?Huylma0Aw9sOC8REeODsNf79Z+S0QTr+1sSSkwJCOt5bLl+JDR77wsHXvD?=
 =?iso-8859-1?Q?ad1tQLcVjsGC4kOVybKWVoIlqsJENwWDclpmEJm9RhDmgIeQEq/3B1A0CA?=
 =?iso-8859-1?Q?1wARvIGwcs6T8KsE5+6pRBf1wRG2xsPG5yFAT+fLCw8pMqahuEFHDqPZFs?=
 =?iso-8859-1?Q?tYKMnK+g4C2g9Uo+j2ZxoisLrRmYN35DiDluCPfeFqLX+DJ70uZcpRfSQj?=
 =?iso-8859-1?Q?uaLNNvlB7Ms5twLw3jd7TZXIYZQQFQVbwM4XCeYEHgtT8v9KyjiUaDRRD9?=
 =?iso-8859-1?Q?oezgXuLpWUT6dZ+Dor+iBwuJ0uCe2I3d2SKh1aT/ovdCA+SISUIflawKoO?=
 =?iso-8859-1?Q?qKmNTmiRhbMQCO0xs/IQJTAk5KbogDN8qKJG+RLODc5jvr8xJFe0ddQA?=
 =?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: x/+bd+Vmatayi3Y3GtDGXO6LBnO30MKRLb2qmrDOu7JuNQYo+K9vq7QTPARwnHczZBK6FervCHjndrhBcmtPfIxTfel3QSq4ARGHJmzst13oHyFgu5zcVGUaGQ5+pAi/sHz5wycOiPnFIXdjVRGvNdZUft25meNnzH8aARX2gcmjEFZzRhM9OVoptzqcBPLI79zVwZHXOwiK8LcSAt2RvWPZuJ6l0R5nUx9DprzMckC5TmVjvBB+5iucZFbS+LkVzr5WXjGVZtjtLlC9RfVU2XCfOXosDATdZLvbjZk0WnRp2Si9bRXO2w/ajVr9UGe7GUet1YeonnqBbKEu5N7lc2aj7f1+YB/njgvv4qf7xOw6D/BibdVnybVgYKO++KCxuh3VGnE2oVEqB0XX9njMDLwt3tiGkc/g/VBPmzJ96axtcpWBALRBDvJyCq9luIxK3j27UbWKZQoR1E98LXwEr4r9nkPDRSP/+rv/H5bXHLFioa/bKSWqCdi9qgdf/78rR7tJrU9cNoXPjUJbHy4j3hFgkm+BG23N717FVLrBD7QzsdL7OySiOQPRY4PmlyOleT5kjyuGIGH5FOEX6WEgFYIM9SKjMwsk1iBAC4bqOktKAWp7/yRlD0KaELcGd7xHSeDfGA9cmlwVKGWpgtgK5psI1d7eZTK3C36LxcYKhUTC3hT2Nbs5iVWPgX80b8tmumM2SgaGe12/LTgNQNkuIZ35JP2jtxHXHB45zNuCqv9O96xEO26/tNefs1ckXbBEDr8BHSNd86lBBPieBx6Sscn8eNCp3E7haqorPnny/CK9SGG3rSEc0Hr3+RlXtb5UZd3KTIW5jNRs3hoRpj9ZwUqE/jZFz/dSKqLhYhWNhWpcMIVXpN8vV4nbYm+P3QuVBiQ28BKRUlLkMVLC8xNXAg==
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: 3acbfce6-4276-47ba-b9ee-08daef5149c8
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:15:58.9693
 (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: uPCYVrUjF/kyqAtu9XGwiQxsSjZWmOIhuDXutorIFomOoQSm5KrBtUcMFEcEsBH1NNph/YRRSLq3ieAXGQwLzw==
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-GUID: 9n8UK822l1bPGrC9hi8N62CgsOQNiiq1
X-Proofpoint-ORIG-GUID: 9n8UK822l1bPGrC9hi8N62CgsOQNiiq1
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/mmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index 4dd7e48a312f..80f12fcf158c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2446,7 +2446,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct =
vm_area_struct *vma,
 		if (end < vma->vm_end && mm->map_count >=3D sysctl_max_map_count)
 			goto map_count_exceeded;
=20
-		error =3D __split_vma(mm, vma, start, 0);
+		error =3D vmi__split_vma(vmi, mm, vma, start, 0);
 		if (error)
 			goto start_split_failed;
=20
@@ -2467,7 +2467,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct =
vm_area_struct *vma,
 		if (next->vm_end > end) {
 			struct vm_area_struct *split;
=20
-			error =3D __split_vma(mm, next, end, 1);
+			error =3D vmi__split_vma(vmi, mm, next, end, 1);
 			if (error)
 				goto end_split_failed;
=20
--=20
2.35.1