From patchwork Tue Apr 26 15:06:30 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: 12827364 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 F19E5C433F5 for ; Tue, 26 Apr 2022 15:06:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18B2C6B0095; Tue, 26 Apr 2022 11:06:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F36C6B008C; Tue, 26 Apr 2022 11:06:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A0866B008A; Tue, 26 Apr 2022 11:06:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 607586B008C for ; Tue, 26 Apr 2022 11:06:41 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 424F6120834 for ; Tue, 26 Apr 2022 15:06:41 +0000 (UTC) X-FDA: 79399357002.15.CC59FD4 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf13.hostedemail.com (Postfix) with ESMTP id 6183D20052 for ; Tue, 26 Apr 2022 15:06:34 +0000 (UTC) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 23QDT2aj015530; Tue, 26 Apr 2022 15:06:36 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=8klIjg+ZE9A5NpgXVEkjPxOyY6MO1DlQ8+vXBvB8UNc=; b=CGaNdObdu1jpSbLM8oQpbngyIzJ/6iklNmneANY1GMDE1oEjzYRjzqQPYj+h6RPy17dO NKPMVayiNXmgAQ03+oroUgQl1gKXwGUwCMOswCZiRvZALjhlL1o9HbhvMDLuQZODSIyy TdLTBB8Uq4DxiTdH1zNhB8Izc4zu/Dx19dN5mhbalT4O2Rk6rql2z9nVcQi+k7NO5LSx ta69nQj8i2LL2X674+BIa5nLVh3BV7CECAtLGHmsNysokf2Q2nHDetSMxafFoBPqy9/1 oylTk6OeZvupp2At7fGiDxJ+vVUGW4ZiMEP4BKjwBgeM56CvKjKY7VyNbwW+EC0UMzEF dA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3fmb9apbhj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Apr 2022 15:06:35 +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 23QF6Urm037859; Tue, 26 Apr 2022 15:06:33 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3fp5yjktje-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 26 Apr 2022 15:06:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KOFs6WvnP0mnWbRfEK9tJR53xdPngvKLWLQCWUnRygZ/IlrMUsywbJI9CZ9CoepNDApNWncbz/chwzO7FgKqG2oee0Nq4T2FCFCE8r4fTrKuaOH7jWnJYF/SM+3h5U6r/ETUahgYn6Cc2SdOHKm8FB81UgwsiOS8J29gxoOkDtv9jPiOqNNt4twPTN15RCXjPHTRMmuNjrz+5BnnRF061gAtpqbsw+LYkitcnCGHWxPVvIe73JhftE1yZSaD2UgyHO9Mvh98e7MekFH3vBqMysF56N5FF2P+At0mSpL20YbO+QHSyTZa2iDH2xCZTGNMOhXuAnJ9K0RgM8XhYe77jQ== 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=8klIjg+ZE9A5NpgXVEkjPxOyY6MO1DlQ8+vXBvB8UNc=; b=bn9DvLSBc6Yv9LsFV0TnTYnpIWrt0FrCk+g2VAfsF8vy7DPg9+4zJEy5oH6j9SEwx5lup+1Fhscw4Top7RYmDGOk/wcss98xiGftcOwkQEvI5V/IaYi1Q7/cuUD1ajs8Z7a4pks7oOxkwL30R5FvuhOrL2FYuc9LdypFY8PSjo5SI7O5tNvFkKTw9ergQvnu+cBadGS322Yl/fNLMy8zLOq5OoJ6G2dceaW7WJ3cubT4ZQ+JlCDgytnu6Tv2tRh7kyLCzQSzkiS2UYArFIp4P/AD4wMM9slJaKzuIEhaAsDVrp77uiN2sqyQYRR/Y5+x0pUCANWWdF3OKZs1bU5msA== 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=8klIjg+ZE9A5NpgXVEkjPxOyY6MO1DlQ8+vXBvB8UNc=; b=jgQdRS1Lp6WBVvXeSZnR0Ul3nelRu6n7LxkmBZATSViUOQJXCKpxJTgIGxRHhmMB4uCBZvaeR1oq5y44p2x5cBo74RzyIPWPYQ9paiNkzGvEi0XU6CxOmvAd9D3/jkgP/UEsJWfc9yTO35ZrIqU/9KgJSLRaik2FnVfTcup1pI0= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by PH0PR10MB4679.namprd10.prod.outlook.com (2603:10b6:510:3c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Tue, 26 Apr 2022 15:06:31 +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.5186.021; Tue, 26 Apr 2022 15:06:31 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Yu Zhao Subject: [PATCH v8 10/70] mm: add VMA iterator Thread-Topic: [PATCH v8 10/70] mm: add VMA iterator Thread-Index: AQHYWX81GzdwxmAI/kuYTsgs9gyOjA== Date: Tue, 26 Apr 2022 15:06:30 +0000 Message-ID: <20220426150616.3937571-11-Liam.Howlett@oracle.com> References: <20220426150616.3937571-1-Liam.Howlett@oracle.com> In-Reply-To: <20220426150616.3937571-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: 35037a86-8d76-418d-c319-08da279658a6 x-ms-traffictypediagnostic: PH0PR10MB4679: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: UKCgn4iqOAHcZ3/pJc2c9ADo0YUvvlqMQ+WSKo9Q2rY5N1dPxBhDyFw2G+EmJeQSv1gy20UqNxAYb3128YbkTLgD4qrUaI/AJ5rV9yBk1urhaOALBaC56XHAjvImzUKsbFQpw/ajaLgm+pCYvqfc+JlI5CEV5WFptLVeYeJheucMD4DbZVWbEXBxSYxbI75vRHAfXErqEGUr64E40BP+0UwMUbymt9Z/gDsz70CwJjBgKvskpJh/OQxwd6Oqpuf+TeEPo+jPR6y7vFgxL3g9dgKG+c1h39WMSuJtocDhhqBZnPQyzqve0WKkaPVgOR5xP1ckv3XKpHracTKw9tD7sVeBTA9J1xj9/50hFSTbXJxVqZJToFsfkuxtXvVkpKah5D70JARlDXXaIo1AuW/jXZJLIF0pnSIhuQMcr2Wx1ImadQ6BWj6CWIgA3EuoQAY7+UMeEMQyXbN4h3U9EwN0MISlsaf2ARHtNzQrkqC3BtqYI4jfraNDWPbIpqIrp7LIkKQTCWZBq7aY/3AdVXKXkcKDMNp4trkN2pw+ELiISTmMYpHAsxONY6VU6IZceD4fiS6mfu5TgRXfT0ONflgIb3OV41mp3d3yBCDIo8nVSgDw6V7UPTM3JUbdXS7Kb25I1IsM62Ci/Cf9lbELVLp29a/o6RC/5kfi5UZFjo0EikByd0Yfhe366eLAphp2/XVohAf2gLReYTyj+iOkIveS/g== 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)(86362001)(5660300002)(66476007)(38070700005)(316002)(2616005)(122000001)(38100700002)(83380400001)(2906002)(66556008)(76116006)(66946007)(66446008)(64756008)(91956017)(8936002)(44832011)(6512007)(186003)(26005)(1076003)(71200400001)(110136005)(6506007)(6486002)(508600001)(36756003)(8676002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?MqWMIGTnow6J6Nm497weNV8?= =?iso-8859-1?q?ZKusY4vkptYrKbzrSkrxsDHCbKnl4n8aQ+CnEGthDNayKLf6wOcbX79+VW19?= =?iso-8859-1?q?iz0pWFPHbaGQa/iDxRXtM7OiwPJZ3wAR6W23mLWWNHZH9g9LNyt4d4PlHzvY?= =?iso-8859-1?q?p+YrfiNT8lciggvCbb5+pkUjWITUlqEY7bK27KeLiD5nD74c6ktMtumPvabY?= =?iso-8859-1?q?JWXaRAV0kDTs7M4kv7zkQmR896YMzIPVc0IFWfaH668l2jENa5bSigyYV+bo?= =?iso-8859-1?q?IEc0LFqVqHFe2+XqF3EAFPZ7a7auvvqFfArYY2JQNdCLKVwcgdJ3/lwT3caV?= =?iso-8859-1?q?XBUSVVQb2eok0/fe9Wu9dazLrbuZfS4Hqj/yMWYhhKwyEPJHWOrODmS4+mBg?= =?iso-8859-1?q?GY4dsn7nM95ecsnGi1G4X7iIgXVHj4wVuH7XRWvahIj5JPcPHXHRYb3+xJLB?= =?iso-8859-1?q?XGUJYmf47bluC6DaPv0/FC3Z6FH7dkwr6wi7/H35Inbu//xkj9xg7CFdJUmD?= =?iso-8859-1?q?80zPBT2GPiZH2OUkBAQEYZBI4TH2UXV5Bs9KuJpViEE3MCJNnAZXUvsIyXjk?= =?iso-8859-1?q?I0U07REWDeh1fBVBrjRA4KbVZOxKNcjKzKFAXrRrhH9HT65ii+sm0tWkNSN0?= =?iso-8859-1?q?Os6eQJ2/7MXLPNXsVSd2ZjuM2pmIeST29yP/KjPKMZnHYuyXvW4DxNTN1QMx?= =?iso-8859-1?q?cDHv0rn29sZzEq9zVAWtyLO1xVjGXV5D1GCQlV5MAMSrHtJoluaR03dS5+2b?= =?iso-8859-1?q?dXabMODZKDdVga8bLmMlQJvEbmfDcnXi4PRpLCTOlNVyRJwKtb3H0T77gvCz?= =?iso-8859-1?q?qKf8c8mI3AbJaibROPkbsXDbEzu2xfsbQtjffsYKojTBze0ziWb2OVFxb4uP?= =?iso-8859-1?q?gKH2Oam6aPbDl+qs/h26rTpyo6HAyFoKyiOuWpe2q1b/WB57tB/6surtNCnq?= =?iso-8859-1?q?1wHBNfJAG7c0fJDgShi1z49nOfRkDQCpxxxp+8+6ei9HXnVPbKhfcwIOlJLq?= =?iso-8859-1?q?XqbGnKVhop4YPertqVaD1Rg71Au+cKLVMf/7Y7W6cuNlgH4nmdPhaz2qSOa7?= =?iso-8859-1?q?GxLpqPYTYsxzeN+Dd+m86y6Qtzi1Gq5pw9RYIG2VMMJpNaeAeDqWzH5wn5hu?= =?iso-8859-1?q?NGXkwjC0sVwEVzsK5fwoJjppfW+3BuqFqZSXgyYh0zd3hkGutel6/szV4BgO?= =?iso-8859-1?q?bDH0yyDIAv+q1DMiaKjdK6ZqI3iw57dFOiQ6AmubYpN0yowNOfUJ73yFZeTL?= =?iso-8859-1?q?yiVxn0JiCaq42vTk2XsR2jZZxojTr5qgnIXrsLdLo0YFLCDet6CRWnD2ywDY?= =?iso-8859-1?q?CPU0Z3T/GxwTdSrX3NX8i7ZzKL59gubWsQ5lCeB8HNP9DGHouULZR+ulZAV5?= =?iso-8859-1?q?Vva565UBtX7uArtQtZd9iN2pIn4iWdXhB8W+iP7eghRRWyUkbIm5LLVYYSYc?= =?iso-8859-1?q?I5+ykTWFPQUd2J20w0MRafI45uZzsmXkBrWDyIDYwNNYRcSAAocPphhz5Bg0?= =?iso-8859-1?q?3zKNRMYMWAAezAsalC+JT83zJ5HIKT6fuJpsP5fweMLCluElomwwsNYZVyCS?= =?iso-8859-1?q?k7cg3sSm+DunXgt0iPM0h4Db6KvcjDk0mRM4HuRy/EwHUYaFUOHWM3bf+t9R?= =?iso-8859-1?q?np9HYgP1qAprlyEYMHA1RRbHxhPYPhfRUdkJiRDfQUuP+i9UqQSLyvCDvI/J?= =?iso-8859-1?q?QvO7A6XD+2DiTqnApOFWuevsp8wj3GpuNK4LMtEL5FRjJRbbj2YnjzO3uEgt?= =?iso-8859-1?q?XFC2ILvFfSarvUZ6gQ5thtkaZQR5MCZ06Khxuy9mWAAt6/Z/ZnumVzA8Nj3z?= =?iso-8859-1?q?0mGZ6EZ0=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: 35037a86-8d76-418d-c319-08da279658a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2022 15:06:30.0530 (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: 8P3sVpNFBJgL+keTN5wJjUiUcKL+eCd3f/yyxPWUA9j6MYFyTpum9CdIU016mz8Xi1jpF3CselgHMxFKZyy09A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4679 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858 definitions=2022-04-26_04:2022-04-26,2022-04-26 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204260096 X-Proofpoint-ORIG-GUID: LcfHlgvkAmIGgtgHhEdAghYrb4VIF4Uf X-Proofpoint-GUID: LcfHlgvkAmIGgtgHhEdAghYrb4VIF4Uf X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 6183D20052 X-Stat-Signature: 71q9duhugjhi67us857s3eamck4aoees X-Rspam-User: Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=CGaNdObd; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=jgQdRS1L; spf=none (imf13.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-HE-Tag: 1650985594-502734 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)" This thin layer of abstraction over the maple tree state is for iterating over VMAs. You can go forwards, go backwards or ask where the iterator is. Rename the existing vma_next() to __vma_next() -- it will be removed by the end of this series. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka --- include/linux/mm.h | 31 +++++++++++++++++++++++++++++++ include/linux/mm_types.h | 21 +++++++++++++++++++++ mm/mmap.c | 10 +++++----- 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 4024ccc94c71..2c639b0a9853 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -658,6 +658,37 @@ static inline bool vma_is_accessible(struct vm_area_struct *vma) return vma->vm_flags & VM_ACCESS_FLAGS; } +static inline +struct vm_area_struct *vma_find(struct vma_iterator *vmi, unsigned long max) +{ + return mas_find(&vmi->mas, max); +} + +static inline struct vm_area_struct *vma_next(struct vma_iterator *vmi) +{ + /* + * Uses vma_find() to get the first VMA when the iterator starts. + * Calling mas_next() could skip the first entry. + */ + return vma_find(vmi, ULONG_MAX); +} + +static inline struct vm_area_struct *vma_prev(struct vma_iterator *vmi) +{ + return mas_prev(&vmi->mas, 0); +} + +static inline unsigned long vma_iter_addr(struct vma_iterator *vmi) +{ + return vmi->mas.index; +} + +#define for_each_vma(vmi, vma) while ((vma = vma_next(&(vmi))) != NULL) + +/* The MM code likes to work with exclusive end addresses */ +#define for_each_vma_range(vmi, vma, end) \ + while ((vma = vma_find(&(vmi), (end) - 1)) != NULL) + #ifdef CONFIG_SHMEM /* * The vma_is_shmem is not inline because it is used only by slow diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 0953add99518..6b31c5252b76 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -678,6 +678,27 @@ static inline cpumask_t *mm_cpumask(struct mm_struct *mm) return (struct cpumask *)&mm->cpu_bitmap; } +struct vma_iterator { + struct ma_state mas; +}; + +#define VMA_ITERATOR(name, mm, addr) \ + struct vma_iterator name = { \ + .mas = { \ + .tree = &mm->mm_mt, \ + .index = addr, \ + .node = MAS_START, \ + }, \ + } + +static inline void vma_iter_init(struct vma_iterator *vmi, + struct mm_struct *mm, unsigned long addr) +{ + vmi->mas.tree = &mm->mm_mt; + vmi->mas.index = addr; + vmi->mas.node = MAS_START; +} + struct mmu_gather; extern void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm); extern void tlb_gather_mmu_fullmm(struct mmu_gather *tlb, struct mm_struct *mm); diff --git a/mm/mmap.c b/mm/mmap.c index 4512f64a30ab..176f114c2ad2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -635,7 +635,7 @@ static int find_vma_links(struct mm_struct *mm, unsigned long addr, } /* - * vma_next() - Get the next VMA. + * __vma_next() - Get the next VMA. * @mm: The mm_struct. * @vma: The current vma. * @@ -643,7 +643,7 @@ static int find_vma_links(struct mm_struct *mm, unsigned long addr, * * Returns: The next VMA after @vma. */ -static inline struct vm_area_struct *vma_next(struct mm_struct *mm, +static inline struct vm_area_struct *__vma_next(struct mm_struct *mm, struct vm_area_struct *vma) { if (!vma) @@ -1317,7 +1317,7 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, if (vm_flags & VM_SPECIAL) return NULL; - next = vma_next(mm, prev); + next = __vma_next(mm, prev); area = next; if (area && area->vm_end == end) /* cases 6, 7, 8 */ next = next->vm_next; @@ -2836,7 +2836,7 @@ static void unmap_region(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, unsigned long start, unsigned long end) { - struct vm_area_struct *next = vma_next(mm, prev); + struct vm_area_struct *next = __vma_next(mm, prev); struct mmu_gather tlb; lru_add_drain(); @@ -3035,7 +3035,7 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, if (error) return error; } - vma = vma_next(mm, prev); + vma = __vma_next(mm, prev); if (unlikely(uf)) { /*