From patchwork Tue Oct 5 01:30:44 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: 12535331 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 25173C433EF for ; Tue, 5 Oct 2021 01:35:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B994E610C8 for ; Tue, 5 Oct 2021 01:35:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B994E610C8 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 0A0F394002E; Mon, 4 Oct 2021 21:32:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F1B26940037; Mon, 4 Oct 2021 21:32:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D46D0940036; Mon, 4 Oct 2021 21:32:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id C43D394002E for ; Mon, 4 Oct 2021 21:32:03 -0400 (EDT) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 92F5E1822163C for ; Tue, 5 Oct 2021 01:32:03 +0000 (UTC) X-FDA: 78660657726.14.86FE9B6 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf22.hostedemail.com (Postfix) with ESMTP id 0C5F61922 for ; Tue, 5 Oct 2021 01:32:02 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19508Mdk004481; Tue, 5 Oct 2021 01:31:30 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=Q5RRnx4kDiaiz6YdhseFw7tFky7FbtfsPONk6dubH/o=; b=fWFhVno8GheTIpJftOmOz6bc3HZsawumAmtsqyuxbJBaQO3R76CYC1GtXqfjoXtTqWwK f7KslVeYUE/h7GMXwqtPbnC8fiE5KspzSYZkl5bty6FSvTb4magyJYgI9fWOj9Jvyfdg PyV6H5WLLYsZRfoEXwKxCm9FRNNBTuWHMEj3v7SildtKVcMpLDgpmp8NfFRBrLq05QNg V0hyVAZSaHVGHZVMKDdio/ivfXvT4UvIia13hKM2fwxFu749dB3cm3xkFIhQHpHXqSYY qtHTRa4cXHQFqqF7wAHHKUGR8S5cJ+8I3fjSSlfbYBQruu4g1mF3PJTAzY/lBh4yDiCJ /g== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3bg43dumk2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:31:30 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1951UdGK141634; Tue, 5 Oct 2021 01:30:46 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2177.outbound.protection.outlook.com [104.47.58.177]) by userp3020.oracle.com with ESMTP id 3bf16s9dx1-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:30:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zg1qS66tueqRl81yg3/ObBCK+eTP/3zv1AQUh+Jh5iHqgVR4je62ppysxYo40BLGSrj7JlyD1pKq4E8ia0eQygSuG911Bw5SJh4It+IroVkNDedXH+zuQEzpLiqa31Tigl4+8HacbZ3RJyffwH9Auszj+AiLgv1aVLxtWDt2dwbLRZX6YW+mjDWeSuTiXDy+uqq6pY9S6oMTzGDTYm6HyH82pWFT9mVow226cigtuws/5bsDklv/FDQdO6fEP9uKaCNsPoNK+S1P9MSGT/TilrJ3CmEb2RHHfqKDSZNZWwZNiurs1F8HepJX50es1KPTSiV4TpNId9HoTR6SJAw/yA== 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=Q5RRnx4kDiaiz6YdhseFw7tFky7FbtfsPONk6dubH/o=; b=W4F0Wll9EnZowiBvosWToGUFUTTzUNlo5rHlV7mL8qt60ztPHL2bJs7ev+2vioJswR7YdXPX/AEKfnHAtlQt1moHbFSjqYLq9CegUDGONfZ/AEb0RFe/I/xjnhWbesPOXKdPg330NREz4HpMh/i3FVXvv3z706YRfo675uz7Agr6/ay0kenHAPyFuOZ3llhqLEOlou6Rpjb3OrvC8G1ZkKrKleKnOdWdydWoqn5R8e0l9ZWgpKwpIlgVKrT6nNW75koH6kuq494q8qlKQQnk3Lun6ikLxsm3jIPHKxJiU/SjN81zADFn3fzPpxIqovqzuLvr5DyAZey66UFDpr4gFw== 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=Q5RRnx4kDiaiz6YdhseFw7tFky7FbtfsPONk6dubH/o=; b=c+ePTyqpSeY8GzAI9soSCsuj0qGJ3piVL4hulLPwad9sEDcK82UwDpqgiS1anDmub5i0a+OurQ808EKOZCQaOjPrQRlVaHeBNiQVYXBvjY2JtLXVTofMh6Szn0+xOTLgMKH7/Hqe1Cv31nESbkHIIA3dR+wnH5m4ba/JidAyfpc= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by BLAPR10MB5044.namprd10.prod.outlook.com (2603:10b6:208:326::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Tue, 5 Oct 2021 01:30:44 +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:30:44 +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 20/66] mm/mmap: Move mmap_region() below do_munmap() Thread-Topic: [PATCH v3 20/66] mm/mmap: Move mmap_region() below do_munmap() Thread-Index: AQHXuYidQQNJUAlBD0K38O5L3+pb0A== Date: Tue, 5 Oct 2021 01:30:44 +0000 Message-ID: <20211005012959.1110504-21-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: be095121-4ab4-417b-9224-08d9879fc06f x-ms-traffictypediagnostic: BLAPR10MB5044: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: J5RRUNfa15gjZHq/SlKrGzyvE00+zyih7dgRWLTq2OQU2S4WrH09VKNDBxL+k5lZ8maUGpB2IRoPrm/IOZZPMElTBn0ejHhaz22RpXlidueiaZ3uDZTT0HY9g56b2hg2MyYr0ljEGgWpaPPFNLdCPVsl9BywYSMTzwh/P+bADTvTnu3jfMvivnuHxiXynFa5sEkecG35zssH1Mbk8DrVx+B3jFPGoxDF+OQzQ1ozEwdTQczK4oqbSBOQkYGmlppjXM6EM8UjTDWegnjyLkkr3AseRj2rhZvVjvrUh3eBhESB+i2sRDU0Yy1//aHGnBqo7MjJe7M8Y082OszBWb998q1faGX+CU1kEcMzMxE+ND0dMY2H/5sEUKI3IjFO5L4JiPZ4b9jmN5O3AuI3SEziaFdh4xSga5FdN/at2vLpYjiM2gdHmRRDaAAeux2MVpcIhxKHXsrvXeRISIJ067cuDYCMEnXLU9RH8soNFNUY+AMmzGPQLLVg583wuwXo7Fb/+xXSteqFUVxqtp/ZD3buQaz7QWSLQ12QCUM806wG2HzzG2WkLfqYDCFBoxhIHqBoanP2mfWzjuAitHkoYlYOu5lFM34+IwZyum31dyyE34YLzJovvZhbpDgvzj4IWXRQp9sTYwMowwpCq92H+bk8ko7zr/8IuzttL2Znf5/7bMp4VFWehXki1IP+wJW24d3ULcXR/PdM0+FjuDaYkUuYGA== 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)(6486002)(66446008)(122000001)(26005)(7416002)(2616005)(4326008)(508600001)(1076003)(38100700002)(91956017)(64756008)(66556008)(66946007)(5660300002)(66476007)(44832011)(38070700005)(76116006)(86362001)(110136005)(8676002)(71200400001)(316002)(8936002)(54906003)(2906002)(83380400001)(186003)(6512007)(6506007)(36756003)(30864003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?/CJhzOve5y2WnafZD9EX47c?= =?iso-8859-1?q?JhwsL+Rhj28llQUU3mQSpvCwLCFK8S2uiYMS/q0tjtR64z5jrjtOYOPqJLFY?= =?iso-8859-1?q?x0DkPxXz5iCl7+KfARd+i35sngYXZL2hDV8fSMiEU24YKsZ0/xagfqscRXjZ?= =?iso-8859-1?q?oVqOqGMa4KZPEQEj12ZqhicocQELQDwM+j+24qbxQTMd6vHnOuNNrZrCvXmL?= =?iso-8859-1?q?Hh9vygJ/cCkB7DZC7QJftH6RA7ioZqF3HkFDgjygjfG2slg3toalxWcsom5f?= =?iso-8859-1?q?AahB9Ns5Es1b2vDG92r8obqNhMCIEbTj3eIdYDg2/CtvVOEwd2G/KDs4/Z69?= =?iso-8859-1?q?Lf/vu14IRTAOJ9wWXHq+1RNs6cH1vey/R4WHQlDXvJjyK6QdtPTRSf30oEuW?= =?iso-8859-1?q?L4yupvDUAI45Ddc9KkNt4p02psfKgaCTPG9s4dKIn9DGsNMCU8QzfUhZtdgq?= =?iso-8859-1?q?83PWecKM3guPEPapQ0FUxJsgxrN1Hy9+qxtXH75Sr6TrGatgp8WGzz0Z/P2O?= =?iso-8859-1?q?RW8VUrQ2hum2JFkqlq516/8DxGZEU5L3vutc2Xle96V+4KcxJyV7QMJVbdTc?= =?iso-8859-1?q?KqLBN99L9r3BCNy92eTtBCQ6HsQ267Zd6oSh9NDqGKznFaLWQzjCSHqLJTz0?= =?iso-8859-1?q?uKIQchYvO16nUdwMsEZ5hb9WhIMoFneLX1FvjhGmHWTolIT8iWG8UTcx1OWu?= =?iso-8859-1?q?hQWxEdYcMxK+E5GW+jAej2JTGrNp8RJI+4rgrQD8vVV1YN9L1VyHlhSxN4N1?= =?iso-8859-1?q?OEtDKLHlDYeZJ22UEuHwMPrdfHRwS2zJfSeTFe8rdPotV1YOLCk78kgZxUfI?= =?iso-8859-1?q?FDJHLh3uBVdJN5Ks2nScC8b6p3PDQifkWEOMBzFbWK/J0vRT6amGFj1letto?= =?iso-8859-1?q?Dr1RUYyvMLi8FEgCH5Pm5rfS85nbZCl4k3NYpzBNongE7jCTs6Ev4nYCbMf6?= =?iso-8859-1?q?PTK6YA2CPk7Ly3Wo4cVFB4ueNiQI7A2IQ9BkjtcSEVl6huF6Uon4pVhOLViR?= =?iso-8859-1?q?wcB7K1ZQwM+fX7+5LCUGmHCJdzQ+9i7lR6GbhSMao34FOjR9iuygCWVSnTcA?= =?iso-8859-1?q?Jm00l9nNaA+dy6OET1ATS6+l3i4d04ZW2XeJJNu1fh0xqLr0YdDf06DGZ2ck?= =?iso-8859-1?q?QoTMvRYO8RkzXPmqRLiTZjdRTh3Ld5fZlIwSphGDcU9m/TJN3Y9DvGatda4N?= =?iso-8859-1?q?l9g/CobXPCgS0VNRuFi5rWw9ysEr80jFzlLVvr7aGhZs8Kb7KyUvABPAFQU1?= =?iso-8859-1?q?H7kmBZHZQV4aG61d+sG6FhOd0e7rQMhyCM27OWFB/hkX5XUcUide5quMgFtW?= =?iso-8859-1?q?g+ZD1ySvNjAEhyLrN/Q7mW2XY+ANce+fKHYZpdNzdYEGKAVQ0aSqYni9/rNy?= =?iso-8859-1?q?i?= 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: be095121-4ab4-417b-9224-08d9879fc06f X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2021 01:30:44.6573 (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: R04mT+L4CaO8YkpmZC5O3NvYexLpss1Cr4911hoaD4vnKb79w0oWv6SYQ2rfwJyAEcP+ZwHHZWK6IE8kfNxf2w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5044 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110050007 X-Proofpoint-GUID: _yd29CpS1OWwOVFWf4HG3cEjDrIWVVrf X-Proofpoint-ORIG-GUID: _yd29CpS1OWwOVFWf4HG3cEjDrIWVVrf X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 0C5F61922 X-Stat-Signature: c5n6sc78cnbskk6h774iabprdniwxpke Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=fWFhVno8; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=c+ePTyqp; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf22.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com X-HE-Tag: 1633397522-511813 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" Relocation of code for the next commit. There should be no changes here. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 450 +++++++++++++++++++++++++++--------------------------- 1 file changed, 225 insertions(+), 225 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index d6c42f416de2..54838406518d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1712,231 +1712,6 @@ static inline int accountable_mapping(struct file *file, vm_flags_t vm_flags) return (vm_flags & (VM_NORESERVE | VM_SHARED | VM_WRITE)) == VM_WRITE; } -unsigned long mmap_region(struct file *file, unsigned long addr, - unsigned long len, vm_flags_t vm_flags, unsigned long pgoff, - struct list_head *uf) -{ - struct mm_struct *mm = current->mm; - struct vm_area_struct *vma = NULL; - struct vm_area_struct *prev, *next; - pgoff_t pglen = len >> PAGE_SHIFT; - unsigned long charged = 0; - unsigned long end = addr + len; - unsigned long merge_start = addr, merge_end = end; - pgoff_t vm_pgoff; - int error; - MA_STATE(mas, &mm->mm_mt, addr, end - 1); - - /* Check against address space limit. */ - if (!may_expand_vm(mm, vm_flags, len >> PAGE_SHIFT)) { - unsigned long nr_pages; - - /* - * MAP_FIXED may remove pages of mappings that intersects with - * requested mapping. Account for the pages it would unmap. - */ - nr_pages = count_vma_pages_range(mm, addr, end); - - if (!may_expand_vm(mm, vm_flags, - (len >> PAGE_SHIFT) - nr_pages)) - return -ENOMEM; - } - - /* Unmap any existing mapping in the area */ - if (do_munmap(mm, addr, len, uf)) - return -ENOMEM; - - /* - * Private writable mapping: check memory availability - */ - if (accountable_mapping(file, vm_flags)) { - charged = len >> PAGE_SHIFT; - if (security_vm_enough_memory_mm(mm, charged)) - return -ENOMEM; - vm_flags |= VM_ACCOUNT; - } - - - if (vm_flags & VM_SPECIAL) { - rcu_read_lock(); - prev = mas_prev(&mas, 0); - rcu_read_unlock(); - goto cannot_expand; - } - - /* Attempt to expand an old mapping */ - - /* Check next */ - rcu_read_lock(); - next = mas_next(&mas, ULONG_MAX); - rcu_read_unlock(); - if (next && next->vm_start == end && vma_policy(next) && - can_vma_merge_before(next, vm_flags, NULL, file, pgoff+pglen, - NULL_VM_UFFD_CTX)) { - merge_end = next->vm_end; - vma = next; - vm_pgoff = next->vm_pgoff - pglen; - } - - /* Check prev */ - rcu_read_lock(); - prev = mas_prev(&mas, 0); - rcu_read_unlock(); - if (prev && prev->vm_end == addr && !vma_policy(prev) && - can_vma_merge_after(prev, vm_flags, NULL, file, pgoff, - NULL_VM_UFFD_CTX)) { - merge_start = prev->vm_start; - vma = prev; - vm_pgoff = prev->vm_pgoff; - } - - - /* Actually expand, if possible */ - if (vma && - !vma_expand(&mas, vma, merge_start, merge_end, vm_pgoff, next)) { - khugepaged_enter_vma_merge(prev, vm_flags); - goto expanded; - } - - mas.index = addr; - mas.last = end - 1; -cannot_expand: - /* - * Determine the object being mapped and call the appropriate - * specific mapper. the address has already been validated, but - * not unmapped, but the maps are removed from the list. - */ - vma = vm_area_alloc(mm); - if (!vma) { - error = -ENOMEM; - goto unacct_error; - } - - vma->vm_start = addr; - vma->vm_end = end; - vma->vm_flags = vm_flags; - vma->vm_page_prot = vm_get_page_prot(vm_flags); - vma->vm_pgoff = pgoff; - - if (file) { - if (vm_flags & VM_SHARED) { - error = mapping_map_writable(file->f_mapping); - if (error) - goto free_vma; - } - - vma->vm_file = get_file(file); - error = call_mmap(file, vma); - if (error) - goto unmap_and_free_vma; - - /* Can addr have changed?? - * - * Answer: Yes, several device drivers can do it in their - * f_op->mmap method. -DaveM - */ - WARN_ON_ONCE(addr != vma->vm_start); - - addr = vma->vm_start; - - /* If vm_flags changed after call_mmap(), we should try merge vma again - * as we may succeed this time. - */ - if (unlikely(vm_flags != vma->vm_flags && prev && - prev->vm_end == addr && !vma_policy(prev) && - can_vma_merge_after(prev, vm_flags, NULL, file, - pgoff, NULL_VM_UFFD_CTX))) { - merge_start = prev->vm_start; - vm_pgoff = prev->vm_pgoff; - if (!vma_expand(&mas, prev, merge_start, merge_end, - vm_pgoff, next)) { - /* ->mmap() can change vma->vm_file and fput the original file. So - * fput the vma->vm_file here or we would add an extra fput for file - * and cause general protection fault ultimately. - */ - fput(vma->vm_file); - vm_area_free(vma); - vma = prev; - /* Update vm_flags and possible addr to pick up the change. We don't - * warn here if addr changed as the vma is not linked by vma_link(). - */ - addr = vma->vm_start; - vm_flags = vma->vm_flags; - goto unmap_writable; - } - } - - mas_set(&mas, addr); - vm_flags = vma->vm_flags; - } else if (vm_flags & VM_SHARED) { - error = shmem_zero_setup(vma); - if (error) - goto free_vma; - } else { - vma_set_anonymous(vma); - } - - /* Allow architectures to sanity-check the vm_flags */ - if (!arch_validate_flags(vma->vm_flags)) { - error = -EINVAL; - if (file) - goto unmap_and_free_vma; - else - goto free_vma; - } - - vma_mas_link(mm, vma, &mas, prev); - /* Once vma denies write, undo our temporary denial count */ -unmap_writable: - if (file && vm_flags & VM_SHARED) - mapping_unmap_writable(file->f_mapping); - file = vma->vm_file; -expanded: - perf_event_mmap(vma); - - vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT); - if (vm_flags & VM_LOCKED) { - if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) || - is_vm_hugetlb_page(vma) || - vma == get_gate_vma(current->mm)) - vma->vm_flags &= VM_LOCKED_CLEAR_MASK; - else - mm->locked_vm += (len >> PAGE_SHIFT); - } - - if (file) - uprobe_mmap(vma); - - /* - * New (or expanded) vma always get soft dirty status. - * Otherwise user-space soft-dirty page tracker won't - * be able to distinguish situation when vma area unmapped, - * then new mapped in-place (which must be aimed as - * a completely new data area). - */ - vma->vm_flags |= VM_SOFTDIRTY; - - vma_set_page_prot(vma); - - return addr; - -unmap_and_free_vma: - fput(vma->vm_file); - vma->vm_file = NULL; - - /* Undo any partial mapping done by a device driver. */ - unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); - charged = 0; - if (vm_flags & VM_SHARED) - mapping_unmap_writable(file->f_mapping); -free_vma: - vm_area_free(vma); -unacct_error: - if (charged) - vm_unacct_memory(charged); - return error; -} - /* unmapped_area() Find an area between the low_limit and the high_limit with * the correct alignment and offset, all from @info. Note: current->mm is used * for the search. @@ -2801,6 +2576,231 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, return __do_munmap(mm, start, len, uf, false); } +unsigned long mmap_region(struct file *file, unsigned long addr, + unsigned long len, vm_flags_t vm_flags, unsigned long pgoff, + struct list_head *uf) +{ + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma = NULL; + struct vm_area_struct *prev, *next; + pgoff_t pglen = len >> PAGE_SHIFT; + unsigned long charged = 0; + unsigned long end = addr + len; + unsigned long merge_start = addr, merge_end = end; + pgoff_t vm_pgoff; + int error; + MA_STATE(mas, &mm->mm_mt, addr, end - 1); + + /* Check against address space limit. */ + if (!may_expand_vm(mm, vm_flags, len >> PAGE_SHIFT)) { + unsigned long nr_pages; + + /* + * MAP_FIXED may remove pages of mappings that intersects with + * requested mapping. Account for the pages it would unmap. + */ + nr_pages = count_vma_pages_range(mm, addr, end); + + if (!may_expand_vm(mm, vm_flags, + (len >> PAGE_SHIFT) - nr_pages)) + return -ENOMEM; + } + + /* Unmap any existing mapping in the area */ + if (do_munmap(mm, addr, len, uf)) + return -ENOMEM; + + /* + * Private writable mapping: check memory availability + */ + if (accountable_mapping(file, vm_flags)) { + charged = len >> PAGE_SHIFT; + if (security_vm_enough_memory_mm(mm, charged)) + return -ENOMEM; + vm_flags |= VM_ACCOUNT; + } + + + if (vm_flags & VM_SPECIAL) { + rcu_read_lock(); + prev = mas_prev(&mas, 0); + rcu_read_unlock(); + goto cannot_expand; + } + + /* Attempt to expand an old mapping */ + + /* Check next */ + rcu_read_lock(); + next = mas_next(&mas, ULONG_MAX); + rcu_read_unlock(); + if (next && next->vm_start == end && vma_policy(next) && + can_vma_merge_before(next, vm_flags, NULL, file, pgoff+pglen, + NULL_VM_UFFD_CTX)) { + merge_end = next->vm_end; + vma = next; + vm_pgoff = next->vm_pgoff - pglen; + } + + /* Check prev */ + rcu_read_lock(); + prev = mas_prev(&mas, 0); + rcu_read_unlock(); + if (prev && prev->vm_end == addr && !vma_policy(prev) && + can_vma_merge_after(prev, vm_flags, NULL, file, pgoff, + NULL_VM_UFFD_CTX)) { + merge_start = prev->vm_start; + vma = prev; + vm_pgoff = prev->vm_pgoff; + } + + + /* Actually expand, if possible */ + if (vma && + !vma_expand(&mas, vma, merge_start, merge_end, vm_pgoff, next)) { + khugepaged_enter_vma_merge(prev, vm_flags); + goto expanded; + } + + mas.index = addr; + mas.last = end - 1; +cannot_expand: + /* + * Determine the object being mapped and call the appropriate + * specific mapper. the address has already been validated, but + * not unmapped, but the maps are removed from the list. + */ + vma = vm_area_alloc(mm); + if (!vma) { + error = -ENOMEM; + goto unacct_error; + } + + vma->vm_start = addr; + vma->vm_end = end; + vma->vm_flags = vm_flags; + vma->vm_page_prot = vm_get_page_prot(vm_flags); + vma->vm_pgoff = pgoff; + + if (file) { + if (vm_flags & VM_SHARED) { + error = mapping_map_writable(file->f_mapping); + if (error) + goto free_vma; + } + + vma->vm_file = get_file(file); + error = call_mmap(file, vma); + if (error) + goto unmap_and_free_vma; + + /* Can addr have changed?? + * + * Answer: Yes, several device drivers can do it in their + * f_op->mmap method. -DaveM + */ + WARN_ON_ONCE(addr != vma->vm_start); + + addr = vma->vm_start; + + /* If vm_flags changed after call_mmap(), we should try merge vma again + * as we may succeed this time. + */ + if (unlikely(vm_flags != vma->vm_flags && prev && + prev->vm_end == addr && !vma_policy(prev) && + can_vma_merge_after(prev, vm_flags, NULL, file, + pgoff, NULL_VM_UFFD_CTX))) { + merge_start = prev->vm_start; + vm_pgoff = prev->vm_pgoff; + if (!vma_expand(&mas, prev, merge_start, merge_end, + vm_pgoff, next)) { + /* ->mmap() can change vma->vm_file and fput the original file. So + * fput the vma->vm_file here or we would add an extra fput for file + * and cause general protection fault ultimately. + */ + fput(vma->vm_file); + vm_area_free(vma); + vma = prev; + /* Update vm_flags and possible addr to pick up the change. We don't + * warn here if addr changed as the vma is not linked by vma_link(). + */ + addr = vma->vm_start; + vm_flags = vma->vm_flags; + goto unmap_writable; + } + } + + mas_set(&mas, addr); + vm_flags = vma->vm_flags; + } else if (vm_flags & VM_SHARED) { + error = shmem_zero_setup(vma); + if (error) + goto free_vma; + } else { + vma_set_anonymous(vma); + } + + /* Allow architectures to sanity-check the vm_flags */ + if (!arch_validate_flags(vma->vm_flags)) { + error = -EINVAL; + if (file) + goto unmap_and_free_vma; + else + goto free_vma; + } + + vma_mas_link(mm, vma, &mas, prev); + /* Once vma denies write, undo our temporary denial count */ +unmap_writable: + if (file && vm_flags & VM_SHARED) + mapping_unmap_writable(file->f_mapping); + file = vma->vm_file; +expanded: + perf_event_mmap(vma); + + vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT); + if (vm_flags & VM_LOCKED) { + if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) || + is_vm_hugetlb_page(vma) || + vma == get_gate_vma(current->mm)) + vma->vm_flags &= VM_LOCKED_CLEAR_MASK; + else + mm->locked_vm += (len >> PAGE_SHIFT); + } + + if (file) + uprobe_mmap(vma); + + /* + * New (or expanded) vma always get soft dirty status. + * Otherwise user-space soft-dirty page tracker won't + * be able to distinguish situation when vma area unmapped, + * then new mapped in-place (which must be aimed as + * a completely new data area). + */ + vma->vm_flags |= VM_SOFTDIRTY; + + vma_set_page_prot(vma); + + return addr; + +unmap_and_free_vma: + fput(vma->vm_file); + vma->vm_file = NULL; + + /* Undo any partial mapping done by a device driver. */ + unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); + charged = 0; + if (vm_flags & VM_SHARED) + mapping_unmap_writable(file->f_mapping); +free_vma: + vm_area_free(vma); +unacct_error: + if (charged) + vm_unacct_memory(charged); + return error; +} + static int __vm_munmap(unsigned long start, size_t len, bool downgrade) { int ret;