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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 33/69] powerpc: remove mmap linked list walks
Thread-Topic: [PATCH v12 33/69] powerpc: remove mmap linked list walks
Thread-Index: AQHYm97rTj/ZYYGWiUOvogSCZUFe9g==
Date:   Wed, 20 Jul 2022 02:17:54 +0000
Message-ID: <20220720021727.17018-34-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?8Wgil/VU9frqrmUyBKlg6GBwL7poACKtbr/36dL28W93/E7hw1uW4Mkn+p?=
 =?iso-8859-1?Q?L1wltQdRm6eY65htZQEyZuAlZ+PFyFwA5NFsoI4DyEu8ryNkRPF3G9UcWU?=
 =?iso-8859-1?Q?Vk+6Vi26ubp8CTVZSpMhNz11/8wlOIwGmdKp0YXRS3bjvUe7rCKvjlQCjq?=
 =?iso-8859-1?Q?ia5bq+C0QLVylzAdIKSiLiDHN0ghyLx7QWM05+uGsZ9C0+cON1nPNkDDTw?=
 =?iso-8859-1?Q?VtoL5uNbFJwZ2c4ihkUBdxR7ZGLEQCvkxfuJ7jDyT4UYyv8mctPxLOu3K7?=
 =?iso-8859-1?Q?281OFy20iLWFU1DOv8vsukyk3veBCNaQINPXC6Shf78gH14Uf0swg+dvoV?=
 =?iso-8859-1?Q?ZNhQXarTpLEaVd1+oqBQYDpuYqRTC8P79ec8GB3H4blIWMpfTryjUTDt6a?=
 =?iso-8859-1?Q?Os+qRP5ODYUMH7dHeuWVRKkBSVnlH+ayGy+9DkUHxEuQM6/nqE2sKJ7yvI?=
 =?iso-8859-1?Q?x1bEPEHcW761hLnQw5Moz2ir1Qz83gn3XqTg+XsyesP0t0O5f9eyyG+Dai?=
 =?iso-8859-1?Q?5mzXJ0E/IjbFSZe8iE7oRm+f8mHXAGTiDEDKYgvnqVpnoGgdoAMbBrlPwk?=
 =?iso-8859-1?Q?KI58q7apIV9oGXNN75FKWHISiihZeoum7IefcLLON8YsNMZ2wT8Cv7GSNp?=
 =?iso-8859-1?Q?hCkf3/gTP/P2CXiTK5V7B0kA+/JX2AJ814F/Fwu3d+FScVyqK/Vhuogm5I?=
 =?iso-8859-1?Q?uyo17YK++V8Cf9CksbM866tB9kKjTAtKPbCGLi0tSRorSUk7Q58IfeLpVl?=
 =?iso-8859-1?Q?kdrBOWv7M4woS4MwP4ZO8yG1SL2NKlobdhj3mzCbpmimcN6KFk1ZZgWe8r?=
 =?iso-8859-1?Q?jntALOAxgyPD413HPL6dbMl7uE7fTlSnxvpWbx7+5zVArMVL3HPw3vxMAl?=
 =?iso-8859-1?Q?u/euIyP1ZOJdP1UxJNIk4KPy3cOW0jHmwo4pcEcXx36iwWxsNruZTeAuhY?=
 =?iso-8859-1?Q?Fud4zFky3CaZHasqxWAOLwxwLGJy+YiLJtd0CKaHjfRZZM5zfwaX7rCS6o?=
 =?iso-8859-1?Q?+pHsAzD0iCwd/hcRq4egPD0jBWc36RGvtBx3f5Dx3DvzJxJBjQ27fFo6Zy?=
 =?iso-8859-1?Q?HK666/OTdJYAf04RfRlmL0uIXg9ov7KlFXBv+eTVPikzfeCVZgA7kajZ0X?=
 =?iso-8859-1?Q?djjiDXBQ5umKwsCSgZ1VpVpBrazLmWnRDGuOSabZS4HSSobJBWmjQY6uIl?=
 =?iso-8859-1?Q?mDdzzfK2/o6/XPM+qPAW7UQlinwhZFeZE6E8E1rwTTGSilGebFDjED8na4?=
 =?iso-8859-1?Q?rSNzjZV7iCuQCo7mETtpUNKKUnWcYsDJfup3WpyMe/3OJYgJTP/jG/xBMk?=
 =?iso-8859-1?Q?GeP47xGDihDADVFtQ9GAvm2cergWylkN4j/YhNCLbldjloEjBNz4ljZdVL?=
 =?iso-8859-1?Q?ok6zQqQBKe+ktmDHxtM28SV+JZ+NHkcbMAVwmPLy4M6Nzy4BUZBf3yYbkM?=
 =?iso-8859-1?Q?Ls6gtkGzyjVZqxQQUAuEoLOOfGIgecCtp6a+r0m+076gOTrbO7ItViatK9?=
 =?iso-8859-1?Q?KvOgO/6YNWB20c66AWl5yr1A0MCsrzQozjbmOWXbZqbTFid4Pft8gY5PO+?=
 =?iso-8859-1?Q?AlAfdTvCkuVTjnJkJHA7uxonZVD80TjS+XWSSiD+0U9rNIi2eQ76KZUPGR?=
 =?iso-8859-1?Q?deYB1QFg61cO6ZVkuRQR9lVEieqTt6Xpvsbdes1WkaS8W7v5yesmIqhw?=
 =?iso-8859-1?Q?=3D=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: a3ac4bf0-e1fe-4b18-86b5-08da69f62388
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:54.8681
 (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: eg/gSOY8HNk5r8Cok7NK1C1TliqNvQuFBKTEur8r7tn4lxuUteau3XMQzDqlhI+JyxC9XCqceJbgZbRZev8/iA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6316
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0
 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-ORIG-GUID: qVpHdXa9uPHQF0h8qW16xxF-wuywhcx7
X-Proofpoint-GUID: qVpHdXa9uPHQF0h8qW16xxF-wuywhcx7
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: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Use the VMA iterator instead.

Link: https://lkml.kernel.org/r/20220504011345.662299-18-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-34-Liam.Howlett@orac=
le.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Reviewed-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/powerpc/kernel/vdso.c              |  6 +++---
 arch/powerpc/mm/book3s32/tlb.c          | 11 ++++++-----
 arch/powerpc/mm/book3s64/subpage_prot.c | 13 ++-----------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 0da287544054..94a8fa5017c3 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -113,18 +113,18 @@ struct vdso_data *arch_get_vdso_data(void *vvar_page)
 int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
 {
 	struct mm_struct *mm =3D task->mm;
+	VMA_ITERATOR(vmi, mm, 0);
 	struct vm_area_struct *vma;
=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_spec))
 			zap_page_range(vma, vma->vm_start, size);
 	}
