From patchwork Sun Jul 17 02:46:44 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: 12920364 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 E0390C433EF for ; Sun, 17 Jul 2022 02:47:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4FF2994000F; Sat, 16 Jul 2022 22:46:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4ADAE94000E; Sat, 16 Jul 2022 22:46:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BD3F940010; Sat, 16 Jul 2022 22:46:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F0FC094000E for ; Sat, 16 Jul 2022 22:46:57 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 777DE609C6 for ; Sun, 17 Jul 2022 02:46:56 +0000 (UTC) X-FDA: 79695054432.26.82483CF Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf25.hostedemail.com (Postfix) with ESMTP id A7313A0006 for ; Sun, 17 Jul 2022 02:46:55 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26GMOljB026163; Sun, 17 Jul 2022 02:46:53 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-2022-7-12; bh=nxs6Cc0dk3QV6W+mxAwWoMvB/ObRju13VWpGJSZOyMA=; b=xl5w/b1Z6D7bfD99R1B4Lljv9nnO1+ZQsvxBCrQ77bAKa3E5jsR5zyEcPWLzwjJ4rsjb T7wQ2jQTl4Sc3ObqXTmPeg/SFn8pdBROzOp2evI+b0DvXWWKIt5Rifi6D7rVTMDwztvq PxanT99E2cwi2WLVlrX6URbFVtAvPWl53I6mzsRcw8QKGGrWdhSMR3FUuOQjpnn6IZsD ty5HhiRoO1PNVSCTf7QyWRGCMlvItwJI+Qfhy8yOGd1zoU3DIW5Z5KINWDOsxoa4WV6y jFslOhAg6zUK7mcUa3G0Mrj4uzDtxDzcYm9ok2/z2k+pntdpDvxJHYHrQoUJDOl1TLmC OQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbn7a0y15-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:46:53 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26GMY38d005941; Sun, 17 Jul 2022 02:46:52 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2103.outbound.protection.outlook.com [104.47.58.103]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1m9d80v-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Jul 2022 02:46:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BHVXJ0IyAz9fPXKBcLa19+8Us9eAiLKdF3mC0eIPzeBdKprfhhgCHZT8qYCfwJu7dH+BFYBJveAfONL97lbTeDJud9et7EJjPIWU0cy0cH3G3+Kpd+fnWL6efrZZefREg7u1c52Nw88FDVwi6v65XeLp7Ii2ktH7abk/VcNVNx8N42UsCc9EcpUZwInmaTCjocYTPzMLQs5H6yp0t7x3jAdkkWwtvkydKI7LnhwrWc2x7qKsVEeqxbeC+toYUR8yDwPEq8WRTClD8biRnjqK/YXvI62Hc962VrABbxvsToR5+gUsj61rhWLEXz5YgzZ2zq9nsGqPH+zAZD9J0RuTqA== 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=nxs6Cc0dk3QV6W+mxAwWoMvB/ObRju13VWpGJSZOyMA=; b=R2KqwgvHY+UY/KrmgugkJlRC7kfkGYVHvha+7jDc1sJbQjrDj9AdH4LS/EMI4n4be62P+Y1d+Few73VEVnV0WVRLV7G+HY3CBV3gShARU8SCoOuYdyyDE8/6pbbgWWEVJoiwUBzM3g1joWE9SoE0uuCJPeck1nmSY5yYRNbqKrlT/5LKYxd/RZtnksHK1yUSfbiKnw2pBdPUjFr89k1hrJ5ebBuwZtjENnU7lLgF2GQZEwN1XqsroB7hz0761CBdrPaZbs1ZDjRwPMclcb0b8YOYLHbRfYjZ8V7xbrrSm8AYxsAPX9js3ZRXwZvILhdk+Nia09m1QrR5Aca3CEsy2w== 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=nxs6Cc0dk3QV6W+mxAwWoMvB/ObRju13VWpGJSZOyMA=; b=E2YmjzjEgA6El5EhdCsCVGyGHv0DG2JLQLaOSjABwDL1Cqwm8THyj00YEcshXgJPyULdWWH0/U4irS14aOfF8AtpFffhMVoh4G0YSmAqpyIoGn3Ep7QorGXlUkTyY/pE44cUaaZvjjTdb2Lq485AHuGjTr+LTjQznrtDJSaOCMk= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by DM6PR10MB2908.namprd10.prod.outlook.com (2603:10b6:5:6e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.17; Sun, 17 Jul 2022 02:46:49 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d1:edc3:7d21:7c68%6]) with mapi id 15.20.5438.020; Sun, 17 Jul 2022 02:46:49 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Yu Zhao , Hugh Dickins Subject: [PATCH v11 24/69] mm/mmap: use advanced maple tree API for mmap_region() Thread-Topic: [PATCH v11 24/69] mm/mmap: use advanced maple tree API for mmap_region() Thread-Index: AQHYmYdz9ozw9iQo3UGLR7+piBM9RA== Date: Sun, 17 Jul 2022 02:46:44 +0000 Message-ID: <20220717024615.2106835-25-Liam.Howlett@oracle.com> References: <20220717024615.2106835-1-Liam.Howlett@oracle.com> In-Reply-To: <20220717024615.2106835-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8eb9e45e-482c-4a0f-884c-08da679e98dd x-ms-traffictypediagnostic: DM6PR10MB2908:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 6dl9OX1GiXiyMMeIiH9rpPzdxT4KPDs1gp6KPzxVV4QVPk1Svx2STHvjmSQcwjYT0XaiDVm4qOz2BGP3S+jncgvcWHCRAF618DM7X2pDNGNLzZSFBH8iDrMLxy9tNihJ9RdWvOuqGvfwI8L5UVDcwt5+2p9ItO1j9jxpnuipA4SP2lCfQH0B+crpNVupcIoxeVKj0GLr9Or5n6L2t9ZK+mRX4GfU7hBpbY9iqY2H9vSRtP8cwsVLhsZ7vVUxjppAR3bSlOTm08D4ED2xkf1JnxihHFObWrVl1S1jNv3SACl6J8NsWNXAWG1OkXalhVZQ6b/6AN2JNrESssHj4US3P2SUUHovDmCBQmJ9gSh776PL6lY/E7UnMdvHwqyp7zqY5oT7EfEjcbfGk8ALMsGvcScSmLd2HQIMwdPopYHhMZtnf/4trzeRoQqNQp8mQQV30fXwffTKuV6K+8hPzFez1sHTidIb4ZLB1NdMM/CDq5Ciaz2Lci4xMv1x49igrWLQk1CY3QcG2+yfKUU8nXmTzBfkii5D5yiMj4OEl6avwT9j9sLjrUWiCHnDpFdh0D7sNSZ0i4G6MzDesgcJR7jS9Cip+pnPvaZSRC9roKLokgvDPGA0Yo1kIZMd6VQf2hF3hEJb780aJGxe3MejusQRtATiJi5mPQPKTVsthIDwOrHWe7A4bn2Xn/Iz4k/mr5UCPm2DYEYkyx5nafqKJYcAdo66dlbI307HkDefUzvqqAo4iYdDDKk6adDUKPl7GjS4q1hAB+V/mhwCzhMDGfQGA/RFM5cvoJfszvMdzBPWuZHv9h222ek72KMLSqCe9jDletxLCMCOaK5yxOG6tLvJMYMJDz7m37U6zi1Zt9rCvYalR4bnOdYIMA09QyKkUrdy 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:(13230016)(346002)(39860400002)(376002)(396003)(136003)(366004)(5660300002)(122000001)(86362001)(38100700002)(38070700005)(6512007)(83380400001)(186003)(36756003)(1076003)(2616005)(6506007)(71200400001)(8676002)(110136005)(316002)(41300700001)(966005)(478600001)(26005)(6666004)(91956017)(6486002)(66446008)(64756008)(66556008)(30864003)(76116006)(66946007)(2906002)(44832011)(8936002)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?WbTmg7SGMg9JbePo3zcwSbT?= =?iso-8859-1?q?nvgGNEjvavhVCsnSOA3fH2i+IoXD53aUa1WiFTKdPQghikDNPRAcywgFZy16?= =?iso-8859-1?q?dn042v2j/W0EM7rgZHmbbkepO7doVFPYRDhEwHx0OfYtFxn/RE6Gq2Cyt6fJ?= =?iso-8859-1?q?6D1u8cROQEzA4egO7uRHCqxW/lMMxMn7nvMVMuj2KpIHr/8hO5yyXjkRSN5F?= =?iso-8859-1?q?aQcrwJPc1/Wpcsc/p/AcKnHPPc+8sxNo0jrzhPGhT4lI31TCCHX9UY03mshs?= =?iso-8859-1?q?zazUfeY3FF8sNcEbT3UGWiP1GXh0/iAhMOoipCcgIl+3ofe2OadXko1FmTQe?= =?iso-8859-1?q?7cQlW/HcDZyGcYwtli5bmwcWDRHtitn1u7+6qtqXvLALELtEgwqhmsM8pSKB?= =?iso-8859-1?q?h9WGNplmYoUphiS6Ol3lfNqr1SvTCSTrQqMN7imWzl4yd+p1oFVuzMo5wd4i?= =?iso-8859-1?q?ctwK8YC0ro6JvkwRhfnvkb+3l8BPW3l73alU1CfkEJqBYcaEFNDcEJtcAXF3?= =?iso-8859-1?q?cvMbBDvo/DEEkt75URKUI5kPt/0MpSlG3uF3d0KKIQjsT6hw7C2A3QY7iDxV?= =?iso-8859-1?q?5URRLllYZoktk9CjzFVb6eiYR+oJt6/NjRnhJ5xOFQ4/nEXbU5utYrJR8pkV?= =?iso-8859-1?q?Iy0Z28r5I+C4Qszn6+SO2u8VePrdOyZQ43Wfwb7I855L7/hbokgijkagNpAA?= =?iso-8859-1?q?8o5/RWa/8ndtL/qsUSO/Lmb4DF4HLo679rzMHCISGhvo9yp3g0Ql67Y5sZCq?= =?iso-8859-1?q?q+aqfFD4pbVXz9XElHbb7zXTlh8eN4yliZIaUtVsGvmusD/dZ4HiGjNOeTsR?= =?iso-8859-1?q?m/VyNRk0nUqKNsuEZLWxkkV4l3VatvPpNF/J9n6bf274dh/4onXWu0vS+PTP?= =?iso-8859-1?q?32aijGyFQNW6eSCqCiarnHeR04QT6ar5JH8BZ5cJYRKlFZxU2FBXWe57fKJc?= =?iso-8859-1?q?Bppqypkcw0BFUcd6TKJbSTA9M0NbwsRM51l4Y+QAmisdUFUIrg/9xcQxga6N?= =?iso-8859-1?q?/cYtwFkLhDLvdkEMRiaC9PYgXOdHK8w6U5BQN4Ncz2mW8UvpGZFWAixlfft8?= =?iso-8859-1?q?S5LX5US5JDeOxDcxmhUvYkX/VVbfjd3nyd7LqO6L5h+bhH2glSiL4lE/4E0N?= =?iso-8859-1?q?pZhE7OVELJu4XyD4Pd9P1h+99Wz8tIKas018G2GQ0M/mxNuOr5FKBMMzjyc9?= =?iso-8859-1?q?B37+QEElFVAHMxKCOOl9qZUg6rDb7I11jG9WnAlka5cPqko1qxDX2a0brqbN?= =?iso-8859-1?q?wtpE+kibvgfr0wMfQBG4MekOzFDMWNLzFdV15rtneyMusB/8ibRD2RABEr5F?= =?iso-8859-1?q?K1WFJUFXrr7Q3qfVwEznwnjBqkum1aWHMxDowNh4QT2or5ayCl5Z4Ifgwute?= =?iso-8859-1?q?t1TESdSdzK9W4WcAdUEwR57vG/kM5+CyTk7mzc4tbe8XT/EzPAYFz/7EsKOD?= =?iso-8859-1?q?BORvHTom7izmIWSrKiTNZ2bmmyFQBpvqe0SCCP+3GbHyB0enCLohJ9v2cpIi?= =?iso-8859-1?q?ZPAblEl9zfOfuJU2jnEBEQCDGKfsXBvglQYL3ojes7fbeyLFZJytj4tML0cI?= =?iso-8859-1?q?ksNriougX8xxg86mwcin/eUEPFBIs9GjKFPMxpFVz38zt+S12/Sw60eixs1I?= =?iso-8859-1?q?wGPBRL9UZLifiISxNqt9IG7DoRyesu/gi06c2cg=3D=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: 8eb9e45e-482c-4a0f-884c-08da679e98dd X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:44.7092 (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: T/yZ2SLYO1kYyzu9qxnxdutraPcl4fFBVIVA+XLIPFrl2C8KrJs0gJ5HTVuT7Tv6E/twLyOSUS1FGyAB3SzWtA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2908 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-17_01,2022-07-15_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207170010 X-Proofpoint-ORIG-GUID: 0IAVLaEctsp6-2Xwa4f1XqxLv-ozQS5F X-Proofpoint-GUID: 0IAVLaEctsp6-2Xwa4f1XqxLv-ozQS5F ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658026015; a=rsa-sha256; cv=pass; b=G49V+t6DSiipYKz/gE069Q4Sc2LRIX28RBKhj7J/VL77vOdcH5cuMjodWxNRLk7w/8F6fK 1rjwM9z+eRwCm4/tSJeIkSD28aSmO5BjgLql3bgiRflDOSZElJZTlZMWvz6bXiwtMLU6x8 HRmQlLv7oGoLUGgGk+Cpsra3LfX7yfI= ARC-Authentication-Results: i=2; imf25.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b="xl5w/b1Z"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=E2YmjzjE; spf=none (imf25.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; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658026015; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=nxs6Cc0dk3QV6W+mxAwWoMvB/ObRju13VWpGJSZOyMA=; b=7NIRM0U/HVuAZAS556Sk7LlARLa2FYLBlO0Q2hQ0K707BrsfxMZdYW1lcz6YXia1jI0gIO 8sV9Dz32Czee4OdMt/W95afGL0rPSP0FzP2TZrVuC+Mho7HTgPEOFpU9nTxFEDUJaWFYqi NCkDDi016TXPACQlLIPh5tB9HOyYdKI= X-Rspamd-Queue-Id: A7313A0006 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b="xl5w/b1Z"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=E2YmjzjE; spf=none (imf25.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; arc=pass ("microsoft.com:s=arcselector9901:i=1") X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: yz116ckypsnhgetog1oe1aqj8rhxd1f1 X-HE-Tag: 1658026015-459445 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" Changing mmap_region() to use the maple tree state and the advanced maple tree interface allows for a lot less tree walking. This change removes the last caller of munmap_vma_range(), so drop this unused function. Add vma_expand() to expand a VMA if possible by doing the necessary hugepage check, uprobe_munmap of files, dcache flush, modifications then undoing the detaches, etc. Link: https://lkml.kernel.org/r/20220504011345.662299-9-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220519020341.rr3s6b4dr7o36cqb@revolver Link: https://lkml.kernel.org/r/20220621204632.3370049-25-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Cc: Catalin Marinas Cc: David Howells Cc: "Matthew Wilcox (Oracle)" Cc: SeongJae Park Cc: Vlastimil Babka Cc: Will Deacon Cc: Davidlohr Bueso Signed-off-by: Andrew Morton --- mm/mmap.c | 255 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 207 insertions(+), 48 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 378275cc390b..f60333798d56 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -517,28 +517,6 @@ static inline struct vm_area_struct *__vma_next(struct mm_struct *mm, return vma->vm_next; } -/* - * munmap_vma_range() - munmap VMAs that overlap a range. - * @mm: The mm struct - * @start: The start of the range. - * @len: The length of the range. - * @pprev: pointer to the pointer that will be set to previous vm_area_struct - * - * Find all the vm_area_struct that overlap from @start to - * @end and munmap them. Set @pprev to the previous vm_area_struct. - * - * Returns: -ENOMEM on munmap failure or 0 on success. - */ -static inline int -munmap_vma_range(struct mm_struct *mm, unsigned long start, unsigned long len, - struct vm_area_struct **pprev, struct list_head *uf) -{ - while (range_has_overlap(mm, start, start + len, pprev)) - if (do_munmap(mm, start, len, uf)) - return -ENOMEM; - return 0; -} - static unsigned long count_vma_pages_range(struct mm_struct *mm, unsigned long addr, unsigned long end) { @@ -665,6 +643,133 @@ static void __insert_vm_struct(struct mm_struct *mm, struct ma_state *mas, mm->map_count++; } +/* + * vma_expand - Expand an existing VMA + * + * @mas: The maple state + * @vma: The vma to expand + * @start: The start of the vma + * @end: The exclusive end of the vma + * @pgoff: The page offset of vma + * @next: The current of next vma. + * + * Expand @vma to @start and @end. Can expand off the start and end. Will + * expand over @next if it's different from @vma and @end == @next->vm_end. + * Checking if the @vma can expand and merge with @next needs to be handled by + * the caller. + * + * Returns: 0 on success + */ +inline int vma_expand(struct ma_state *mas, struct vm_area_struct *vma, + unsigned long start, unsigned long end, pgoff_t pgoff, + struct vm_area_struct *next) +{ + struct mm_struct *mm = vma->vm_mm; + struct address_space *mapping = NULL; + struct rb_root_cached *root = NULL; + struct anon_vma *anon_vma = vma->anon_vma; + struct file *file = vma->vm_file; + bool remove_next = false; + bool anon_cloned = false; + + if (next && (vma != next) && (end == next->vm_end)) { + remove_next = true; + if (next->anon_vma && !vma->anon_vma) { + int error; + + anon_vma = next->anon_vma; + vma->anon_vma = anon_vma; + error = anon_vma_clone(vma, next); + if (error) + return error; + anon_cloned = true; + } + } + + /* Not merging but overwriting any part of next is not handled. */ + VM_BUG_ON(next && !remove_next && next != vma && end > next->vm_start); + /* Only handles expanding */ + VM_BUG_ON(vma->vm_start < start || vma->vm_end > end); + + if (mas_preallocate(mas, vma, GFP_KERNEL)) + goto nomem; + + vma_adjust_trans_huge(vma, start, end, 0); + + if (file) { + mapping = file->f_mapping; + root = &mapping->i_mmap; + uprobe_munmap(vma, vma->vm_start, vma->vm_end); + i_mmap_lock_write(mapping); + } + + if (anon_vma) { + anon_vma_lock_write(anon_vma); + anon_vma_interval_tree_pre_update_vma(vma); + } + + if (file) { + flush_dcache_mmap_lock(mapping); + vma_interval_tree_remove(vma, root); + } + + vma->vm_start = start; + vma->vm_end = end; + vma->vm_pgoff = pgoff; + /* Note: mas must be pointing to the expanding VMA */ + vma_mas_store(vma, mas); + + if (file) { + vma_interval_tree_insert(vma, root); + flush_dcache_mmap_unlock(mapping); + } + + /* Expanding over the next vma */ + if (remove_next) { + /* Remove from mm linked list - also updates highest_vm_end */ + __vma_unlink_list(mm, next); + + /* Kill the cache */ + vmacache_invalidate(mm); + + if (file) + __remove_shared_vm_struct(next, file, mapping); + + } else if (!next) { + mm->highest_vm_end = vm_end_gap(vma); + } + + if (anon_vma) { + anon_vma_interval_tree_post_update_vma(vma); + anon_vma_unlock_write(anon_vma); + } + + if (file) { + i_mmap_unlock_write(mapping); + uprobe_mmap(vma); + } + + if (remove_next) { + if (file) { + uprobe_munmap(next, next->vm_start, next->vm_end); + fput(file); + } + if (next->anon_vma) + anon_vma_merge(vma, next); + mm->map_count--; + mpol_put(vma_policy(next)); + vm_area_free(next); + } + + validate_mm(mm); + return 0; + +nomem: + if (anon_cloned) + unlink_anon_vmas(vma); + return -ENOMEM; +} + /* * We cannot adjust vm_start, vm_end, vm_pgoff fields of a vma that * is already present in an i_mmap tree without adjusting the tree. @@ -1677,9 +1782,15 @@ unsigned long mmap_region(struct file *file, unsigned long addr, struct list_head *uf) { struct mm_struct *mm = current->mm; - struct vm_area_struct *vma, *prev, *merge; - int error; + struct vm_area_struct *vma = NULL; + struct vm_area_struct *next, *prev, *merge; + 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)) { @@ -1689,16 +1800,17 @@ unsigned long mmap_region(struct file *file, unsigned long addr, * 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, addr + len); + nr_pages = count_vma_pages_range(mm, addr, end); if (!may_expand_vm(mm, vm_flags, (len >> PAGE_SHIFT) - nr_pages)) return -ENOMEM; } - /* Clear old maps, set up prev and uf */ - if (munmap_vma_range(mm, addr, len, &prev, uf)) + /* Unmap any existing mapping in the area */ + if (do_munmap(mm, addr, len, uf)) return -ENOMEM; + /* * Private writable mapping: check memory availability */ @@ -1709,14 +1821,43 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vm_flags |= VM_ACCOUNT; } - /* - * Can we just expand an old mapping? - */ - vma = vma_merge(mm, prev, addr, addr + len, vm_flags, - NULL, file, pgoff, NULL, NULL_VM_UFFD_CTX, NULL); - if (vma) - goto out; + next = mas_next(&mas, ULONG_MAX); + prev = mas_prev(&mas, 0); + if (vm_flags & VM_SPECIAL) + goto cannot_expand; + + /* Attempt to expand an old mapping */ + /* Check next */ + if (next && next->vm_start == end && !vma_policy(next) && + can_vma_merge_before(next, vm_flags, NULL, file, pgoff+pglen, + NULL_VM_UFFD_CTX, NULL)) { + merge_end = next->vm_end; + vma = next; + vm_pgoff = next->vm_pgoff - pglen; + } + /* Check prev */ + if (prev && prev->vm_end == addr && !vma_policy(prev) && + (vma ? can_vma_merge_after(prev, vm_flags, vma->anon_vma, file, + pgoff, vma->vm_userfaultfd_ctx, NULL) : + can_vma_merge_after(prev, vm_flags, NULL, file, pgoff, + NULL_VM_UFFD_CTX, NULL))) { + 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(vma, 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 @@ -1729,7 +1870,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } vma->vm_start = addr; - vma->vm_end = addr + len; + vma->vm_end = end; vma->vm_flags = vm_flags; vma->vm_page_prot = vm_get_page_prot(vm_flags); vma->vm_pgoff = pgoff; @@ -1750,28 +1891,32 @@ unsigned long mmap_region(struct file *file, unsigned long addr, * * Answer: Yes, several device drivers can do it in their * f_op->mmap method. -DaveM - * Bug: If addr is changed, prev, rb_link, rb_parent should - * be updated for vma_link() */ WARN_ON_ONCE(addr != vma->vm_start); addr = vma->vm_start; + mas_reset(&mas); - /* If vm_flags changed after call_mmap(), we should try merge vma again - * as we may succeed this time. + /* + * 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)) { merge = vma_merge(mm, prev, vma->vm_start, vma->vm_end, vma->vm_flags, NULL, vma->vm_file, vma->vm_pgoff, NULL, NULL_VM_UFFD_CTX, NULL); if (merge) { - /* ->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. + /* + * ->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 = merge; /* Update vm_flags to pick up the change. */ + addr = vma->vm_start; vm_flags = vma->vm_flags; goto unmap_writable; } @@ -1795,7 +1940,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, goto free_vma; } - if (vma_link(mm, vma, prev)) { + if (mas_preallocate(&mas, vma, GFP_KERNEL)) { error = -ENOMEM; if (file) goto unmap_and_free_vma; @@ -1803,6 +1948,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr, goto free_vma; } + if (vma->vm_file) + i_mmap_lock_write(vma->vm_file->f_mapping); + + vma_mas_store(vma, &mas); + __vma_link_list(mm, vma, prev); + mm->map_count++; + if (vma->vm_file) { + if (vma->vm_flags & VM_SHARED) + mapping_allow_writable(vma->vm_file->f_mapping); + + flush_dcache_mmap_lock(vma->vm_file->f_mapping); + vma_interval_tree_insert(vma, &vma->vm_file->f_mapping->i_mmap); + flush_dcache_mmap_unlock(vma->vm_file->f_mapping); + i_mmap_unlock_write(vma->vm_file->f_mapping); + } + /* * vma_merge() calls khugepaged_enter_vma() either, the below * call covers the non-merge case. @@ -1814,7 +1975,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, if (file && vm_flags & VM_SHARED) mapping_unmap_writable(file->f_mapping); file = vma->vm_file; -out: +expanded: perf_event_mmap(vma); vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT); @@ -1841,6 +2002,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, vma_set_page_prot(vma); + validate_mm(mm); return addr; unmap_and_free_vma: @@ -1857,6 +2019,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, unacct_error: if (charged) vm_unacct_memory(charged); + validate_mm(mm); return error; } @@ -2679,10 +2842,6 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, prev = vma->vm_prev; /* we have start < vma->vm_end */ - /* if it doesn't overlap, we have nothing.. */ - if (vma->vm_start >= end) - return 0; - /* * If we need to split any vma, do it now to save pain later. *