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 19/49] coredump: Convert to vma iterator
Date:   Fri, 20 Jan 2023 11:26:20 -0500
Message-Id: <20230120162650.984577-20-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?k9+yrNsGv6BkwcZgEuPPUn3IE+rKkFnXVIsuDlM3ZeuMirMy0tk4vBbAPpOm?=
 =?us-ascii?Q?YdDF4yKokLpTZ/WZWzXb/UAng6Djk1DYD3fYqr2SBPKDwi95XnxK4t9TqLIQ?=
 =?us-ascii?Q?VHQA2kYtYdaEeYSbAeWiGTXoMHxK0/diTpwE4lBRg+MBBQ/18ZXcHiJGc0Sq?=
 =?us-ascii?Q?mI48SbEKUkC5qUtKbIDBpN+bmqSQRn2kw/rWzKd/FvqS1NPcd9mOCltPXuJV?=
 =?us-ascii?Q?noeEI/UHzxpzjgLVgOLSuxrPDavsw2P4cfC2RKKLHptgXQscUPheFWG1FWcZ?=
 =?us-ascii?Q?pblC6nRc8NOY7HGN2rUEoOb2lInV+jmIMkd8dBPv/Qlqdyhg1JhAjVNyq+Km?=
 =?us-ascii?Q?XrrTCpMdv8+MKeWeiPU8lj5UwItMSgzF4iB9vTRcMaxaHS8RjxTVn4SsuJsI?=
 =?us-ascii?Q?K1qPrpaqcw6+i3bsanr9BQgABWH+n81sJE/gMc7+D4AxXRHS5bYIIwwyxFfq?=
 =?us-ascii?Q?0EjEbFz5ZqBa9dPbJW8090Ce2bIbBuN6H8ar7noN6GtsRhu81y47ftlWxqJH?=
 =?us-ascii?Q?fyMl+X/WqsO4D46361nOUb4tRzoJ9gQJh5komFDvsBnc+vN365x1urGiGFal?=
 =?us-ascii?Q?vSEBnz/RkmjmfXgKBKCeYAqgHh/v5N3YH84N1H0gjkf3PD0EN1vePh7wGXDy?=
 =?us-ascii?Q?qU0bl5MJU91Namg8pq9buqqgY1hBz4Lev4vO9xqbEt/S0nl0zZkU7L39MPW/?=
 =?us-ascii?Q?N/Dt9abLdFMgthrH/fBSvPnk0vF2Qau9k2Xtab5uHgnD+Ho9sSl/IcTrQNxO?=
 =?us-ascii?Q?GYS7zcw4vEfuP1GzjNvlECp31kaptYtI4KpJB0RnT96d5RYDiR7gKQsEPF/L?=
 =?us-ascii?Q?XZNGIabJ/EFMHGQ+gYHF0cieIwEEIqzA0U5TaF4X+Rg6BqWfeiI6Z5IaiQ/1?=
 =?us-ascii?Q?QVOZ/7fJ9HQAej0LzDfFOdckMImRUCPhNvWyxb/sbn/r9YbUbNBw6LoU8lDF?=
 =?us-ascii?Q?1s7nT+t2aQH5OfQrreBqiy/+XtGhvCgMIEC7M4U6hQhcqENGgmzn9/Xbe7DT?=
 =?us-ascii?Q?/JVvGHqHhj+hoBUD0U5L7HFLYlyOZImuJf/U6q0SOvrRfK90Ms/XRRg0uy+b?=
 =?us-ascii?Q?HM9YGKbdUZ/wWeWAwzIhzirEFUu1mFV6iQmZ/Gt16WoyvxJ7IPIjpaAGbIu5?=
 =?us-ascii?Q?ikPMmT+7W/z+cYHnlMkaKL3Ao+UMCT63ypb9sovvJuUbmCltD4ronhyq5EYu?=
 =?us-ascii?Q?zvijvrJdixVk8YC9mYL5C5k0p18hPssxr2KjjyGyBVrxkemBvzShLAdafO/q?=
 =?us-ascii?Q?mkus3ISd5LR4WCrDxCpj1LBZXCOq+dixLbZe4QqIQ4wMeKOu06k+cs5SsfwU?=
 =?us-ascii?Q?DSt6Yd6S33A803b3Oh9wEWLlw+EOx3iUNeU8J6kxCjFv0+nmbOUtm0gUdcVi?=
 =?us-ascii?Q?wP+cWU7vm6wHbdD66BxcYXu9jttMjBbTOx7A9n5xvGO1mm/HXvZZTjKjkw7P?=
 =?us-ascii?Q?SCub+zL0fcgg27tlA6M8YEv+JVuN36bdID4m2c+p3r4MewQnN6xE5uVhgzIm?=
 =?us-ascii?Q?MwOiaXSJ8mtbrk3Tik/MoY9u4NeewYh5NOmhmLZLVToJTpub2BlpiUVrUWM7?=
 =?us-ascii?Q?1zVtqNxvRMCFtSvlG35QrdNsdmRSSUbagX4kOaOxQvHST+HjUHBvyj9DAYdr?=
 =?us-ascii?Q?0A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ewb25UxK4SXR8HLzTl/rHxpNgmee1R9JzAjxzU42VTZgl9DQ52SMmsqjhEOKMR8OkB2in+F2eGXPVzSVUWrcX9L8OijMrdXcMiHt0wUPe2bJ/aDhbZJv2iEVBCxi1Fp3V90GVFjxTFoUdDLClOk5K5q9xlsQ9aQUcKRXdstS/CIBgK9sxMgLBu8rM/LgztZlRRmtrB02BrZ9Qx33bcQkiyatAKraQeV/wkud/esT6ea9z7VDjLhEQb2XRuVdtEXW0lMXMFL591YEwFXbbKuDGdNBKBApvyLknv+5OfVhe45DHHLlzuIjfWPxfXYQwvyzLZcV1b4E2k1WcAlv4diY95YvEV5BYq6l6AMr3cuqb7ZaFBObtBza6Ed2RyLoTyQcZDyZwM0Rz3dSEGEvu7EgdOHAJfjKb8DTB6ff7f9ffT+denE7BrHGOZxcJLs1hh3r9XpLJAxjlqO2KiNJTCI/ruYz2W/YDIAClF7RjRDMW+O2gTNJLGMFSr2zCqphzlmK+P1oGdtk1BavHNRr3HPyfQxmYFMTsYoiKU0XqkOMzCbmK6eITBm2SK4QM9vaOeBX+fXZTQ+8ggvK48IFdZTRc2gOLFN3oUEdtVjP8AKNxOOGrJ2JdrQSrhgWpc1eIArTcgdGYP5GJ9zwk9UNaJ/eJb0NT7U8gQ37ti2peBOIvavZ9gFjWxPqmyMEl/vV5cJNTwcdq0dMJ63Pu8UgrA4USB5C6VCNa4MVoagPdE4Y8ouprphyXThGjV68xAW3s7bKMI22p54R9b+3Djjyv965gy8OalP5CygqENzYFhDBKJV2GHGU54JD8dCI5YXmFqq6mx+eM+3UqA+Z7AxBAk9ngWlDIku/ONn0fHv8K/TvNC+Z+aRsZOj0VLwF953F6pdsVQlfMPZ6rGKzCALz+jxpbA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b6304b48-82cf-46a5-ae38-08dafb034ae0
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:27:58.7933
 (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: z4TimXEOL3RaIIX2TuhYXy2kuZSSiNEif8lGkZuRys739Wq/bzAPLnryQA5GBEkiHQGTIc2/PCaOF+++rjcKiQ==
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 suspectscore=0 phishscore=0
 malwarescore=0 spamscore=0 mlxlogscore=999 mlxscore=0 adultscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301200157
X-Proofpoint-GUID: jOU0MwfaRsnZi4rKzuj3KyjiDJQfsgZ3
X-Proofpoint-ORIG-GUID: jOU0MwfaRsnZi4rKzuj3KyjiDJQfsgZ3
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>
---
 fs/coredump.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/coredump.c b/fs/coredump.c
index de78bde2991b..f27d734f3102 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -1111,14 +1111,14 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
  * Helper function for iterating across a vma list.  It ensures that the caller
  * will visit `gate_vma' prior to terminating the search.
  */
-static struct vm_area_struct *coredump_next_vma(struct ma_state *mas,
+static struct vm_area_struct *coredump_next_vma(struct vma_iterator *vmi,
 				       struct vm_area_struct *vma,
 				       struct vm_area_struct *gate_vma)
 {
 	if (gate_vma && (vma == gate_vma))
 		return NULL;
 
-	vma = mas_next(mas, ULONG_MAX);
+	vma = vma_next(vmi);
 	if (vma)
 		return vma;
 	return gate_vma;
@@ -1146,7 +1146,7 @@ static bool dump_vma_snapshot(struct coredump_params *cprm)
 {
 	struct vm_area_struct *gate_vma, *vma = NULL;
 	struct mm_struct *mm = current->mm;
-	MA_STATE(mas, &mm->mm_mt, 0, 0);
+	VMA_ITERATOR(vmi, mm, 0);
 	int i = 0;
 
 	/*
@@ -1167,7 +1167,7 @@ static bool dump_vma_snapshot(struct coredump_params *cprm)
 		return false;
 	}
 
-	while ((vma = coredump_next_vma(&mas, vma, gate_vma)) != NULL) {
+	while ((vma = coredump_next_vma(&vmi, vma, gate_vma)) != NULL) {
 		struct core_vma_metadata *m = cprm->vma_meta + i;
 
 		m->start = vma->vm_start;
-- 
2.35.1