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 20/49] mempolicy: Convert to vma iterator
Date:   Fri, 20 Jan 2023 11:26:21 -0500
Message-Id: <20230120162650.984577-21-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?d3LkIb8H040rbUw1l9SoapIEHzInk+mbdFrQACFaA4jWP9wE4eq27Drgy5lU?=
 =?us-ascii?Q?kZ8K2ym5BiNp0/fOX7MvQLMuEqS7Ub5OK/5fLMQUAyq16vWh+wQNDLfm9Fo2?=
 =?us-ascii?Q?9xuNbYn2RSdKDpbbiPqdzBRFu+n+Z0LMoPlThVdy1A8wHKo2mjvyQPuI/vKB?=
 =?us-ascii?Q?nBoXueaUQcTCaprEgNNnDG7/REjrfeS/XdgUCKPDbRctTmZe8TvYs6cizf3L?=
 =?us-ascii?Q?LS1JoSpqSZXP/N9+X79M9S11hqQYa++yWs35kWdjJ5LW6RjbpaqnOiY6feYE?=
 =?us-ascii?Q?68xZ0WSWfUj58Dss7DDvSY9DcbJyjW3ua6ZnBJPqqUXhKo5UZhKQNvP7Zwbw?=
 =?us-ascii?Q?9toaPkKioAXv4Igoi5pYchjWhFF7/3VvtkXsJUtNUDJ7ULc+RrCQH9FON/Xr?=
 =?us-ascii?Q?BHqYG+rcA810P3OkVFPx4oJdWpUhFXqE0fJTSQKM9htWLrNdlFEEQNESukHX?=
 =?us-ascii?Q?R0B+H0LecqVFOYcEUTmh7ABv66MB9cz3SUdsg3HlqR6VyEFNnLzLTyjkPvd2?=
 =?us-ascii?Q?uh9Ar8MvSOPyb1kCM8mkzGKQOyBxN3azswqFLcW0y9VuX/MUgXQ6RWPyCveA?=
 =?us-ascii?Q?y0ljfTEuo66rkpCB43yTJ26PfnkiCBXB7w918gkXEVmsQZw77KTljdpZs7qL?=
 =?us-ascii?Q?CKdPyyuje2Fac0kwvknFxqJCALzQDJoLr1yRssO1i/bM4Dm6T/gf2QQiuA/p?=
 =?us-ascii?Q?5wJ4331wh5lnCC7k3+LSNdLNvb4Za6+JiXGp3YpQF8i2ykiL5w2xtjx4pt20?=
 =?us-ascii?Q?DSlcdR8hkJenSto9dGG5Xlks+Biov15LJG/c+p1+nsyq2MFCQznQQj7aUwFB?=
 =?us-ascii?Q?R4gV7yvqgb45JoW/PvKHGUUhQMFfpu6ilqfb2M2gQugTK1HyrTNkVPMyfdJQ?=
 =?us-ascii?Q?zsT5W/zMIfnWCNyiEWjkDeDycKFXziisE6F29BWaY1tbTArXYDYojGDF2HIM?=
 =?us-ascii?Q?LpihB14eMDfaMieJ8px+MY2VfX9dAtqpE6Pqn69Alfr5qi0QW0xoQlemkKzo?=
 =?us-ascii?Q?e2buIy1cLn5DshkwxirgaGNSDid0+BwfpgEy1cbWdiHvt0q3mDVnbSquGYDg?=
 =?us-ascii?Q?Vaw3tZkDzwWgOhNPzQ/LkiAOFPXc9oMyIKw3skBMvSJ93e6MoseavToXcrTN?=
 =?us-ascii?Q?reT+zk6MQzIf1OmhbI1HwsUKZ+kSuWQ9LWqjnYs4wyktNcnwCxFKQ2nrXnnI?=
 =?us-ascii?Q?jwh0//01pUm+/Xka1uNxa62ypSPmmFqM8WD8NES+6BnqOnLABm9gPnKx6yb8?=
 =?us-ascii?Q?Osn8IyqbK++h/TKyWmvJC7N085n5AIu7XS2/ZKAcNxq79mHROAtd0ojtKVY+?=
 =?us-ascii?Q?ATgfe//5b9l101MVm/Jw/S/a1OkTBIecz2CZUTbId/lNYjaB6fUkFBTZKv+G?=
 =?us-ascii?Q?MpcC5PVqZIo9POXChSqFX/CdVpw/rT1r+BfPRGiOg0fTcZq4Y88SZvCOfCYo?=
 =?us-ascii?Q?24M6HsnLQ0CplFmTl2ESbXRvJssIBfoReu5XaqP0MjFC3XdyqbMN5pxfT+Qi?=
 =?us-ascii?Q?elE/NEW7Lpqnk/5cuVFYGyuXXuvcdyKOOdD71x1w2S6xirL16a7Pmw0UOcoF?=
 =?us-ascii?Q?HAIS2HTxvqoTtkShYPHFS6BloShiM+N3Rilpnq9BmffwQv13WXwno1RZ/pzf?=
 =?us-ascii?Q?lA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cquKLitXkdoepoDxPCNEyaEpFFrGnOOXIJUEb8M+a9X5Mwo7sLu59HmGN1vxHyxm6zpFsPa+v5Y5NgRSMR07bNCN5eiF75AX/DgHNqx268LHVHhXlOXUj/OMbJwMQh0+P/6tBb/+3q9P27UhaMFYBcjUygimYG4F9dYLWe1KLq3eS9tl9yGD7/djrDH3MQr20PEX4adDRzu0BdngExVaWt2nEYLt+rqw64UbpZObltrirBeOx7dpllQcmA8anGnlH0UgibcmmLUMxtVzglGdXszYPHc6c8gSQ1aSpIZEFWfHt7M0xXMvB3I6IaY7zqB5FARihc9bNvvM4ba1ySYNs6evHXAaapvPisrVPW3KkwshJ2WeRU6XGRdzKS8qE3/OM6N6UY1l+2462wvxyhBo4z5q/eWhFEDMkNQHyYLN9bdO44wzkoh2V41XHddUY+2qR/JRHE3ta6uxWIfIwqVBNX2ljlZK0MLkk1bm0Dx5qlMx+aGuySdyTm7BLfCiR9qhg7c2qW1gBGp2oRd9PSYB+VOWedI4JcJji5hX9K/Am7ZND5AAFucb9WVGk15lr/h2bi/KNHnwH6Bz2IgRpBczrAg+6pbKMZfbfOWuEpiQPY7WUXEkApoqG18ODEqCa1n2UVpNNjNfrg7IWTnkg+m5We4wPAizNE8wa+GKCXF3xUKclizr8k2DQnYDBWyi/41qUcleWjUZ7T7vzLJsdWZHQOal03/MTbITmOI/XBOBzyo792M5eL+Ivt8XPWQGGATSZFXgw3se25yyrz2Ox7qmR9Z2W7a5FFd04wWYyegEFRwDJTJ1deCXnBHbCwkZcAMFoGnEseFNvn0npX1S+DSHU4ZP8NhA/8Ia/5Vps/X+V7RfbxHOS4ZBYk825YFHx5GUOj955MSxexw2InwFq4jfaw==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cf7538ea-4cd3-493f-347e-08dafb034c52
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:28:02.4025
 (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: ooo4p9iExumGqHeNr8M36R7YpH9bgK1dUHjS+duEBJ/hRJXvZPFXtBmnJQnPvY2XrJf2PXlMxe9JMlGfLYX1wA==
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 malwarescore=0
 phishscore=0 adultscore=0 mlxscore=0 mlxlogscore=999 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2301200157
X-Proofpoint-GUID: Sg_AcXIX_VmotX3jsWaskJdGwpoJruJf
X-Proofpoint-ORIG-GUID: Sg_AcXIX_VmotX3jsWaskJdGwpoJruJf
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 fd99d303e34f..f5201285c628 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -786,24 +786,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 = 0;
 	pgoff_t pgoff;
 
-	prev = mas_prev(&mas, 0);
-	if (unlikely(!prev))
-		mas_set(&mas, start);
-
-	vma = mas_find(&mas, end - 1);
+	prev = vma_prev(&vmi);
+	vma = vma_find(&vmi, end);
 	if (WARN_ON(!vma))
 		return 0;
 
 	if (start > vma->vm_start)
 		prev = vma;
 
-	for (; vma; vma = mas_next(&mas, end - 1)) {
+	do {
 		unsigned long vmstart = max(start, vma->vm_start);
 		unsigned long vmend = min(end, vma->vm_end);
 
@@ -812,29 +809,23 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
 
 		pgoff = vma->vm_pgoff +
 			((vmstart - vma->vm_start) >> PAGE_SHIFT);
-		prev = vma_merge(mm, prev, vmstart, vmend, vma->vm_flags,
+		prev = 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 = prev;
 			goto replace;
 		}
 		if (vma->vm_start != vmstart) {
-			err = split_vma(vma->vm_mm, vma, vmstart, 1);
+			err = 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 != vmend) {
-			err = split_vma(vma->vm_mm, vma, vmend, 0);
+			err = vmi_split_vma(&vmi, vma->vm_mm, vma, vmend, 0);
 			if (err)
 				goto out;
-			/* split_vma() invalidated the mas */
-			mas_pause(&mas);
 		}
 replace:
 		err = vma_replace_policy(vma, new_pol);
@@ -842,7 +833,7 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
 			goto out;
 next:
 		prev = vma;
-	}
+	} for_each_vma_range(vmi, vma, end);
 
 out:
 	return err;
-- 
2.35.1