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>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 35/69] x86: remove vma linked list walks
Thread-Topic: [PATCH v10 35/69] x86: remove vma linked list walks
Thread-Index: AQHYhbAQBq0rb1krjkSS4++J9+9WlQ==
Date:   Tue, 21 Jun 2022 20:47:03 +0000
Message-ID: <20220621204632.3370049-36-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-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?mhBDm13wGY7dCNYMCH8lNAmHEfZ3gVadwSBaX1gNtu/IPoNHokYh8CczOs?=
 =?iso-8859-1?Q?5EbPWcnvAUa6VUeZHNkgZkWLPZ7ux+bqMHsOlY6mT/ph3qebLwRr2fDAXk?=
 =?iso-8859-1?Q?T1TIn9hC+0InDHrm2Gk4vm8J2BV9fcyrTM22IM4cgNkzpMBAl+T5z0vR/4?=
 =?iso-8859-1?Q?qNeOSxikpd+rcJ+/XmCJ6ux8HXXxz1K1DnTlEPoJcSYr7bzTjb7/BHENio?=
 =?iso-8859-1?Q?qMlVi4mZk7UeRETN0M2fm7nknmo0UTGiqWPHx6vVfynm2DoIc85yNZSnzy?=
 =?iso-8859-1?Q?CX33VZbYYmieX4uisRcK/AJUVASFhS4Md2MH6OVSb4JIubB+AwqA9MSBM4?=
 =?iso-8859-1?Q?VrBe0fLeuIM0WcYlN6BBIGYLSsTjKTZswJgsN2N0MJvqdvcBdFpXiS+BoI?=
 =?iso-8859-1?Q?yjPb9gwYbKdvW/rXZ/FGfBoalqtRrvb5MliyxB+XpS5T51iF1NoqbwHfak?=
 =?iso-8859-1?Q?MQDOoG8iLhdVIaLlZcgK0Jqa9FjGiduUqRWtEBYIZy+YX+J86kzWu5WZmQ?=
 =?iso-8859-1?Q?LRreWIX8VLDKdTZBGsD1nAb/nvOMB2ZfiifCXpN50kp1QiXLipdnd0P5EC?=
 =?iso-8859-1?Q?7PGGXPY7OhGjqjuD1RQH8amG03x3X5Wj0c6WhyxrjYGBk9MFoy90sdSel6?=
 =?iso-8859-1?Q?u5IZ7Lvchc8M2K3+jMmdaeQ8237fU+YAvwq+8iIenWhhZzQzJiYpSChi+Z?=
 =?iso-8859-1?Q?6DiWzq1SCbBe54bciDe7xCCHxU8IofJlqbDaAWtLTW/DHPaw+q9o4wINM7?=
 =?iso-8859-1?Q?8YUvyFDzuw6JNQ2eTkknTTkF1BVy5Nz2DBkogo/RhpC2Wl1EG59XC2vT2l?=
 =?iso-8859-1?Q?NQZjsXk8qSzONTnwDyZEKG0uXpmzz0Io900G7CJoDWVHlRiTBI9RlOgy6T?=
 =?iso-8859-1?Q?pANxcg0WanzZ6nbVnsJXJ7xn2nLVTnkk65W3+PeAclhdMLkwSJPXZoTnrV?=
 =?iso-8859-1?Q?z3P3g3DUDNrbg0CSoBxG+G9peCLIHAE68tZm1KaJ8hnb21t0m2i87WDLao?=
 =?iso-8859-1?Q?pmIzqnwK/CLZ9x2Ir/9IFutbhhhTyW5/Vage3vQpVJc4NZcxGIAHjjOjyw?=
 =?iso-8859-1?Q?wQNsDwsXcICPg76dUARmNaB4Z4MqAvoT3O1s2D+cYu5nSFp8PM1rdV1125?=
 =?iso-8859-1?Q?zBN46uNlI6Tyg3GXChHJCkWFnPP7maXrjOeSSXgWPs4H3jJEHqWGMTVcZG?=
 =?iso-8859-1?Q?rbHNgDXRGRXynGIQH3560N5fVYaiiEATMdNISXaQfOZoQrJBOGrSLTz+1d?=
 =?iso-8859-1?Q?d4hrnJ8kIkKyK3uVE0xuBKFt5OAxGlVthI5oq62PP0AK99EnF2Wb0UH18H?=
 =?iso-8859-1?Q?99Gi+CltAfCdrqPoxrFU1ocOt4NRoVRr3VAf1e0X00GQ/2SkMvJpjNMB5a?=
 =?iso-8859-1?Q?e9f4WhhEkjOBz9we3Wi0NoH4SDKAjiUC9pXA9Ruz1CbuHShWTHBUwuzWna?=
 =?iso-8859-1?Q?Knrl3RbaT9wsIGwpFsyIDf69zpC7T7iSLfG/RTU6x0kpP0sdYHM4nvZT1l?=
 =?iso-8859-1?Q?VPaTQBSOAkRk2jYQaIGeTOTtPz387Tr8n77mqYt6qtraVq0sPNu6bj/+Ya?=
 =?iso-8859-1?Q?i6zbqcVNBDoVcFCJh87cOL+xkeQfByT/U3WGRTPAchccehvC7t+Xo+74qo?=
 =?iso-8859-1?Q?J3ABS5+S15bWZk12QSnAp8UfJTKtuLonrkKLdEs9d2CxNjJpriv3myHPxC?=
 =?iso-8859-1?Q?0gHV6ROl4cp93jzwYySLOT0KB2F0w6tLPL9PyiGxAAcefV1IJjs6/WcqDG?=
 =?iso-8859-1?Q?qTl2NbsHvPoxClKXzljzO/mhdxGOje0yrf2+8QMRNPvjcEOMQK5joAvwGG?=
 =?iso-8859-1?Q?XZK2VZCQ22OoLbYJSBRKXTkcSK5krn4=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
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: 1cca2342-5326-462f-5bec-08da53c74ba5
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:03.9881
 (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: tpQld2b3A4bgLGv31hHfg7UxXAySSVUDooIf6Hc22x9feg88o4fE4uIxsGTcAeuAkUsJrnB2Z5AKmRggBZq2WQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4025
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206210087
X-Proofpoint-ORIG-GUID: 3v0ofEcXWqoZ-BMHnSnXVvp0lVw1CKNZ
X-Proofpoint-GUID: 3v0ofEcXWqoZ-BMHnSnXVvp0lVw1CKNZ
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,T_SCC_BODY_TEXT_LINE
        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: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Use the VMA iterator instead.

Link: https://lkml.kernel.org/r/20220504011345.662299-20-Liam.Howlett@oracl=
e.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 arch/x86/entry/vdso/vma.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
index 1000d457c332..6292b960037b 100644
--- a/arch/x86/entry/vdso/vma.c
+++ b/arch/x86/entry/vdso/vma.c
@@ -127,17 +127,17 @@ int vdso_join_timens(struct task_struct *task, struct=
 time_namespace *ns)
 {
 	struct mm_struct *mm =3D task->mm;
 	struct vm_area_struct *vma;
+	VMA_ITERATOR(vmi, mm, 0);
=20
 	mmap_read_lock(mm);
-
-	for (vma =3D mm->mmap; vma; vma =3D vma->vm_next) {
+	for_each_vma(vmi, vma) {
 		unsigned long size =3D vma->vm_end - vma->vm_start;
=20
 		if (vma_is_special_mapping(vma, &vvar_mapping))
 			zap_page_range(vma, vma->vm_start, size);
 	}
-
 	mmap_read_unlock(mm);
+
 	return 0;
 }
 #else
@@ -354,6 +354,7 @@ int map_vdso_once(const struct vdso_image *image, unsig=
ned long addr)
 {
 	struct mm_struct *mm =3D current->mm;
 	struct vm_area_struct *vma;
+	VMA_ITERATOR(vmi, mm, 0);
=20
 	mmap_write_lock(mm);
 	/*
@@ -363,7 +364,7 @@ int map_vdso_once(const struct vdso_image *image, unsig=
ned long addr)
 	 * We could search vma near context.vdso, but it's a slowpath,
 	 * so let's explicitly check all VMAs to be completely sure.
 	 */
-	for (vma =3D mm->mmap; vma; vma =3D vma->vm_next) {
+	for_each_vma(vmi, vma) {
 		if (vma_is_special_mapping(vma, &vdso_mapping) ||
 				vma_is_special_mapping(vma, &vvar_mapping)) {
 			mmap_write_unlock(mm);
--=20
2.35.1