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 R. Howlett" <Liam.Howlett@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        Andrew Morton <akpm@linux-foundation.org>,
        maple-tree@lists.infradead.org
Cc:     "Liam R. Howlett" <Liam.Howlett@Oracle.com>,
        "Liam R . Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v4 24/49] mmap: Pass through vmi iterator to __split_vma()
Date:   Fri, 20 Jan 2023 11:26:25 -0500
Message-Id: <20230120162650.984577-25-Liam.Howlett@oracle.com>
In-Reply-To: <20230120162650.984577-1-Liam.Howlett@oracle.com>
References: <20230120162650.984577-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ryQhpu5U3t7P32/mOBBnsvI+AxhMdXL4tH8WeKtqJpxjrgvDqv1OdDoL+IWt?=
 =?us-ascii?Q?tOjwTDZOeQE5SKhEHuOoNWa2q07m1Z3MfrWwcfoF9/ANK6PgomZnRPJpPU0s?=
 =?us-ascii?Q?PzemRkBVW3RrLCW04QUE/LqpjYvZKKFC2Zx+CRknV6VMOMS62EbAgqoVgORn?=
 =?us-ascii?Q?6ujTeKckrKdnCj4XvcJRlCPOLO36j9ADgDCrdIuhr9wFRO+Hqn3GH4bSDTRy?=
 =?us-ascii?Q?u1quIS9Cfb9vL/xB9Kq2mraVI0wwbvHYtE8NK4G75BxyukxdAUA1l4FPk0aQ?=
 =?us-ascii?Q?vqH0Vl4+Ef0uZdO8ZoLQubeg+H6q+xPQOa1cWULD5tydOLkeJge3pdtSQ7VI?=
 =?us-ascii?Q?5KMuWsjKwgwj/7TpKLzB2NRoCAS9m3s8eaCW8LvOi07LQ/vm8Eww0guHJ28S?=
 =?us-ascii?Q?8jw8fqIcqRi7R1XcfH1q8LCRrU4gJbDhIXcY3BuTPtmxnqT3Thq1ZAYwTOay?=
 =?us-ascii?Q?+deuGtx7bjY1KPbVYsGIBWHYqT1VL0OwfJf71zhrGvsbN++6Ei81DY4aFM64?=
 =?us-ascii?Q?W17msP5PLy4FOkPLkFhMVmc2rO2H8uWW/LecKoeCmAMaV1iDPAHl8KVfTQSX?=
 =?us-ascii?Q?BbpCLgEIWbWFv2gyuwqKPHu0LPmUNQn1qjgyoDnr4UxK7OhBGCyAJVbEJtLH?=
 =?us-ascii?Q?k2UOrQ+ziew8yVFGPVySslQxEjGNE23660iH9c5obwjUhW5qiyBK3QtBDlCT?=
 =?us-ascii?Q?CrtbftJUUrI3slGfgn2JbN0tZJ3jyd3+SjIg+mwLNXpUPbg8/Ezp3r1oTUT4?=
 =?us-ascii?Q?B8ryAOgeqscJZIk4x8iJWn9ELVo3ehawefsCGw6akmMks0GcyhYu5Mlz4Q/c?=
 =?us-ascii?Q?lLURCnkdW4pk+F6K/k1ugjwIpZUo6mT7hzZplKU75TA7JmIjTqd23E4wfFa0?=
 =?us-ascii?Q?EooZc3HdAdkYFKDEoKrIGBDajymhpG6Lo7dh2DKrcASQLTofypHrTDBmNZHm?=
 =?us-ascii?Q?f+4kru76SPvJFClGGC3P74hINQUzdBbyn5xVje2L8gxip4rfg1jUlprgPVLc?=
 =?us-ascii?Q?/djJk2krzBoOiZG5yjUCXwridyHEQbaPjoT3x73kwFO3wSvdpHN3ZR1kUeL3?=
 =?us-ascii?Q?gSxl2uqeA3OVCr+VQQJ1tTLqvW2FavG1MqqtAo6qBX5o0kTXbo1orXewfteT?=
 =?us-ascii?Q?DFjhngOG08DmglT27YXv6X5aKl7jO5HvyI+dhM/J+1Pwq3ebc8GcFGnHlf8v?=
 =?us-ascii?Q?HLjm8l30gOnh2e1E/pf7lFcnO7OEMT8I2C//aFQIKoa7/WlXkvJ8SMpBAT8F?=
 =?us-ascii?Q?OHadVSsPRQAEXK4DaRz+I/SiSh5SHrS0ov5SgmsLo3isdGNOoq61gx0BIDS9?=
 =?us-ascii?Q?hktRmHOcMhC2nH0zw363aGRCLWARrJhBPxwD7JJTC1sGskit2kwPu330ADDE?=
 =?us-ascii?Q?BaOBFdrhS/u9eadDrC0nxAXrVSjl55eDuIlJxyQMtoit61bJgNz/zFpyPhWE?=
 =?us-ascii?Q?zgV00rkvUiQFxx6IadVmWRz8t0PEiK0RCpdOTgAXAPP4dZ4Ug/sBj0fy+m4O?=
 =?us-ascii?Q?q9lT5XRy18HI+ncJRzf5lqkAhiltPxUYaAeCxp5CNZTirdqB6x7nu6QlGX4H?=
 =?us-ascii?Q?T/X7E6ha/jjbToqKA5fCIF8jzOQ+1t3Kd1hIxNdjAh/xRfd6Rb68hXfX/im0?=
 =?us-ascii?Q?Ew=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: fGjjqvOzI53/qWxQU67pYrcAKU7nxjyWzhJUBXAJdu+ACoH+QXSRWIahEP3F8JXn0ZX2ddaPYMmPOMHIhEFK0BlC+kYKMadaefh5BzRQMWBAq+6iKnQgPzW3lpEsuzfSSTHEp3CEBqAxJS6WQnTW96JKh3QCkn/KShcRVWRR/rZHZBEUZtxyLjUEMFEPJKr4M0g9ALgHahn/0Q6oADG+IQZiq3bRpDnnK3Xb/2avTsAg3mjjeJiQIfuaH7/8Apis69WMNnkA5JPDGcdAZbXUDjgUjdyRtKkUoCMrxlhDSfo0FsQ+/azfE62prpqMdCiGR1q4zrmM5Qbm6E1iZnsrmNsoXMNqPCsxaUuoLVWl2JyEmhB2s0HW3YCrCtCwuk6DA9j5lDIHQIA6eS1DyOq9/XyEChBUbAlRGLFJf/6A+xFWhzBdF0RpCUsKVxBGhHrjTas2kZ/r2b9fQazZKy2KE7Zzeald2+JF+Qqrd9Vj9Fvw3vq5GLyBPhTu28pPin2Rhq6G3Rc8oVYFkFszsCP2gPSYVaPw1wo0GemF2ZuO0j1BWqx/TIqvh2n4tZkDlUiUr6KD3hwMCBub3ghECUNiiAaV1YjIMDmxP+ldBNM80ERh6zftpgUWQ4xDInoIxYD5Mbnl/x9Jnvyhz3ZUHt3G80s2GEI0fEfvv8pKyoDvkizjrz2Yc9eqla/5UlA11gYfZrXXtGRRQ1vK0GnbXKdqkxxckdomOe5IAKfMmTh+S5pcBfnHtMhE5uQUYlnYshTQXXhEsH1PkF9i2yI0YQWKMrZP+wXswfvo5NfJKk2nMBYSGVFIrdFC8v04kLmWzNxh5Mm5cd9/s7fv/E9ZGvUyEJqittDcacaDpwE5TBJsM2ubqOZoYz6zEFj+Tdd+fEPw/7y2fwFDvpKteGY7JHVecA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d5f1cbe0-ac1b-45d4-d7b0-08dafb03534b
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jan 2023 16:28:12.8861
 (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: ldIxr2U7ElivZQxLzv4gLTM0ZOWzknXZtCFpk2vY6ctGhfZiZAe6OWJBSJByHvK2UC1zfoDPYP0hePih1XPRzg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR10MB6619
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-20_09,2023-01-20_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 spamscore=0
 mlxlogscore=999 bulkscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301200157
X-Proofpoint-GUID: CFYzbznot7Yn5W3QVXrXnKEMTtJVpCqG
X-Proofpoint-ORIG-GUID: CFYzbznot7Yn5W3QVXrXnKEMTtJVpCqG
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 5092d0405883..0de180bb4df0 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2391,7 +2391,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		if (end < vma->vm_end && mm->map_count >= sysctl_max_map_count)
 			goto map_count_exceeded;
 
-		error = __split_vma(mm, vma, start, 0);
+		error = vmi__split_vma(vmi, mm, vma, start, 0);
 		if (error)
 			goto start_split_failed;
 
@@ -2412,7 +2412,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		if (next->vm_end > end) {
 			struct vm_area_struct *split;
 
-			error = __split_vma(mm, next, end, 1);
+			error = vmi__split_vma(vmi, mm, next, end, 1);
 			if (error)
 				goto end_split_failed;
 
-- 
2.35.1