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 Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Liam Howlett <liam.howlett@oracle.com>
Subject: [PATCH v2 17/44] coredump: Convert to vma iterator
Thread-Topic: [PATCH v2 17/44] coredump: Convert to vma iterator
Thread-Index: AQHZITojDS5jnae8Q0GVPtLwlCGoAg==
Date:   Thu, 5 Jan 2023 19:15:57 +0000
Message-ID: <20230105191517.3099082-18-Liam.Howlett@oracle.com>
References: <20230105191517.3099082-1-Liam.Howlett@oracle.com>
In-Reply-To: <20230105191517.3099082-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?TJZUuLADYzmWMlqhauk+zGLK4ccKCL4pRZiYcPrr2iKS7hKBZmOJVAfNb5?=
 =?iso-8859-1?Q?L0gFfmqSv1FPAWzqt7GFWnXR/FDsQeGCI2iEdH8LFrfNCWvV4GSaxDjWMb?=
 =?iso-8859-1?Q?SkrWTqo06cPt4wEMlmUhRz76rMrhfzz8mPP+WBZg1UMe4gazbrboUIChT+?=
 =?iso-8859-1?Q?zokB8/zsRwHulary0JPmsegsjuzeB6Ml6rkr9bxYE7VJsVQb1TiktYVQTc?=
 =?iso-8859-1?Q?GskzGf6nPuBb+ijpw/bCTBotwY3v+wAWbPgdSGxXRLAkgoPe7X8u7jKqnr?=
 =?iso-8859-1?Q?J58w9CQdcDRmIpQpT9NYjGxkAfaFNf+br2YoCrDaBSBk58cX7G41DBf17P?=
 =?iso-8859-1?Q?r2t9SINVp1szLl96g6feosNCWxzBeY4OF6+flcaWmlCxf2lXKnPWTJ5T9X?=
 =?iso-8859-1?Q?z2chNjsl2kd/UugI3ueuRVjKYOs41jnYqHQlp2U8zwqDr+8l6xvMpGyiAL?=
 =?iso-8859-1?Q?IixQ7j0PjmnPYPONvMak9+Bdc0aSM4ixiwo2681YpPa+mp3N2Oz4nsrHs7?=
 =?iso-8859-1?Q?g/Z+YT6qM93nPjf6KoK+nEGj81tD1Mv6IZDa/m/HjFb27DwHOx2hOhzApD?=
 =?iso-8859-1?Q?uCiwChs5bGfTB6rNQxa0P38zr48R54IrL9AqNZHeWvC5Kej1WZWHbgFEi/?=
 =?iso-8859-1?Q?qDoD/5r7LMkFjaKZmMI/6WD6eJe+DgK5Iai3hdhJX4bzGq+JkIlBnDw1/2?=
 =?iso-8859-1?Q?Jn64pbZavkXV+F5ieEaYOs1zaB5idPxvRDCSl/TwOw3MW1xVLxxLuD2HUK?=
 =?iso-8859-1?Q?0Ljm4vtiHc6Lj88SSFWFD8O6epS52xf1M45Y4rKO/1ziiYJOhRFimSIYHi?=
 =?iso-8859-1?Q?ZfNNnDrFQHeo9gb4bYQZs5g/gs47b7qng0dfhTIw/8D5tCfpiObsgZReXR?=
 =?iso-8859-1?Q?LJLqm3glwPqBJoSS2sYEYklc4FuNultBRP3zahf/GgxcpzQNYOVeMboQcx?=
 =?iso-8859-1?Q?mMJAZ40xIdbqoxYd6NodnUgJXy2Z2sOLZrBI2A4cuBQ2iGfi4BlNW/vdfn?=
 =?iso-8859-1?Q?dqmc+mPuLwDP9GXqC5If8BCbc7X65lWqDUGJlHnFIHmF/aSoVkFL2DZar3?=
 =?iso-8859-1?Q?9uFcl/krqdyVsUUOtfzRYnijaa7vKzmib+QA97Xly7CYN5snTsfOWQ0qI4?=
 =?iso-8859-1?Q?kYkouGJ8dVhZ2buTtNF9s8UASjNYnYMq4sGCxWeQsiztwUhHIwJzvglk9t?=
 =?iso-8859-1?Q?kXqlsNUzszVNFYQn/E9Q1i68TWSQsXblyCZXTtm7PFhsC8F8b/vhka7dW/?=
 =?iso-8859-1?Q?w7IUyRX9HDwHBdZ3hgl/YqLCb8ENMvVf/ho7y9uihWBSETPpKiMdvjdu0L?=
 =?iso-8859-1?Q?PDR2G68eLxN7SLIlIEcd24LPGpNGgK376PwciMnkrZxXLPhRdUuCjHJ+eB?=
 =?iso-8859-1?Q?QZER38vCW2Vsz5b0hH4hUeHldkwOtP65Kz/WxJTd40HgV3pbJDhmmeMLHi?=
 =?iso-8859-1?Q?95QpThLpOfO8TlL9/UMySRxP3mLWJYk3zRSQv99l4YUU2oPfhHfYPlCd/H?=
 =?iso-8859-1?Q?H+n8dm3d0PLK4lZ97tojtG5z303KnPjgdG088lnEIV2ooiAZ2l42JIU+L9?=
 =?iso-8859-1?Q?VZENWAg362ydnEevYKjuN9P8UkZGPFDX6uSwlPheRjgDM2gS1u1X0FQp84?=
 =?iso-8859-1?Q?vLZtCy0fPfVVDIZRCioatQHiMKXaEZEi9JM9ArE24A8OtXCB6eM543Sw?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ao3lQANr1mxO5/uXIAPWWXZs3xbZorvZv9Bf1FXj1mYev+rKfX6Z8Bk33Zh/98SXYBQhU6CXvVewxjsd1zzLQtOe+6x9Nm7TV0OEZKvwF07wClhGzD5Y1CW1CKQErVRIJYWMAIEPpX+3VsEuJogmDAotmCEjnlWuJpeWvDJljGJHWdLiFCLyn7dLginK0Qdm4W0A0srrO+YnGaAzXv6Obe7XXEJ5enAC5mKzyCHdWl1If+DfoBzXW02WWXhWnzcfBjOvA/6R6x/ayIsLWNCJA/t1u7N6vpp2jJPCCaD2Grl5KrTE/TcrJyPJlwCHHElbel6Pji7fGEXrummfWk0+kCIPKRjf0PbFKpHrQnPcCaqdEn5cedfE9/ScGtmNTssSABpuwoLcbF17wn/RDYvgAkfqu5wA9REQwg9EDwsmDA9jBQloM/6QBvPj7MdWq3i1gOf3hB9tot28LrOfHIYFJx1TqrGl5L7+2XUYZpGRqUvKsvyn6nbZwb/iAuUg++khiYZytFTLu6mETSgJ4uMyjIUxQlUv6qc0nULFxcbo/DourDBtXd+rnwvaEsMeG1WIHpPennLamLyChwB4dblIuivTmD0pDeh/UKED73majxgldnWidUSuZMn2XHimigUPi8vAxjd1B3MSyttKTGpU9w3z63WtDyXGtC5oRgzTkCjOl6s7py7qd+ug1bl5CmJIL2A101omq0dmY7LlLwZWZJ/Z5ZYWV2R/1+tcri48nV7yQlC772S8ayfISN/uQ3BaXJEAfEjDb210gqCvoUTQhJ40NUJ1Sidtbb9Cgqd6J7nW3iwA28ql9d8sgdfuPtbYlhRKI+dfGduOIcozK64u8MaOCC/yKuPZhGyBXP3Jh/QF99qbgUe7tvHbcxBIsQD3tdJlJiQ8kD3dLRkYr+fEQw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3954ead0-7d07-4238-f874-08daef51485b
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:15:57.6100
 (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: MtgraOol+xxlXLwDr4zmZyFPc3tLGrtXthu74+i06gUhlAGir19xvfX2K/mdgcSgvDEh3U8WVteRxAa9oGGd+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6075
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2023-01-05_10,2023-01-05_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0
 mlxlogscore=999 spamscore=0 bulkscore=0 phishscore=0 mlxscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301050152
X-Proofpoint-ORIG-GUID: MUMrhaSss9grnPS3DmuOJSTGbJhSc1c5
X-Proofpoint-GUID: MUMrhaSss9grnPS3DmuOJSTGbJhSc1c5
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_s=
truct *vma,
  * Helper function for iterating across a vma list.  It ensures that the c=
aller
  * 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 =3D=3D gate_vma))
 		return NULL;
=20
-	vma =3D mas_next(mas, ULONG_MAX);
+	vma =3D 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 =3D NULL;
 	struct mm_struct *mm =3D current->mm;
-	MA_STATE(mas, &mm->mm_mt, 0, 0);
+	VMA_ITERATOR(vmi, mm, 0);
 	int i =3D 0;
=20
 	/*
@@ -1167,7 +1167,7 @@ static bool dump_vma_snapshot(struct coredump_params =
*cprm)
 		return false;
 	}
=20
-	while ((vma =3D coredump_next_vma(&mas, vma, gate_vma)) !=3D NULL) {
+	while ((vma =3D coredump_next_vma(&vmi, vma, gate_vma)) !=3D NULL) {
 		struct core_vma_metadata *m =3D cprm->vma_meta + i;
=20
 		m->start =3D vma->vm_start;
--=20
2.35.1