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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 33/69] powerpc: remove mmap linked list walks
Thread-Topic: [PATCH v11 33/69] powerpc: remove mmap linked list walks
Thread-Index: AQHYmYd1bD1BlHswgUOpOlje83oYDw==
Date:   Sun, 17 Jul 2022 02:46:48 +0000
Message-ID: <20220717024615.2106835-34-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?iahC+dVF5FJ6a94h15s0PPdXHdUYx4dN0axkdgrq1ufuv4Tf4uHnTU2T1S?=
 =?iso-8859-1?Q?SPXntNfzLd89f84AalKzVTOmNjuoSLXweLvE3p/sk6bo5CxUkzxei0xWj3?=
 =?iso-8859-1?Q?njvIldEGTkoBq/DXdtAuIP8c00O81h/ma1xyPulrb6cPErX5Ux2p8Mq558?=
 =?iso-8859-1?Q?Y/uBBgMIbY/rXYL0Y2+JGyh2p+qXRk+wi7s5HeQSWLQqwK/lgupgQpluaK?=
 =?iso-8859-1?Q?fnbfewrZ774caaXMoCdqhrXYUlz9enGNhAOk+vUDhxFppOBMHqdBkOKJfd?=
 =?iso-8859-1?Q?y0NSF0D6l/WdyUrBj5a1rKDy8MU6HSPrzjTS/kG3FFCOR9Z8J2jo4+26w9?=
 =?iso-8859-1?Q?N254s6dNO0/b567fi0M38D0viYAcu6Zs6q9REhZk0u/VQ8r/4NXrjbxfSy?=
 =?iso-8859-1?Q?xp7I4lPiD/NI7Xq2DcAcTcxFQIaH5IimpgX+ieSsIU1SFoYsg+u+25WNYP?=
 =?iso-8859-1?Q?mnif2oF9EuJU6YaHKcRUWAwI0adeLDzF5g2r63a1J4m+opy9ro6JqoQISO?=
 =?iso-8859-1?Q?vlzUOYnlMcUNsZVrIPrVchdOM92+FtXWhIj8dcAf7TrhF/yO4w8SwhJ+iF?=
 =?iso-8859-1?Q?/w8rBhdFhMXBHYGUyXQbm7nSexfjqfb9bxKP1VH0zmGWTGL2l93NN4NDOT?=
 =?iso-8859-1?Q?UDU1XIKJ45PxNoo7/RrWwCOvh/Mpd83sAYGrA6ZdSTK0jEkiCIhmTxoq1y?=
 =?iso-8859-1?Q?fS1dK+WyodhR5oKmzuDOSkx+5xLApbu6WnrCNws6Pi8GhuT9W+SYlzHz29?=
 =?iso-8859-1?Q?DMiqQXiks5k4NU3zLfRiPvQRN8ub4NX+b+QE8advr3r0fkAoM0D+P9MQ85?=
 =?iso-8859-1?Q?EUa3fSKXrHmmx9QwaoiUzkkacB/cGFSMCzzc1ofLhq1TxWydJBLBjZaDI+?=
 =?iso-8859-1?Q?bCGU8vmzY8+bcyK09KJfBb3gNv1UJSgptBb6RtkXJOVZE43HT3yl9kmUig?=
 =?iso-8859-1?Q?i0AwSFiUwL88bHfZVJGNZBYjkZTMfvSy2Mim+TY+nhEQJgDwpMA6dfVbGr?=
 =?iso-8859-1?Q?zDZ0J+Ik706qlneF988DtZ4g0Z+h5pDLPkI198MRMUQitW326HCcfUIC7d?=
 =?iso-8859-1?Q?w2ZCwDR2r9kwOjZjhx19KvJHEMUvjD/7RYezQZUSZFT/bRLMS9dCpjL3Cp?=
 =?iso-8859-1?Q?f70bxHjE8yZ8BptH3KL3XoAaxsyvh0plDpxhzmeVzifkhShk7tAdOCfbLc?=
 =?iso-8859-1?Q?wzmlwjMXjOywXKMGHWKWB1n3x/DWehQEKc7nqHWaZVT+Tlo9OrJ2pKsfNW?=
 =?iso-8859-1?Q?2e5FiUNsOFpo721Vo52Hf3aDyIOsvt+qf98hGIFLogo+GZcbXFQoPaoTp9?=
 =?iso-8859-1?Q?dfSVn3BBQ3hbh8VBlMkndamP1CsqX8ZZW8RglHSkiNvpICtEqRzEhvmwO0?=
 =?iso-8859-1?Q?wC7Ix+OlZIs3EmtgkHvoRJrgx7eZ/T4UsiBsVRPfATCdeDmRQOVntCQLuK?=
 =?iso-8859-1?Q?/whXSKcuhVEMXXxBMYcD9qozer1IQiWRBDNf8cXYbW5xCXEhX+4i7XagBd?=
 =?iso-8859-1?Q?XSfffXEvoakhFoP6hgw2MvQA3sH7LA2mc+it83VICQMgVDsGH8askDWZwW?=
 =?iso-8859-1?Q?Lnp44fqTcxk17qFeQkilBb94hgsVxPTfDYZTl6g9f7D/AJuQ9qg1DJLhz1?=
 =?iso-8859-1?Q?a9Hv3qvaDOst5DI0EzUHcc+wXDlOi8g8SolTd4ATyhFd/5JwXSCnil9Q?=
 =?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: 72302601-d6ba-4216-6341-08da679ead5a
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:48.5527
 (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: vJJ0MPPmNgNj1QoQ69GP9Rawqu9mbqNU0I0GmkfUHSS7rgyr1e4uQ1vdsO+jbbO0Q86rGQRPZlXrgZFBxgMH8A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799
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-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-ORIG-GUID: 4b4n-elwiKHuZtd0sYCV1mNebKVq54cC
X-Proofpoint-GUID: 4b4n-elwiKHuZtd0sYCV1mNebKVq54cC
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