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 22/49] sched: Convert to vma iterator
Date:   Fri, 20 Jan 2023 11:26:23 -0500
Message-Id: <20230120162650.984577-23-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?IEeGcSnpCIwYmS0g6wl0aOccf0WOGxXpT8DdqsQze3FqcJ+QGeCPeoFMI4qY?=
 =?us-ascii?Q?MSF/mclX9nooJ+OoJJ+yYd/j+XXVlHhNBlqjag/klkGMVMlqrU3VhFmATQrN?=
 =?us-ascii?Q?YOxvzq5JDU2xsbBeKFeVsDHXyjXR7XrghGqQMYdTaoIKzaTTOiJDd5uo06KJ?=
 =?us-ascii?Q?C+xrUpFedHPDmrQ0tFgUz1g0sP8MX5FjhjgeUbTv2vw/LrjNyLkIaw+6M8Yw?=
 =?us-ascii?Q?xsIWWQKk7UwOgWLStOsSNmfyXKXSM0VdAEMs2bPUxfprJoyoClyM+1DLymfW?=
 =?us-ascii?Q?4SR7Z90IZj5lZ2iBiKP3UZEHZmOCMIWbOlEVQxHc+dfXrAn8qgTCf3GvRnbN?=
 =?us-ascii?Q?aapyJZpxL3Vykv5rDXoE/ddHO///yTl6L3Ee/6oFfAcS1k6M3lr0yYIpYHcH?=
 =?us-ascii?Q?0EoYqcGtfjXRtZzTtoK7UQrqysIb0u065/7FEg268Mao0FoXJ9zwN6RnxfOQ?=
 =?us-ascii?Q?VUXGoT9Tm4spTgAELbkfUXBYOPRJoEOM1/pml3mAfPmm1vVO+I4gT8r8nf78?=
 =?us-ascii?Q?sRIEL8O2piPTYZ1AHAyXNPCKnM+UqtYt9uprNFfMKxVYTy8OS8+rox8QLnyW?=
 =?us-ascii?Q?6Xe/CFtHaBDyrqVTAjU8qVbzwe5SR7kLfqenZdzq4X2NlaWSJuWg3h+Irr3k?=
 =?us-ascii?Q?8xU9fhZnWmdLQL7cp3A4yHIzeaypN1s+soc9bKg+QHMpQcIeKwR9yu42E5hF?=
 =?us-ascii?Q?eRD93GYkXtPJvBzR6KncGr+iUQfr2OFuONXYFsmHVVMni+NaeWGV/xVlfSZZ?=
 =?us-ascii?Q?V+YcIc8/QCcTq3AVZbv/mpOV2uz0WdaxURLLRFnZN4eBfO0RtBsZmsZEEC6c?=
 =?us-ascii?Q?6hTPL3f0uvm59d6otdw1gGQoDpC6ij36p4jwze4IZpn7mmErQ4MQ/A0AIz2X?=
 =?us-ascii?Q?XZw+VvCQoWpPnlq1+SIz2Yw4wQ3MJPY3ySmqPS0UF0ueGohCdAZbiaNeLYQb?=
 =?us-ascii?Q?nni6aycNQ/feXjS15oUUD9qdqeECxoVX5PwUOlpYIJN7YjfVdPUBnddNioEL?=
 =?us-ascii?Q?c3f1MH2gJ/azdWdWMRAJMCATjOo5Q14a/VtFlA/IKLwbAJwIAXIgf/okyfzE?=
 =?us-ascii?Q?SE13B+ytJh5yvHZloC1T56Ikt23erpy6DgxZ55HKBpGg3LUySMsrg8q6cVCz?=
 =?us-ascii?Q?dDZuHG6YxwGZs0y/cuKY/4wwZpFKoL6s1KM3i3wUoWD9gPePZxU11gBVTIO5?=
 =?us-ascii?Q?Fi83YmsZyUHJ8IiPhsRty/RAV7Oz3gETerfjqJKBlNPKo7TQsou5kUX7Z4WH?=
 =?us-ascii?Q?EzpUHcPAcmtr0KL8TyBkwdRkleB1PpXKOVCE5r/WHoREOQ7dc/siwe+w+jhP?=
 =?us-ascii?Q?mGIsg88tkuwCamsyIW48qBDdCdYa+xLmmZgL4x6tac+uXvAzDzH75G7ec+PW?=
 =?us-ascii?Q?zPLu42uYRTd1xnlslC33UewjVJeWeQflkqZABcZJaqvIDbF3z3cKGFrqtXRp?=
 =?us-ascii?Q?MNgbbkY4PuhyT8cBPh7/ZpP+27WRIzT+/TUVIt7ZggDm2XkvyOPaTmRaTGrs?=
 =?us-ascii?Q?tyMx6zGc8Cj9VDYHLsMVEvum+Ag4qyTuRsjUCzpg0mNw8ck0fDi5nN4aaCU/?=
 =?us-ascii?Q?gzzDSIn1ipwkcgRtJ5xnLpuKvwHRY4Bn8xpe+JklP97bf8vzbEpWBGxYcRaH?=
 =?us-ascii?Q?eQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zNcRx8mN+pgzvfY2O6iHcUK0m2m2yNPuD6yyTOCRT3VAfVSle7fhzaF9O0LxPhc/ngnbaB/2/1n3CgkHtveJS88M+RAh0hiSNVIzs5hqkBaKYlyBmqIUbTkTk/UZVyGEGnf8czYFPqIWBmML1CstTZJY5iKTZYdygr6pk/OH9+Vj0TD9Iy0RdF/BWgUnDmwDkuFgpm5cWuqcRfomh4UxMF9awxNFzIiZlG7e5tStnRjuBl4UbkF6gGhBnWVEOChMdqR1Mw+0hRy3BhvYW8y/pw9EHUITeOWPHnMojMntOnRbk5JmP7PmTSeUq/cNf9KnLyUtQpIEHHtz0+YNkJHVZb+fRY1I8c5VQ78cUXHpNV0JOTC392ZKgZ76MqmEa/Vpa8mkeQg1IpSBFT//giRmX/Osez4R8RA+VKGLXR+uMD2KiP7x/GWHrLb2t1COvfbswGMHba6ArAbPB4TNUe7U38dorI0L9OXXScNOLWKIDsYdYp5KuQJ5MY8n2Ti+3NsMDlv/GW6TunLRSXOcSQ6Ygibt3bljxU+99PQdsTMkSJiO9CGNsFIzK5d4EkqF9OT5Qv1XQts0L9LZudJTPcygSmbvJURYxrSBU4CkVVbpnqi06Me+ahdCIRAFoLcZN1gdeKzrmnmWmB5sn56DNu1jdBIAhgR9zsmsQTgVGgZtmYUs2anvAyL9ZNUHvdbKMx9dqq/mm3gOIyQdC494eQmmPUJ3vvxKiEqRk8QymRXUqHjzgpGyIf4YksErr6U4HBNL3yU9pN1PnS47UMyfhsMo2j9jfoFHT4uS/QtTE9+JeZlIrdXLurMoT3wSyo1u3AcUS/ptoFqBrn7SMYWUTeBMFn/ndBaQPYSY5Yl96W4z6g4Da0LRLZQILzqw85K4Jvf8TpZLeMo66O37vGfBjK9GJA==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 29b1eb2c-0179-4172-601f-08dafb034fb8
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:07.0272
 (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: DQsXwzQJT1ooLVzp4YhW2RwPUDY+QdgZN0gJsslMKva6AWVCA+vnXirZDT5tR1fXVU7R8BjkfTh/acxOacf+ug==
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: LAaaxzGMVOjS_PAlRyu1z8fc3aL_t3xy
X-Proofpoint-ORIG-GUID: LAaaxzGMVOjS_PAlRyu1z8fc3aL_t3xy
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>
---
 kernel/sched/fair.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index c36aa54ae071..9c9950249d7b 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2938,11 +2938,11 @@ static void task_numa_work(struct callback_head *work)
 	struct task_struct *p = current;
 	struct mm_struct *mm = p->mm;
 	u64 runtime = p->se.sum_exec_runtime;
-	MA_STATE(mas, &mm->mm_mt, 0, 0);
 	struct vm_area_struct *vma;
 	unsigned long start, end;
 	unsigned long nr_pte_updates = 0;
 	long pages, virtpages;
+	struct vma_iterator vmi;
 
 	SCHED_WARN_ON(p != container_of(work, struct task_struct, numa_work));
 
@@ -2995,16 +2995,16 @@ static void task_numa_work(struct callback_head *work)
 
 	if (!mmap_read_trylock(mm))
 		return;
-	mas_set(&mas, start);
-	vma = mas_find(&mas, ULONG_MAX);
+	vma_iter_init(&vmi, mm, start);
+	vma = vma_next(&vmi);
 	if (!vma) {
 		reset_ptenuma_scan(p);
 		start = 0;
-		mas_set(&mas, start);
-		vma = mas_find(&mas, ULONG_MAX);
+		vma_iter_set(&vmi, start);
+		vma = vma_next(&vmi);
 	}
 
-	for (; vma; vma = mas_find(&mas, ULONG_MAX)) {
+	do {
 		if (!vma_migratable(vma) || !vma_policy_mof(vma) ||
 			is_vm_hugetlb_page(vma) || (vma->vm_flags & VM_MIXEDMAP)) {
 			continue;
@@ -3051,7 +3051,7 @@ static void task_numa_work(struct callback_head *work)
 
 			cond_resched();
 		} while (end != vma->vm_end);
-	}
+	} for_each_vma(vmi, vma);
 
 out:
 	/*
-- 
2.35.1