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:     Andrew Morton <akpm@linux-foundation.org>
Cc:     linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        maple-tree@lists.infradead.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 22/34] mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes
Date:   Tue, 25 Apr 2023 10:09:43 -0400
Message-Id: <20230425140955.3834476-23-Liam.Howlett@oracle.com>
In-Reply-To: <20230425140955.3834476-1-Liam.Howlett@oracle.com>
References: <20230425140955.3834476-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?4C3SLf9ad9Xq3Bq2R5PS0e+ln4hx7TObIVVktpClJmrlrcyhrAkfYDexvmDf?=
 =?us-ascii?Q?VtMvl7GLJOjU5WcMdui06CXR4mR2/SCPPXQsvfEFM9HqOpArqHYiTLkkuorb?=
 =?us-ascii?Q?ng0djiCQK7QbD5jyrEUs5ApEjSjz8CqUMQah/LtuX4Z/n1xJyhECktEbrBls?=
 =?us-ascii?Q?Rwwc8ahYbGfXQ/zfggairBGgHeiQR6pF+l0zkMKpBVtejC8R/RJuHvW3NbFe?=
 =?us-ascii?Q?rR7PHm5A7DiQ7dT3/Np4HkVPb2jjmR3OloePW0kOUmD96rk9Zq8lFpNs5/Ol?=
 =?us-ascii?Q?4KwFludoNy009YuYJsstJPDgOjil+GIc84uiVPR7C9295kgy9afPmJeDUqzB?=
 =?us-ascii?Q?7uNo7tftzP7iVEobrAocxSarpGrQXLN267FPxj3L2/D4MAPXZQfnuhxRzXY5?=
 =?us-ascii?Q?K2bttwtpIFPK83QPn8l1gx/aWx0OZ5uQMEOemXxzVHr/ZOLDn6w0BuhyD9Fz?=
 =?us-ascii?Q?HJ/++ae9KXtlXrO/7yc4TPqfAwg3puDYepGT7o03UkcrUOy/263Nc4ycDn6v?=
 =?us-ascii?Q?Q6mGREBTu4B6b9NojDml7QfTbRs6g7D87eIAY2r1doN5xQeodLAnss083QfJ?=
 =?us-ascii?Q?Yn2N9JH/HcRujLbALkASOJ0Zn95SmJ9aHS8ENmWAEG2iBE1HrWeVwVQIsxWH?=
 =?us-ascii?Q?WVvwqW0ryl/vS0jNUB++Pm8xgprdQz270NyYtliCLX2nyXMGm8dkQVbHakdH?=
 =?us-ascii?Q?NKK95Eqy5qKiO0Fta6Hd81+CUvqCKZF2F3S6D0TyIDdErZra1iIqwr9/Eo5X?=
 =?us-ascii?Q?T48B6XtQT/ExUKe7xWq3PZhUtnCpOeUuvvZC26TGrOImj4JOwezss0F8VXaO?=
 =?us-ascii?Q?M5vszBF0gGbW0ZfoUnK9buZn7fhpgT9ZJDvki9Ee64+A5r+kBnTuwEwfeAcY?=
 =?us-ascii?Q?fVbgLEZNdcBO/GWJILo0i1XpVCIdc1ji+U5+NruWSNrf9UI/kd6kneBV+Oxw?=
 =?us-ascii?Q?ZbNykSNglasFLyNC09lJaBTDOFKYH4X8r5bjUivtsUgTo/5gwzqqRf1Yjv0H?=
 =?us-ascii?Q?1mToNNj0aoLUYZbGAAzOAYJFM4YoMtU+TCrXdCaRiLQCQh9szW9145DXjWz4?=
 =?us-ascii?Q?Xb7RaCBUeEkTSPC1TgETFjFSLti7VJI1RrPw++AQkXuOSOeQHNRjIHKGhYKx?=
 =?us-ascii?Q?jxrOP8CqcHs2eZbYQ8ZbAzuQgCnieDIIYt4QGRnNcRFqk5+cKYywAjpNttey?=
 =?us-ascii?Q?QryDAquPOhSnxz7LstXcQGH9q7f2QO2PuNQQ2nWKcFyeSFtQJ7mpZLV7mykl?=
 =?us-ascii?Q?khqXR+t7mkyQGSX4+AWcMBl0gIeLAu5i8q5+cibwNDDLF6LuUqpSvnwQxx84?=
 =?us-ascii?Q?rO4MyJc+QBDcH8iPIOTOM/2o3tr0+4ZIJpidEc6QlRqGeJ36Ej3U+cP/2nDT?=
 =?us-ascii?Q?M0H9H9q/ybyauJlf3rHd5W/Kix8FRFv7tKMX6LMbShFTuNm/LuUE8HGXen8m?=
 =?us-ascii?Q?r8Po2oV7jx9rGTqVJigyA1utiNlNI+krRQusY8txPk2f2ZeiImKCZMr3M3wM?=
 =?us-ascii?Q?x+Eg5sldCq41xXeXf4OicvL2WAk9C9jtHoLCRlhk+lresQYDMY0A+O6V5DMa?=
 =?us-ascii?Q?L5YSSr/6ilVVhuoKfxKP2Kdfptch8GRoqOiaC59nnTiXR4zK0MZQdODbJHO3?=
 =?us-ascii?Q?gw=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ejWzLphT3T+ClNk9wQs1ovWh0d4/g314EuMqF82NHC37XSknO/Ai6zjemP/rqkkTirgznjxrr5vBQH8TZMoUWN7ewC9TmNSs9bRzkHs6zGwS/52hjYyOf+DNPtRxGL8bI2KYi54tHVr5WHXY2UOcTI3SmtaqIXMCbxJHEfDPv8V8DOoUVeBgGJUvEttWfXjgo9+z9ASMJs8fVMUQGB8/53WPbjgwz3+jFWcp7W9JLJcEFUKkn3gPywSqFzFife1eFs/qt4U/U8kv0HUEphi97G9w7rfei0XXq7vXXS3BEAklFZF43ESMva4+oZiGK/MnJQIYqUznNVB/Dqb0mzQWLVYhydVa+bZdUKw2tBwhbID2Zw6V+qPkK8ByM1IJhKZH0jki5Mj1PDyOzSxK51sAehL/BqCBYsU8XzBOkaHia2vwh9/lzD2xIzskAlAt7Ww/6wM3ePav+oCWIOymAu65dD/m/0yO5+kp5Ol5jK1IvhCgf6Ja8fj6YydWro/BRCu3YqGYoCMRVGF1nq8DR3MbrPy7KVX8QFl7vJr0f5iiKIEmpUFTCNqPCiSsWV8hJtpHP6azNEm4CZoF+GX1Pg3KWWuzYRh2YnZUW/eWUaZFIhlPXNXZOevByP9GaVTpkZiN7dEcwxfo7zYAOeFndtL2zZ6OZCDW4uwAUPycxE4H8hcytjgvPTttrLZwMEwaAkW8xQdj0xz/dNXr/KQ+XLbzk6S6UfgRssfTBARTLwgdZ1mRG/aE6CxiPwwU0NWVQwDo31O8gvuDolHpyExJfbyctuqwTccsm5cFJPjHQ8qz6S3+HJTxPu9/+yx2IB0xt85pXVlh/qzeLZoSeFhfZ25h3qheOQC5aJRjhpfeE3iCx132djwLy5Jz6SGpLm7q1oRsvCAp+S0uU5ZSrntBgajnJw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1fb3e998-a05b-4a26-b99c-08db4596ecfa
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2023 14:11:12.7224
 (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: DhGuCQPMDQzc7TKMVLxR+n23Go2gXGHbD0ytXjDV3XE1+irZ2xCienZ/49WMd+qHM/zTtr9Bvog9EXxBVEHE3A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5572
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-25_06,2023-04-25_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0
 malwarescore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2303200000 definitions=main-2304250128
X-Proofpoint-GUID: V3j-aEsCKsoSNYX7ECsgYiDCn3kIT5Xk
X-Proofpoint-ORIG-GUID: V3j-aEsCKsoSNYX7ECsgYiDCn3kIT5Xk
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,T_SCC_BODY_TEXT_LINE
        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

The maple tree iterator clean up is incompatible with the way
do_vmi_align_munmap() expects it to behave.  Update the expected
behaviour to map now since the change will work currently.

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---
 mm/mmap.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index d34a41791ddb2..c0140a556870a 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2391,7 +2391,11 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 #endif
 	}
 
-	next = vma_next(vmi);
+	if (vma_iter_end(vmi) > end)
+		next = vma_iter_load(vmi);
+	else
+		next = vma_next(vmi);
+
 	if (unlikely(uf)) {
 		/*
 		 * If userfaultfd_unmap_prep returns an error the vmas
-- 
2.39.2