From patchwork Wed May 4 01:13:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12836641 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 766F3C433EF for ; Wed, 4 May 2022 01:14:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E11748D0009; Tue, 3 May 2022 21:14:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE51D8D0003; Tue, 3 May 2022 21:14:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC4048D0009; Tue, 3 May 2022 21:14:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 998658D0003 for ; Tue, 3 May 2022 21:14:02 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 70A662922D for ; Wed, 4 May 2022 01:14:02 +0000 (UTC) X-FDA: 79426289124.22.D302537 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf19.hostedemail.com (Postfix) with ESMTP id C79991A007F for ; Wed, 4 May 2022 01:13:55 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 243KsJbK018676; Wed, 4 May 2022 01:14:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=jiiqwWTcSVmUrGeXEAypedCW5tagsdzk787hNrV2FEk=; b=lVrqA4PEOJJpSuzz8Q2zsJP+dF/wm70iiii7EPHVbsweImjHGtta39AfK36WtzRqVcYp 0wxDJ0tBJEdN8JOCA+33Xu1BcSU58EQQ4q6BjZ9zLhzOmtyVQpHBxr+QrQVgKll6dIM6 MwqMacVJ/H1L1fzBGL/RCKaSW8z6C2W8ufWDZ1sCuB7/WYl69N/Io2U8lDj/I9jhd9qh hx1MNivqZ+bgp4qD0xVHYO+++jy7cC7qwUExMRYQxTI/ixQm9MPw9Hb0ra66kjWxV/gm QGHVzQKT9mVh06+oVbmUPk+oAU10bz35E0O8EQXXVcz9hugm9qFqoYt5ql+CTuE1eDov 8Q== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3frwnt74h4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:14:00 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 2441Ato5020100; Wed, 4 May 2022 01:13:59 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fruj922he-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 04 May 2022 01:13:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n6Tkc0UU1D4cP0hcZ0bUD1kbaIwyHJPNiVfwK28oGZD86ZOIqRYdqwyfbRdg940TZVHo7xsOZSrlIbEy+mYdved2WwTgEnbI8co/PhkUc2RxGFSuImjr/exQvYPZ0Zlt6o4vnrdYU+VDgv7V+zY1s9Ozfor5r/o336vlMceoIHP3uuxASdbFsVClZqv6NqQX8Dff6S/Ra92YKU86SPpYNDif47QycGybIkIgZDgl/qzOUhmS8jcw6WMpQWvUX9H4zuil4J2rGf7bogJrqzpvC96cFWgCC2WOjhignUJyrsgO/HImKKjdFTIwO3P66/uGTCJHNUXsifFsjBLDM6KTDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jiiqwWTcSVmUrGeXEAypedCW5tagsdzk787hNrV2FEk=; b=f2F3/eexfFTwNQxqQa8LzPxZfwZBxamD4kwzcN2ZiC3d7zJeEQ1hx4U1qV6JrUvy8k1zkRrvjmrP9GUiYnkY1tV3ggl7ArnSRed26Yy+J89FpnhhAEQtID/l+5zlTdlpukDY/AcXVUfrd3t3Ph1SQ2tkzL+L1Lkk/2D041nZgk8URPd/CHG1FSkLq0dwI725pDDo2LPOl1eYzqo+DsFMokx2fC0lKAsvY5ELew03fRVB1u1v6l2fO3i6ZZZu+9GPxDr7YTvh+aHZP565xxtu2FRjqb3ZUAzr8dL2swMPUQQuLdbn+WWwcZM7Y0fHtJAabYM8YujjQ8IJ7hqMk78CMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jiiqwWTcSVmUrGeXEAypedCW5tagsdzk787hNrV2FEk=; b=Qsu+Gf4pDLwwWqTPRTgo6mNmn9uKtKhgu45+OeaVv7akJ+tNyQfrVWn30m2LOVug23K7FH9MTdVUzrJspeUwhfQVmREMZ+HBHofjQkH7gm5zWe/1PDMbgEYvwb8hbcSp3YOjFbit/PeAzJPcCRI9tpKm1hbhhmidsXJrDdd19QI= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by MN2PR10MB3728.namprd10.prod.outlook.com (2603:10b6:208:115::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.21; Wed, 4 May 2022 01:13:56 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::318c:d02:2280:c2c%7]) with mapi id 15.20.5206.024; Wed, 4 May 2022 01:13:56 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH v9 33/69] powerpc: remove mmap linked list walks Thread-Topic: [PATCH v9 33/69] powerpc: remove mmap linked list walks Thread-Index: AQHYX1Q5HqDgOSjbAkKrblSz2IwTXg== Date: Wed, 4 May 2022 01:13:55 +0000 Message-ID: <20220504011345.662299-18-Liam.Howlett@oracle.com> References: <20220504002554.654642-1-Liam.Howlett@oracle.com> <20220504011345.662299-1-Liam.Howlett@oracle.com> In-Reply-To: <20220504011345.662299-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: df88e168-7685-4551-7da9-08da2d6b5c6a x-ms-traffictypediagnostic: MN2PR10MB3728:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: o7934K3arhrvxDxbLqd+233hS9NiQTNqBSha4EOQxQccqBGegIUl4TR13/9/28CfyzWzIJ7AwlVM9vZGxin/HAZtv4UKIXLvc4g8d9Lj97ZYdSVw5GLEYK6vvQGNejYTIyU4TFXi3XTjjyD1Bix3R9w/TXSkUegU2Oc49PuQMWOccFvdQ9INfAKagTyb/zGwGaKHuFxODvlrWPMp7+ZEAxSI9kRW1L4B9Bsvj/wOmNEEzpAQcehHXO27/fu9NAQf0GBcco2W5jyqijcFE6xM13wse1z4KTouVC9+nFIyER1CH7iJYp0nV/2bbn/5ldyBWNbCRVgAegvrToLrW8WHDQf0+vQ9c3S1Ahj2nKC63CHuhNsWI3EMEm+UML9nFJtgoq8fx+Zgxur3n9DgNeBXp9QxyuMGRusWP4zhvVTn/iGJB0TIp3y05XOBlypNJUPVID8uiGegDgxvfuwBpIYGzT+tCmeW4MlJdJJTmHAVzPKa9SF+JavlpYgeA417gij9WyW0Yktoo0JH0Q6pVeAwedFGNF7thLYKl6l1+0qdMRjy3vEhy5S8Wr4116VizZhqn6ctRUr81GCdAX/0jKwuZvSg4Yzdcd8/7CBlhs5Y7a2gdo06+jdnPXeRJrmHGEx5UsLl7ifJNDNy28E41me/As0wqpdQlwplZoEGPyyzSCQyAsqC/0Yw1l+/lp/sAqxzzJ1pDFKW035qUvWa6W9x3g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(71200400001)(508600001)(5660300002)(8936002)(6486002)(86362001)(26005)(6506007)(2616005)(6512007)(2906002)(83380400001)(44832011)(186003)(66946007)(91956017)(76116006)(110136005)(38100700002)(38070700005)(36756003)(316002)(8676002)(66446008)(66556008)(64756008)(66476007)(122000001)(1076003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?et5RkwvMAuWa8BlldsTvWfk?= =?iso-8859-1?q?sgvPwZRKpHp2XBcB7Boaq3NHjd8ssrPgmjoLDTBzJxhs4bW6Bo8fPYHSzfQ9?= =?iso-8859-1?q?RnoLPvZH+wDBZXgIEtj1ICLWJBEVuI5w6miNYaSkSHzGkcddINhOcpATjhkx?= =?iso-8859-1?q?HyGgRKBx73xID+C8ND6bhqDEGSslxhxIedTwclRp3I5CkaMsf9i3EOOIrsjr?= =?iso-8859-1?q?0HhvQHE/TARY4BveU2mInFCA+csBqzo5twT5BbKpDuMtE6XsNkmfnAYvgMlN?= =?iso-8859-1?q?4or6E1UBFstzxQ3cNN6az4gnFcZ5G5Rfn4PNhGS93BKYur5Zzrv9NGvnbXMj?= =?iso-8859-1?q?RS10YrdX+Ub72uK/tdo4GlZRmNiMKAudr1rCQCmmypeSa0jIjgWL7HFbDTpQ?= =?iso-8859-1?q?a966w24M8psW42iGFPsfFD9G6uv//kQeHkBCTS6fygUdbD8afSDrd87xjh+f?= =?iso-8859-1?q?vYf4HsavezXNNJNuKvLj1o+aezvmfXXOaDTDMRb47EhJ0IpIose+tIVQ3Z+d?= =?iso-8859-1?q?dl1MBaDgLTLUt9n20cU/S2uGH3Sam/k8d0eFOlq1l8O1/hDyWrk+8SN/26K+?= =?iso-8859-1?q?0HimWUci73gjSJ4NbVeHfP3e1cgZTgDnvfebURGKSIhYHjmflkp5t0ojk8Pq?= =?iso-8859-1?q?Gv0VZcdn2jN7BU4GfaT/HxL/uoP8QU+gXGUbfVAGfD/ZWUIn4bwOaYixJ7CN?= =?iso-8859-1?q?NPR+6QqQpVSb/+KmHn2b+d0F1XY+PHufgWNsNHHFWWsANhKUfP7Dj74KwxfU?= =?iso-8859-1?q?UK2gTQrytmJVHKk4g//gKCOgZsT9MkKl9VJ0TBbKUKHnnTWGNv0e/HC86RSf?= =?iso-8859-1?q?ESIDXzOhA7XfFtEK6JGZlv5i4Lj3BB9dR4s1bYaahlQmShdjHo0H+Lnuepui?= =?iso-8859-1?q?uod7wtF0WRrsZ03Y7FwPrvzh0mCAQt065AerV4XJMsn4RPc8pic7X3pBhx6X?= =?iso-8859-1?q?Wzz+rdPdyqauLBc+7BaisGIQhogoh0+vdeTzYqMVnRX31/as+pAf7t9yMY4Z?= =?iso-8859-1?q?n0yIU7G42xWkH3d+s+IDMlX9+kFhjIam8ursTzQ4qWo7GCBd6I+0wSl4NFl+?= =?iso-8859-1?q?YhphbUG4Rh2xUiiAgG+zHzyFAYmDAn8AX0lGj4m4mkmDppFaj/IYQUAOTOqN?= =?iso-8859-1?q?jQaz0PRmUBpEM+pG/BsrG2h5gag3fwnRe7Uian+DQ5KpzSNBpuWnl1zVSIsJ?= =?iso-8859-1?q?jlMuGcI6Bad6LfwbzP3zvpwvQ/6HaVCS8KMPd48cip35LGlzVan5B28nRchl?= =?iso-8859-1?q?nJ/FG7fjnp0Fb5tg75HmEu88loqIeTAzSnRWvd7Xnr+k3yOgPKlZTSzQzfEc?= =?iso-8859-1?q?u0wOp5FIsyfsn/Lwrm5S0ueFuCsZYCbQd48WwfNHuK4rW1AuG0yeYp5o8Jz2?= =?iso-8859-1?q?nZcqgxy69Zy9J5dpxV1A/M3jpkXERUrVHMfXF8Rym5mmUQvMkGSlqvTFuo4I?= =?iso-8859-1?q?k4e9Aue8fOB9igJi0C215+DbmXyUb7awBkOujFDGm7GChbv5f0UWmn33gzrn?= =?iso-8859-1?q?vcyXe3GsP0f9oaP4goDeHzDWnKGnX2+4LY8GYWgFTGHl36JAZrd3ht6fpkAg?= =?iso-8859-1?q?+9lEsAbem66cpyMbZOCy6FpsMWqhdyC1z/pfl4RLxUGfbtmD+q35F5iSrbV7?= =?iso-8859-1?q?mxEJiukGZQKe6JZ2owTj6yiWl3BJCmpjHXKacu9991+dttnX2n0Z3x381rzR?= =?iso-8859-1?q?FaSZnpTSiqdH97iVLtwLlqCb2Ifb0nltM6GrCVVuuCcXi4ng0Nn8VUmUI/1S?= =?iso-8859-1?q?8nQUo00CmXkaJoQWusHpln46H61k0NXCVCMayydaPyCxQBTOonaANiVIhLj2?= =?iso-8859-1?q?MOXHVzWw=3D?= 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: df88e168-7685-4551-7da9-08da2d6b5c6a X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:13:55.6424 (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: ANQhQuPkTc0el0E5Hoj+pDaCLjCtUeLgiWkQqzrM5HKsmq0J3oLOHijburWcOziEWoaUGMfVlayJldqzrw3KzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3728 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2205040006 X-Proofpoint-ORIG-GUID: EqTx3zfeZuYmMxMFv8WPa-SGc85LQ-w6 X-Proofpoint-GUID: EqTx3zfeZuYmMxMFv8WPa-SGc85LQ-w6 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: C79991A007F Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=lVrqA4PE; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=Qsu+Gf4p; spf=none (imf19.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Rspam-User: X-Stat-Signature: whi4kobisxma78id3zeuo5uadcgs1yuw X-HE-Tag: 1651626835-241550 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Matthew Wilcox (Oracle)" Use the VMA iterator instead. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Reviewed-by: Vlastimil Babka --- 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 717f2c9a7573..f70db911e061 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c @@ -114,18 +114,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 = task->mm; + VMA_ITERATOR(vmi, mm, 0); struct vm_area_struct *vma; mmap_read_lock(mm); - - for (vma = mm->mmap; vma; vma = vma->vm_next) { + for_each_vma(vmi, vma) { unsigned long size = vma->vm_end - vma->vm_start; if (vma_is_special_mapping(vma, &vvar_spec)) zap_page_range(vma, vma->vm_start, size); } - mmap_read_unlock(mm); + return 0; } 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); /* - * 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 = mm->mmap; mp != NULL; mp = 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/book3s64/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); /* * We don't try too hard, we just mark all the vma in that range * VM_NOHUGEPAGE and split them. */ - vma = find_vma(mm, addr); - /* - * If the range is in unmapped range, just return - */ - if (vma && ((addr + len) <= vma->vm_start)) - return; - - while (vma) { - if (vma->vm_start >= (addr + len)) - break; + for_each_vma_range(vmi, vma, addr + len) { vma->vm_flags |= VM_NOHUGEPAGE; walk_page_vma(vma, &subpage_walk_ops, NULL); - vma = vma->vm_next; } } #else