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:     maple-tree@lists.infradead.org, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v2 22/36] mm/mmap: Change do_vmi_align_munmap() for maple tree iterator changes
Date:   Fri,  5 May 2023 13:41:50 -0400
Message-Id: <20230505174204.2665599-23-Liam.Howlett@oracle.com>
In-Reply-To: <20230505174204.2665599-1-Liam.Howlett@oracle.com>
References: <20230505174204.2665599-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?jjnhliEqt5Z95QlRJfFNcuqn1frnleBM9Umv24xq95sF3qYa2uS2L3arYBFB?=
 =?us-ascii?Q?9T7XeY9GOLPgyifH8dpO2Jr5KuYL6sP3cfcxX6FAhUGt7/9ThzQRG1HJQemO?=
 =?us-ascii?Q?xQNShO6jfGJ02j5+w8752qMiavVog9KiEkYC1LIPSZOIgxOKMXlK/9L6rMix?=
 =?us-ascii?Q?mBeI1ImHHGEbTUS7L8IVyi2tcq6ZERNou1DbQ8aLbIzcOTUHsdJftX8wkWkP?=
 =?us-ascii?Q?oM+1vKZwMBL5u3UsRzCALDsjdE4F2c7piSgyP1AfS0OoLG9U+AAyFA4vzoM9?=
 =?us-ascii?Q?uiP0EQpQP3laXPfPDvtlGr991nccoQ5jHyOVuWYnjX1WFZQtEgYKy6VjTv+h?=
 =?us-ascii?Q?TxEIzDf6draLfzkNJo9Kw8y4TJcDt7XFMnewQMFDVDOhqVbIlMNFNoumhlO3?=
 =?us-ascii?Q?Z01aifrsdhnXeXj0a+WI2aKli5B16/IgnrO1YPyK6XZg9D1q3DNUO6cWkI9F?=
 =?us-ascii?Q?GDscbqywfagOqy68t7yQ6w6qyxmlapUUMMSusEATRg4K5F+wKyGABPOs5ZLn?=
 =?us-ascii?Q?EbVcuub7efCvy/jQvWj3oQTopB7tGEr1ukfnQ1VtZgv+Zzmn/CjEs3KExQcw?=
 =?us-ascii?Q?LKYUg8Xho1MOenmSwOG/EhGZ6Q2FXz0AL73SP3F6/vQncauwe3MI0vMUVrFB?=
 =?us-ascii?Q?jSgQO5abPOnRO6t0b4xlGqD7yXbVEuNUlvVTjTzEiLXj16mNDjImhe9OFW0f?=
 =?us-ascii?Q?ae3QZf2R5CKn+PzCGsswiK/vD5SOjy7QczRV4w4KRkQu35JmfwVGKbXWah6k?=
 =?us-ascii?Q?ifzRWJ/K1lvgmCyB0f/UtdBW1MZYuFi8Hi33tlBPf1/rGExm/q+oooFBx1JB?=
 =?us-ascii?Q?FiYTM/OMOM9Cbw8VtR40YKa8Ljr5gMUds6s0ED+aCm6bgWAsrQM44EqTKKTC?=
 =?us-ascii?Q?k5mGm7txlYCSm9930ZOVMnbZAGUJMBghi8GfsJnBSHVLsTVZHUuKtXRM9KkB?=
 =?us-ascii?Q?e076BCQG29XD5+E8QC3WlaxpBziA87baD8oq0zKSSwGMjbqS1qEnCJ70fwXy?=
 =?us-ascii?Q?w83SYX+IxCwIqMCyq4E7OyUM15AqBCX22KpOjmhet4arW/tzgWMeXNZajCtZ?=
 =?us-ascii?Q?LNSQCTzLZrcxbRl7nZxrplkXLif8q+OKMqZqdul29EFLjSUaCchliyUaArMN?=
 =?us-ascii?Q?MIN+r8xzAiez7flOmApQslieXaNA4t9KT7EFEBMrF7X5YCTrMyC6zuPuS6T6?=
 =?us-ascii?Q?blvjdkuKOJ9JcgbaLKmoB4/9Iqf4lVTBqvsjp8iNlnZso9y1o6KxI82uELj2?=
 =?us-ascii?Q?ouLmpo2c1oFsqTzWm5+MlTzHfpBZ/cUAVicMtkVi2cgXoIZjn4ECHpGgKrsE?=
 =?us-ascii?Q?z8RNx9eawhJcdBtAgI0Zn64TsK/xtN5GOG8xX2pQUzO8kpSkxSBHB0kJ6iw+?=
 =?us-ascii?Q?BNFyNgZkld+Yu9juidfIaQJ9qP4IpinXE5bBgBm/U+aT+030oemPhxO8wnfk?=
 =?us-ascii?Q?PqGoBJH2GwKm2LZlxvS/kKIvGZixZNy8ph8UE16OD4dyYzUxC7AbGVXF+y6k?=
 =?us-ascii?Q?uTPhwtw0z4v09kPshixRl1Ogcfh+s6cfq2QOppOB+aLRdltmAGr3Vn7btVag?=
 =?us-ascii?Q?lIIwYA0DzLm3pGlc2B60IPK0DEe2DQkeiwKMu5dBf0xZOJZaQTwQkRzF2xNs?=
 =?us-ascii?Q?Qg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: C/IE80HXFEShCCZ2K5Gaa2bVmDVKJ45b8i+CupovesCMQlpQzQQmWGFUx1xxcdXwNDU8ZT4Zb+uU1L3o3VlisRH8f4hU9l6JfF0Av1+oVxIMTIPPW3rZxwzA8fEvnXEeGZcdJaPwBS8x2kf6roQWi0cel2XMeYMNVvGGDjWsiwGJBmeJ4A3UV3rQn6q8LOkjJFkalTnCYtX+UKM7Zel2fP74rLCrwNeifP6mf5Gr+jaEJ6GGZEJOQ1JYTDATr20bTnhbogUfmfqofOPu9/rYnDIhlHpPtVNcF0sFKhJ4lzSj5gMeYp/zyMoiOESwIjhdDDRqrsA/ZWr1MPEqqdaHTUhqffdk4+/RVolHZBNSlrq5FGYwBZxjLG4EShMRyT3bWK4O2LfRmdN6w1X778B7AZhApljcSKPPB5DrHJOGzfSnP6kC3Jj0+NLh9dbSHQvraZ1WMCdhRhErWEZKxkwyBPPi9SrNMF0tVqI4GXZ6OGVblTeQDV1EYClfkqftN+q8ggrYVH7I/T7QesJp8kiRorAJ+QdF1D9nK9kF1S6MQILHzjM0HaRiM2PxyQvCa2g99xzmpwimQsjYXfEe+0dHVuD/cEBU2MzHWdjxOlg4kRxAx8akGqagcvay2iKknvIhowotc/gwme2GXzBzP1S6X/1pfxTeMELZoA+QnQAIH6/k5kgLVP1etxGYcLLptCrulfuNAH0e6P1HOX966VBXSQNCMIhXjqVLBU+9alIjH/za1iJ3jKZ6gcxf4S/aekgzv2Mkjs7UX2olEk4k1h1ZWM6LgTT+RuF2lbDRUpV0hGW1q2rPBN6BlXGxmxQhmCIwLcV70zFXmGqG9zEaG8yFCbK5LXpM1VOa3rhTIn2QHCcgPaOBbf9tzI3am4hqPUIqyqorRZ0V9MA/CjRYVr26BQ==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d70230a-d0c1-4412-d9d4-08db4d9063d7
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 17:44:35.0017
 (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: iEFMpF6pbkTzZGl0ku2ojV7+cqXcKKt1u5qloQwjrJ2XTTtV/4Oh5Ao0CAGzhdHS+MoSBlm6c/+F/qjL1vc2FQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB6895
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-05-05_24,2023-05-05_01,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000
 definitions=main-2305050146
X-Proofpoint-GUID: OjPz1oIn4gmgVkkXeLOlFTGQDdWdKwJA
X-Proofpoint-ORIG-GUID: OjPz1oIn4gmgVkkXeLOlFTGQDdWdKwJA
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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mm/mmap.c b/mm/mmap.c
index bcebfd9266324..1602c854133a4 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2418,7 +2418,12 @@ 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);
+
+	if (!next)
+		next = vma_next(vmi);
+
 	if (unlikely(uf)) {
 		/*
 		 * If userfaultfd_unmap_prep returns an error the vmas
-- 
2.39.2