Received-SPF: pass (google.com: domain of linux-kernel+bounces-210386-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: "Liam R. Howlett" <Liam.Howlett@oracle.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Vlastimil Babka <vbabka@suse.cz>,
        Lorenzo Stoakes <lstoakes@gmail.com>,
        Suren Baghdasaryan <surenb@google.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH 2/8] mm/mmap: Introduce abort_munmap_vmas()
Date: Tue, 11 Jun 2024 14:01:54 -0400
Message-ID: <20240611180200.711239-3-Liam.Howlett@oracle.com>
In-Reply-To: <20240611180200.711239-1-Liam.Howlett@oracle.com>
References: <20240611180200.711239-1-Liam.Howlett@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?XmYJ0Fq+APNLE24qeLX8/8dbZn0E2QxmMIPSM8XDoRu+qOsH+oFfPhXvRhI6?=
 =?us-ascii?Q?HS/N9LXPlVMwuTz19bNamSbSFoWEbivl8Sf+S2cLde2C5JXvRi3/iLfSiNxz?=
 =?us-ascii?Q?Poklw/ZB1i9x4RfdSIK3B/fyEvTXAuF07wfdkS+Y7/HPsjBbXKm8Y+rS7rbx?=
 =?us-ascii?Q?33k1F0JSYRpwMn+BDYsyNL+et2Mfuo6GQJceP5kaA/w3sOF+Vc93z3DARjcE?=
 =?us-ascii?Q?WBysOuYJnBnmEbx6vSoJ9G/E/0azvirOKXN+Q56thU5Fztw4frp40RbVxg9k?=
 =?us-ascii?Q?XAYISdH2Izw+M4eLTr/0FKhNzNO3ICAnOOsMUL5g4mKbWh2m1oc++3anJHiI?=
 =?us-ascii?Q?flk9MuzO4EwzxUTXKnA7AbElwd/Y1WTKfkgE199u81VnWZjMU8bxD5pE4a9a?=
 =?us-ascii?Q?Lt8fcCoHmGjgFaktoxrtS6lNs7YGRI+duh+Y0VBf5sNdFKtvwBu6O/C/tB7W?=
 =?us-ascii?Q?J4Esium60M+XRaC7WpvqazCfSwVFm9uY7NS1nQ61qSUipa56XL9O/mKyamlS?=
 =?us-ascii?Q?ZCf12u7XnaCEz0OTK8SEAqzsSByaayM4AQe0rAe2cBARUIaxNAOWnV0DbTd+?=
 =?us-ascii?Q?6zB2fhxuCjnqiBmVd7y3haLmKSUGlIzZXC/IfiIJ/gfGVgygy9sjNDNgEXJI?=
 =?us-ascii?Q?c2tJ6W3P126foF6e5L2npBipD51OoqE0en7YjAiOpY4v0zpm27laYnKzMLl0?=
 =?us-ascii?Q?InY/15o7Yjjozw17h0Kq1d9pyMEDRvfrFNoHJAI+I2yTV59X/8Yd4q8MpkvV?=
 =?us-ascii?Q?AmDW44533W6TldF0DUNGG06+rascJI4Z+tvMV4b9Ine6WhXUa1IDjolPC4P/?=
 =?us-ascii?Q?kjSbVU6gZkHM9AbBgtX2/mM+3jVVznwYe0PbsVi957x6bhKdZKafi6uOcOQI?=
 =?us-ascii?Q?0XUSyh9xLwJ7ugBXH27wJ7Y955zJaS2pZUmtx+6fI0vPTx5+eYwNFwiXIQHB?=
 =?us-ascii?Q?8MJgbWzzoeyRxRAXxcXryUh+jRxWvfuqkUMO/+yYYUzXl4oJ/TJnNM1DzVmL?=
 =?us-ascii?Q?TUmzcXCJkbowl7bseEXGtI4UiNSz+2yDZQhet/fT0cl9/OhPz6Qe1QC2xhXM?=
 =?us-ascii?Q?ge3wEd9EFZXl8O1SAuWsVE1QwaqvZNyAvmC8ZMNo1BFUZWOGnitv4OzUk6A7?=
 =?us-ascii?Q?APi1OQAqQTCUMzrHAV7Gik5Epr/EED/1qyx9+wd7Hy0UVyjRmLpB34cUQb00?=
 =?us-ascii?Q?ovDUYyhyv337DgK3bNnDra4teRg7gJRWOuBHc0vIxeSOHVtcDjd6sTJz7Rn+?=
 =?us-ascii?Q?gFxpJlqB8AOFPDPUfSvnrtynPNzvEfcci/kjkw72JoCb2aaK2End83peF3DI?=
 =?us-ascii?Q?HoMkaCG95VzUcFYzCMpE4xY3EPUHcYbFslq4G6efrGsRtA92GFyFJbwJ/Itl?=
 =?us-ascii?Q?XDAiU7fww6ORZqh5cR6mugBWDKBeiyj+IBjG1AMx4BhKSECqKzHHOPdzI+8o?=
 =?us-ascii?Q?M/mOIwKIP+krCuHmWdVVFVGCy6fFXxlFMnO0MZHi2MFr2zxSLlm3XtbfNcOW?=
 =?us-ascii?Q?vg2+vksn8fJ2WbPTUgNrJhGQz12YVPp46hzLf3zGbiLOXh692avZuGiOkZUk?=
 =?us-ascii?Q?Q3468z1kA+dA9E30/1T4105ftuVqtU9NWfTkzDIK?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	/Doz1UG7dPkqjElFhDk0LKVFTxdprTCnHKEdUgXZOIQKbw+pcCPaDWlefBHJBWdvon/1cNssvUfuefIzHdBN/nMtdtMi8qsQMoTkOEUxeMmXCDQfEHXtsflV1Fz8JWwerwbA6gUkmBM+q2XIU88YEaTl8YAGZCWIdkL2dv+OCRv7dgfbQRZKvvEztwPW5Uh7l0VrHm/Ayau/uxJJdRi5Tq88IT7p4NaVTEVsULPiQccZHYXY9lItwMWZDsZtni8D0+9T7GMvmC8HQobmcc17L8fKgqaYKt2VaBViSPZln5zoKNy1szlBkBgtAhd0v9ujfa/GoYFNH0httWOaE4bd6L59+rA0JczNdoyM5ceha/w9C7GZJpvKngA7JXHRY/a6uIFIRSmiR0cCg8ikbih239/BmSKtBW5Ny1xUhBAT7RMS9rPtk9xqIp2JPyqNsKQTjHMFlNDdD97cPQosDAIpdkrUKratJAnvrkpmpkhSe8fuFIXMbE3nfcg/ggHVJPfmKuGpHWhUgGB7CjJ54LBT2xoRD5YspxWRVcczTuUN2YTkASKd3CbU96MsnvAe9j65HQXuZegwpL4i0eNol72iEbRSAzBOOJlYsKGuUN/Zlpo=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3559d057-bcf3-42db-9883-08dc8a40a082