-
 	mmap_read_unlock(mm);
+
 	return 0;
 }
=20
diff --git a/arch/powerpc/mm/book3s32/tlb.c b/arch/powerpc/mm/book3s32/tlb.=
c
index 19f0ef950d77..9ad6b56bfec9 100644
--- a/arch/powerpc/mm/book3s32/tlb.c
+++ b/arch/powerpc/mm/book3s32/tlb.c
@@ -81,14 +81,15 @@ EXPORT_SYMBOL(hash__flush_range);
 void hash__flush_tlb_mm(struct mm_struct *mm)
 {
 	struct vm_area_struct *mp;
+	VMA_ITERATOR(vmi, mm, 0);
=20
 	/*
-	 * It is safe to go down the mm's list of vmas when called
-	 * from dup_mmap, holding mmap_lock.  It would also be safe from
-	 * unmap_region or exit_mmap, but not from vmtruncate on SMP -
-	 * but it seems dup_mmap is the only SMP case which gets here.
+	 * It is safe to iterate the vmas when called from dup_mmap,
+	 * holding mmap_lock.  It would also be safe from unmap_region
+	 * or exit_mmap, but not from vmtruncate on SMP - but it seems
+	 * dup_mmap is the only SMP case which gets here.
 	 */
-	for (mp =3D mm->mmap; mp !=3D NULL; mp =3D mp->vm_next)
+	for_each_vma(vmi, mp)
 		hash__flush_range(mp->vm_mm, mp->vm_start, mp->vm_end);
 }
 EXPORT_SYMBOL(hash__flush_tlb_mm);
diff --git a/arch/powerpc/mm/book3s64/subpage_prot.c b/arch/powerpc/mm/book=
3s64/subpage_prot.c
index 60c6ea16a972..d73b3b4176e8 100644
--- a/arch/powerpc/mm/book3s64/subpage_prot.c
+++ b/arch/powerpc/mm/book3s64/subpage_prot.c
@@ -149,24 +149,15 @@ static void subpage_mark_vma_nohuge(struct mm_struct =
*mm, unsigned long addr,
 				    unsigned long len)
 {
 	struct vm_area_struct *vma;
+	VMA_ITERATOR(vmi, mm, addr);
=20
 	/*
 	 * We don't try too hard, we just mark all the vma in that range
 	 * VM_NOHUGEPAGE and split them.
 	 */
-	vma =3D find_vma(mm, addr);
-	/*
-	 * If the range is in unmapped range, just return
-	 */
-	if (vma && ((addr + len) <=3D vma->vm_start))
-		return;
-
-	while (vma) {
-		if (vma->vm_start >=3D (addr + len))
-			break;
+	for_each_vma_range(vmi, vma, addr + len) {
 		vma->vm_flags |=3D VM_NOHUGEPAGE;
 		walk_page_vma(vma, &subpage_walk_ops, NULL);
-		vma =3D vma->vm_next;
 	}
 }
 #else
--=20
2.35.1