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 18/44] mempolicy: Convert to vma iterator
Thread-Topic: [PATCH v2 18/44] mempolicy: Convert to vma iterator
Thread-Index: AQHZITojQR0bNu46JEWQV7nrYFuiYA==
Date:   Thu, 5 Jan 2023 19:15:57 +0000
Message-ID: <20230105191517.3099082-19-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?CUy+QztiyZwJMqNvrEfWyHNklTuakB+xU33/vLXV2D2V194UM66K2QvYYH?=
 =?iso-8859-1?Q?9INWDeZBMTtKxV6dS4ZlF6TbkszyE8xTi+mbNhe3igJaYUIRgUf9zLljP3?=
 =?iso-8859-1?Q?z/t9zVYDyra+Zamnq0w4A7YXYC14kQ2RZ4K6x8dSqTV4uhYGxC16yhOp0f?=
 =?iso-8859-1?Q?jmDeO0xPDNALb75IpsErYBLiS/B49cQOOxMLUfc4UWVkssaT7mADMpsaFM?=
 =?iso-8859-1?Q?D3XnPLPnGZzzqEFF2OuDm3x5nCR6G9GbxG7bvoHpLH7a36unsGt0JLo8C4?=
 =?iso-8859-1?Q?UXX4+FSzIPYK6F37tJ4xd8X3Q289FgxJSajR+UDFWXhxFffvH8XQgSEPcN?=
 =?iso-8859-1?Q?9O3R7wCr+hv6/s1Y8FI+v0tWPaFqMBp3skH+iPJxho7c51nNQqftn8iBoV?=
 =?iso-8859-1?Q?knsWT6NpTdTc5gAQDxwklq5gfPU36mOI+lKCKSVx76XlrcTT4RIELbljzS?=
 =?iso-8859-1?Q?t8GK6YXecbhFH3hqsgUzN/jHZ3FevFLQkBL7hxIX4fAGJjzf3nb/MeHu7K?=
 =?iso-8859-1?Q?UDNG8aG3AS6UVfFjJlR/1zAGxuS+M/ZxlM5NF/bQb328gQavdb48NRQYij?=
 =?iso-8859-1?Q?x2u892gOpJghanl/BkI/jjNUnkbY00NDFUpyyLYCjayI4ktXaMg8t8znWw?=
 =?iso-8859-1?Q?EYsuBQE5zW4XP5D1dZeYJjgJMmrtQaN/dCrTbiw2O5B3LWopuA9ge0whgF?=
 =?iso-8859-1?Q?y4lHJRLciX+sqXtJeQOCyrmLw22S1pF3TvoFADnJ7SMth1NwOBcJTkxHWN?=
 =?iso-8859-1?Q?ZfwD68QbFoPC1Ly0rrCpTgvNcRUgXSyWCzSt8djSjwK1qQ0UT9aSqgqytv?=
 =?iso-8859-1?Q?p/80IO7VHmQnDV5zoK2EMDRtr0y1KWXTXReniIlTjx2x/AbKZj7ky+QbpV?=
 =?iso-8859-1?Q?UkBJZzcOr6boy++32we3WtBQ1eq8gmkmBhnA59wK49sB9iL/QxZmk/A1Ra?=
 =?iso-8859-1?Q?I0brRpTaLHrAk4UoqF4Eh9OYIbm2sTzzwoTVOe+kIqiWogBS0a29slAPBr?=
 =?iso-8859-1?Q?zH0gh3lSfL9fF3EgIFlBVWfzdEK+y9XNyD11Wlk3eqcZP7Phwaf6kNNVlr?=
 =?iso-8859-1?Q?KW5Gs/9/ERt2X6BtcshEB84tIDa+1M9prXR7nQbVQ25ecGkvmqFb8bDBSX?=
 =?iso-8859-1?Q?hBSobwNMmZsBnP8FuTvjoacBCwFZa9oxBM/Lf5QcieZo/c252y4UV0L7Jl?=
 =?iso-8859-1?Q?qmxd1rjAbnlQE69j3s2c4gjQk7zdlk//lV8EoiYMqoTXNmEJ5g3sLJrRHr?=
 =?iso-8859-1?Q?h9SgSDipihJWTm+01kf9xjqjfbnI9qZLPlM56BD4a5SUebccjJG8L8vYu+?=
 =?iso-8859-1?Q?UTg3GFz7P35vupDkOl2MJBu5LAxau8sl8ByhUm75/rjCDR3DMbW26IGQfr?=
 =?iso-8859-1?Q?eev6+Pj2EIvvRYNwWb93QJ+UhF2SLPpLNAaGCB7o/SfVoDBl5NR42oXn84?=
 =?iso-8859-1?Q?lms7+ZQuhNWBdSOGgXe82KNWa+AUdNkqK/2bNY6KTMuPZGW7f0bNdCSks+?=
 =?iso-8859-1?Q?YouEElHqYBsyReaL/c35eMmmmqNVJblualL9HGCcetRqZoc3lzummESPFm?=
 =?iso-8859-1?Q?2is1K2Xfi0GQ6XBXZ0D/nxvbLj9wFHhK4cmoIJ7scJltzPCmlEXsP3fs+1?=
 =?iso-8859-1?Q?QhGy1wA0xwPRdB7nny2XUpyzE1piRnh7SKNsZUfiynvGZguDXZNHLUhA?=
 =?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: X/hlp/36PCFPXA36Vs0RgvUaKFqT9/UrbLBbaqrKoxPdm7bRKxEmNlHWl6huuDdleOuCNmpbYsQSodhBl0wtbPuvEuzMyftZ+gGjOISV1cmrCYX4tnfBcj9WM9VTnkes4KEy3d6MlZPweLeKrEuPNIAEOQxOCIojBZXQUNI4+1LXMmP7J8miEa8sieT7cB4rSg3OWv40B2sn2hwrly3Xz88WwSBrYx0HWCrYOv6UKuS+5sRAnl1iX4uAi77ecez8CCfZ2Y6rnoKUm6gr9RCUq37XUW8Njoy19cqjMTAZ5ADdryyPKyr6UrrG0pE/bq1/J0LPRfrtwSY/YY4KTnyoXDiTRUA3Em6Rxo2OEfb/fn2J+rDc04bqIm+8OsmxLUwyy1bcYMqiJ6eufX8qMZqFdbuHRwAEfUbDWLx1Ix8YDqFKDK69NvY5ZN1jer/0gOOsLtclK+OQBfDBouyo/Ue80IiYyPVPunmCzWuFvTEKmpPqRqnEdzjQNdxmJc4yNvIhO/MoNrUzEhIycEw7dREp2mBPUesvpy8NnpxYIl/KU2VWyVBdP5YvjY5U7nrk+WrxcYLv8n6SVLqxlbEu1gwk291+Y8u72Hj9W0SB9AwN4p/2PtnqwfWjI3qD6tEzZ3J7myJuyZvES6st1kewgOg1xNN2fgAJFLmKmBArsC6TdHrH/9QEyPXlfLgZZz4nEryhqNj0pN2TUX06+xbI0qXfdqX0ZPCu8QQkORwKbob51F5zIGWpt39BBo9LaPsmkury8aG9Z6Nv+rfZEwA9vvSjZ2YU7MFQiWcdjlBUzO102rT3EebEBHl6mogdVpB3O5jL59WXa5YGLZJiu4rCCpK1y3uW/TqMXCBCZyQD2XhFh7Ow2WFkV7D2TtL9lwPX7tbKNbHj/QKFr8vheUREmhuqiA==
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: 33094665-4373-43d5-e008-08daef5148a5
X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jan 2023 19:15:57.8756
 (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: CA7cnuFRhyGQ5SaHWink6XGkSJHVzOzPT4ux2xlmyD2G2itaygw6gsmNrU0yecyPjc4k2MW4hiKBbzI3KPMPeg==
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-GUID: Y9ZUs5EXdjX9YmwDwncjXe50waS1pZ1D
X-Proofpoint-ORIG-GUID: Y9ZUs5EXdjX9YmwDwncjXe50waS1pZ1D
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>
---
 mm/mempolicy.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 02c8a712282f..6f41a30c24d5 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -787,24 +787,21 @@ static int vma_replace_policy(struct vm_area_struct *=
vma,
 static int mbind_range(struct mm_struct *mm, unsigned long start,
 		       unsigned long end, struct mempolicy *new_pol)
 {
-	MA_STATE(mas, &mm->mm_mt, start, start);
+	VMA_ITERATOR(vmi, mm, start);
 	struct vm_area_struct *prev;
 	struct vm_area_struct *vma;
 	int err =3D 0;
 	pgoff_t pgoff;
=20
-	prev =3D mas_prev(&mas, 0);
-	if (unlikely(!prev))
-		mas_set(&mas, start);
-
-	vma =3D mas_find(&mas, end - 1);
+	prev =3D vma_prev(&vmi);
+	vma =3D vma_find(&vmi, end);
 	if (WARN_ON(!vma))
 		return 0;
=20
 	if (start > vma->vm_start)
 		prev =3D vma;
=20
-	for (; vma; vma =3D mas_next(&mas, end - 1)) {
+	do {
 		unsigned long vmstart =3D max(start, vma->vm_start);
 		unsigned long vmend =3D min(end, vma->vm_end);
=20
@@ -813,29 +810,23 @@ static int mbind_range(struct mm_struct *mm, unsigned=
 long start,
=20
 		pgoff =3D vma->vm_pgoff +
 			((vmstart - vma->vm_start) >> PAGE_SHIFT);
-		prev =3D vma_merge(mm, prev, vmstart, vmend, vma->vm_flags,
+		prev =3D vmi_vma_merge(&vmi, mm, prev, vmstart, vmend, vma->vm_flags,
 				 vma->anon_vma, vma->vm_file, pgoff,
 				 new_pol, vma->vm_userfaultfd_ctx,
 				 anon_vma_name(vma));
 		if (prev) {
-			/* vma_merge() invalidated the mas */
-			mas_pause(&mas);
 			vma =3D prev;
 			goto replace;
 		}
 		if (vma->vm_start !=3D vmstart) {
-			err =3D split_vma(vma->vm_mm, vma, vmstart, 1);
+			err =3D vmi_split_vma(&vmi, vma->vm_mm, vma, vmstart, 1);
 			if (err)
 				goto out;
-			/* split_vma() invalidated the mas */
-			mas_pause(&mas);
 		}
 		if (vma->vm_end !=3D vmend) {
-			err =3D split_vma(vma->vm_mm, vma, vmend, 0);
+			err =3D vmi_split_vma(&vmi, vma->vm_mm, vma, vmend, 0);
 			if (err)
 				goto out;
-			/* split_vma() invalidated the mas */
-			mas_pause(&mas);
 		}
 replace:
 		err =3D vma_replace_policy(vma, new_pol);
@@ -843,7 +834,7 @@ static int mbind_range(struct mm_struct *mm, unsigned l=
ong start,
 			goto out;
 next:
 		prev =3D vma;
-	}
+	} for_each_vma_range(vmi, vma, end);
=20
 out:
 	return err;
--=20
2.35.1