From patchwork Tue Jul 19 19:14:01 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: 12922941 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 D71C5C43334 for ; Tue, 19 Jul 2022 19:14:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A0D76B0071; Tue, 19 Jul 2022 15:14:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54FFB6B0073; Tue, 19 Jul 2022 15:14:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3C7A26B0074; Tue, 19 Jul 2022 15:14:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 27C2F6B0071 for ; Tue, 19 Jul 2022 15:14:10 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DC819120272 for ; Tue, 19 Jul 2022 19:14:09 +0000 (UTC) X-FDA: 79704799818.12.5E1DC07 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf23.hostedemail.com (Postfix) with ESMTP id 512F214008B for ; Tue, 19 Jul 2022 19:14:09 +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 26JH4AZS002405; Tue, 19 Jul 2022 19:14:06 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-2022-7-12; bh=k+BZf+ntyzOOg1yT9po8ujP+S2PlrQV+a2W3a+0bpLU=; b=DspbsST+OubiHud1whh/7GixEtE/C/RFIDc3Br2a0TPgDFq3G5pyQxD8EgpenyEvUfjZ 36ZZcPqaubpRi32vnLVJJOVpTz9dRdpkVKESHaY/tgZkCQ0byNoQYqi9TrzMBVY+Detg 55GV/DnMJVJB7I4mBwh7KYJP/tx2JgAerwsYktg354bmsovrb2CFqs7i2s7QqaDxx/D4 OJe3mx+p+PS4JM0jFVGXtdvPggLcVxMtG1eUyUmtdm5yiRcWyT2dVSwQQTkDF9xeU6Rj 3Qh+a1M3W7ZNr3dOw+1bLrCGsewJ6eNWax6g5gExF61D88MnoUqJEWKipBI8yJOIbXMX UA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbn7a7cmx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:06 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26JIShfS009880; Tue, 19 Jul 2022 19:14:05 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ggsbfr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WtMcVXMmUIBVy5NZBG6mxEqbH1K7VZHy2obRSzpJ+Du+I1/IK2OjDaIW1lgmkAiZUiC0SnEmkg7hT6sMlOAnsrdB0My9iit2AR7BqDambXKezuqoqYewO5tKgzDHvAmdWOugeVuXvdP6PRo/j9xirHvtQU1B1W28CiSYkruM151b+Y8Ss1USOqhW+OTIH3K/NJ9eRO4FKTGw20djuswPV66zH+fIvXShdssXHYOIYiw55vY1M3adNMTT4gDzk3Qx9L2uZ7mjXSk3AJjcX+vYGdk1tQktUFln36RatyCf0wkB5/+AOanyI+0LOTOEEfiucc+08jeBD4Ezgv0OzOpmxg== 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=k+BZf+ntyzOOg1yT9po8ujP+S2PlrQV+a2W3a+0bpLU=; b=iGPmJ32xopSIpjcxhuAIOKw/M0JJ7Ds42XkhfQk2Kcj5FJINeLbqlwFfld4ZONiPF+sNJcA1GXlW8Zgdv93p2S3nXW0/cMgNO41x0JGFAlPSVFSjXqW3gwuK6Ii8TbgPc2LoByLgLERi8UoccIMFRXGcLtsQe1g/Y80Dr+R/jTJZQJ5Ygzk4YWQZ4lKrrPRbaLeQmpj+nv2aOvmUdWzP27HeGjj1MgexyOL10D0CDoV175Uvp3jmLK4CsC2PdgpGbik83lSzfwvxPPJlEeuphbhI28T+sQJihCVsda7kt7pqXuDLqHms7oHk1XCBcQTF+/n6YMI3zBtC8z3GJN5mBQ== 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=k+BZf+ntyzOOg1yT9po8ujP+S2PlrQV+a2W3a+0bpLU=; b=iZ6RL5DwjGa5hMZWRwRnK7PXS4J/KoivaFy/zbOVA6mYapb0LNGnk2PH2nQ1VOCoc2l0YsthyLyYi5OLaKqYlH4XVr9RFROtLOK+Fh/z0quGKR2XDHS5z/oveiccZTeKXfTlfvfWF9XA7qtCcz7mQiD8bOEfkE8BS+vES2dMItk= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by MW5PR10MB5805.namprd10.prod.outlook.com (2603:10b6:303:192::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 19:14:02 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87%4]) with mapi id 15.20.5438.024; Tue, 19 Jul 2022 19:14:02 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Hugh Dickins CC: Yu Zhao Subject: [PATCH 1/3] mmap: Remove do_brk_munmap() optimization Thread-Topic: [PATCH 1/3] mmap: Remove do_brk_munmap() optimization Thread-Index: AQHYm6O0TzwYnOSDc0K3kiJ7wbgw6w== Date: Tue, 19 Jul 2022 19:14:01 +0000 Message-ID: <20220719191352.3366482-2-Liam.Howlett@oracle.com> References: <20220719191352.3366482-1-Liam.Howlett@oracle.com> In-Reply-To: <20220719191352.3366482-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: 38b7e359-b8a8-4f40-4143-08da69bad79e x-ms-traffictypediagnostic: MW5PR10MB5805:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: a7xYbMB9/qBGie+MGyXF09dpvjWGnQCywYm8WY5iDrAXSUbIMK3s/cS0K6oknUlxKRxrVVqjzlJK5L7ZXhsCc2L0a7KdWwHqSMuf+23Cw6pCv9a8Pv91js186PD+5W/WTERX1DlPga81CDE5eVyHekT6Bx9xoQalyvz9IoAhDPY0KY3lW/R2aLPTyW64RQylJmKVvGd+hBp5PhqKGxVL0KVatud1DEyPvLWsaAeuhKaVtJAzhkehG8vliJJG7atYQSps7AkO33tUGixXGv76hJSv5AziqdAV0D0IDbpYNZYAzzw8qO4BWF61E1sM0sbcI3QSjhs9H/5CjvsGJbVzNOaiXgmSdn0iLDGK2CLuCBuhZEtVI7gF5cPKptsqbBgRIJx+kDLPuggMQImqI/KIlu6fT2R20UUalxRD9jNWYmnp1q7Wlqozdq9O/PgqYD0x4O75dqE/UQooFtp4UNVqaJgXuhAKm3TL7i8py2WRVEVyUpYmE92G1FhAyhi8rgyCrwW4AvMTDz0VhalpgO04bnjFyElZoiW8iRzlydua+xsTGXMcNA4PypiNOylsQKDPel5f5NDZNMOCAi9Jhyn0q81yfOgTIxBi3AgXcJeVFkj1yUuFZzVLpkYlHu+QKOJFT+OgprqR7QKdJiW/rsbIZqmK8MKnyrty7rWAFb7dPvaFnJS3enBmNpcEUBeNDEkEAw97UgZKX6fsCgdMH0ap5Aqrh+2RUi4ssfttDjqRbv2nhq03XUiPklfvrGKAGg+CgQ9EGAyC63vGt9g7Sbf/JsUpBto3fCvqihZHbPWl0Lqal/ydjrglFQQBjCrDKbbG 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:(13230016)(39860400002)(396003)(136003)(346002)(376002)(366004)(2616005)(86362001)(6486002)(26005)(6512007)(38070700005)(1076003)(41300700001)(8936002)(2906002)(4326008)(38100700002)(6506007)(44832011)(478600001)(5660300002)(122000001)(110136005)(186003)(316002)(66446008)(76116006)(8676002)(71200400001)(66476007)(91956017)(64756008)(66556008)(66946007)(36756003)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?M9FblNSZWcZqYWVMjnQGxfS?= =?iso-8859-1?q?Gvkqlc7zDOJlVpbViuwkumy29unkv5smsDqQ8ixI5cAfuHXW5K48s7J286H/?= =?iso-8859-1?q?L8caB0BzcoaQ3djGTqjhRg6QoylhoP9yKjScB6sALvZkv+1Fbm+sSdokYz4R?= =?iso-8859-1?q?u64I0pMzvbHCjnr8yT0EN1yR7h29w5P2gHRbTGdMEAb3DeT/JiRjvuA5UIgr?= =?iso-8859-1?q?5tZgSTGYIWjptDim5661HcCRxZptxppIZMKLaCBlktoV0J7IkchPSXFf1alf?= =?iso-8859-1?q?aQFOq6elxfEX2mgjWHVbbgvZI0q4DfbM/6QZ+BY9KUCRH9QKQLGdX+uy/Uwz?= =?iso-8859-1?q?i/yCgVhbA5eADkAQdmppuH6F+zoZsr1PmM7OChTrdnW6QaLbfTXMpzpX4SeW?= =?iso-8859-1?q?Ws9LcG1nWKQNMEUGDvmPnHo+fqy0QzudcOP29LZDgTdR18yk4fuA0biDmk7x?= =?iso-8859-1?q?59//gO+S5HPO5HaqeTa/20v8wPIH9dECbzQV5QPMxfixJXwfN5OF2H9POze3?= =?iso-8859-1?q?AKhq7hD6tLxOsH+Ad2w+m6cchct89Te9VWkZfC+ZXsISKDLWcAl5QcceaEvw?= =?iso-8859-1?q?zZqDYQU6vdDLRxno/Y6Zw/4YuEcKLyTHt7UWEGNy4P9G4vffAtRJtMglluCE?= =?iso-8859-1?q?0+M3I3CiH0mV1dlddmaH6lVyfzB12Yrzo4d8nj+TtfKN+3ceF6YbwYGtbnVv?= =?iso-8859-1?q?wr3y48wigmgCOD2URQeSYFCdAyq+9BXADT4VMcp+krelnkyeIu0CMLvN7ZuL?= =?iso-8859-1?q?7qYldYAFiEEHVl0CCGYEmAEh6jOc1oQ7u3wgaogDwvUI7bl1o4UgRdwM0/oa?= =?iso-8859-1?q?c3WwgTd2ikRj8tM0IYTEtwHZT7/ZCY/zXQjjKNOO+lwPSlYeNgTOOYTi1D4B?= =?iso-8859-1?q?ByeVK42VXWcFWn3DCIxKLIQF2Z2qqL/X/p4rLVjyxY4h1r6lswWQFlI4EE9q?= =?iso-8859-1?q?nl+LZHGsQ3EupZZKv5NvwhTEL7qiNZknRzQ18QDFla6AFWodqwIYqtlbgI7i?= =?iso-8859-1?q?oQzVUtaGhYhtVj8f10QZoe9a1n7v4KdsMQm7fqi8QoWiAjnOxJn+biszQFD8?= =?iso-8859-1?q?Ia32+0Mbws3BOj8qQTx4YT9KAkfs97fe/8GAZ01FNtfeFW0Q/4f+f3Q4J6kG?= =?iso-8859-1?q?BUUJ7mXCC+qovPNNEMpzfjKOYHvCBefUxuhHogdyuLjMjPtEjplnjgwFPYtB?= =?iso-8859-1?q?bdcoiOyiG6iI2Bb6YslUm6GW1gzgsNtI6RY3H+fD5B6gwZlH9+1Q2sfJm9xM?= =?iso-8859-1?q?r7Ee+NJYX1HKax73uYDFfHscetjdUNz6gS8weH4FHqwEyxeR8aHKvJ8kEvOv?= =?iso-8859-1?q?ewY8GbnleiOYCGkdE3iwZ0UA9JvEu0BcDbxx63Fq1stpD9v8YksQ1OfJlzMI?= =?iso-8859-1?q?f5XaI5HmUxI/KXCxHjXTUmj3P1vCQAAiLzt0Bj7OJvi/pvUbsB4YOVOTbCPQ?= =?iso-8859-1?q?L08XiRbI36e3+BMKLTAmCaplj3p6gnWNYgBp0z6oHXJ/QjHPUK5H3tpawZrs?= =?iso-8859-1?q?7E33FltyXgwlT8gYId7hN03fmwDijIxAsYBi57w3KyAuHbn9Tr9o485uqTCD?= =?iso-8859-1?q?5G74Igj0m2wN8GzR1MokwWaMfoxnlcfMxLVQ/JzW2cMFF6NfjSJdWNIhi6eG?= =?iso-8859-1?q?5Cerlm4TqmVzasiwAPOx6UdQSgr05sJ4dzL1tTg=3D=3D?= 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: 38b7e359-b8a8-4f40-4143-08da69bad79e X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 19:14:01.9122 (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: ROHL2uJuyj+0eSeVBdqbNEVNX6gQmtjCinxI/kGTgo6CJBBWcY3ACaRn3K6JSIpOyR9m4ZcjFqhqbJnzOZmEFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5805 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-19_07,2022-07-19_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207190082 X-Proofpoint-ORIG-GUID: kVaPLjBg4cqhRZ4b-be6UMjpLAoPEhfj X-Proofpoint-GUID: kVaPLjBg4cqhRZ4b-be6UMjpLAoPEhfj ARC-Authentication-Results: i=2; imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=DspbsST+; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=iZ6RL5Dw; spf=none (imf23.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=1658258049; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=k+BZf+ntyzOOg1yT9po8ujP+S2PlrQV+a2W3a+0bpLU=; b=8pjTn3APgp+4csaLucL2vnWb6UJHylFf+wGbpmJ6fZBpmxA2XwXA/FFDYN4YAXpuZFTlAz vNgOWYfLSll4YvkjMhGkpjGm38iGRKe4LzSP2QX/V63OF889vB6lScVhmF+peTLNBZ6Z/g 3ynYMO/p+tA4ROxUXNrU9bHyRNSklAc= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658258049; a=rsa-sha256; cv=pass; b=4I9fnqpi/ZjJTCLHEMFHoZheAZM386UIY2EztNQHe6xMILjTyEvK1bRR/3W3kt15PeisTD /M+3tcGzkfVVJ7DCzLqrWkrDuvYR9uAyTOG6NeTLWFJhTK2TmUr5js0BLrSuk8wXyTLhuG UK2TJSnoVtwfGgV6J4T2etkY4WGjLyw= X-Rspam-User: X-Rspamd-Queue-Id: 512F214008B Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=DspbsST+; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=iZ6RL5Dw; spf=none (imf23.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-Stat-Signature: 8b6ectffzdyq33f4ym88cqg8faim65yt X-Rspamd-Server: rspam07 X-HE-Tag: 1658258049-273454 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: This optimization does not work with the locking. Fixes: f12fee814843 (mm/mmap: change do_brk_flags() to expand existing VMA and add do_brk_munmap()) Suggested-by: Hugh Dickins Signed-off-by: Liam R. Howlett --- mm/mmap.c | 61 ++----------------------------------------------------- 1 file changed, 2 insertions(+), 59 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2f19976ea817..4fc1b3098c91 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2861,67 +2861,10 @@ 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; - unsigned long unmap_pages; - int ret = 1; + int ret; arch_unmap(mm, newbrk, oldbrk); - - if (likely((vma->vm_end < oldbrk) || - ((vma->vm_start == newbrk) && (vma->vm_end == oldbrk)))) { - /* remove entire mapping(s) */ - mas_set(mas, newbrk); - if (vma->vm_start != newbrk) - mas_reset(mas); /* cause a re-walk for the first overlap. */ - ret = __do_munmap(mm, newbrk, oldbrk - newbrk, uf, true); - goto munmap_full_vma; - } - - vma_init(&unmap, mm); - unmap.vm_start = newbrk; - unmap.vm_end = oldbrk; - 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 */ - vma_adjust_trans_huge(vma, vma->vm_start, newbrk, 0); - if (mas_preallocate(mas, vma, GFP_KERNEL)) - return -ENOMEM; - - if (vma->anon_vma) { - anon_vma_lock_write(vma->anon_vma); - anon_vma_interval_tree_pre_update_vma(vma); - } - - vma->vm_end = newbrk; - vma_init(&unmap, mm); - unmap.vm_start = newbrk; - unmap.vm_end = oldbrk; - if (vma->anon_vma) - vma_set_anonymous(&unmap); - - vma_mas_remove(&unmap, mas); - - vmacache_invalidate(vma->vm_mm); - if (vma->anon_vma) { - anon_vma_interval_tree_post_update_vma(vma); - anon_vma_unlock_write(vma->anon_vma); - } - - unmap_pages = vma_pages(&unmap); - if (vma->vm_flags & VM_LOCKED) - mm->locked_vm -= unmap_pages; - - mmap_write_downgrade(mm); - unmap_region(mm, &unmap, vma, newbrk, oldbrk); - /* Statistics */ - vm_stat_account(mm, vma->vm_flags, -unmap_pages); - if (vma->vm_flags & VM_ACCOUNT) - vm_unacct_memory(unmap_pages); - -munmap_full_vma: + ret = __do_munmap(mm, newbrk, oldbrk - newbrk, uf, true); validate_mm_mt(mm); return ret; } From patchwork Tue Jul 19 19:14:02 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: 12922943 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 737DEC43334 for ; Tue, 19 Jul 2022 19:14:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D8996B0074; Tue, 19 Jul 2022 15:14:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 660A36B007B; Tue, 19 Jul 2022 15:14:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37C166B0075; Tue, 19 Jul 2022 15:14:11 -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 0D8706B0078 for ; Tue, 19 Jul 2022 15:14:11 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DD0A6AAB7B for ; Tue, 19 Jul 2022 19:14:10 +0000 (UTC) X-FDA: 79704799860.21.6C28ED1 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf27.hostedemail.com (Postfix) with ESMTP id 4D6454009B for ; Tue, 19 Jul 2022 19:14:10 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26JGccR0031777; Tue, 19 Jul 2022 19:14:07 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-2022-7-12; bh=lyfc72GZP977oxFlG43zetRhmzihEcX0Xnq9e9u/+Ic=; b=CVSktswH3/CHZU/S5LN8yEL0ND/YRpdPq13lba/wOfY9HI2t8uQQiMUGvr9U/tyI3xsX QZB3Dt2GTBUpa5mLo4LH/Ykoa1kaq/l1U0w7Mslf/Orjxtx78QMWoJmmy7Ef2NYdTa5x uwZ2nVyK/EcEaNJl8WA1F9wSgnzFxiU4GE25EyPBuwcSA5jB7daZn9KcdiALDxTzYwoo t0443jUFOuZL2mvf8tWhDWE3WArwKHBqeoZbBj0oJc34oD7bxLNyS3nWd25WJjvrYdPk 0kys047jiIaIQn8y1Bz2EDyL2qaqgoLrg4e2edfNXdeIOKbb26I5FLhSzL7kZ7Dzu26e cQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtfh5j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:07 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26JIShfT009880; Tue, 19 Jul 2022 19:14:06 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ggsbfr-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=er7GTCR1Lv5az2trj3+bF8W8abvOEEhJwelfxpre01RjrFT5E/wRsoZCvaLxN2MKfRoW4Tnd5cThB8e4Y7atQNXu+UGrs1oIjizCF/Jbt0Ul6/wMWBHyS1c1Ivinfjfq9nZ6ssoERNxMh8KwGCUlvE7x0ATgy1Y/6wV6+Uiy/lRmek8gaP74ZFCWJmOxRAomuE4g1k5KGpXQ/idsCmzAG3at7wBfwdyJx6lIAobdJ82Pgw88YAgJhC8Ae3fFh4yrLeGqN0LPppCGu0dZr4zI4LZWtFU6RBjbGIPnTv9oSlx+G75BXcJDftCqhbrznlX4SwBsF6NWb2k76P5m2KbCRg== 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=lyfc72GZP977oxFlG43zetRhmzihEcX0Xnq9e9u/+Ic=; b=m3fHjIW+coqJXUouqpFUMmLjRCVG1s9ANHjMSN3UUE/a1eFkL6MhW6ZnI7fghy5apGTvEuaUs3Vr3S7z9oLdUgXmZ6nwtdPN9bYTOpK1xCr6efBXl8bprsuPxmCcRIu7ePnfMZ7WlAAFFaO+mpA76TrMOzrtHjssDMxY9kJDbVqBJuD9J6EnN/IXdsyBWXXDTQjnjquxWBr6sPX0bwl3fpQ9xtHEKmVRPNTAJZAamUAp+q46U0AGG+20nxaMRPfm5DX1RMvyGgfVTGP80PE7BCWxQKeHhkrsn4qS1E4qjSyas0KhA76bcdCjjf+Bxm3gdBJemRfcgmFa3BL+3qEaoQ== 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=lyfc72GZP977oxFlG43zetRhmzihEcX0Xnq9e9u/+Ic=; b=IbkOd/n/XVU0vBmy6Y/40XF7KvicooNIFkDFgDl9DNqLWrmdaxyVvI5X+wMtkDkCYUvUHJZuQ0H4NGyk5zEc+GaVbSzzYQyZ+zVlX0jr0m/fZRWyOaYRZrNAXQ7IrTYp7R7WtNM2w25kkmmId+744zAFpRuy8GQnZfi+vkc0TTY= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by MW5PR10MB5805.namprd10.prod.outlook.com (2603:10b6:303:192::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 19:14:03 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87%4]) with mapi id 15.20.5438.024; Tue, 19 Jul 2022 19:14:03 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Hugh Dickins CC: Yu Zhao Subject: [PATCH 2/3 ] mm/mmap: reorganize munmap to use maple states Thread-Topic: [PATCH 2/3 ] mm/mmap: reorganize munmap to use maple states Thread-Index: AQHYm6O0ToLuGWSQFECVDRaTevEw0w== Date: Tue, 19 Jul 2022 19:14:02 +0000 Message-ID: <20220719191352.3366482-3-Liam.Howlett@oracle.com> References: <20220719191352.3366482-1-Liam.Howlett@oracle.com> In-Reply-To: <20220719191352.3366482-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: 50dbdabd-382d-4e7c-24fb-08da69bad826 x-ms-traffictypediagnostic: MW5PR10MB5805:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VXktWCaWnpvrqet32w+Y1CE+wG7JkwprRlGk1c/EXyPl0PwtmRqyi/IHZq/kgXCduOv54mKcGB1MAw+dC6fqY3WECdKIw3JyjU4qPZ+g33BUk4t0grZ/Idsxh1SDuW030T8KlvTWKj8LK7jR+ph6dKEDPps0endp13u4+pHWoyO3bMM/UnO95YXjVptMzZ+mlkvYPaSUbOBK5z4IPywQGZuaTi4UgCXOpsGHRVf9rxOD/bxTnqwBEVElO3Q2GtLLDUdhpByhJ3jh1DLhm+GLWhtMacj/bgjQTvUFqeRj76pw/hOV4Q1WUqzGd0R0r8JSh9kSd46kaua+tz7YUU4A8IndhAsRo4G+H5kPfR9VsNYaiN+HazivNidkpnCk4mf0HDMAc/2NMR3oMKQp1GKzoI1N+Z04+Dx8Q6Rp2/PJbdEPoEq2FqeVdQEOdDssRQLnNJsGxMwwNqj0ocK6Dt/slMoIFJ89+B9Cu6ciijr/ETq9i8riNfOpvXUMQnXGlDvurHXOtBB7dnUUs11LiEwfJBIRJSN9dRLKjDMQz/5Ek49tMQoJgshq7m0WfDTYRVLHc5NfsZSh5LX0D6Ob8JTK7ddslUhXaH063d1H3n9Pko9CPuPWq114ZfyusYfRqWLXpIWygtW/n1wmRHYbYHKr8+lLhHfCOQWYBJbTlbwXm+ns5VzYzyd/j8XynAgpm4dL7NX1EBRjTPZR6bHfW4/7WvQAKON0Iegbx5g/hKVpJhs1loaEJkPjc/b4RZcyE/o5dHEgFqhETh2SmmwDyzuCNBkwrZt7TGH9w0Pezln/m+dG3L4mXKNTNCm1l3Z0bmnOOtFx22Q0qUf90D3dotE+g5KDnKm1h4ujJpZ0kzXgI2sDe5V5f930VUay6A1uMiFg 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:(13230016)(39860400002)(396003)(136003)(346002)(376002)(366004)(2616005)(86362001)(6486002)(26005)(6512007)(38070700005)(1076003)(41300700001)(8936002)(2906002)(4326008)(38100700002)(6506007)(44832011)(478600001)(5660300002)(30864003)(122000001)(110136005)(186003)(316002)(966005)(66446008)(76116006)(8676002)(71200400001)(66476007)(91956017)(64756008)(66556008)(66946007)(36756003)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?XlS90+lCjBPu9miKL1zFG8O?= =?iso-8859-1?q?s1TTKPuiycsz6GZy0PvTpwnm8i8EjR7KZtZgvG/teGWa4stU2iAC2qzogZu8?= =?iso-8859-1?q?YLtviNVaqvR3HsvAbeWH9bNVp5nZEHAMfIy96R119sfgbzNJfyVmaPBifFKR?= =?iso-8859-1?q?sQQA3/2wIz+6pPsFBRRygX8NCrX/9pH/XWYa7ixA6SdB4lp1X+76AUmXjWoN?= =?iso-8859-1?q?Q36kbm6kHOtkgL4Iv/TFMF8XpDhZiFwgrKjaq6ZQMhf72g7TN1r9AMtwDuhi?= =?iso-8859-1?q?lLwdptyHs44sTc/4TpHAiCTQwM/DjU4xNed5cm0UCZSh++ETtydMQ9+Q+QPY?= =?iso-8859-1?q?TsSPkzaJnE+abnVFdIz82zo4c+fvbDDv/P4Q9vK817+D5Svs5eiN5JqxpOdo?= =?iso-8859-1?q?D2bXqyKqy9QvtQqNFRcOcg2ZoNN8ilfOc11ICi9SMg3w2VFYpQDQ+ZGS5Usd?= =?iso-8859-1?q?rZRzDHIrg8ZzxQCafQxCX/yueEFOWHiCeyYcmN6cObUO+P3RBGJDHdM+6K4w?= =?iso-8859-1?q?eq7n9sjlOdBJ1CuQ1BfwsBFzMdT1hFTliZ2DfiIa8FY6syo5tFq4gNmqb7P7?= =?iso-8859-1?q?XdgGTYbmBMpKU5sEQU52TR5G2NxVGtkxADBbqVlUZEPIeX4BHx76c1y00gpu?= =?iso-8859-1?q?TT7mkDp5KL2WZHRJgayLhtMqBu2HWArafzgBMrOWZIYorc5c4MCtD/CJIxmB?= =?iso-8859-1?q?46xq+8IWKhbgAAlqtDC4IezEUxVkDGFD1uRrQOLzdv+MtZBwuPgjDdJ2APkX?= =?iso-8859-1?q?OfRmb8lskoGOavEibFTGwPmTbR1pl/Jcwu4Qn8YclIKWRcA8iqIs+IuCuXoF?= =?iso-8859-1?q?oXcykiASOTa1XHvSuBDDaBscuVxR3ns6GpEUKbsuutj4ZKrfh5+mt43sA94r?= =?iso-8859-1?q?tyIQlsuJ6WKyRidYCHShxBcSGzvwMCetEFyqpGmjhUSBCWPMPa3EuDmVB2cK?= =?iso-8859-1?q?nU/BvUcH51uQlIdniv27nJRdMMlDX5Dd2Xn99bSPfyLUjqKp4saFNrvFDM2Y?= =?iso-8859-1?q?bkVYcj/0/khVrAMPI26nUI46XrAsPE1lkGwpXvm3IC48DQ8BHofemWfpiYRI?= =?iso-8859-1?q?PgTtb6Aqw/c0t3ON6hSbr6P0NuAEV2BUt1PFsDf0m6pThfA2D3w+oKlNvbGM?= =?iso-8859-1?q?mZ+9L0Nqa6jFFiyq9+KLFPB6zxW1WtpUeM+KlxWn/WU3BNRATTl8MzwSF8Yb?= =?iso-8859-1?q?fHUWMTsbgmN+/8HR0avnhSj5iXunFWgp3sHuzx8QQJpsXzoD4X92TL8+BSly?= =?iso-8859-1?q?QoCSAY6S/2EFgmtu2Qf8LHzDHkVCvDKfeCvKklCkgKYopz9TYdlIrwudnzKR?= =?iso-8859-1?q?pssCu2BnGD61gDum/Aw+a1avs/HxxKAz1awihGYaScw/5q/b/osxixl9ADLZ?= =?iso-8859-1?q?WHLEDJlxabp5BAHcCcBNg4aaLN4eOUqb85Cw7SzQLqA4+zhd465MoYGIe2wp?= =?iso-8859-1?q?ohtJnamqpBB7NALDraLbUNuEliHPxh3miIUP/imyUDLx52JLK60WiUHR3F53?= =?iso-8859-1?q?h+khABvkuPDVVAt/i/5IWHuXxP8cMMkws0hIaPqbsQ0AGN3GDAevkG/5KQYx?= =?iso-8859-1?q?l9RgWROiFzohwK1lF+PrWd3vAlti+KgCJF7KujouYsM0lSTtOvb+kicMiG+9?= =?iso-8859-1?q?BFHUfICwY72lnN8O6GGSmEb19wookQ60I19yU+A=3D=3D?= 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: 50dbdabd-382d-4e7c-24fb-08da69bad826 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 19:14:02.3965 (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: /4Kw/0UZt0qTxkIENdho2Ccc1OWoMMiweYawdmJiiDFeIlfPy+8xyiSXKXLGBNqZ2XTiSBUTdI+BZUAlEDtsAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5805 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-19_07,2022-07-19_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207190082 X-Proofpoint-GUID: HekPmvO7egrwUsng8Boy9z6uQIt_YuTg X-Proofpoint-ORIG-GUID: HekPmvO7egrwUsng8Boy9z6uQIt_YuTg ARC-Authentication-Results: i=2; imf27.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=CVSktswH; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="IbkOd/n/"; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf27.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658258050; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=lyfc72GZP977oxFlG43zetRhmzihEcX0Xnq9e9u/+Ic=; b=wFP/o14k3WdYkt0ZoPE+Sd0NyFbmZmFa/XdIhJt4ejq+uaV9jvMNJSmLVC/mXpkaujHBvM cOxory+6azwNlcX5Sd7q0S1y7ZZHk41Fxr++pm+shDvZWZderW+ZWxA4/NLkDZlTPUr9bB 6F+qrrIgIDCONE3A/a7CIBYzv8kE4ow= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658258050; a=rsa-sha256; cv=pass; b=SW2gIOIWTiyk/2EFCujdIu7y0g5MKBRUzhPIXfkF5npKyAZEbmtr8slvw/Yq6q4nSrCHnU jgW5R4+JV5L0OZDVxkSflwijYQKkxSdhH1xDL2W3Vomgi2QAtIqMIeOamfDWTW5/T3hGnE amdKvi1ojxkmF9Mr7KLxfxzgXw0ruE0= X-Rspamd-Queue-Id: 4D6454009B Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=CVSktswH; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="IbkOd/n/"; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf27.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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: e8gougcxz9w69mdjrkgnzmxz1zmcjiow X-HE-Tag: 1658258050-774355 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" Remove __do_munmap() in favour of do_munmap(), do_mas_munmap(), and do_mas_align_munmap(). do_munmap() is a wrapper to create a maple state for any callers that have not been converted to the maple tree. do_mas_munmap() takes a maple state to mumap a range. This is just a small function which checks for error conditions and aligns the end of the range. do_mas_align_munmap() uses the aligned range to mumap a range. do_mas_align_munmap() starts with the first VMA in the range, then finds the last VMA in the range. Both start and end are split if necessary. Then the VMAs are removed from the linked list and the mm mlock count is updated at the same time. Followed by a single tree operation of overwriting the area in with a NULL. Finally, the detached list is unmapped and freed. By reorganizing the munmap calls as outlined, it is now possible to avoid extra work of aligning pre-aligned callers which are known to be safe, avoid extra VMA lookups or tree walks for modifications. detach_vmas_to_be_unmapped() is no longer used, so drop this code. vm_brk_flags() can just call the do_mas_munmap() as it checks for intersecting VMAs directly. Link: https://lkml.kernel.org/r/20220504011345.662299-13-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-29-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 --- include/linux/mm.h | 5 +- mm/mmap.c | 228 ++++++++++++++++++++++++++++----------------- mm/mremap.c | 17 ++-- 3 files changed, 158 insertions(+), 92 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index a250fd86fde9..75ac5664af69 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2724,8 +2724,9 @@ extern unsigned long mmap_region(struct file *file, unsigned long addr, extern unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long pgoff, unsigned long *populate, struct list_head *uf); -extern int __do_munmap(struct mm_struct *, unsigned long, size_t, - struct list_head *uf, bool downgrade); +extern int do_mas_munmap(struct ma_state *mas, struct mm_struct *mm, + unsigned long start, size_t len, struct list_head *uf, + bool downgrade); extern int do_munmap(struct mm_struct *, unsigned long, size_t, struct list_head *uf); extern int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int behavior); diff --git a/mm/mmap.c b/mm/mmap.c index 3b67ae3ca0f3..ddd5040ecc9f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2407,47 +2407,6 @@ static void unmap_region(struct mm_struct *mm, tlb_finish_mmu(&tlb); } -/* - * Create a list of vma's touched by the unmap, removing them from the mm's - * vma list as we go.. - */ -static bool -detach_vmas_to_be_unmapped(struct mm_struct *mm, struct ma_state *mas, - struct vm_area_struct *vma, struct vm_area_struct *prev, - unsigned long end) -{ - struct vm_area_struct **insertion_point; - struct vm_area_struct *tail_vma = NULL; - - insertion_point = (prev ? &prev->vm_next : &mm->mmap); - vma->vm_prev = NULL; - vma_mas_szero(mas, vma->vm_start, end); - do { - if (vma->vm_flags & VM_LOCKED) - mm->locked_vm -= vma_pages(vma); - mm->map_count--; - tail_vma = vma; - vma = vma->vm_next; - } while (vma && vma->vm_start < end); - *insertion_point = vma; - if (vma) - vma->vm_prev = prev; - else - mm->highest_vm_end = prev ? vm_end_gap(prev) : 0; - tail_vma->vm_next = NULL; - - /* - * 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 (vma && (vma->vm_flags & VM_GROWSDOWN)) - return false; - if (prev && (prev->vm_flags & VM_GROWSUP)) - return false; - return true; -} - /* * __split_vma() bypasses sysctl_max_map_count checking. We use this where it * has already been checked or doesn't make sense to fail. @@ -2527,40 +2486,51 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma, return __split_vma(mm, vma, addr, new_below); } -/* Munmap is split into 2 main parts -- this part which finds - * what needs doing, and the areas themselves, which do the - * work. This now handles partial unmappings. - * Jeremy Fitzhardinge - */ -int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, - struct list_head *uf, bool downgrade) +static inline int +unlock_range(struct vm_area_struct *start, struct vm_area_struct **tail, + unsigned long limit) { - unsigned long end; - struct vm_area_struct *vma, *prev, *last; - int error = -ENOMEM; - MA_STATE(mas, &mm->mm_mt, 0, 0); + struct mm_struct *mm = start->vm_mm; + struct vm_area_struct *tmp = start; + int count = 0; - if ((offset_in_page(start)) || start > TASK_SIZE || len > TASK_SIZE-start) - return -EINVAL; + while (tmp && tmp->vm_start < limit) { + *tail = tmp; + count++; + if (tmp->vm_flags & VM_LOCKED) + mm->locked_vm -= vma_pages(tmp); - len = PAGE_ALIGN(len); - end = start + len; - if (len == 0) - return -EINVAL; + tmp = tmp->vm_next; + } - /* arch_unmap() might do unmaps itself. */ - arch_unmap(mm, start, end); + return count; +} - /* Find the first overlapping VMA where start < vma->vm_end */ - vma = find_vma_intersection(mm, start, end); - if (!vma) - return 0; +/* + * 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. + * @vma: The starting vm_area_struct + * @mm: The mm_struct + * @start: The aligned start address to munmap. + * @end: The aligned end address to munmap. + * @uf: The userfaultfd list_head + * @downgrade: Set to true to attempt a write downgrade of the mmap_sem + * + * If @downgrade is true, check return code for potential release of the lock. + */ +static int +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; + int error = -ENOMEM; + /* we have start < vma->vm_end */ - if (mas_preallocate(&mas, vma, GFP_KERNEL)) + if (mas_preallocate(mas, vma, GFP_KERNEL)) return -ENOMEM; - prev = vma->vm_prev; - /* we have start < vma->vm_end */ + mas->last = end - 1; /* * If we need to split any vma, do it now to save pain later. * @@ -2581,17 +2551,31 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, error = __split_vma(mm, vma, start, 0); if (error) goto split_failed; + prev = vma; + vma = __vma_next(mm, prev); + mas->index = start; + mas_reset(mas); + } else { + prev = vma->vm_prev; } + if (vma->vm_end >= end) + last = vma; + else + last = find_vma_intersection(mm, end - 1, end); + /* Does it split the last one? */ - last = find_vma(mm, end); - if (last && end > last->vm_start) { + if (last && end < last->vm_end) { error = __split_vma(mm, last, end, 1); + if (error) goto split_failed; + + if (vma == last) + vma = __vma_next(mm, prev); + mas_reset(mas); } - vma = __vma_next(mm, prev); if (unlikely(uf)) { /* @@ -2604,16 +2588,46 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, * failure that it's not worth optimizing it for. */ error = userfaultfd_unmap_prep(vma, start, end, uf); + if (error) goto userfaultfd_error; } - /* Detach vmas from rbtree */ - if (!detach_vmas_to_be_unmapped(mm, &mas, vma, prev, end)) - downgrade = false; + /* + * 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_prealloc(mas, NULL); - if (downgrade) - mmap_write_downgrade(mm); + /* 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; + + /* + * 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)) + downgrade = false; + else if (prev && (prev->vm_flags & VM_GROWSUP)) + downgrade = false; + else + mmap_write_downgrade(mm); + } unmap_region(mm, vma, prev, start, end); @@ -2627,14 +2641,63 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len, map_count_exceeded: split_failed: userfaultfd_error: - mas_destroy(&mas); + mas_destroy(mas); return error; } +/* + * do_mas_munmap() - munmap a given range. + * @mas: The maple state + * @mm: The mm_struct + * @start: The start address to munmap + * @len: The length of the range to munmap + * @uf: The userfaultfd list_head + * @downgrade: set to true if the user wants to attempt to write_downgrade the + * mmap_sem + * + * This function takes a @mas that is either pointing to the previous VMA or set + * to MA_START and sets it up to remove the mapping(s). The @len will be + * aligned and any arch_unmap work will be preformed. + * + * Returns: -EINVAL on failure, 1 on success and unlock, 0 otherwise. + */ +int do_mas_munmap(struct ma_state *mas, struct mm_struct *mm, + unsigned long start, size_t len, struct list_head *uf, + bool downgrade) +{ + unsigned long end; + struct vm_area_struct *vma; + + if ((offset_in_page(start)) || start > TASK_SIZE || len > TASK_SIZE-start) + return -EINVAL; + + end = start + PAGE_ALIGN(len); + if (end == start) + return -EINVAL; + + /* arch_unmap() might do unmaps itself. */ + arch_unmap(mm, start, end); + + /* Find the first overlapping VMA */ + vma = mas_find(mas, end - 1); + if (!vma) + return 0; + + return do_mas_align_munmap(mas, vma, mm, start, end, uf, downgrade); +} + +/* do_munmap() - Wrapper function for non-maple tree aware do_munmap() calls. + * @mm: The mm_struct + * @start: The start address to munmap + * @len: The length to be munmapped. + * @uf: The userfaultfd list_head + */ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf) { - return __do_munmap(mm, start, len, uf, false); + MA_STATE(mas, &mm->mm_mt, start, start); + + return do_mas_munmap(&mas, mm, start, len, uf, false); } unsigned long mmap_region(struct file *file, unsigned long addr, @@ -2668,7 +2731,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, } /* Unmap any existing mapping in the area */ - if (do_munmap(mm, addr, len, uf)) + if (do_mas_munmap(&mas, mm, addr, len, uf, false)) return -ENOMEM; /* @@ -2888,11 +2951,12 @@ static int __vm_munmap(unsigned long start, size_t len, bool downgrade) int ret; struct mm_struct *mm = current->mm; LIST_HEAD(uf); + MA_STATE(mas, &mm->mm_mt, start, start); if (mmap_write_lock_killable(mm)) return -EINTR; - ret = __do_munmap(mm, start, len, &uf, downgrade); + ret = do_mas_munmap(&mas, mm, start, len, &uf, downgrade); /* * Returning 1 indicates mmap_lock is downgraded. * But 1 is not legal return value of vm_munmap() and munmap(), reset @@ -3021,7 +3085,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, int ret; arch_unmap(mm, newbrk, oldbrk); - ret = __do_munmap(mm, newbrk, oldbrk - newbrk, uf, true); + ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true); validate_mm_mt(mm); return ret; } @@ -3161,9 +3225,7 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) if (ret) goto limits_failed; - if (find_vma_intersection(mm, addr, addr + len)) - ret = do_munmap(mm, addr, len, &uf); - + ret = do_mas_munmap(&mas, mm, addr, len, &uf, 0); if (ret) goto munmap_failed; diff --git a/mm/mremap.c b/mm/mremap.c index b522cd0259a0..e0fba9004246 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -975,20 +975,23 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len, /* * Always allow a shrinking remap: that just unmaps * the unnecessary pages.. - * __do_munmap does all the needed commit accounting, and + * do_mas_munmap does all the needed commit accounting, and * downgrades mmap_lock to read if so directed. */ if (old_len >= new_len) { int retval; + MA_STATE(mas, &mm->mm_mt, addr + new_len, addr + new_len); - retval = __do_munmap(mm, addr+new_len, old_len - new_len, - &uf_unmap, true); - if (retval < 0 && old_len != new_len) { - ret = retval; - goto out; + retval = do_mas_munmap(&mas, mm, addr + new_len, + old_len - new_len, &uf_unmap, true); /* Returning 1 indicates mmap_lock is downgraded to read. */ - } else if (retval == 1) + if (retval == 1) { downgraded = true; + } else if (retval < 0 && old_len != new_len) { + ret = retval; + goto out; + } + ret = addr; goto out; } From patchwork Tue Jul 19 19:14:02 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: 12922947 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 18910C433EF for ; Tue, 19 Jul 2022 19:50:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E7666B0071; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 694116B0073; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50F0B6B0074; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3F3E96B0071 for ; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D0252C028D for ; Tue, 19 Jul 2022 19:50:07 +0000 (UTC) X-FDA: 79704890454.04.A5FE346 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf11.hostedemail.com (Postfix) with ESMTP id 42C5E40006 for ; Tue, 19 Jul 2022 19:50:07 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26JGccR1031777; Tue, 19 Jul 2022 19:14:07 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-2022-7-12; bh=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=F2rHkPEW37xhtWffJUvPdODsW47Km1kd3/TuK8+/245EvZF9gt9KppWwmWu/d03rSd4E HbE7cwziaqfXHUITByNwhAYPQt8GLAd2npysWkGy44yFCWIA4yudjR1gHSL1jZw8zaMo +gepDUaS/6/a5qWWe8S1avvIeGSWNtMzirUkaxq1iR+76hC8w1+5gbs0xos9pgPMpueg IWPNPnPy7GcQUReccNmPNGcuYEiT7VlVitTzo74bup/pU2+c+ZFPZJycfS/dB2JJs6lQ nqyHrRxblSVzJcqWPK52+MTiuLaddFw4Pjula2i22C6NpUcSVTXrb+JQ5IV0XZSp1CX0 0g== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtfh5k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:07 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26JIShfU009880; Tue, 19 Jul 2022 19:14:06 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ggsbfr-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M+ori3yuftmuL2ZnlIIAHQ1W7EUzvNBh0jtyJ/r52G3Xdlzs+sfDiTpxgzic4+vFEscUQGEeFYSFMBeM8zGqOAAhT0FEImy5ZyO/KiXC+BqPgEK/fpZi73o5jQudlS+gweW3qQmg+G5j5rPXg/ZR++AQ/kdD6ILvMSbxY6nNwVkwUmfx4YCfPXcEAuRhaFhkkZxW/fXalttbYEMavv3+4nz0MbMCj+goKY/yOhfbrXqZoIS9K9l0o+lP9LcU2Up4NiDjvMVMFXTPFo33o7GL12a/ybdzk87037quYR9Ug8xV/0pi0Nk9SMGCNB+WmqwrPZHf75iM8DGOeUzpqOnfJw== 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=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=NdheDV92IU3OdKSO/68ECK8QbarQNJu0hbgfOb2zDBZeJy8c1jlgOr3CrAjJFOnnAUr17yxgIbRDjJBmcMe9zKov8oBfTjjQOTtH7M3p3jh4B0VC/GbWpw0BxtsLcDeWZ+pY29cVOFSfwm5LAJo/z6IXS7cH66yYeQrkPz7+fCKmwPyh6y8/L6Mv1Oneod7TSHFiL64kUtvQlvtVx73jMOj5XF4FGTese1DHAQSwSk+SlrDzv98TcYX8ZEuOriYASRABQLn5JKh7+Zgx9IUewmWFPSferyKK/uBnJRwvfM2s1QX9q9SlSvzljeKjLB18AaBypKtNpJGVqy5h1iz5eg== 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=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=f3gU6boc9RxAbuOXZMJQ5GyACIY/o62FwpWagy7UxRY/hUfL24PLzNCkfBYuxHgIUIvtu7zXt6FctVSm5ZI//mLjm1mOt775xUX8Tzi3LfOyq4dGspPkmW+0f2t0aaPJDEzjN6uMGLdhHQejHY/Fj8tlEWiORw60IITECQzV/fU= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by MW5PR10MB5805.namprd10.prod.outlook.com (2603:10b6:303:192::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 19:14:04 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87%4]) with mapi id 15.20.5438.024; Tue, 19 Jul 2022 19:14:04 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Hugh Dickins CC: Yu Zhao Subject: [PATCH 3/3] mm/mmap: change do_brk_munmap() to use Thread-Topic: [PATCH 3/3] mm/mmap: change do_brk_munmap() to use Thread-Index: AQHYm6O1bKoRuJ9fK0eWoMj2rSrXUw== Date: Tue, 19 Jul 2022 19:14:02 +0000 Message-ID: <20220719191352.3366482-4-Liam.Howlett@oracle.com> References: <20220719191352.3366482-1-Liam.Howlett@oracle.com> In-Reply-To: <20220719191352.3366482-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: 81955a46-67f8-4364-f63e-08da69bad89a x-ms-traffictypediagnostic: MW5PR10MB5805:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 013xdFkE/encm/S8biPz6RnKUutNKQHNvtxHpwnx/+IWqil3eUuQabnOkxUOSKDNXit5Ov8yEb8nwVw9LrCBD1jwuSIJNiWO/JIXvKRQN3d2yCFfLa69VLMoS2WzUN+EhT/u9yrCruD58pzXrM5gpYElAxVEOtUa/S+lrF5vwnU/uDCoZN41KPF8YiQRqXRuj495ekZJKvUNlyHOxErcXg+DZJO0K5mGYWDThllCPUN1GzkmYxHk2qQ2llqfNDH+280hnQLZIFzgWsDC9+VOw8PyTuTqfZCndBEZGXDlDndA2o23nFwXLvNAUQSnCNE9nnSVpyy/2eTa9R3gUY958OiW97KcAQtnOlgPXz7DI0oaoxxKgYRUHMWH8vggLmywWv066NBwCd9YXTZ3HCP2uCpPDQZDAj7L6ydwV46pH6pUw/fp5HUw4lfgNyeYNqkW5Tt+MumemZKMimvcKB9q+u3aTMck80hvNS1/+LZuuO+pnPoYGM7EvNv/1fh6dAQKD8b8xwscfhhm+mQ84Bj2H3ff0Yr7h+8DAe1DImU8xaqNM224osYfekPvymIuPAA+Ikz8P23jqP9OfRAFn+9TV9e7ImPW53KsdKWsBxPs+onmyQ5LBUed9LsY6YIfmFEMWFYNHoKZY/RGRP/UqZieoiVV454F8sVpxKZW666eGBh7Ay6wXGVzm8BVCT3qTIGyEpK2QwDViinbCBKRWIr2S72K9I6tcCCdUwckuhhT0L+8A47HFOhQA4NprK7Lh2Lm8d54h/JJknW0TjsZ9hcrM6/R/4u4nxrO/amyRygDQwIKjDTwnuDy1N3tuPvPn/mvYWYwGdhXFWL2zNuCBURhYiNgWVrUVvLgaIkbCnjUH9Qy6lb4LQM5slsV42UMcBvP 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:(13230016)(39860400002)(396003)(136003)(346002)(376002)(366004)(2616005)(86362001)(6486002)(26005)(6512007)(38070700005)(1076003)(41300700001)(8936002)(2906002)(4326008)(38100700002)(6506007)(44832011)(478600001)(5660300002)(122000001)(110136005)(186003)(316002)(966005)(66446008)(76116006)(8676002)(71200400001)(66476007)(91956017)(64756008)(66556008)(66946007)(36756003)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?eCLMH2NCU4tMvk67yuajKxz?= =?iso-8859-1?q?r3LhWX050tMWCx6TQQJTPx2cy/QqBnubb2d+XMPKWgf0wO3AvNlEUxmPL46a?= =?iso-8859-1?q?l4+dNKVrKrIzP570/uxKAHyikEnofNJLImVvio99XnFgIS1GZnwkOIGX6zi/?= =?iso-8859-1?q?RpYPeXqfBA9l+UOLDh575RIw1f0sn084WI2GW7xxl/lr7ZDEng6j8hOz2d1a?= =?iso-8859-1?q?Qt+67wZq8Ae95ljz3YToEH1dblhv9EyCIXSpJVBtBHlmYQZ5aBhkUcZzM1r+?= =?iso-8859-1?q?RhtlocwlNuec5jeqVRMnnRn0Xzw700pWe7NtZaFxCDMIw+IgJih2OW/v8i5A?= =?iso-8859-1?q?MSqpM4rihhEoWT7R+trhXyXaZERHRcE+FmUUadIGgYDMV6uL06hTJQzhxNzI?= =?iso-8859-1?q?bYwmy7dbYpvLzR8t19oMuGGcm5Zhf6pQDorK3sUgFqp28K8tbyCYGmhIz6Wc?= =?iso-8859-1?q?yCTyaifQrT4vxwzQh7sODcul6TGQbCR2fZA2a7+wB2EA3BMGw9rDqEAQGNgP?= =?iso-8859-1?q?MdqAIJpRAUkqjlfOUvOTCPN7//Tg9VdCf1WqcRK0My9CJcYm7Is0hHZ1OLo+?= =?iso-8859-1?q?30Te7jkii63cZXURIN6C8M0tekiVV87EkewCdiyBF8D1z3szTVFq0fQ7xiy1?= =?iso-8859-1?q?lvweuFrBooc6FYrT0OgOAM/Yy2gQCgVsYCncZG3Vp49ZMcr19Uhn/O6pzH/m?= =?iso-8859-1?q?5aMQVIzvawLev8PQQnm+UDWCeAHmq3MCijdQTnEdwosyPVeRxiBN7VaAuVbW?= =?iso-8859-1?q?X6kTTQtVUN+yWjr/OK4tNVMEuW+YwHU2ppEISjR3db+WaYanXvl6gbgAa0o4?= =?iso-8859-1?q?owubfF7QZ5MF5GA1J20h8+LhaBu064S0q2fDkt3Bth8fzaCn/sWe8t2asHkh?= =?iso-8859-1?q?KIeUPSXzYdKfyQGedQRzR8Toe5wD8oQEb3DsPX7ZDH1PnfowcK9fmS4rQA2t?= =?iso-8859-1?q?Te+qfYMxzyeIwOeqJMXU1YIPrLRmvyNZ3Knfi+7seGhMhjn1qCA49dwRc1W5?= =?iso-8859-1?q?+F+Ru2gVQA/AUSYXJTGKbrmn6KwFXdsqlhgJdEn+FpF3eI2Io3cv5TJafvcP?= =?iso-8859-1?q?5ZMDokgPHEHt1edg7z3DgAmPbLZSvhs71k/yxjpRpKc7Z8GV/js5ctMQGKuW?= =?iso-8859-1?q?h/e6QK1FgYyElAIThV9LjFWlRsk0ICZZko/MA5R09sOT7wpQmttjqGuBqD6b?= =?iso-8859-1?q?XORSdNDtVLErSpV+4lHnLnzTuyLpKzu/oImDUhhCJ23Qw3YvaEtn3CxzNqx5?= =?iso-8859-1?q?YRtCgAzROFyCBCWbsiCnn1Wnph4z5UJBfF2uHBVyNt2mnwrUFKnWZGJAV+rQ?= =?iso-8859-1?q?455UYu+5/DqWJ1Pq/AfdVB61XodyH1xeAkRVoidcs94kcciEDvthcaV7Dli1?= =?iso-8859-1?q?f2Mx2TjaDq4c6UCYAM7ix3jO3tPu7dvS22xMVwq+e6VKbW7K+ypPw3hAVncV?= =?iso-8859-1?q?vHQd1SZCXEId4IRSB5I0xo98Td5MvQ/CWxG/Ot+67qywn8SwBmA+ZA5eAA4Z?= =?iso-8859-1?q?6F0d9ruGDpxbCqcEhvvKDx3C8IBku2GBS4FSKq3/KQLAjEQQhZXuU4GQxdzd?= =?iso-8859-1?q?UQorhLGo+Z9yWYsnG3fl8cmVn5biyEIYtHg8rX8sGdm8jrwDmZsorFigIzP4?= =?iso-8859-1?q?zKcHj181LrgYV/6hEqZqj5EVNfmqgvmfqD5BPOw=3D=3D?= 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: 81955a46-67f8-4364-f63e-08da69bad89a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 19:14:02.7871 (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: 8QuIEPR7HH7OhpOGD/IXQsZkjqYNyPlkL4POCQbypg9mu/t/3m0Cys8ADaFKauwlX9RLC6ttBtSh83Dk7htlAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5805 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-19_07,2022-07-19_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207190082 X-Proofpoint-GUID: DJjD6ClP2mfMokIGy1APfeU-fxzkBoEl X-Proofpoint-ORIG-GUID: DJjD6ClP2mfMokIGy1APfeU-fxzkBoEl ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658260207; a=rsa-sha256; cv=pass; b=A4b6uSdu5EN8Y3407bPONqonA7snnCDWUPPpKg0/BfpE48QcmK3O4yArzV5RP/hwNUJUjw nLwbDpIioymZvCXju4/ZFEz5tZqk50YiUlv7wdz+Uh9CV6j9Yp3C7N/ffP6bxuiSZcz/92 Ool08dMyrN2z6Wqvitoicwd+fS3xD60= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=F2rHkPEW; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=f3gU6boc; spf=none (imf11.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658260207; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=cPUrEqz11BTEsyQtNLQ9vZvb7beEPYZiIz3ygIqdxXKc8h5SQDMBjlT7UzSov7PszD88ye f7OiZg6QEDomK33Vtjx5n6j/6EVwineahoaEfDWTgIGf3M+3U2bAQ5+OSBEJFj+aGsptNg Ojf7VMfL9XDjkUe3MCzwgLlgHGLpVgk= X-Rspamd-Queue-Id: 42C5E40006 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=F2rHkPEW; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=f3gU6boc; spf=none (imf11.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: fhr9fdxr1gudmw4d6qo7jgokouppo6q6 X-HE-Tag: 1658260207-546206 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" do_brk_munmap() has already aligned the address and has a maple tree state to be used. Use the new do_mas_align_munmap() to avoid unnecessary alignment and error checks. Link: https://lkml.kernel.org/r/20220504011345.662299-14-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220519150509.1290067-1-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-30-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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index ddd5040ecc9f..10ea2f146d4f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3085,7 +3085,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, int ret; arch_unmap(mm, newbrk, oldbrk); - ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true); + ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, true); validate_mm_mt(mm); return ret; }