X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2024 18:02:15.6073
 (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: xxOh2QT+0CjgojXEr6WBriv+PdGEYwKTJCmyuWLwXB52WEDwwmDkPxeNnaGdR+lisPQ5l+A77tKMkOMvmX8urg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6154
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16
 definitions=2024-06-11_09,2024-06-11_01,2024-05-17_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 adultscore=0
 mlxscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000
 definitions=main-2406110123
X-Proofpoint-GUID: ViI8sNpOhNVne46ufb6JpFJJwZAeuOJq
X-Proofpoint-ORIG-GUID: ViI8sNpOhNVne46ufb6JpFJJwZAeuOJq

Extract clean up of failed munmap() operations from
do_vmi_align_munmap().  This simplifies later patches in the series.

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

diff --git a/mm/mmap.c b/mm/mmap.c
index 4a9929bc18bd..bcfcbe006b1e 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2545,6 +2545,25 @@ struct vm_area_struct *vma_merge_extend(struct vma_iterator *vmi,
 			 vma->vm_userfaultfd_ctx, anon_vma_name(vma));
 }
 
+/*
+ * abort_munmap_vmas - Undo any munmap work and free resources
+ *
+ * Reattach detached vmas, free up maple tree used to track the vmas.
+ */
+static inline void abort_munmap_vmas(struct ma_state *mas_detach)
+{
+	struct vm_area_struct *vma;
+	int limit;
+
+	limit = mas_detach->index;
+	mas_set(mas_detach, 0);
+	/* Re-attach any detached VMAs */
+	mas_for_each(mas_detach, vma, limit)
+		vma_mark_detached(vma, false);
+
+	__mt_destroy(mas_detach->tree);
+}
+
 /*
  * do_vmi_align_munmap() - munmap the aligned region from @start to @end.
  * @vmi: The vma iterator
@@ -2699,11 +2718,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
 userfaultfd_error:
 munmap_gather_failed:
 end_split_failed:
-	mas_set(&mas_detach, 0);
-	mas_for_each(&mas_detach, next, end)
-		vma_mark_detached(next, false);
-
-	__mt_destroy(&mt_detach);
+	abort_munmap_vmas(&mas_detach);
 start_split_failed:
 map_count_exceeded:
 	validate_mm(mm);
-- 
2.43.0