From patchwork Tue Oct 5 01:31:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12535355 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC5D6C433EF for ; Tue, 5 Oct 2021 01:36:03 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BAAC9610C8 for ; Tue, 5 Oct 2021 01:36:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BAAC9610C8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 1FED1940042; Mon, 4 Oct 2021 21:32:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1ADCE94003E; Mon, 4 Oct 2021 21:32:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E7EB2940042; Mon, 4 Oct 2021 21:32:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0207.hostedemail.com [216.40.44.207]) by kanga.kvack.org (Postfix) with ESMTP id CF41B94003E for ; Mon, 4 Oct 2021 21:32:20 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 846A72D4AF for ; Tue, 5 Oct 2021 01:32:20 +0000 (UTC) X-FDA: 78660658440.01.FDDC757 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf19.hostedemail.com (Postfix) with ESMTP id 0563FB001CDB for ; Tue, 5 Oct 2021 01:32:19 +0000 (UTC) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19513vb1024351; Tue, 5 Oct 2021 01:32:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=JK/UiV6UUJHET68odutL3PbBVcYfYKw4yIAxixVXuQA=; b=n6xs+jumr+ByA2AnZXLgnP9QD6VgZyf6VxFJ7ZtG7TKs7tn1vYRT7Mu4dFmCyFM9eEZP UvMp3m16HsaKhk8g05Rwp3v2hMt8C5TMtF7fblj7YMZZq4HbsRGtUJlF/8YXMomv/7ii yazaXqn7IFfH6m0d4W2mxgNwsO9IxdLgEONt+gM23Ce28mzo30EKFUDxQbaVGd2AUepz 6dx/IyKswOGaBylotKcnuChMiMj/dw0iykJvByDAcLms0jBe+E9STJ1glTTgWbHdRJZB veouqK6dy/2Z3P4lCEE0reMi6ITlLGKKym4is9LljZ6bEwsoVPfG3Nzcs+vpcJfZx3Ee aQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3bg454bvvd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:32:08 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1951Uft1062508; Tue, 5 Oct 2021 01:32:07 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2173.outbound.protection.outlook.com [104.47.56.173]) by userp3030.oracle.com with ESMTP id 3bf0s5r11v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:32:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i8o67w9jk/93DoJSvMDTjcCkKnNJmBFnvarFMVpJ5Xd8AUns0uD4UQpZ/Vv8TG/akntMgzTVulNn/7+SQKkkWqlP6JexH8ZgiEfdwUo+K2V6VwLE2/9OLtWm0wDJABQ/0q/dWeJuD5Gog+r0ROy3Lath2fa5fqDVsOMNgrNi72FZxh7GImWNApp2r+2eZ8DirgougH681ZHn3LLJvIGNxyMz+gxjBHGPJzWJgqNMLFSfJEq0k+MC6ZnNy5+JcE4d/gmYpySZaqx6XUEo/Cm68jqNADwigDlHIa3weZ89mZKTbSoDivISjsF1UeC3iZEd0Ag5JUjk5cZtZRr4pctUZQ== 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=JK/UiV6UUJHET68odutL3PbBVcYfYKw4yIAxixVXuQA=; b=npRwvw/MuOdXA7MlaySLLjKcCNEELBwe04bUqSlWOfDf+9d4505d65sn99EVnpdRsiKQxyZxmX3PeMph6yrC38cRElbA2apzRQZ95vA4mSmQ8JbF+ElS9ShcIWukOYwygb98DAJMamE0TJA2db2FdoXgegs9Zt55ZRQ9l63SNwSrGEG/JcnDttMptHG0xII95QEMTWTHXetjhJgCzWZwttxNYk3DEnO+Wz4NGlAUlNTrIAXqqNqQUDJXybFmY5Usl2klQPmFTuMdI0gyfqi65XSvg2+wCHbJu5SSGv848RniuHL29r+4SFVxJUj62K3d/9vFkEkXA8WTDfvxzW12Ww== 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=JK/UiV6UUJHET68odutL3PbBVcYfYKw4yIAxixVXuQA=; b=0QKKJxbpj+/pVaMDCDuNogbUUwvP0LkEZg8AsKzn9Ba6JC0mS1qHEUE0nbwDIApvUuUSCejefv3JZpm1psqTvHbPg4RZ5lXzQKy4+TiD0Py3V/o/obOR9yDr+LMHe7675vTUV5Dlhw+6iscREX1Y9iQ5TBKt4Iu9a7Rfks4zo+w= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by MN2PR10MB4288.namprd10.prod.outlook.com (2603:10b6:208:1dc::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.17; Tue, 5 Oct 2021 01:31:58 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::6d61:54c2:40f0:93a]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::6d61:54c2:40f0:93a%5]) with mapi id 15.20.4566.017; Tue, 5 Oct 2021 01:31:58 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , David Hildenbrand , Douglas Gilbert CC: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Vlastimil Babka , Rik van Riel , Peter Zijlstra Subject: [PATCH v3 65/66] mm: Remove the vma linked list Thread-Topic: [PATCH v3 65/66] mm: Remove the vma linked list Thread-Index: AQHXuYiwb2AvTk14DEqG+olgecG4ww== Date: Tue, 5 Oct 2021 01:31:16 +0000 Message-ID: <20211005012959.1110504-66-Liam.Howlett@oracle.com> References: <20211005012959.1110504-1-Liam.Howlett@oracle.com> In-Reply-To: <20211005012959.1110504-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.30.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 67fd9357-b7ff-4199-9b4b-08d9879fec66 x-ms-traffictypediagnostic: MN2PR10MB4288: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3383; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: cml4cwUntqpJ9cUU7sgoIH73DQTQnTNXLOCm0f2hSwuipd+XsAYNmlxgveHzz1Gaba2uLuvP1uyEtqqlj1UXzSlVKqe9X9utRntG6ImvcKaYxXy6Gr6YOpAXpvAlCCOJR/vmz1Khb21JIAYMHAGpGJDy0fJJP9DQ+0sGO819Q4wetj+xa+yXI13eob8M8chbSWfCEiqCEe8jMk4j2XbVBHsw2Cw89ko5gMAay8dEGMbaznYXSuXORe/NC0CYoPQJ+HgrpbJLhzZBiljgAPWx6LZBEjMEfLoZJXH979QMpABdEej7Nrv8ArAllp15yxx5G/9xD902M+xZJ7ExZ4HMFEATHthls0Wy4R94Gw/aKcUONyi842Pxl80ktYLKFugBFvzE9ai6jatDnlCmRQDqxFd0H2248DO5HEwpwJMVMoaUJRH9VaPIeneWyRmJ4d7Ai84t/YorRGDv93A4qRTiSvqqpVBr/BceqZJqv3bukKWOZqkWJE8WJ4ifqTFMVif38ggAYxHQNReos46OvUUUkBNDbgZBoBQQ2qCMdimt4X253ky0OvOWJzAwaMma/OG77sZA0HbcDYGleDVTK4mXkeAuUKro6OxIfEKNSXZ7UtEDXfEg2aJrflUIGTiZU/j2a5ig4wObU+0fTxen2ILY2WpR+RNVpmGtHzC2992NSlj5yonhhp2o4/D7h2r0xrKjyQotvVC0WNzrZHTije919A== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR10MB3011.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8676002)(38070700005)(71200400001)(8936002)(76116006)(6506007)(1076003)(122000001)(316002)(2616005)(44832011)(6512007)(6666004)(6486002)(38100700002)(508600001)(66556008)(66946007)(66446008)(26005)(86362001)(83380400001)(30864003)(5660300002)(91956017)(110136005)(4326008)(2906002)(66476007)(54906003)(36756003)(7416002)(64756008)(186003)(559001)(579004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?9uxGpZABq1wKj9J9Ih/LWxN?= =?iso-8859-1?q?7Ek8MaY6fKaCZToifbCATkoDguLMLJtbVqzN3j02pNIIHl/KBQ0nuFrmiSnr?= =?iso-8859-1?q?lDLOvVMLEil9qXuZBYMf1kllWA11e+BrpO/h59tzzvBYeghgAg2i328gVAMu?= =?iso-8859-1?q?NX5ZZO2U4Kkye/OwP0Z2QF+aF8enBq3+jmcmcuPAEQcSz2Bh7FpEYZclYB3d?= =?iso-8859-1?q?rPC0m+nqPivOwTM08h3NJ5WlGIBu2fvfrsYB4AmuwetV83O6/CsnpeQDYolV?= =?iso-8859-1?q?LbLv/yzYZS0HFvZ4IrJlOPiaXit22HXY0rMnZViYzEUOKVaSx2DcYIqYa4HT?= =?iso-8859-1?q?sSIGFEA3t2UytfvYWaTotUojQq+OrP3IaprmdE4090f85Eku8amUHq9r7skx?= =?iso-8859-1?q?eVPk6ykz9KiiDbnHVUxMiA5C7jfraFK+qXQ93DhVXdigMjbtHUGxbIe4ptaH?= =?iso-8859-1?q?TbFT30WU+PL+9g2uaLVRIlUWUGBxd3C9rGVr3wfceyQDMtR+s4pbVqONIroL?= =?iso-8859-1?q?bizuxnGf+czRkcuKdI/xFf//g49h6tASTtkihITJN6P68/f+TTMKpF3BBFGB?= =?iso-8859-1?q?2MRenk20nLlPBir1PJ5ur42HMop5YuB6yKvz+U/QOGSyx46r/TNiIjZu3ffa?= =?iso-8859-1?q?C3958CcxDdRRP8qHMIUK924moeLkqSUhMPkZLPcGIkjkgjjDsSt0k4XdJrah?= =?iso-8859-1?q?+Ir0YbXrFjbLop+8B/qB0qRBG0Ni4FH0jUlvrIrl6kwkAdpVzVdb9WodQ5vl?= =?iso-8859-1?q?Izt01E1sNPYEv0zUy8OMB4C+OYmTovoHP0QW88PRgeNQABUoxL7kxJ1KvfJs?= =?iso-8859-1?q?JMKt4qRAgBsj3VI2SpmSNf3s6xRRbAH4mmem4o7AXQ2YQtUpFjP0LEMUIIoX?= =?iso-8859-1?q?WgmfVWb53q2p+zVgDh+Ehtfy7c2rJjVG899qPfUl+LRs26S8hVu7baDRRkCL?= =?iso-8859-1?q?Q7WuHS37VXqTd9QR2dciovswQm/dsyqjhL79MdoKKsTAmLdofixd90DPi5Xi?= =?iso-8859-1?q?tDgPjvjUfyeHXCtkUpwG98lro4uk5lwa00Ubwq72YWL9r+WGKu7cDwZ1D+JF?= =?iso-8859-1?q?k9VH/ySPQKK0Uej9chsSzTpBpHTp32Y9aHMglVNqdrGcoU2/nLiKDrS60iMG?= =?iso-8859-1?q?Yd980LH4/JzZZGYYt2K09kk6zy4ef3yxRgmPoLOa4O6zkhL3LqCJOSO5enAy?= =?iso-8859-1?q?3qEIpYJJumZtDHn4tyh5isRJYtAaR6MUjoz+VBtzaBCJuVJo/a7zi4dIOO84?= =?iso-8859-1?q?jLfVrQOHUxD2A91Y01AQ1ZpFdRNbvsyeNr/+xgY2HKiIefLPOx6nk9U0jEvd?= =?iso-8859-1?q?JzmPGDjEJVuEYZ51u/JmUOD7ctB95lcp6Ia8jR2lQdjpOzbTdQ1oShwjOoAB?= =?iso-8859-1?q?T?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL0PR10MB3011.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67fd9357-b7ff-4199-9b4b-08d9879fec66 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2021 01:31:16.3013 (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: 6LkLkLySuc/tAt5n1WOwxxx6KA+v1/iN8wYWQ2DkB7R4s56krnPKutINbEJ0HTBMVSGW2+KoLK+TWfof+uCHWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4288 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 adultscore=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110050007 X-Proofpoint-GUID: 7eSSDVf_Wk21PnMywtax6IXHMUcistYy X-Proofpoint-ORIG-GUID: 7eSSDVf_Wk21PnMywtax6IXHMUcistYy X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 0563FB001CDB X-Stat-Signature: sza1k4jckwhcq3dbwuyx8hfdrxc39atr Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=n6xs+jum; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=0QKKJxbp; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf19.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com X-HE-Tag: 1633397539-643590 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: "Liam R. Howlett" Replace any vm_next use with vma_next(). Update free_pgtables(), unmap_vmas(), and zap_page_range() to use the maple tree. Use the new free_pgtables() and unmap_vmas() in do_mas_align_munmap(). At the same time, alter the loop to be more compact. Now that free_pgtables() and unmap_vmas() take a maple tree as an argument, rearrange do_mas_align_munmap() to use the new table to hold the lock Move mas_lock()/mas_unlock() from vma_mas_store() and into vma_mas_link(). This will allow vma_mas_store() to be used in loops. Remove __vma_link_list() and __vma_unlink_list() as they are exclusively used to update the linked list Rework validation of tree as it was depending on the linked list. Signed-off-by: Liam R. Howlett --- fs/proc/task_nommu.c | 2 +- include/linux/mm.h | 5 +- include/linux/mm_types.h | 4 - kernel/fork.c | 13 +- mm/debug.c | 14 +- mm/internal.h | 14 +- mm/memory.c | 33 ++- mm/mmap.c | 507 +++++++++++++++++++-------------------- mm/nommu.c | 6 +- mm/util.c | 40 --- 10 files changed, 283 insertions(+), 355 deletions(-) diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index 8691a1216d1c..be02e8997ddf 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -246,7 +246,7 @@ static void *m_next(struct seq_file *m, void *_p, loff_t *pos) struct vm_area_struct *vma = _p; *pos = vma->vm_end; - return vma->vm_next; + return vma_next(vma->vm_mm, vma); } static const struct seq_operations proc_pid_maps_ops = { diff --git a/include/linux/mm.h b/include/linux/mm.h index 68e315cb1056..e85dbadd3aac 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1736,8 +1736,9 @@ void zap_vma_ptes(struct vm_area_struct *vma, unsigned long address, unsigned long size); void zap_page_range(struct vm_area_struct *vma, unsigned long address, unsigned long size); -void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma, - unsigned long start, unsigned long end); +void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, + struct vm_area_struct *start_vma, unsigned long start, + unsigned long end); struct mmu_notifier_range; diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 6ba95ad603d6..737f0e732c24 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -324,8 +324,6 @@ struct vm_area_struct { unsigned long vm_end; /* The first byte after our end address within vm_mm. */ - /* linked list of VM areas per task, sorted by address */ - struct vm_area_struct *vm_next, *vm_prev; struct mm_struct *vm_mm; /* The address space we belong to. */ /* @@ -390,7 +388,6 @@ struct core_state { struct kioctx_table; struct mm_struct { struct { - struct vm_area_struct *mmap; /* list of VMAs */ struct maple_tree mm_mt; #ifdef CONFIG_MMU unsigned long (*get_unmapped_area) (struct file *filp, @@ -405,7 +402,6 @@ struct mm_struct { unsigned long mmap_compat_legacy_base; #endif unsigned long task_size; /* size of task vm space */ - unsigned long highest_vm_end; /* highest vma end address */ pgd_t * pgd; #ifdef CONFIG_MEMBARRIER diff --git a/kernel/fork.c b/kernel/fork.c index d995ab62002b..b3798e31b628 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -364,7 +364,6 @@ struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig) */ *new = data_race(*orig); INIT_LIST_HEAD(&new->anon_vma_chain); - new->vm_next = new->vm_prev = NULL; } return new; } @@ -488,7 +487,7 @@ static void dup_mm_exe_file(struct mm_struct *mm, struct mm_struct *oldmm) static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) { - struct vm_area_struct *mpnt, *tmp, *prev, **pprev; + struct vm_area_struct *mpnt, *tmp, *prev; int retval; unsigned long charge = 0; MA_STATE(old_mas, &oldmm->mm_mt, 0, 0); @@ -515,7 +514,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, mm->exec_vm = oldmm->exec_vm; mm->stack_vm = oldmm->stack_vm; - pprev = &mm->mmap; retval = ksm_fork(mm, oldmm); if (retval) goto out; @@ -600,14 +598,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, if (is_vm_hugetlb_page(tmp)) reset_vma_resv_huge_pages(tmp); - /* - * Link in the new vma and copy the page table entries. - */ - *pprev = tmp; - pprev = &tmp->vm_next; - tmp->vm_prev = prev; - prev = tmp; - /* Link the vma into the MT */ mas_lock(&mas); mas.index = tmp->vm_start; @@ -1053,7 +1043,6 @@ static void mm_init_uprobes_state(struct mm_struct *mm) static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p, struct user_namespace *user_ns) { - mm->mmap = NULL; mt_init_flags(&mm->mm_mt, MAPLE_ALLOC_RANGE); atomic_set(&mm->mm_users, 1); atomic_set(&mm->mm_count, 1); diff --git a/mm/debug.c b/mm/debug.c index 5fe665c6ce1c..d171a0edd5d2 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -189,13 +189,11 @@ EXPORT_SYMBOL(dump_page); void dump_vma(const struct vm_area_struct *vma) { - pr_emerg("vma %px start %px end %px\n" - "next %px prev %px mm %px\n" + pr_emerg("vma %px start %px end %px mm %px\n" "prot %lx anon_vma %px vm_ops %px\n" "pgoff %lx file %px private_data %px\n" "flags: %#lx(%pGv)\n", - vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next, - vma->vm_prev, vma->vm_mm, + vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_mm, (unsigned long)pgprot_val(vma->vm_page_prot), vma->anon_vma, vma->vm_ops, vma->vm_pgoff, vma->vm_file, vma->vm_private_data, @@ -205,11 +203,11 @@ EXPORT_SYMBOL(dump_vma); void dump_mm(const struct mm_struct *mm) { - pr_emerg("mm %px mmap %px task_size %lu\n" + pr_emerg("mm %px task_size %lu\n" #ifdef CONFIG_MMU "get_unmapped_area %px\n" #endif - "mmap_base %lu mmap_legacy_base %lu highest_vm_end %lu\n" + "mmap_base %lu mmap_legacy_base %lu\n" "pgd %px mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n" "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n" "pinned_vm %llx data_vm %lx exec_vm %lx stack_vm %lx\n" @@ -233,11 +231,11 @@ void dump_mm(const struct mm_struct *mm) "tlb_flush_pending %d\n" "def_flags: %#lx(%pGv)\n", - mm, mm->mmap, mm->task_size, + mm, mm->task_size, #ifdef CONFIG_MMU mm->get_unmapped_area, #endif - mm->mmap_base, mm->mmap_legacy_base, mm->highest_vm_end, + mm->mmap_base, mm->mmap_legacy_base, mm->pgd, atomic_read(&mm->mm_users), atomic_read(&mm->mm_count), mm_pgtables_bytes(mm), diff --git a/mm/internal.h b/mm/internal.h index 3f45e1d0c02b..f77ecd7384f1 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -36,8 +36,9 @@ void page_writeback_init(void); vm_fault_t do_swap_page(struct vm_fault *vmf); -void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_vma, - unsigned long floor, unsigned long ceiling); +void free_pgtables(struct mmu_gather *tlb, struct maple_tree *mt, + struct vm_area_struct *start_vma, unsigned long floor, + unsigned long ceiling); static inline bool can_madv_lru_vma(struct vm_area_struct *vma) { @@ -375,9 +376,7 @@ static inline int vma_mas_store(struct vm_area_struct *vma, struct ma_state *mas #endif mas->index = vma->vm_start; mas->last = vma->vm_end - 1; - mas_lock(mas); ret = mas_store_gfp(mas, vma, GFP_KERNEL); - mas_unlock(mas); return ret; } @@ -411,17 +410,10 @@ static inline int vma_mas_remove(struct vm_area_struct *vma, struct ma_state *ma #endif mas->index = vma->vm_start; mas->last = vma->vm_end - 1; - mas_lock(mas); ret = mas_store_gfp(mas, NULL, GFP_KERNEL); - mas_unlock(mas); return ret; } -/* mm/util.c */ -void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, - struct vm_area_struct *prev); -void __vma_unlink_list(struct mm_struct *mm, struct vm_area_struct *vma); - #ifdef CONFIG_MMU extern long populate_vma_page_range(struct vm_area_struct *vma, unsigned long start, unsigned long end, int *locked); diff --git a/mm/memory.c b/mm/memory.c index adf9b9ef8277..1a7dd86a9bea 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -398,12 +398,21 @@ void free_pgd_range(struct mmu_gather *tlb, } while (pgd++, addr = next, addr != end); } -void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *vma, - unsigned long floor, unsigned long ceiling) +void free_pgtables(struct mmu_gather *tlb, struct maple_tree *mt, + struct vm_area_struct *vma, unsigned long floor, + unsigned long ceiling) { - while (vma) { - struct vm_area_struct *next = vma->vm_next; + unsigned long index = vma->vm_end; + + do { unsigned long addr = vma->vm_start; + struct vm_area_struct *next; + + /* + * Note: USER_PGTABLES_CEILING may be passed as ceiling and may + * be 0. This will underflow and is okay. + */ + next = mt_find(mt, &index, ceiling - 1); /* * Hide vma from rmap and truncate_pagecache before freeing @@ -422,7 +431,7 @@ void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *vma, while (next && next->vm_start <= vma->vm_end + PMD_SIZE && !is_vm_hugetlb_page(next)) { vma = next; - next = vma->vm_next; + next = mt_find(mt, &index, ceiling - 1); unlink_anon_vmas(vma); unlink_file_vma(vma); } @@ -430,7 +439,7 @@ void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *vma, floor, next ? next->vm_start : ceiling); } vma = next; - } + } while (vma); } int __pte_alloc(struct mm_struct *mm, pmd_t *pmd) @@ -1616,17 +1625,19 @@ static void unmap_single_vma(struct mmu_gather *tlb, * ensure that any thus-far unmapped pages are flushed before unmap_vmas() * drops the lock and schedules. */ -void unmap_vmas(struct mmu_gather *tlb, +void unmap_vmas(struct mmu_gather *tlb, struct maple_tree *mt, struct vm_area_struct *vma, unsigned long start_addr, unsigned long end_addr) { struct mmu_notifier_range range; + unsigned long index = vma->vm_end; mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm, start_addr, end_addr); mmu_notifier_invalidate_range_start(&range); - for ( ; vma && vma->vm_start < end_addr; vma = vma->vm_next) + do { unmap_single_vma(tlb, vma, start_addr, end_addr, NULL); + } while ((vma = mt_find(mt, &index, end_addr - 1)) != NULL); mmu_notifier_invalidate_range_end(&range); } @@ -1641,6 +1652,9 @@ void unmap_vmas(struct mmu_gather *tlb, void zap_page_range(struct vm_area_struct *vma, unsigned long start, unsigned long size) { + struct maple_tree *mt = &vma->vm_mm->mm_mt; + unsigned long index = vma->vm_end; + unsigned long end = start + size; struct mmu_notifier_range range; struct mmu_gather tlb; @@ -1650,8 +1664,9 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start, tlb_gather_mmu(&tlb, vma->vm_mm); update_hiwater_rss(vma->vm_mm); mmu_notifier_invalidate_range_start(&range); - for ( ; vma && vma->vm_start < range.end; vma = vma->vm_next) + do { unmap_single_vma(&tlb, vma, start, range.end, NULL); + } while ((vma = mt_find(mt, &index, end - 1)) != NULL); mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); } diff --git a/mm/mmap.c b/mm/mmap.c index 9b6765db14c0..51620d545021 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -74,9 +74,10 @@ int mmap_rnd_compat_bits __read_mostly = CONFIG_ARCH_MMAP_RND_COMPAT_BITS; static bool ignore_rlimit_data; core_param(ignore_rlimit_data, ignore_rlimit_data, bool, 0644); -static void unmap_region(struct mm_struct *mm, +static void unmap_region(struct mm_struct *mm, struct maple_tree *mt, struct vm_area_struct *vma, struct vm_area_struct *prev, - unsigned long start, unsigned long end); + struct vm_area_struct *next, unsigned long start, + unsigned long end); /* description of effects of mapping type and prot in current implementation. * this is due to the limited x86 page protection hardware. The expected @@ -173,10 +174,8 @@ void unlink_file_vma(struct vm_area_struct *vma) /* * Close a vm structure and free it, returning the next. */ -static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) +static void remove_vma(struct vm_area_struct *vma) { - struct vm_area_struct *next = vma->vm_next; - might_sleep(); if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); @@ -184,13 +183,13 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) fput(vma->vm_file); mpol_put(vma_policy(vma)); vm_area_free(vma); - return next; } static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, unsigned long newbrk, unsigned long oldbrk, struct list_head *uf); -static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, +static int do_brk_flags(struct ma_state *mas, struct ma_state *ma_prev, + struct vm_area_struct **brkvma, unsigned long addr, unsigned long request, unsigned long flags); SYSCALL_DEFINE1(brk, unsigned long, brk) @@ -203,6 +202,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) bool downgraded = false; LIST_HEAD(uf); MA_STATE(mas, &mm->mm_mt, 0, 0); + struct ma_state ma_neighbour; if (mmap_write_lock_killable(mm)) return -EINTR; @@ -261,7 +261,6 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) * before calling do_brk_munmap(). */ mm->brk = brk; - mas.last = oldbrk - 1; ret = do_brk_munmap(&mas, brkvma, newbrk, oldbrk, &uf); if (ret == 1) { downgraded = true; @@ -272,28 +271,30 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) mm->brk = origbrk; goto out; } + ma_neighbour = mas; + mas_lock(&ma_neighbour); + next = mas_next(&ma_neighbour, newbrk + PAGE_SIZE + stack_guard_gap); + mas_unlock(&ma_neighbour); /* Only check if the next VMA is within the stack_guard_gap of the * expansion area */ - next = mas_next(&mas, newbrk + PAGE_SIZE + stack_guard_gap); /* Check against existing mmap mappings. */ if (next && newbrk + PAGE_SIZE > vm_start_gap(next)) goto out; - mas_lock(&mas); - brkvma = mas_prev(&mas, mm->start_brk); - mas_unlock(&mas); + mas_lock(&ma_neighbour); + brkvma = mas_prev(&ma_neighbour, mm->start_brk); + mas_unlock(&ma_neighbour); if (brkvma) { - if(brkvma->vm_start >= oldbrk) + if (brkvma->vm_start >= oldbrk) goto out; // Trying to map over another vma. - if (brkvma->vm_end <= min_brk) { + if (brkvma->vm_end <= min_brk) brkvma = NULL; - mas_reset(&mas); - } } /* Ok, looks good - let it rip. */ - if (do_brk_flags(&mas, &brkvma, oldbrk, newbrk - oldbrk, 0) < 0) + if (do_brk_flags(&mas, &ma_neighbour, &brkvma, oldbrk, + newbrk - oldbrk, 0) < 0) goto out; mm->brk = brk; @@ -304,6 +305,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) mmap_read_unlock(mm); else mmap_write_unlock(mm); + userfaultfd_unmap_complete(mm, &uf); if (populate) mm_populate(oldbrk, newbrk - oldbrk); @@ -322,45 +324,23 @@ extern void mt_dump(const struct maple_tree *mt); static void validate_mm_mt(struct mm_struct *mm) { struct maple_tree *mt = &mm->mm_mt; - struct vm_area_struct *vma_mt, *vma = mm->mmap; + struct vm_area_struct *vma_mt; MA_STATE(mas, mt, 0, 0); + rcu_read_lock(); mas_for_each(&mas, vma_mt, ULONG_MAX) { - if (xa_is_zero(vma_mt)) - continue; - - if (!vma) - break; - - if ((vma != vma_mt) || - (vma->vm_start != vma_mt->vm_start) || - (vma->vm_end != vma_mt->vm_end) || - (vma->vm_start != mas.index) || - (vma->vm_end - 1 != mas.last)) { + if ((vma_mt->vm_start != mas.index) || + (vma_mt->vm_end - 1 != mas.last)) { pr_emerg("issue in %s\n", current->comm); dump_stack(); #ifdef CONFIG_DEBUG_VM dump_vma(vma_mt); - pr_emerg("and vm_next\n"); - dump_vma(vma->vm_next); #endif // CONFIG_DEBUG_VM pr_emerg("mt piv: %px %lu - %lu\n", vma_mt, mas.index, mas.last); pr_emerg("mt vma: %px %lu - %lu\n", vma_mt, vma_mt->vm_start, vma_mt->vm_end); - if (vma->vm_prev) { - pr_emerg("ll prev: %px %lu - %lu\n", - vma->vm_prev, vma->vm_prev->vm_start, - vma->vm_prev->vm_end); - } - pr_emerg("ll vma: %px %lu - %lu\n", vma, - vma->vm_start, vma->vm_end); - if (vma->vm_next) { - pr_emerg("ll next: %px %lu - %lu\n", - vma->vm_next, vma->vm_next->vm_start, - vma->vm_next->vm_end); - } mt_dump(mas.tree); if (vma_mt->vm_end != mas.last + 1) { @@ -377,12 +357,7 @@ static void validate_mm_mt(struct mm_struct *mm) } VM_BUG_ON_MM(vma_mt->vm_start != mas.index, mm); } - VM_BUG_ON(vma != vma_mt); - vma = vma->vm_next; - } - VM_BUG_ON(vma); - rcu_read_unlock(); mt_validate(&mm->mm_mt); } @@ -391,35 +366,33 @@ static void validate_mm(struct mm_struct *mm) { int bug = 0; int i = 0; - unsigned long highest_address = 0; - struct vm_area_struct *vma = mm->mmap; + struct vm_area_struct *vma; + MA_STATE(mas, &mm->mm_mt, 0, 0); validate_mm_mt(mm); - while (vma) { + rcu_read_lock(); + mas_for_each(&mas, vma, ULONG_MAX) { #ifdef CONFIG_DEBUG_VM_RB struct anon_vma *anon_vma = vma->anon_vma; struct anon_vma_chain *avc; + + rcu_read_unlock(); if (anon_vma) { anon_vma_lock_read(anon_vma); list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) anon_vma_interval_tree_verify(avc); anon_vma_unlock_read(anon_vma); } + rcu_read_lock(); #endif - highest_address = vm_end_gap(vma); - vma = vma->vm_next; i++; } + rcu_read_unlock(); if (i != mm->map_count) { pr_emerg("map_count %d vm_next %d\n", mm->map_count, i); bug = 1; } - if (highest_address != mm->highest_vm_end) { - pr_emerg("mm->highest_vm_end %lx, found %lx\n", - mm->highest_vm_end, highest_address); - bug = 1; - } VM_BUG_ON_MM(bug, mm); } @@ -477,29 +450,13 @@ bool range_has_overlap(struct mm_struct *mm, unsigned long start, struct vm_area_struct *existing; MA_STATE(mas, &mm->mm_mt, start, start); + rcu_read_lock(); existing = mas_find(&mas, end - 1); *pprev = mas_prev(&mas, 0); + rcu_read_unlock(); return existing ? true : false; } -/* - * _vma_next() - Get the next VMA or the first. - * @mm: The mm_struct. - * @vma: The current vma. - * - * If @vma is NULL, return the first vma in the mm. - * - * Returns: The next VMA after @vma. - */ -static inline struct vm_area_struct *_vma_next(struct mm_struct *mm, - struct vm_area_struct *vma) -{ - if (!vma) - return mm->mmap; - - return vma->vm_next; -} - /* * count_vma_pages_range() - Count the number of pages in a range. * @mas: The maple state @@ -594,7 +551,7 @@ void vma_mt_store(struct mm_struct *mm, struct vm_area_struct *vma) * @vma: The VMA to link in * @mas: The maple state * - * Must hold the @mas lock. + * Must not hold the maple tree lock. */ static void vma_mas_link(struct mm_struct *mm, struct vm_area_struct *vma, struct ma_state *mas, struct vm_area_struct *prev) @@ -606,15 +563,15 @@ static void vma_mas_link(struct mm_struct *mm, struct vm_area_struct *vma, i_mmap_lock_write(mapping); } + mas_lock(mas); vma_mas_store(vma, mas); - __vma_link_list(mm, vma, prev); + mas_unlock(mas); __vma_link_file(vma); if (mapping) i_mmap_unlock_write(mapping); mm->map_count++; - validate_mm(mm); } static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma, @@ -628,7 +585,6 @@ static void vma_link(struct mm_struct *mm, struct vm_area_struct *vma, } vma_mt_store(mm, vma); - __vma_link_list(mm, vma, prev); __vma_link_file(vma); if (mapping) @@ -647,7 +603,6 @@ static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) struct vm_area_struct *prev; vma_mt_store(mm, vma); - __vma_link_list(mm, vma, prev); mm->map_count++; } @@ -705,7 +660,9 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma, vma->vm_end = end; vma->vm_pgoff = pgoff; /* Note: mas must be pointing to the expanding VMA */ + mas_lock(mas); vma_mas_store(vma, mas); + mas_unlock(mas); if (file) { vma_interval_tree_insert(vma, root); @@ -713,15 +670,8 @@ inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma, } /* Expanding over the next vma */ - if (remove_next) { - /* Remove from mm linked list - also updates highest_vm_end */ - __vma_unlink_list(mm, next); - - if (file) - __remove_shared_vm_struct(next, file, mapping); - - } else if (!next) { - mm->highest_vm_end = vm_end_gap(vma); + if (remove_next && file) { + __remove_shared_vm_struct(next, file, mapping); } if (anon_vma) { @@ -762,7 +712,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, struct vm_area_struct *expand) { struct mm_struct *mm = vma->vm_mm; - struct vm_area_struct *next = vma->vm_next, *orig_vma = vma; + struct vm_area_struct *next = vma_next(mm, vma), *orig_vma = vma; struct address_space *mapping = NULL; struct rb_root_cached *root = NULL; struct anon_vma *anon_vma = NULL; @@ -804,7 +754,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, */ remove_next = 1 + (end > next->vm_end); VM_WARN_ON(remove_next == 2 && - end != next->vm_next->vm_end); + end != vma_next(mm, next)->vm_end); /* trim end to next, for case 6 first pass */ end = next->vm_end; } @@ -817,7 +767,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, * next, if the vma overlaps with it. */ if (remove_next == 2 && !next->anon_vma) - exporter = next->vm_next; + exporter = vma_next(mm, next); } else if (end > next->vm_start) { /* @@ -908,8 +858,6 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, } else vma_changed = true; vma->vm_end = end; - if (!next) - mm->highest_vm_end = vm_end_gap(vma); } if (vma_changed) { @@ -934,10 +882,8 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, flush_dcache_mmap_unlock(mapping); } - if (remove_next) { - __vma_unlink_list(mm, next); - if (file) - __remove_shared_vm_struct(next, file, mapping); + if (remove_next && file) { + __remove_shared_vm_struct(next, file, mapping); } else if (insert) { /* * split_vma has split insert from vma, and needs @@ -984,7 +930,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, * "next->vm_prev->vm_end" changed and the * "vma->vm_next" gap must be updated. */ - next = vma->vm_next; + next = vma_next(mm, vma); } else { /* * For the scope of the comment "next" and @@ -1002,33 +948,14 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start, remove_next = 1; end = next->vm_end; goto again; - } else if (!next) { - /* - * If remove_next == 2 we obviously can't - * reach this path. - * - * If remove_next == 3 we can't reach this - * path because pre-swap() next is always not - * NULL. pre-swap() "next" is not being - * removed and its next->vm_end is not altered - * (and furthermore "end" already matches - * next->vm_end in remove_next == 3). - * - * We reach this only in the remove_next == 1 - * case if the "next" vma that was removed was - * the highest vma of the mm. However in such - * case next->vm_end == "end" and the extended - * "vma" has vma->vm_end == next->vm_end so - * mm->highest_vm_end doesn't need any update - * in remove_next == 1 case. - */ - VM_WARN_ON(mm->highest_vm_end != vm_end_gap(vma)); } } - if (insert && file) + if (insert && file) { uprobe_mmap(insert); + } validate_mm(mm); + return 0; } @@ -1182,10 +1109,10 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm, if (vm_flags & VM_SPECIAL) return NULL; - next = _vma_next(mm, prev); + next = find_vma(mm, prev ? prev->vm_end : 0); area = next; if (area && area->vm_end == end) /* cases 6, 7, 8 */ - next = next->vm_next; + next = vma_next(mm, next); /* verify some invariant that must be enforced by the caller */ VM_WARN_ON(prev && addr <= prev->vm_start); @@ -1321,16 +1248,20 @@ struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma) { struct anon_vma *anon_vma = NULL; + struct vm_area_struct *prev, *next; + /* Try next first. */ - if (vma->vm_next) { - anon_vma = reusable_anon_vma(vma->vm_next, vma, vma->vm_next); + next = vma_next(vma->vm_mm, vma); + if (next) { + anon_vma = reusable_anon_vma(next, vma, next); if (anon_vma) return anon_vma; } + prev = vma_prev(vma->vm_mm, vma); /* Try prev next. */ - if (vma->vm_prev) - anon_vma = reusable_anon_vma(vma->vm_prev, vma->vm_prev, vma); + if (prev) + anon_vma = reusable_anon_vma(prev, prev, vma); /* * We might reach here with anon_vma == NULL if we can't find @@ -1978,15 +1909,10 @@ struct vm_area_struct *find_vma_intersection(struct mm_struct *mm, unsigned long start_addr, unsigned long end_addr) { - struct vm_area_struct *vma; - MA_STATE(mas, &mm->mm_mt, start_addr, start_addr); + unsigned long index = start_addr; mmap_assert_locked(mm); - rcu_read_lock(); - vma = mas_find(&mas, end_addr - 1); - rcu_read_unlock(); - - return vma; + return mt_find(&mm->mm_mt, &index, end_addr - 1); } EXPORT_SYMBOL(find_vma_intersection); @@ -2000,8 +1926,9 @@ EXPORT_SYMBOL(find_vma_intersection); */ inline struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) { - // Note find_vma_intersection will decrease 0 to underflow to ULONG_MAX - return find_vma_intersection(mm, addr, 0); + unsigned long index = addr; + + return mt_find(&mm->mm_mt, &index, ULONG_MAX); } EXPORT_SYMBOL(find_vma); @@ -2103,7 +2030,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) if (gap_addr < address || gap_addr > TASK_SIZE) gap_addr = TASK_SIZE; - next = vma->vm_next; + next = vma_next(mm, vma); if (next && next->vm_start < gap_addr && vma_is_accessible(next)) { if (!(next->vm_flags & VM_GROWSUP)) return -ENOMEM; @@ -2149,8 +2076,6 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) vma->vm_end = address; vma_mt_store(mm, vma); anon_vma_interval_tree_post_update_vma(vma); - if (!vma->vm_next) - mm->highest_vm_end = vm_end_gap(vma); spin_unlock(&mm->page_table_lock); perf_event_mmap(vma); @@ -2177,7 +2102,7 @@ int expand_downwards(struct vm_area_struct *vma, unsigned long address) return -EPERM; /* Enforce stack_guard_gap */ - prev = vma->vm_prev; + prev = vma_prev(mm, vma); /* Check that both stack segments have the same anon_vma? */ if (prev && !(prev->vm_flags & VM_GROWSDOWN) && vma_is_accessible(prev)) { @@ -2312,20 +2237,22 @@ EXPORT_SYMBOL_GPL(find_extend_vma); * * Called with the mm semaphore held. */ -static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) +static inline void remove_mt(struct mm_struct *mm, struct maple_tree *detached) { unsigned long nr_accounted = 0; + unsigned long index = 0; + struct vm_area_struct *vma; /* Update high watermark before we lower total_vm */ update_hiwater_vm(mm); - do { + mt_for_each(detached, vma, index, ULONG_MAX) { long nrpages = vma_pages(vma); if (vma->vm_flags & VM_ACCOUNT) nr_accounted += nrpages; vm_stat_account(mm, vma->vm_flags, -nrpages); - vma = remove_vma(vma); - } while (vma); + remove_vma(vma); + } vm_unacct_memory(nr_accounted); validate_mm(mm); } @@ -2335,18 +2262,18 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma) * * Called with the mm semaphore held. */ -static void unmap_region(struct mm_struct *mm, +static void unmap_region(struct mm_struct *mm, struct maple_tree *mt, struct vm_area_struct *vma, struct vm_area_struct *prev, + struct vm_area_struct *next, unsigned long start, unsigned long end) { - struct vm_area_struct *next = _vma_next(mm, prev); struct mmu_gather tlb; lru_add_drain(); tlb_gather_mmu(&tlb, mm); update_hiwater_rss(mm); - unmap_vmas(&tlb, vma, start, end); - free_pgtables(&tlb, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, + unmap_vmas(&tlb, mt, vma, start, end); + free_pgtables(&tlb, mt, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, next ? next->vm_start : USER_PGTABLES_CEILING); tlb_finish_mmu(&tlb); } @@ -2387,8 +2314,9 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, if (err) goto out_free_mpol; - if (new->vm_file) + if (new->vm_file) { get_file(new->vm_file); + } if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -2430,27 +2358,6 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, return __split_vma(mm, vma, addr, new_below); } -static inline int -unlock_range(struct vm_area_struct *start, struct vm_area_struct **tail, - unsigned long limit) -{ - struct mm_struct *mm = start->vm_mm; - struct vm_area_struct *tmp = start; - int count = 0; - - while (tmp && tmp->vm_start < limit) { - *tail = tmp; - count++; - if (tmp->vm_flags & VM_LOCKED) { - mm->locked_vm -= vma_pages(tmp); - munlock_vma_pages_all(tmp); - } - tmp = tmp->vm_next; - } - - return count; -} - /* * do_mas_align_munmap() - munmap the aligned region from @start to @end. * @mas: The maple_state, ideally set up to alter the correct tree location. @@ -2469,9 +2376,13 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, struct mm_struct *mm, unsigned long start, unsigned long end, struct list_head *uf, bool downgrade) { - struct vm_area_struct *prev, *last; - /* we have start < vma->vm_end */ + struct vm_area_struct *prev, *next; + struct maple_tree mt_detach; + int count = 0; + MA_STATE(mas_detach, &mt_detach, start, end - 1); + mtree_init(&mt_detach, MAPLE_ALLOC_RANGE); + prev = next = NULL; /* * If we need to split any vma, do it now to save pain later. * @@ -2479,8 +2390,11 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, * unmapped vm_area_struct will remain in use: so lower split_vma * places tmp vma above, and higher split_vma places tmp vma below. */ + + /* Does it split the first one? */ if (start > vma->vm_start) { int error; + /* * Make sure that map_count on return from munmap() will * not exceed its limit; but let map_count go just above @@ -2489,32 +2403,55 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, if (end < vma->vm_end && mm->map_count >= sysctl_max_map_count) return -ENOMEM; - error = __split_vma(mm, vma, start, 0); + /* + * mas_pause() is not needed since mas->index needs to be set + * differently than vma->vm_end anyways. + */ + mas_unlock(mas); + error = __split_vma(mm, vma, start, 1); + mas_lock(mas); if (error) return error; - prev = vma; - vma = _vma_next(mm, prev); - mas->index = start; - mas_reset(mas); + + mas_set(mas, start - 1); + prev = mas_walk(mas); } else { - prev = vma->vm_prev; + prev = mas_prev(mas, 0); + if (unlikely((!prev))) + mas_set(mas, start); } - if (vma->vm_end >= end) - last = vma; - else - last = find_vma_intersection(mm, end - 1, end); + /* + * Detach a range of VMAs from the mm. Using next as a temp variable as + * it is always overwritten. + */ + mas_for_each(mas, next, end - 1) { + /* Does it split the end? */ + if (next->vm_end > end) { + int error; - /* Does it split the last one? */ - if (last && end < last->vm_end) { - int error = __split_vma(mm, last, end, 1); - if (error) - return error; - vma = _vma_next(mm, prev); - mas_reset(mas); + mas_unlock(mas); + error = __split_vma(mm, next, end, 0); + mas_lock(mas); + if (error) + return error; + mas_set(mas, end); + } + count++; +#ifdef CONFIG_DEBUG_MAPLE_TREE + BUG_ON(next->vm_start < start); + BUG_ON(next->vm_start > end); +#endif + mas_lock(&mas_detach); + vma_mas_store(next, &mas_detach); + mas_unlock(&mas_detach); + if (next->vm_flags & VM_LOCKED) { + mm->locked_vm -= vma_pages(next); + munlock_vma_pages_all(next); + } } - + next = mas_find(mas, ULONG_MAX); if (unlikely(uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas @@ -2531,35 +2468,36 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, return error; } - /* - * unlock any mlock()ed ranges before detaching vmas, count the number - * of VMAs to be dropped, and return the tail entry of the affected - * area. - */ - mm->map_count -= unlock_range(vma, &last, end); - /* Drop removed area from the tree */ - mas_store_gfp(mas, NULL, GFP_KERNEL); - - /* Detach vmas from the MM linked list */ - vma->vm_prev = NULL; - if (prev) - prev->vm_next = last->vm_next; - else - mm->mmap = last->vm_next; - - if (last->vm_next) { - last->vm_next->vm_prev = prev; - last->vm_next = NULL; - } else - mm->highest_vm_end = prev ? vm_end_gap(prev) : 0; + /* Point of no return */ + mas_set_range(mas, start, end - 1); +#if defined(CONFIG_DEBUG_MAPLE_TREE) + /* Make sure no VMAs are about to be lost. */ + { + MA_STATE(test, &mt_detach, start, end - 1); + struct vm_area_struct *vma_mas, *vma_test; + int test_count = 0; + rcu_read_lock(); + vma_test = mas_find(&test, end - 1); + mas_for_each(mas, vma_mas, end - 1) { + BUG_ON(vma_mas != vma_test); + test_count++; + vma_test = mas_next(&test, end - 1); + } + rcu_read_unlock(); + BUG_ON(count != test_count); + mas_set_range(mas, start, end - 1); + } +#endif + mas_store_gfp(mas, NULL, GFP_KERNEL); + mm->map_count -= count; /* * Do not downgrade mmap_lock if we are next to VM_GROWSDOWN or * VM_GROWSUP VMA. Such VMAs can change their size under * down_read(mmap_lock) and collide with the VMA we are about to unmap. */ if (downgrade) { - if (last && (last->vm_flags & VM_GROWSDOWN)) + if (next && (next->vm_flags & VM_GROWSDOWN)) downgrade = false; else if (prev && (prev->vm_flags & VM_GROWSUP)) downgrade = false; @@ -2569,10 +2507,12 @@ do_mas_align_munmap(struct ma_state *mas, struct vm_area_struct *vma, } } - unmap_region(mm, vma, prev, start, end); + unmap_region(mm, &mt_detach, vma, prev, next, start, end); - /* Fix up all other VM information */ - remove_vma_list(mm, vma); + /* Statistics and freeing VMAs */ + remove_mt(mm, &mt_detach); + mtree_destroy(&mt_detach); + validate_mm(mm); return downgrade ? 1 : 0; } @@ -2756,6 +2696,11 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } vma->vm_file = get_file(file); + /* + * call_mmap() may sleep, but will not alter the maple tree + * since the mmap_lock is held. This is safe and will be + * changed later. + */ error = call_mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -2855,7 +2800,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vma->vm_file = NULL; /* Undo any partial mapping done by a device driver. */ - unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); + unmap_region(mm, mas.tree, vma, prev, next, vma->vm_start, vma->vm_end); charged = 0; if (vm_flags & VM_SHARED) mapping_unmap_writable(file->f_mapping); @@ -2947,11 +2892,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, goto out; if (start + size > vma->vm_end) { - struct vm_area_struct *next; + struct vm_area_struct *next, *prev = vma; - for (next = vma->vm_next; next; next = next->vm_next) { + for (next = vma_next(mm, vma); next; next = vma_next(mm, next)) { /* hole between vmas ? */ - if (next->vm_start != next->vm_prev->vm_end) + if (next->vm_start != prev->vm_end) goto out; if (next->vm_file != vma->vm_file) @@ -2962,6 +2907,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, if (start + size <= next->vm_end) break; + prev = next; } if (!next) @@ -3007,7 +2953,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, struct list_head *uf) { struct mm_struct *mm = vma->vm_mm; - struct vm_area_struct unmap; + struct vm_area_struct unmap, *next; unsigned long unmap_pages; int ret; @@ -3027,9 +2973,14 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, vma_init(&unmap, mm); unmap.vm_start = newbrk; unmap.vm_end = oldbrk; + unmap.vm_pgoff = newbrk >> PAGE_SHIFT; + if (vma->anon_vma) + vma_set_anonymous(&unmap); + ret = userfaultfd_unmap_prep(&unmap, newbrk, oldbrk, uf); if (ret) return ret; + ret = 1; // Change the oldbrk of vma to the newbrk of the munmap area @@ -3039,10 +2990,12 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, anon_vma_interval_tree_pre_update_vma(vma); } - vma->vm_end = newbrk; + mas_lock(mas); if (vma_mas_remove(&unmap, mas)) goto mas_store_fail; + mas_unlock(mas); + vma->vm_end = newbrk; if (vma->anon_vma) { anon_vma_interval_tree_post_update_vma(vma); anon_vma_unlock_write(vma->anon_vma); @@ -3054,8 +3007,11 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, munlock_vma_pages_range(&unmap, newbrk, oldbrk); } + mas_lock(mas); + next = mas_next(mas, ULONG_MAX); + mas_unlock(mas); mmap_write_downgrade(mm); - unmap_region(mm, &unmap, vma, newbrk, oldbrk); + unmap_region(mm, mas->tree, &unmap, vma, next, newbrk, oldbrk); /* Statistics */ vm_stat_account(mm, unmap.vm_flags, -unmap_pages); if (unmap.vm_flags & VM_ACCOUNT) @@ -3066,6 +3022,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, return ret; mas_store_fail: + mas_unlock(mas); vma->vm_end = oldbrk; if (vma->anon_vma) { anon_vma_interval_tree_post_update_vma(vma); @@ -3086,15 +3043,16 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, * do not match then create a new anonymous VMA. Eventually we may be able to * do some brk-specific accounting here. */ -static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, +static int do_brk_flags(struct ma_state *mas, struct ma_state *ma_prev, + struct vm_area_struct **brkvma, unsigned long addr, unsigned long len, unsigned long flags) { struct mm_struct *mm = current->mm; - struct vm_area_struct *prev = NULL, *vma; + struct vm_area_struct *vma; int error; unsigned long mapped_addr; - validate_mm_mt(mm); + validate_mm(mm); /* Until we need other flags, refuse anything except VM_EXEC. */ if ((flags & (~VM_EXEC)) != 0) @@ -3119,7 +3077,6 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT)) return -ENOMEM; - mas->last = addr + len - 1; if (*brkvma) { vma = *brkvma; /* Expand the existing vma if possible; almost never a singular @@ -3128,7 +3085,8 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, if ((!vma->anon_vma || list_is_singular(&vma->anon_vma_chain)) && ((vma->vm_flags & ~VM_SOFTDIRTY) == flags)){ - mas->index = vma->vm_start; + ma_prev->index = vma->vm_start; + ma_prev->last = addr + len - 1; vma_adjust_trans_huge(vma, addr, addr + len, 0); if (vma->anon_vma) { @@ -3137,11 +3095,28 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, } vma->vm_end = addr + len; vma->vm_flags |= VM_SOFTDIRTY; - mas_lock(mas); - if (mas_store_gfp(mas, vma, GFP_KERNEL)) + + mas_lock(ma_prev); +#if defined(CONFIG_DEBUG_MAPLE_TREE) + /* Make sure no VMAs are about to be lost. */ + { + MA_STATE(test, ma_prev->tree, vma->vm_start, + vma->vm_end - 1); + struct vm_area_struct *vma_mas; + int count = 0; + + mas_for_each(&test, vma_mas, vma->vm_end - 1) + count++; + + BUG_ON(count != 1); + mas_set_range(ma_prev, vma->vm_start, + vma->vm_end - 1); + } +#endif + if (mas_store_gfp(ma_prev, vma, GFP_KERNEL)) goto mas_mod_fail; + mas_unlock(ma_prev); - mas_unlock(mas); if (vma->anon_vma) { anon_vma_interval_tree_post_update_vma(vma); anon_vma_unlock_write(vma->anon_vma); @@ -3149,12 +3124,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, khugepaged_enter_vma_merge(vma, flags); goto out; } - prev = vma; } - mas_lock(mas); - mas->index = addr; - mas_walk(mas); - mas_unlock(mas); /* create a vma struct for an anonymous mapping */ vma = vm_area_alloc(mm); @@ -3167,16 +3137,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, vma->vm_pgoff = addr >> PAGE_SHIFT; vma->vm_flags = flags; vma->vm_page_prot = vm_get_page_prot(flags); - mas_lock(mas); - if (vma_mas_store(vma, mas)) - goto mas_store_fail; - mas_unlock(mas); - - if (!prev) - prev = mas_prev(mas, 0); - - __vma_link_list(mm, vma, prev); - mm->map_count++; + vma_mas_link(mm, vma, mas, NULL); *brkvma = vma; out: perf_event_mmap(vma); @@ -3185,17 +3146,16 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct **brkvma, if (flags & VM_LOCKED) mm->locked_vm += (len >> PAGE_SHIFT); vma->vm_flags |= VM_SOFTDIRTY; - validate_mm_mt(mm); + validate_mm(mm); return 0; -mas_store_fail: vm_area_free(vma); vma_alloc_fail: vm_unacct_memory(len >> PAGE_SHIFT); return -ENOMEM; mas_mod_fail: - mas_unlock(mas); + mas_unlock(ma_prev); vma->vm_end = addr; if (vma->anon_vma) { anon_vma_interval_tree_post_update_vma(vma); @@ -3223,9 +3183,7 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) if (mmap_write_lock_killable(mm)) return -EINTR; - // This vma left intentionally blank. - mas_walk(&mas); - ret = do_brk_flags(&mas, &vma, addr, len, flags); + ret = do_brk_flags(&mas, &mas, &vma, addr, len, flags); populate = ((mm->def_flags & VM_LOCKED) != 0); mmap_write_unlock(mm); if (populate && !ret) @@ -3246,6 +3204,9 @@ void exit_mmap(struct mm_struct *mm) struct mmu_gather tlb; struct vm_area_struct *vma; unsigned long nr_accounted = 0; + unsigned long index = 0; + MA_STATE(mas, &mm->mm_mt, 0, 0); + int count = 0; /* mm's last user has gone, and its about to be pulled down */ mmu_notifier_release(mm); @@ -3274,13 +3235,24 @@ void exit_mmap(struct mm_struct *mm) mmap_write_unlock(mm); } - if (mm->locked_vm) - unlock_range(mm->mmap, &vma, ULONG_MAX); + if (mm->locked_vm) { + mas_lock(&mas); + mas_for_each(&mas, vma, ULONG_MAX) { + if (vma->vm_flags & VM_LOCKED) { + mm->locked_vm -= vma_pages(vma); + munlock_vma_pages_all(vma); + } + } + mas_unlock(&mas); + mas_set(&mas, 0); + } arch_exit_mmap(mm); - vma = mm->mmap; - if (!vma) /* Can happen if dup_mmap() received an OOM */ + rcu_read_lock(); + vma = mas_find(&mas, ULONG_MAX); + rcu_read_unlock(); + if (!vma) /* Can happen if dup_mmap() received an OOM */ return; lru_add_drain(); @@ -3288,21 +3260,24 @@ void exit_mmap(struct mm_struct *mm) tlb_gather_mmu_fullmm(&tlb, mm); /* update_hiwater_rss(mm) here? but nobody should be looking */ /* Use -1 here to ensure all VMAs in the mm are unmapped */ - unmap_vmas(&tlb, vma, 0, -1); - free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, USER_PGTABLES_CEILING); + unmap_vmas(&tlb, &mm->mm_mt, vma, 0, ULONG_MAX); + free_pgtables(&tlb, &mm->mm_mt, vma, FIRST_USER_ADDRESS, USER_PGTABLES_CEILING); tlb_finish_mmu(&tlb); /* * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ - while (vma) { + mt_for_each(&mm->mm_mt, vma, index, ULONG_MAX) { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); - vma = remove_vma(vma); + remove_vma(vma); + count++; cond_resched(); } + BUG_ON(count != mm->map_count); + trace_exit_mmap(mm); mtree_destroy(&mm->mm_mt); vm_unacct_memory(nr_accounted); @@ -3711,12 +3686,13 @@ int mm_take_all_locks(struct mm_struct *mm) { struct vm_area_struct *vma; struct anon_vma_chain *avc; + MA_STATE(mas, &mm->mm_mt, 0, 0); BUG_ON(mmap_read_trylock(mm)); mutex_lock(&mm_all_locks_mutex); - for (vma = mm->mmap; vma; vma = vma->vm_next) { + mas_for_each(&mas, vma, ULONG_MAX) { if (signal_pending(current)) goto out_unlock; if (vma->vm_file && vma->vm_file->f_mapping && @@ -3724,7 +3700,8 @@ int mm_take_all_locks(struct mm_struct *mm) vm_lock_mapping(mm, vma->vm_file->f_mapping); } - for (vma = mm->mmap; vma; vma = vma->vm_next) { + mas_set(&mas, 0); + mas_for_each(&mas, vma, ULONG_MAX) { if (signal_pending(current)) goto out_unlock; if (vma->vm_file && vma->vm_file->f_mapping && @@ -3732,7 +3709,8 @@ int mm_take_all_locks(struct mm_struct *mm) vm_lock_mapping(mm, vma->vm_file->f_mapping); } - for (vma = mm->mmap; vma; vma = vma->vm_next) { + mas_set(&mas, 0); + mas_for_each(&mas, vma, ULONG_MAX) { if (signal_pending(current)) goto out_unlock; if (vma->anon_vma) @@ -3791,11 +3769,12 @@ void mm_drop_all_locks(struct mm_struct *mm) { struct vm_area_struct *vma; struct anon_vma_chain *avc; + MA_STATE(mas, &mm->mm_mt, 0, 0); BUG_ON(mmap_read_trylock(mm)); BUG_ON(!mutex_is_locked(&mm_all_locks_mutex)); - for (vma = mm->mmap; vma; vma = vma->vm_next) { + mas_for_each(&mas, vma, ULONG_MAX) { if (vma->anon_vma) list_for_each_entry(avc, &vma->anon_vma_chain, same_vma) vm_unlock_anon_vma(avc->anon_vma); diff --git a/mm/nommu.c b/mm/nommu.c index 9833f0f77103..dcfddbc1c715 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -577,7 +577,6 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma) mas_reset(&mas); /* add the VMA to the tree */ vma_mas_store(vma, &mas); - __vma_link_list(mm, vma, prev); } /* @@ -602,7 +601,6 @@ static void delete_vma_from_mm(struct vm_area_struct *vma) /* remove from the MM's tree and list */ vma_mas_remove(vma, &mas); - __vma_unlink_list(vma->vm_mm, vma); } /* @@ -1410,7 +1408,7 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, struct list return -EINVAL; if (end == vma->vm_end) goto erase_whole_vma; - vma = vma->vm_next; + vma = vma_next(mm, vma); } while (vma); return -EINVAL; } else { @@ -1467,7 +1465,7 @@ void exit_mmap(struct mm_struct *mm) mm->total_vm = 0; while ((vma = mm->mmap)) { - mm->mmap = vma->vm_next; + mm->mmap = vma_next(mm, vma); delete_vma_from_mm(vma); delete_vma(mm, vma); cond_resched(); diff --git a/mm/util.c b/mm/util.c index 7179a25f7f2b..d5ff9a02b0a8 100644 --- a/mm/util.c +++ b/mm/util.c @@ -271,46 +271,6 @@ void *memdup_user_nul(const void __user *src, size_t len) } EXPORT_SYMBOL(memdup_user_nul); -void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, - struct vm_area_struct *prev) -{ - struct vm_area_struct *next; - - vma->vm_prev = prev; - if (prev) { - next = prev->vm_next; - prev->vm_next = vma; - } else { - next = mm->mmap; - mm->mmap = vma; - } - vma->vm_next = next; - if (next) - next->vm_prev = vma; - else - mm->highest_vm_end = vm_end_gap(vma); -} - -void __vma_unlink_list(struct mm_struct *mm, struct vm_area_struct *vma) -{ - struct vm_area_struct *prev, *next; - - next = vma->vm_next; - prev = vma->vm_prev; - if (prev) - prev->vm_next = next; - else - mm->mmap = next; - if (next) - next->vm_prev = prev; - else { - if (prev) - mm->highest_vm_end = vm_end_gap(prev); - else - mm->highest_vm_end = 0; - } -} - /* Check if the vma is being used as a stack by this task */ int vma_is_stack_for_current(struct vm_area_struct *vma) {