From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D65A7183074 for ; Wed, 17 Jul 2024 20:07:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246857; cv=fail; b=Bja7B16BUgVAJfiSF86udJo+F9xLTD5Ehq/03YAcPzhc0myodjR7XDZKdHdyx7nU5FrlU0g1yv26IwIyjGuFsg41j3awP42OuOrYX4Famm935Pf7LpW6kwzVNrxT75Z7e92z/dECfSSfK9WR60pYs6dz+krKylKJl77KEkcsz5Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246857; c=relaxed/simple; bh=ZPESTzeh8XvfaDK583IP69YPpytuZWpRLgai7JM9aKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=UAqzLR+CM3lpjR9XQmLyKkN9dnagVuodgpsDOjBf1wUBD0D526WJ7cBrUM0EOlN3wNuJtIoBjnjYImRWtBtLEjoxgzle2MHGSadchdfCqMLuZbqssn2jEf0N+qxdJ3/iimEB48GvinUyHOr3hG5y+BQ9MAUyMgKw67sD0bDRYEU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=PXMg6VvV; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=VOsEjgRS; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="PXMg6VvV"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="VOsEjgRS" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJu5hB000339; Wed, 17 Jul 2024 20:07:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=vBrw4cpyDlw0oCxrS1NpsHrvh6il04b/OpjjP2KEzV4=; b= PXMg6VvVChm6zPaY5LxlXGuDAk23rLTAEuihIW339N2dcu4knnjE7D4uhSnD6aBY Q3BjC5RuYHrWlTgtd7wwdFBEmKD6eCvbcz0EMDP4OD1oXlxDUkok7EMJ8f9ua6VM DSQdnco0RO3v4klG9W76IPAKvCSIitzkIKqfiDdBkjGMuyzqfdVR7KHTE/HrVJk1 Ot5Lig3trbcwbfCOnbCbVF9HckP6BFYPd+zyCLjnih1KkdoBgYVnBh/t4c3X3RhY U9cFnS2fBVM7QpJCO1bI78EG+vbh8fyGZRNGLgX5dkGJoI9iHrz0rc1rdmiC24OJ Qgw6MLVWh/cnvvnR4cSysQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhpr0q4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:20 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ01Pu006829; Wed, 17 Jul 2024 20:07:18 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1f7t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=J+8Zpl685VyB6GnOoPaYwgeIVSTMWN9pHHLGHFm/F8+31mK6kZj5rQBPW8iKPvdnWNbMEtTIjhVw9YE/R3Qx4JVAZuQCNHJ4YPWTSdgKQncF4r2stoMlNw3uGUrocs8+PiUAfLbC6+WWpoLSyG93PyI01XwavgoRG4q2CBM3jmyts3J1yOL4DlxTvwf0WdQ0QQ6tmq7CllfzQI7L+83J/O9zhMkC6kjsSS7gfk438EW3FT2lQuH4lpN3nidng07QVlG4V/eEv7avL/Y0RF0rFz8jolgFWAyZ05SKbMM3j5D+1tSIxusRm8Onwkfr/589sNpeLNhJ53a70loaIP3vwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=vBrw4cpyDlw0oCxrS1NpsHrvh6il04b/OpjjP2KEzV4=; b=YnZzkqnsVdpKq0YIYgdiSLBVr0nCXBZ6KHbnlm3OM6ki7K6+RphKkns/B4lfchsqGf8w6NGv92v/PdjODATxSKAFzfZG8bvMVr20kkFH60rPNY1W1yYF1xGJeQp7WdrYfXa5zdygaSbcHBXv1jV2ftKVT6pAT3S09QMLIJLNwZ9SkXTKa8mufhiykJDNH5hsAyjRZbrquqB43WAkeLanTjGl4j1ToVC5XYL7HXCYnci95xkUMUJXHixVGEUhLOxISqCn4/m5hT9xf+sDS3rCocnYhCdcEgnhyaXxfgem1da08MYw1qf1aHf1Y+JaBQ9ZZGrkOzIzAUROC6zPkyzIqg== 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=vBrw4cpyDlw0oCxrS1NpsHrvh6il04b/OpjjP2KEzV4=; b=VOsEjgRSUUQGs3auk+9Zi3ip/V6p43uGOMGR+sUQWJmQv9E0UedlN7DulpJxLzb7bsiEfRSfDLoFzeyb5Ekfycc5y325ykXSwleTMo+Ptb0yo/gN7hAi4GXKEoKtQ8awoVOTCL9NVrmojB7OebO+yhcSg0MMcXnvHiOR4kKJecY= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:15 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:15 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v5 01/21] mm/mmap: Correctly position vma_iterator in __split_vma() Date: Wed, 17 Jul 2024 16:06:49 -0400 Message-ID: <20240717200709.1552558-2-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0242.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::21) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: 601ed92f-7f4b-4ad4-5dd7-08dca69c0d93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Lye1SotZqYbu9AKIX/iRjbsoSp764YIJuWJ8w16eR2Q8I2cWCG6BwcU2Cmqe?= =?us-ascii?Q?ottneQQN/iFU/kOdJIIfeRig65vqtFo7kINJqDC9nmZK5o46DLods/KFrDnH?= =?us-ascii?Q?Q8+ah1gokKLm4fAaDHjKfOGjW6FuC9M6i9o4GIFOE5VnI+MIyA1ujV++vkRF?= =?us-ascii?Q?tf9oNIiVyxzqM1LcB69AnXVu9TjsfxnksVI8xJDglNRboauzA+Dhbm9R7Kro?= =?us-ascii?Q?QuHxJc6chXsp57z8ba2RlE+SC+VcLv82Bwrj083MOPGbkGY7H9GIdCy7NVV6?= =?us-ascii?Q?QAJDsGsrmWPFFaybh0BrvIsYHDKj+iFhFNBJhn2uxE4C+73djtjkFDH1ivxt?= =?us-ascii?Q?OLsE7tQuxouGTEFUytAIJGO/atO4xtY4OFhottxD2dncT84yNYJGZL+y0E8U?= =?us-ascii?Q?w79CxYHhRoQfGUB3Bp7ZODQ+kb6Q90NTQe7mhi8yIixFQDXnVjH66O8R+JlE?= =?us-ascii?Q?8RdsGkjK6lzIlxAoijTfxuzUp+IvB2PTK0FSrjJE0ABgX6tywagHMlQrnMVz?= =?us-ascii?Q?CLDHWcILZY3b+VYpzcRsjLxnvUps/hwj9jxJXH6mQBgBq5zdp7qWWqeFYgfu?= =?us-ascii?Q?X1gS2C0udbNWqU00xlE5S7mGjcGFoxx3+9+mWUGw/xLghOIOWivRd61DsI1j?= =?us-ascii?Q?Mi/efUjSxEigMZNc4z9ucGF1vnatd0sjtxs/eWKXyFN/zEQyiG0XnYjvDngR?= =?us-ascii?Q?JbgwqxPSlRXs4kb3TeOgxZWxgj6gntdg6YFmLitfDtGOotbgDqk9CxIOOSQ+?= =?us-ascii?Q?Zb1WBmddUaJg7S2q5yItpQKH0rKquSXqHYnzdAB3QZ1WUT748qTidN53gkyv?= =?us-ascii?Q?vyfvHjJYaU6Oh4GRkT8ssvZ5FwfNNQqECEPAyUXkECGI6VJoClnbQP6P+2Tx?= =?us-ascii?Q?U74n0Hllus/2GAkwRaAqfGt5Z8rQv+5aGEFIl06RxxkopWArXIfgATpkovwK?= =?us-ascii?Q?cKntxwLnMchtnBjcXXxhN9H2S8ZG+6T5RnviDkU28EeWY1L40DlFMlC5ZPxy?= =?us-ascii?Q?zHJ9ba/i0xsxuXZVVLqDkiaO0wwKFGUVVS6bkSY4aeGFw4zhOHwVABhC6TzK?= =?us-ascii?Q?pwbOWAtfgc8guwOCm1OSwlodbbTFjUHxjFkjpueI6eu/C91Kkodt3+ktFaaH?= =?us-ascii?Q?6IB43jGXGHvM2gmqGIGPtcNIfq97nvMQJ+U6yQEMhTFQNGumTjpIxQx45/ju?= =?us-ascii?Q?EgT4mt6hM28fyK6OqWzQt4sW7bEcvf5gm/EDX9GIt1UIIsmC28GL1YP2As6N?= =?us-ascii?Q?OT45rTapPy+DxJeWXOaMsJZqGat2gRWjLQcGmbRDrOrkFiZTckMJCaFJ/Dar?= =?us-ascii?Q?WIKyvVvvSd2hfuO0h0STaH7/zQy4Tmppbr6k3mERpKd2Dw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RehTt9hjQSgvOhQHWS0DSfsUzlgd5nVWV87librkiTso+nqo3JpRod6ppw17?= =?us-ascii?Q?fS9nD0oKsx5OSziBuzYrMFG4Ptm4228OMWNd/t/NpslupTua00nQNUA1MDmp?= =?us-ascii?Q?zn4/obveLwHZGtq/MOM0/Lv9HTtJ5J4JdRxm9AGZ8jZa64oy9Aad7/E7mnY5?= =?us-ascii?Q?CsrAfnKexUMRkkPTwXyofJKmONlnR2Hm5hwPjjyzAV1iDVldxtoS57Rnn+8Y?= =?us-ascii?Q?EdKf0uKwq+jOiqQS8okh3a+s0VrZoYCkI6jGhh5z3NsTCPmTyDHlz9pD2UsP?= =?us-ascii?Q?2gKZrwPJLmpqhwuh5Flq0/GLkWSyo9mWEcSLfgxsCb3+SZmF9xPHy4FPvMVr?= =?us-ascii?Q?BatEi8kb++tsNYnur4jTl3ldC3TXxWXgQCPUKFbm07tCOrjWjVxvBbdIdyyh?= =?us-ascii?Q?iuIx4t4a7YwLJRRQ7f1i3zjqr3it71S9udDUuDzEj4Q6q6bnATEin4HgyEMt?= =?us-ascii?Q?yZVAqJkpfH5oBHjv8zzjYR2csqluSm35/UsxQmerPC0efpV6/vYxqsOFqFjj?= =?us-ascii?Q?JTejaubVhQVu5Drvhe4zJXwbV6Birv4KeSfHgkiZyUq81az0gvlTHP/yk2RT?= =?us-ascii?Q?UGjThlXmBKrmBNHIniTJEvoIOX6H00vL+Xa5gaup0Tk9gFoYGHsxc3RrQYQj?= =?us-ascii?Q?//2SiyzfxDKhDv5jJW1BuiHOWLF1yl5SvVUB1Vp8OnSvhS26kjEH20zhIZ/3?= =?us-ascii?Q?WdiFhBX1+PU6KfhTdWVdfe8IVeIqVUczecIFpTOl7ut8MSLjfuJVO65qkhg0?= =?us-ascii?Q?s9JpV7nwOw8PW98haxJAs1YPMO2+llpDK6HcWzulPCraYL0zIKgsAJ1ReZlN?= =?us-ascii?Q?KF7KsBABiXfx1KtSDr4GvhHbjn4bDK9V/ZnR2X8yA6mi1HdhwLTFXpEH3Bxg?= =?us-ascii?Q?5jXwSgRMvJySvrexgNNQGZ71AIYwbyb/51H+tgFWBhYEibAvFoN9fWwPWPUO?= =?us-ascii?Q?YUBAXjI6LSyPrmy3nmiMsmn+MSqNEqeWA4TG0uyLVpuIwUKq3xOepXmu8hSb?= =?us-ascii?Q?clwP0GbHKnPl80WUzbbmiuRO4XdWxrJYyqfUg0mcC4r2cgWw7eou/c1oY3wN?= =?us-ascii?Q?5jLC76oqyzx2OFcRmmRKm3Mr6IZezCWxmK/6v/+tkR5RNJlrirr8sGfVzCrh?= =?us-ascii?Q?5cPxbYKuTEA8BLPDsXjnu36dvP/vn3EuOsq3c8ZSNHObtWNdTaD3gupkWSqr?= =?us-ascii?Q?B8+tnishXyWDmxAx2itRgkfPNOtEJK1q6gtL+D6RUaKH+kwcC/XPjJZH9qAv?= =?us-ascii?Q?plgOjxD7io4tepaFHx4cnFpJ+jFEWuDu1VuRtIZHwadXTwrptPx+FyiG0c/6?= =?us-ascii?Q?nZ35CmCX83g9ojWeGSOGdylRXxlsnzq2yF85yUiWMadL+ql+PDODWk82AS7i?= =?us-ascii?Q?7q0dGatGJ35CpO4KbTLNRPQdA0KsjSv3lTYOfB+RZJPqsmhzIiX5EIUum6dK?= =?us-ascii?Q?QdL5tq++7XS6Hk41CpYPIDzrZVJWfeN1TcZp2y/oKlyzOjKvtwPZwAavLkXw?= =?us-ascii?Q?NskJJ4Zt9O4LCkFlzVZaJ/A3qSLjZsF2fTtYOynW4AEbB6Ikh9OuzJxW5RM7?= =?us-ascii?Q?xA9JvKOqMcK7wJvyYGUg42OlpWEAQhtzlV0hAjv3HPxSj4ZBJ3divE29V8Ec?= =?us-ascii?Q?IA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Vt7qNiN7clzQPgCUlr1B142FzDrMIQodC3KehzzdPbxzh0H31S4takTPTjDbLUeQaQ3H8Ll13aDIUkI8WKq2KYYy/08FFLyYlpQTmFJfaCa2gvnXH459zkiMuE3od/0LIE6J3wisvbT+45UWrKYTkfYREYmaQcxgeChVB8lE7ZyiP6IVxYl5z757kFZ0suuLdlYzw4cUiDbdf0af1xsdPAxQfW3HpnZIY/pst7S/1tuULuBBAiaA+dBqZkBe2Hx0NtfSG16HLntefRnKCr+UKMTp5o6PArIRt2Jf99vOqUJuyKQTDIbLVZsCJM7eW+Nf77pqZI+pxhzv2qtRzeXhumPteOy7J7yhQzNq7JsT3fXTUjMOwkNt02XodU6PwPjwtLgCuWru+kFz3b6PVZecxUBmzDvRz4qfquTlSOnFCZwa+W2FkHbFGa9ev2A4G0Et1c1hGUdvsyw36FdTkcUpaAlnUkT5GzwU0NHWkPQJbEiinvptoLTeiGt46PDXuCOM69l3s3LDBuA6L2YgMb/ZuDifYWyLF3zFCH1ug4q5gBs5Be+KYU2LAe2w0rw60yyIT99B/gdqMH8A/tlLb4tuXz2is89DE5RH/tIIFy9eEOo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 601ed92f-7f4b-4ad4-5dd7-08dca69c0d93 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:15.3726 (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: NgtYF8bXCuReoB1TnYjaq900+/AgT9zy1vODnUpRdhgd16IMI73yjxGvM7/Gg0smATC1HFH/8G1xufE2hkmmiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: 8OI3qzsgwM6PVv8UAj1fSiyPCHzfEas2 X-Proofpoint-ORIG-GUID: 8OI3qzsgwM6PVv8UAj1fSiyPCHzfEas2 Content-Type: text/plain; charset="utf-8" The vma iterator may be left pointing to the newly created vma. This happens when inserting the new vma at the end of the old vma (!new_below). The incorrect position in the vma iterator is not exposed currently since the vma iterator is repositioned in the munmap path and is not reused in any of the other paths. This has limited impact in the current code, but is required for future changes. Fixes: b2b3b886738f ("mm: don't use __vma_adjust() in __split_vma()") Signed-off-by: Liam R. Howlett Reviewed-by: Suren Baghdasaryan Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index e42d89f98071..28a46d9ddde0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2414,7 +2414,7 @@ static void unmap_region(struct mm_struct *mm, struct= ma_state *mas, /* * __split_vma() bypasses sysctl_max_map_count checking. We use this wher= e it * has already been checked or doesn't make sense to fail. - * VMA Iterator will point to the end VMA. + * VMA Iterator will point to the original vma. */ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vm= a, unsigned long addr, int new_below) @@ -2483,6 +2483,9 @@ static int __split_vma(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, /* Success. */ if (new_below) vma_next(vmi); + else + vma_prev(vmi); + return 0; =20 out_free_mpol: --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1BB1186294 for ; Wed, 17 Jul 2024 20:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246863; cv=fail; b=h2YVlgfwfMsP9bMRXM5QPaJ6RMDdF06elkoXT8l/vGWKtN0o6okX4WvtdC78D3iSTwAQ7SuFOq8S/P2Tneo7uMZpQUJ/q1njdrIxKrzSFTstKQRiyGS0zauD4Whx/91uk0zlKhfrsi1IBK63jr8imxn8CKOWIVOhTX32uvcYsSw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246863; c=relaxed/simple; bh=HxBHxkKm3AhqwDr6kUdVgq6UsZzfrODotR8onovNq+w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=KPqpwEO0rV9w7BmmFPzUqp9A5Ef+l4YmqgRlzZuCftZdQIEW10A0O2N0VGzR82EkqWbMnZOxKNB+/JxWdvT6Kb3qAy9uD2JYEw0+gRjfgSzbNYrzDijVlX2awAIZ9FZ1dsd8PYF0qYpjXQmIll7ugJmYNNEIvnrx8dD9JyK0jGM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ZIA1iP/G; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=i4pW+gnO; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ZIA1iP/G"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="i4pW+gnO" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJtlDm031584; Wed, 17 Jul 2024 20:07:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=wem2AJBoTGHtBckyqvpen9uiSUKgs9mhKNjHQHA0o5E=; b= ZIA1iP/GGVdIiWFx7zHprxM6H79jnoNvqLFAdnXXJwcNikN47hdhnizNe3mEm/0o dCyYmfSSy1SqjAxqG5DL4TFcoqEE/UwfJ2Z0AtnoVNCXPI/dfcSljl4w0P2mbeer VYWJiaxTXStGpAcymAe0cbbkl3JIlRq3fKrXShghKndt/rnG8pVf2XJKffHrvyYN J4g8QONGr0vNoggT5U0JDJRg+TzpMWtbtKowUd++c59EOC/z6S0uuEgy9UoCPOlr i3aCJWS/Uv8yVJN4j/XcMuNE1K7ee6xRKpaZwVUIqdkoP9Ux4t0mOZpzSRY6LjCU USotMqNbNdgLiNtQwIl3oQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhpr0qf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:28 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXk006940; Wed, 17 Jul 2024 20:07:26 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W8nJvMHJBbDc4gPv0yTVQSd1pgBxNo2fvb0Mj1JOa34/PCKMIsgjYijjAveYEddgNc9WT21QzeAmZYWmwjr7q0rKcDn8MS/oscC5aiJUmDZSkHkEfcap/rkSfDXpxCHvg7eOA2t3ccSCXTBcaATGQmTRxIZZfok8q31Tyu7fWUbpa7voB5u8TqJV8EvmDjcl+XZSWabw0gSTphC5XCB+GId7c1j5lp84J7FLU8KLQyQLQvJ+IkNag8OZylxEseUhzxt/215f0NVS2Zxqvg7XIMHtdLbYvcFBOGeLXg/Ixxe88Q6iCvUmyCBfDjT/kkGerzohrFEdtgjRG/mVnxk0bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=wem2AJBoTGHtBckyqvpen9uiSUKgs9mhKNjHQHA0o5E=; b=Bd98euYxD7WOZZaqpN29GWFXFKHDO0iDWWBXnc60ERQQ37/EE02cp/xI7+ljiPdbNhBwILuoHnwKf7wUWmaU1TJPjECqT2edyUpEAZ//PVEg5Zo/DMNYkv4aIPoPiixfT82180P4kaI1sgzo+W//VjCVajQKXG6SLtoC8k5WFhiOcqivuFvBrEpSmWU9PL1Ne0oN5/CVZoUtBtN4z3RCerXQPlgFr83V/NuSkSHgLawwZBvI/PFUQl0kTxHIvJJo//eL2fN9eaSNwl9Q3Avxwdryf1v9mqd3aBbCmjUmvyep5IeqAN+TCJF/yDGyLjcCQkGjmarM8WXqglKGcsoZzg== 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=wem2AJBoTGHtBckyqvpen9uiSUKgs9mhKNjHQHA0o5E=; b=i4pW+gnOSVnA3s7/ntzREOViaBZMNHjlfQNnO29A4x52ADTrbHbMKUxi6u9yvPmPuYIRlO4QcvchTjTxZ/x1gcCi/QZjwbAVK9o+Ln0x+U49VwDJ+5hZCVtSjGnccZSlUmRM9cQSk04duA4dPoiublgUGnIWYFb6m0Hu7Hiw6jc= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:23 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:18 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 02/21] mm/mmap: Introduce abort_munmap_vmas() Date: Wed, 17 Jul 2024 16:06:50 -0400 Message-ID: <20240717200709.1552558-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0459.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d6::18) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: f7f43bfb-d2fb-4ba5-16b8-08dca69c0f2a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?x3mJTI5lRr8oOddF8b9f6nxCpq2Eh1YDmnQe0rVsLtv3mTUuGysIQHZPfnc9?= =?us-ascii?Q?z5GgoWUog4j93aBdb71fXOZIyZz3rRe7JWLaOHmVA5qQF1jDyiyhaPy0VI0L?= =?us-ascii?Q?C3XnIh03BYZpvMfD2NVPP/nUFs/JvPuMqWu5LwIl496bDHexzcuOkuUAenmE?= =?us-ascii?Q?XlIbAIRFvUFqL6ozEpxHMOMbhrOXmhcEb8UFfknlY+I2QLOBX6mkNa7BYZwR?= =?us-ascii?Q?jLKCijP7jQuXfrXatEznBx7mUPbVwuy/MZxzYLauldfPNCJjlw0aUTpIpxrF?= =?us-ascii?Q?XEgvuOC66NfTiQMJBNr2+KtpdFAA/ogKNU2MBsQVBaGXBJ+XXVWlxAgXPE/Q?= =?us-ascii?Q?FzizUQBRs6lWsuSt0rckZysqHKoZIrcVqFoJqY48742VjU6P84fDd8xiEJNt?= =?us-ascii?Q?Ik3MccAAnu6cG2mEu4BuCM0Ta8t4ihiQQsLRgTB5O250pTtlysUnoJxCLPiJ?= =?us-ascii?Q?UN4qVFcWe3bYJ1hUB0gmN2UGKRTx30R/9YkjbN+F7BiylpTYBl9EkQPKf4gE?= =?us-ascii?Q?ps43Tvhnz0Ro0jpMf8JL/vKwV0xXPWKgUsXgf33DvC3Es+3M/5h0KWalmHLm?= =?us-ascii?Q?LyRmGEYZxM6nloGWxgVBuwE/t59nJG7t/V11BP8JaTB7z/alY5jiUwzbf0Xs?= =?us-ascii?Q?WYpeRmbfWRMtqh6BQpkMfH0EM4FJAtivbat3PtdakxAIFtfn+w5gYMoAgYfJ?= =?us-ascii?Q?GYNG+QOYnC7PEQTmGav+ds5IKEy+iDBOgasZX83y2YotHcYIw6nL0cp2mrSM?= =?us-ascii?Q?v8iW6lHFJifbJSk9s10O33vQbITvRYv8PS9I29FpAQFm0/lFik2PtyB/kgz0?= =?us-ascii?Q?peIfx76bCQ/shIdRHrXh00Mn47iF7+z1uTqncjCLEj6St+rswc2lbcDGrhwg?= =?us-ascii?Q?V3A/MlpZsNeADoo8RcqXbccCfv3GBY94rzH7pq6Ndiw4GmIw59RGevXFOrtf?= =?us-ascii?Q?65d0W77E6sI3jhzunK/JcUU41pqYbYt2f9extmqfnumELiiTG2M4XXj2SEO5?= =?us-ascii?Q?flTGcP6mLT7ICkRXIXwdx+/3+iR6Pgfycr9SEK75Sl3xpGztrgjP4nBjj2cH?= =?us-ascii?Q?lGvQACrcSO76MvdDNFqcrHRO9NioW0c8K29+CvRGZ9uUUSzLb65v4ZSv8Tly?= =?us-ascii?Q?2WId2BECvxRrDRQWstv3/uYxH1Pydy+xf8VSyJFeZTIsFLo1f5+fN/KWrGBj?= =?us-ascii?Q?yvGgteOXzH7LbdeoeKwMXfw8e8Y1QAq0uHus8F7LYay8CIhxRq1FolCymSOa?= =?us-ascii?Q?XhqF8Tp6u6nnexdJSp1XAmN7JLBcdWDklBn+LhmDNOK05PuYvtdaOF5MJh8Z?= =?us-ascii?Q?Adiw8n3u8hggrKDrgkAjGPL2dHO1rG3H53xHIkXqcRdiRQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SOX94kEo2GhU2l52u6K2vsmOnJQ/Zamm8yn1LD0xrwoQ4IdqgrnJzMGqb38I?= =?us-ascii?Q?RU/8Xce5gwd/Z4dQrn9Byd01+JIPvLBYnq/WI2Qlju5F93tlpkCMI9knAtCz?= =?us-ascii?Q?+nX3iIjZmb/4J5sG/MKLKmcE84t7aOQc93ZXb0qSV0qKuyp2eByjKhBHCnZn?= =?us-ascii?Q?F9mjsdkuzoHuzzdsY9qKZjhF1QnQft+dyciIum7PwW655rhGvG6XI6/UJwaY?= =?us-ascii?Q?VG20Rojz5WAGcuN8351+A0pAXnNi2xHVqA2eUTxK6l+6cNB7Epx0JZdu7Avw?= =?us-ascii?Q?KYc1rKUZTZo4tSadxnInU/YI74nntvTF1f6CQdYuBZ87twapvrqbSOTa8EWC?= =?us-ascii?Q?R0CsTPxHE1u2jV/RKuABGVvUF6zu0KPDhTrVJMBwL/BcVUvClJw05UkvvT6g?= =?us-ascii?Q?pQc2C466OL4rvorUO3u7JYqAAuN+Q4jtQZqY3nlcL+RHpJSJ8RhQqfasNW67?= =?us-ascii?Q?KBC44HmX84sxq8y2OxLk/5W8JTBBGOgEECj9mtf4e7+wfN/l32RDP6Au0hrR?= =?us-ascii?Q?Ii80XiwYV7o1rAJ0Iy1GzODRhfL7FQWSXkBOypAX0m1ZXw98Xt5grpQdFd8/?= =?us-ascii?Q?HBEmGcLER7bbvnIOYfz61Fulb7gyW1uIY+VcVeR5ITPMF5FvE6NLkYe/sPzN?= =?us-ascii?Q?KGpaxjaZtuc8DsS3mUAPkxVmZe8zlajk8NRM7jKYXDTXQiwso1g8wHtblmO0?= =?us-ascii?Q?bOHs2I4oMfVwBqqhjQmkpMq+Awp7xgDJVkDXUd+mFnoWALIRLGdtrTepDEx0?= =?us-ascii?Q?Ixtu1mmALWnAEtsJOo2QElJlT2GU73CK0GIt6hN73prFB+a9sz0Ex4J6/oBQ?= =?us-ascii?Q?dAgyfRY38NZNupQit6z9pMDdRors8h/6HK/f5EOUGjXEcwjXQN7ViDH7ieFW?= =?us-ascii?Q?goDXTvwSKcCNDNWNUfL0i9tiRKvPyODSejk+3I3a3FUq7BprmO8exL0tQu28?= =?us-ascii?Q?EqtO89TxsLsYbzWRSCPULXLmBfNz+wZrSBq2EIQaG2mESwKR2bu7Ptv3GQdH?= =?us-ascii?Q?TQuOAgBseKc3REWAkBuYMhGQXOs8MOOc7aTqhjRngsiHcmogLCJxpzOhKwSJ?= =?us-ascii?Q?5UOHNRVJsmIl+IoU+C78cqraDmxrIEalM5oC/YsFat45chyDm98vMTWRajZ3?= =?us-ascii?Q?INFNDr8/FZ3qwVvPoINJF01o+gYxB/ZQcf1b/Vfnbf0HlpfvDwvp0sHRj2p4?= =?us-ascii?Q?tNWL/sw1XQ6pSGacIIVYE+K+YSOKRtKnwOa/kKLvfdi1V3MxQ4rnTx03P27p?= =?us-ascii?Q?2Mq+DZmTSfzntM1jWaFndmMVIgkh1Uu4cALqlFLCRSvHZx/S2CBBTTD3YBWO?= =?us-ascii?Q?WZeQd0AGl/YjPv02fciFvAn2BJr2OHao0CYxHIRETNZMRdSi7tSAMse1NekO?= =?us-ascii?Q?08BDR66mfC4Kc9thu0IQ8eZOvtppGis2yjyiVJWYWSNBTSysW6igiacojplC?= =?us-ascii?Q?OdiuaqRraiop0DlovD516BLEBhmfG3/evrTk5Y0NPHYJvbuk3qk0spfLv7Yo?= =?us-ascii?Q?ecamn70MtEQ624qha29GNK40ulEws5kLudWjH1B1kaHSi4p4eYT/t/EDdoxO?= =?us-ascii?Q?ZaR1orpxYWh/cP743cWW7vw23mbLVnwDeQFR1pjO?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cMuIu1Z7h9LrSz3cEydnUdk1zofbu0MPZZJ9Xguy//0aCLXqyUPxL+VZYnykhVy/FmtdxtEmkRGC/IsTBx3DY+xc2KBqRuc7aoPVZCU17fL5r5T9f27Kr3h16B+CfXVAkiOzdStskcgfUt53n9lWSyHSM6nBae3CTtUjs32uHhQm99m5T/YiN5q3aZtpdt9kS5/b9A8KY+Gwls7wqHgFyl5bfspvYoCi190/NnURTEAVoZ7dmkOOYXm1AcwROY79f+gBfIcfQFGIsWE/LdcS/fu2b5OGIBQFY+DuoEFuNb3bvF3z23Kpiruqrxnv9/LP/Fq1ACegWkQXzq+T//J2rl4WypDsqLSbz9xl1EYBq6C4lsdixFjLhuXuG8P86RqLndYtZxNn8H96vXDQRwIYf4Q0y16xGr5nqSj4fLIkWWFYyTHBMohbVCBwyvIbxeIImsn807ql2Ca9/O7U+HekCfDlqD55pnmlWftx+jpqzv/m+4WLyB0wMgeeex2LvQaacCERV4BC2/4BSiaNRbADQgyqak9lgr6VqMzJ24ErSToROQgaap41Sr55jX9e0aJQh72lQRvQNY3omU7rdeNongtmdh2mhY2cY3zdf/rwbeY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7f43bfb-d2fb-4ba5-16b8-08dca69c0f2a X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:18.0283 (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: EjUkB1chtJUogZV/hlklPwq2AXKFvgRhO3qQUuQPLhhzf0sxqHGoCjR0C/+hHegkX1649nLga6tyteBXUeWsRA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: 659WKp4VXWsHkCKUMiFhSCsM0zMKIQwV X-Proofpoint-ORIG-GUID: 659WKp4VXWsHkCKUMiFhSCsM0zMKIQwV Content-Type: text/plain; charset="utf-8" Extract clean up of failed munmap() operations from do_vmi_align_munmap(). This simplifies later patches in the series. It is worth noting that the mas_for_each() loop now has a different upper limit. This should not change the number of vmas visited for reattaching to the main vma tree (mm_mt), as all vmas are reattached in both scenarios. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/mmap.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 28a46d9ddde0..babfa50f1411 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2586,6 +2586,22 @@ struct vm_area_struct *vma_merge_extend(struct vma_i= terator *vmi, vma->vm_userfaultfd_ctx, anon_vma_name(vma)); } =20 +/* + * abort_munmap_vmas - Undo any munmap work and free resources + * + * Reattach any detached vmas and free up the maple tree used to track the= vmas. + */ +static inline void abort_munmap_vmas(struct ma_state *mas_detach) +{ + struct vm_area_struct *vma; + + mas_set(mas_detach, 0); + mas_for_each(mas_detach, vma, ULONG_MAX) + vma_mark_detached(vma, false); + + __mt_destroy(mas_detach->tree); +} + /* * do_vmi_align_munmap() - munmap the aligned region from @start to @end. * @vmi: The vma iterator @@ -2740,11 +2756,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, userfaultfd_error: munmap_gather_failed: end_split_failed: - mas_set(&mas_detach, 0); - mas_for_each(&mas_detach, next, end) - vma_mark_detached(next, false); - - __mt_destroy(&mt_detach); + abort_munmap_vmas(&mas_detach); start_split_failed: map_count_exceeded: validate_mm(mm); --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF368188CC1 for ; Wed, 17 Jul 2024 20:07:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246871; cv=fail; b=AfMn5Ef5BzYd88wfyg3B4R9bSUJjCd7vNVqvvGCdiLLH2eeRGInDnhEcnL+FxBlje5iGIr969r+YxolNEUfxk+T9gfJ2KLrWNg+2bLqeVkdCljj2W/6Wc0KVE5UNc4vlTTkGqUZwgiI+LcLg3ltU2ttbO7ou28aO6zXISbpTDq8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246871; c=relaxed/simple; bh=ahjT4jAX2L9Bvhdj5nbsQZCB8KEUEamjhkuT5LY7s2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=q/xIQOwPv0ivQC34M0ZviqaqWXDnZ6/8/viDbOydWq0IrgYZ8er9npk9vYpZcE0LeXvoq5ARvjYvdjwL9N+PHNUpByLy2FYOjgUc6BOo6nMeMSZpii4zQUPifFEasItPvy109LIiEEnpR1e95nCyjRyS/WdTEdWwawEB48MLgL0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=L8Qn6u6u; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=kIz/lBPa; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="L8Qn6u6u"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="kIz/lBPa" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK02JU028040; Wed, 17 Jul 2024 20:07:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=dpHEzn80OIyOxWiBfc/i9nreyp81gPbsuptSnKpNCXI=; b= L8Qn6u6uI0rigaSQ56VHmhUlWrMua93Sqy8GV8Slqr1He+Ft0X9tCEG3z1LVceuZ JJffKVIFsP7nxRK/Z0RClQtrkXlvFL/3iM1F3zUgjtd9BuAFJr5VTp90t433vbBq 7P2JR5Xvq3y/wRm8MqFIYdDX57wHnYkgjIYPmfq87eUmUww/PVqkrv3+moimZTH2 AIKkUzNFW2GRGv6zNRsNU8yxfzwCAejkaHD8YP9wejT/pOusfNMn8ahywZ1P3npf NQ9UOB/33ijfTU97vqbcyvKRaQCK0/nqAUseX+oodXCexz6MQpzVwbIwyJhjS3Re YGhHRnhj1cF2MAJnrIbJDQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emkyg19k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:28 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXl006940; Wed, 17 Jul 2024 20:07:27 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cUSht0IDkIuSCu+OnoiRYek3cOumGDq22liHknB1nzXWtmW8sRCz8VRmAd0GDNRrAB8jqcOYOcj+1yee7a3HY/kozLOQ4j7zpZgGCcD48fbHOCjU1talcGGAr/+r9W5xFqS90sbwbtWuIxuKZppny0tKmJQ3tVpOEYTgFFBqgic65ZfSUwTghRJ+DzYjSmKiVXrSXDrdwhNg2crCPaEAffsPhowSRgRjslMfJxNjaaSIwxE1buCLuxvcO5RjfYd0kRa0t2wEuZ46L6Y2s4n2xkNrkzCUJRY7oX6FSb0gNXKIiVrzjAU7W3OIJI7AS56wpj9rm/MlcU1C2pIhjyEooA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=dpHEzn80OIyOxWiBfc/i9nreyp81gPbsuptSnKpNCXI=; b=EwqowUH+XnKKwYt6rwqqfcqhgp9Sbnx200vhKzyALnRQ8THjL5vROTZ8fK/AneIPRpZtlWxhUkl7rHjedEodcwNeLd2zzaGZIi1M+KnkXuvA56Y4MbOftDSRa+FAJM40ariKE44/Fg7iIGnavFRPrdGtYHyJCYOuHTIITNIMTDyQxf3ueMd3WQJF6ZQD4KU6OGtoxPgVFuDDdz4DeTjBnqoOz8qb4J4nDDQsg3nk00rwBb61XzHNQoErKRObmvRYdCz1GaTNuq7Ohjo+OkWtZ53XYO1hSaIw7Mq1gMOPDQqcaoxD0hkovPQGJ9P109Kz0LzGTmQdKyxv13wzu5KRfg== 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=dpHEzn80OIyOxWiBfc/i9nreyp81gPbsuptSnKpNCXI=; b=kIz/lBPaRN6SI/ITe+XB0lwkWvfhFUMHZRM5San4l04X3XGX4H1/RoLiAnQxldWTOMTm3KzIyvoH83dhMtKaoqlCUkY1lr7CHXFDu8OHvSkEq9c02jWDHXIqTPtgX5AizbYlTufLjBmlHJqrCuWn1DIhZvRYE9NeMzVaGFvm+sU= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:24 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:24 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 03/21] mm/mmap: Introduce vmi_complete_munmap_vmas() Date: Wed, 17 Jul 2024 16:06:51 -0400 Message-ID: <20240717200709.1552558-4-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0083.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::11) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: b85c3025-21dd-441b-d1b0-08dca69c104b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?e62a/9dA5J44bLZYKBqIKnzoJJ6Zi/nbGUX9DI5NjKkqdCIb1DoVARYe/95l?= =?us-ascii?Q?oYqQJnztszPGlwudsPbLQPRsDlX9FLlvrVhf/yL5MK6Y3XJxIG9ult17+QRb?= =?us-ascii?Q?W65k83nOr9oBQ+lnrGPHBjIJd49fEMSWEtJSncx/kXWQ+zWmmWKPmpTBDQKQ?= =?us-ascii?Q?5gN3dO6m8/Ind5Ug/Yiamulw9SW2P4N1QgWTA3yCygZF51yXehdiaS8f0OIq?= =?us-ascii?Q?NaaXaKeFV8Wf4mAIXvBTzFsJgE5gm3WG+94MpH9zu232ebpSFufP6b4lCCCv?= =?us-ascii?Q?KgYiV1oEdtovKrt0CeSWGHP0LTlcJqeYG1ZIgAaoysLQVELxeEPO8w06Vjx/?= =?us-ascii?Q?PvC222aD7sOK1UGbucn4NYiVIWqHi6bgxje6vbeHiE5pjHKBg6HXiNuv5CEl?= =?us-ascii?Q?5TyIf+mTHQpxC8ioPubVDQvkgfxAxdA4OzeI9ujHWit8ow8xrCF0MU6XM8rr?= =?us-ascii?Q?qWZjk6PoKJ9LGdF+Uwr4gqPXPKjTKIyxueCukKg7/O3Uqsk6nP7rnpol5KGd?= =?us-ascii?Q?LQCtHzDIHc10iUNj5JOOVfOa85Gjntof2zcV3Aefa0And0F2bHdvhScHi6Le?= =?us-ascii?Q?RK4tMq7G/VWmAJUeHTXipcAGKUDlp0jHxoCR4l8BFhfGl4QAFSRvJ/YYKU7V?= =?us-ascii?Q?fapuHqB6jfog88nHYmNTUzUzmTG0oqflI+yuZHyxe6WZ36gNXpBayKt4ilKh?= =?us-ascii?Q?pU+aWrk7kQ9JcRdU0tI65S8MZRtx923+A7fRyj/d9DYqheWroO1sO1DrFspZ?= =?us-ascii?Q?NdG/dO8eWHR32+2ldL0yEjbUnY2REh52myd8eKEZYfZp5CIDxDbQyinAKA5F?= =?us-ascii?Q?ZeS85lRkWuXob8I0X9fHXdLxqpeKDsZ4z3KL8gSOsPwkga7rJYgvJZ6HgU5i?= =?us-ascii?Q?zmgUG6DRg96PjiNttZWeDJtMy6RCvt2xLTDv2tKYaSvI9nYlup+5IL7k88hz?= =?us-ascii?Q?ShR1RMGrxB+icw0zPv5uCx99qpY8VT61G9LYacamTM04bzv9YMixozEc08kl?= =?us-ascii?Q?hCgGrqIncZp+OQKhMv1ou2/XSgfesLreN6inXGMmnny0A3Fsvbf7CQaRwv7A?= =?us-ascii?Q?icyqPnnT8s+9+YLtXBSLgufBIQ0jbh8/WSPVfNq2FBDOBjmle4miCmFZXa+x?= =?us-ascii?Q?Ac5X9Y0Bb9ekPHQsfkBkGnJ3TSA3n8+59dpS5A0vlvDYYWSmEneryLdX1m59?= =?us-ascii?Q?epuL5zpAuiUjxpSGTQ7XoOK8AYZs2dzcZzdnxSNBWxO7z7L1N1MRNHSYm/0G?= =?us-ascii?Q?ISqbF6vbi/kIynqzXSFAJFBj4FyxF0Rmt3VjNHNI4etPU17kss6XksI0dIMq?= =?us-ascii?Q?qod1Q33bWXmRkdv3mWty51HJP7ze1TRlF1ueotMQ3fKBkw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gE5StXQyyZXM9PxttijVvsn5BqKp/q/f5nUgGnKBxmeMEvXguXiHrIuL1nEC?= =?us-ascii?Q?kb2Sqts2gDU/gV1WeSJpWbpVs1t7RwYIoaxTKT92IEVExkmakLqvbGXHwy36?= =?us-ascii?Q?wJi51E3WQdcSq1S5QFvpLzloATUJDaPGrb6ptoUvb4WQ7YlQJqyRMKMKX98s?= =?us-ascii?Q?E2A9iGvbZnYClYVVV9FwJ4boGH6q9/ZYmHcf+v8nMU/BwjHsuYui5FOkhlyw?= =?us-ascii?Q?/Xn+wEfNI+1HlOTqKrTO2Fa/Vzg3tuC1nbAqqslbxG6eOsEP9A9UUFr17buW?= =?us-ascii?Q?FK/a1VdDSggvzbVsrry073nOJUej+Ne9X2hPwtEVg/PGeSu2FeJu/qWClXZI?= =?us-ascii?Q?zJFHhywoIz8WqRU35dDWN2HxhF8EobYN0nWof5D3ms2UNxNfswjyvRhlSSUR?= =?us-ascii?Q?2U2cbS+INQuyUyjERt3hLIn5UYYv4DGp6aDDnsSzrBk3cQHaii/DT6Vu79/y?= =?us-ascii?Q?zCKHW8h5IOxihJr0K5gOcnLAqGWewmdg/waLezcO9PVU1xVLldzR9cJVbmIY?= =?us-ascii?Q?CbhOvo7YOLJ/tremHgyX2AAoPVG7IAlR8Eus2RJcJrtF/gpeqkj7N1v2zunu?= =?us-ascii?Q?vgpQjj3ka7ltz7iYET9+HAZga0GsGQRHPMvGjOT4vei3mJ6r0Bbmoz6Bvo94?= =?us-ascii?Q?809Y3fmpyKfNufBG1f71L6jym0p8xFQ8GtWU3bR9KVzj/EFLuheZfUz3TWSh?= =?us-ascii?Q?M2hctDHbBTs/NWWLUq2T8U2aQxcoHxiMCjeo/Ngk0AD1t8akbIekVU6FDY3+?= =?us-ascii?Q?CGW7iN/qTptvJOWudV8mE9CyuvMewm4nJDGKpW4Z03nL/Z+DGrwEEY1W8Ohc?= =?us-ascii?Q?RAC5Or9GktuOw/MraXX0pw7cwnwIevNdPATlCs1e4QqJTOLQlOZVsOt23Her?= =?us-ascii?Q?SGx7Sa5Qiw7lbNJUsbku5xSdNO1cR9v0M9tJ/vB5jZUgA4eXxVRMR390I7TZ?= =?us-ascii?Q?rLWEvzn7YFboj+7vjsGdQ62wknx/cXgKljCm0346Jr4KVv5CGm4u4Nbb04Qz?= =?us-ascii?Q?RE6HdJkyHqy6Hzk9+x9BBZnhds8fopKl5+Mr/Jk+4Kfn0qa8RZ7VWEMyupNF?= =?us-ascii?Q?w53i04EqDThQ0ZTiql8U64KM1Vzs6caJ1CsAvK4gVSqqGxqPaKZaLHPPkNb3?= =?us-ascii?Q?fSc64AbgkZd+4KGewPgqi3zJUaLRgRPJe0xLdSKvie62++qcF5OPRlhCnZhd?= =?us-ascii?Q?frzNnJA7XP/CLd0JzcY74nzFBOg2AmJSGFDYBG98NdU1IqfWu24fDZAWmJ9G?= =?us-ascii?Q?pXmlz2l8K6CT+jFbIcgKw7HD8NmuSU24Ur1kwRqGwM3Q3KYuVQ5MK0KZ/RUa?= =?us-ascii?Q?yS8GfsxoG+fm8k4ZJBx3OsPhTVCAx/8ysiHxB0g0gIoeAscZQE8zMQ+Ux077?= =?us-ascii?Q?fA+JaW0AiMBVzoSDgmCaG1um5qglKzALrmkQZChFlneqa/EFztfBbQlx0xkh?= =?us-ascii?Q?5LAIKZJnzrjVf15O2bOhC0yCX3fyiVIumaeDumhG7yqZ9/96/3AtR4JV10hm?= =?us-ascii?Q?LFnbYGdrVlSxNEjRxm890qZC4X5BwiSYGn+DRXlQ8ILqKDHl4SvHBJIVq9F+?= =?us-ascii?Q?yfZP7SZIWNRlON5Omo/D4ImrNlqTH8r9+MJdFm15?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: sfZMqnuArvtftoEvrJ/D1Q8W1ic2laaU1Y8v/8+U64Q7zS58ffa1GR3n1omsvrL0dpqzldeWifJw46X6AAxQ9XVXk61HfG1qUqQV4yera+BrIcN8RtCgxo2vPJ1ConXsWKfEPA/+IzkOon+l9Vwe/r3TRbdDd5/4OhkLpYHECw169bFg+dQWp89ihKJI52oap5uQqCG3VDkQvjqDdtdQKLeq3Srzm0UmHtVrFctuaPqBLiFt5sUjzn9EbSPUs9Xc9MDaThH3NWTyw+Jmu734b5ksmDYw1rGyVkrbyE8gMgLShz3raXaYW2cddePGbC1s2UZXu1lofoyI25tYijtsXm15dNJD1hGIG/qJ+UORreMOnGNZCl9SzB6S07mrCIxhYHMfwT/lb5y+c/qPl8Ejk18sZupTJDmYZCCNsFZ8Vsg4D2Wnj6Eo3uqkplBzkcXf15+JwNUyVnO2MAKoR4qNKCs/jwxAjM7IixPUFQ+Vol+IVuw9CTTp2wmDShK+ghTymbREOE7bMJJpjRJRsjJIGn85SwaKUXZQNNsYMGpxmORBMbH4qfXR8ldd68j1SLjdJNgnEr7SN1t2T3H8dkfnsJgR4Re+2Yll5tZCvPtGOqk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b85c3025-21dd-441b-d1b0-08dca69c104b X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:19.9280 (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: 7U5l9aqes1KCB4reRwC4OxJjzBddKEafZibhuXhfLdVbwPfnHGirI/2BtUMnPt/fGf8VOAy6bCAcmqol3Ii4ng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: qKmkn7AXKb2v2bJP3Hj8a8xZ3O6BRXsf X-Proofpoint-ORIG-GUID: qKmkn7AXKb2v2bJP3Hj8a8xZ3O6BRXsf Content-Type: text/plain; charset="utf-8" Extract all necessary operations that need to be completed after the vma maple tree is updated from a munmap() operation. Extracting this makes the later patch in the series easier to understand. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/mmap.c | 81 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index babfa50f1411..bd3378935c70 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2602,6 +2602,58 @@ static inline void abort_munmap_vmas(struct ma_state= *mas_detach) __mt_destroy(mas_detach->tree); } =20 +/* + * vmi_complete_munmap_vmas() - Finish the munmap() operation + * @vmi: The vma iterator + * @vma: The first vma to be munmapped + * @mm: The mm struct + * @start: The start address + * @end: The end address + * @unlock: Unlock the mm or not + * @mas_detach: them maple state of the detached vma maple tree + * @locked_vm: The locked_vm count in the detached vmas + * + * This function updates the mm_struct, unmaps the region, frees the resou= rces + * used for the munmap() and may downgrade the lock - if requested. Every= thing + * needed to be done once the vma maple tree is updated. + */ +static void +vmi_complete_munmap_vmas(struct vma_iterator *vmi, struct vm_area_struct *= vma, + struct mm_struct *mm, unsigned long start, + unsigned long end, bool unlock, struct ma_state *mas_detach, + unsigned long locked_vm) +{ + struct vm_area_struct *prev, *next; + int count; + + count =3D mas_detach->index + 1; + mm->map_count -=3D count; + mm->locked_vm -=3D locked_vm; + if (unlock) + mmap_write_downgrade(mm); + + prev =3D vma_iter_prev_range(vmi); + next =3D vma_next(vmi); + if (next) + vma_iter_prev_range(vmi); + + /* + * We can free page tables without write-locking mmap_lock because VMAs + * were isolated before we downgraded mmap_lock. + */ + mas_set(mas_detach, 1); + unmap_region(mm, mas_detach, vma, prev, next, start, end, count, + !unlock); + /* Statistics and freeing VMAs */ + mas_set(mas_detach, 0); + remove_mt(mm, mas_detach); + validate_mm(mm); + if (unlock) + mmap_read_unlock(mm); + + __mt_destroy(mas_detach->tree); +} + /* * do_vmi_align_munmap() - munmap the aligned region from @start to @end. * @vmi: The vma iterator @@ -2621,7 +2673,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, struct mm_struct *mm, unsigned long start, unsigned long end, struct list_head *uf, bool unlock) { - struct vm_area_struct *prev, *next =3D NULL; + struct vm_area_struct *next =3D NULL; struct maple_tree mt_detach; int count =3D 0; int error =3D -ENOMEM; @@ -2725,31 +2777,8 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, goto clear_tree_failed; =20 /* Point of no return */ - mm->locked_vm -=3D locked_vm; - mm->map_count -=3D count; - if (unlock) - mmap_write_downgrade(mm); - - prev =3D vma_iter_prev_range(vmi); - next =3D vma_next(vmi); - if (next) - vma_iter_prev_range(vmi); - - /* - * We can free page tables without write-locking mmap_lock because VMAs - * were isolated before we downgraded mmap_lock. - */ - mas_set(&mas_detach, 1); - unmap_region(mm, &mas_detach, vma, prev, next, start, end, count, - !unlock); - /* Statistics and freeing VMAs */ - mas_set(&mas_detach, 0); - remove_mt(mm, &mas_detach); - validate_mm(mm); - if (unlock) - mmap_read_unlock(mm); - - __mt_destroy(&mt_detach); + vmi_complete_munmap_vmas(vmi, vma, mm, start, end, unlock, &mas_detach, + locked_vm); return 0; =20 clear_tree_failed: --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B89351862AA for ; Wed, 17 Jul 2024 20:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246866; cv=fail; b=HVuKwUD5xFLo+FSh+/9kkAZcCSMdkm/ayu+aiuRCiJdk7928roFPXlUcrxEogsRVnX6zs8L1+TwWORjsKqrnzJIMi37xoVXzVd9/qLFzHH85G5N+2C02MaYP3bacvkIkQHl2KC5faGSJMMyVPVySGmCGD1CAZPj2aj5QlAJaOD8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246866; c=relaxed/simple; bh=z9lPIBEB8h0tkNv8hatUxAW8h6cpl1NOiwc80r4ThwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=cK02M/sAB4BZeAKMQpuw31EZBBfdL5O5zRnhM0sj3mRo2pnI4lzWT7F/7+RFo/lIeNkyRgdoceOm7WaNYIBRl/vyYVr+AmIxmVG9xu0FOJhIHs3yopsh+tBzLgwz5XKrD+KtU2knLgd+e0aaeMRh3u3C8XTNSDtWGqmu46uarH4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=K+C4GbOi; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Jo7y10DN; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="K+C4GbOi"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Jo7y10DN" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJsS4o002470; Wed, 17 Jul 2024 20:07:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=W8ePtixmHK858Jxwt740eyTinrn/Sv9QWh8NJ5u4sOE=; b= K+C4GbOiFPwZABIXe6mNL4Jj2ProPb7If/OMOLVqRm4iK37LL7AWbqmB/BkEtdsx nnr++EJG7g+X5jajgiAU59pKcXQ4Xl1gd/H0ZwAPw7ih0sO0amK66AU38YF4b20O mRITla0mPjiffuAyGvNaTBnJ1SgeT5a1KgYRFpYh2rwFkxeNMHW0RALDAlvjxMGK eKNZKKpNOlvFv+HSrF1VRhfdxlgmQ76NwAXtt7b85BbhKdmH79Rnl9/4VWHqsNEF A+oL8+NrwBCHJqM6TRLrDzO1gZlWjvDUAA9m7PKgLAuNGs7UCyM11JyWUPUTvTZd OPeGodJ87CjsgnGwSuhaKw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40ekxy84ad-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:29 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXm006940; Wed, 17 Jul 2024 20:07:28 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OxTaIv5bbHkEP+QPEjkwA89YUI3b462E4bkQB3AXq/EG/wL38L4QxO/aYXi+Cm6bm6iwPAIDyOJT4QS1eDuWEa/Nt+7ugOUftNK1IrxiWAgTtCXAD74bfPHNKIl48gXk1tdZ6ZS3KymAJzRpfAc0wFIV5zq4mjMh5UIsNJXUSRrJp2Cx9o0Ctssej+D3FkEckFqrD8+p3OxLctZwcM9kHF3AESnF1VZUGAXILXrp8oMnS6tXCvvmAacxNwCZahrAL++Y12LDWld/93yb7VUEJdZ8nOn8qgKcp47rFFBbKYcnj9cHlL2KrT9+UmbVEDbTMRhR/kHw1j0fymmGVuMJxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=W8ePtixmHK858Jxwt740eyTinrn/Sv9QWh8NJ5u4sOE=; b=fUqcePQA699PLBbstItIrApibdNVUJw8xQywwPCJ9HmJkMHaCvK6yfPkwJoFUIQFmk5xLVfRbddm9/KuIneCAfwYHIoINThzqFy8tRTD6+S4dwFjNlpzG2X0ZyZ4hBzAlnlwm+2Pjub2ab6tbqATjtdvREPYGGpal+RGdbIml03CMbKSFFIrcHJ+bigFdqyltywfwgEhNvDrv+uhtnpbh2XvJemb8GPAu3B/yXe5ikxqDzF3g/o5ha1HQzRnRS5XMBqNHlCSoJQz4rD+PP5WaI7Y7KnjBgrZxE2Mch85urLa8CzFV33v46peoZD7aCh/Dlb5VejBz5E1ebqSmwCSTw== 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=W8ePtixmHK858Jxwt740eyTinrn/Sv9QWh8NJ5u4sOE=; b=Jo7y10DNg/DAcytYUYDwEf2KJe3Oj68yPxN7I3X2sResQYdR/AI+QeLgNnKc6ImhmAoQrwpMg7WjrNYlAVJce2J4VtIn9cggUYrygLUAKK8aflszRmkDqzGfPtMacsLCYuglcqsF32pntpc5BMRGgyp0i0FiSMMuVxAQ0TvTkCk= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:24 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:24 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 04/21] mm/mmap: Extract the gathering of vmas from do_vmi_align_munmap() Date: Wed, 17 Jul 2024 16:06:52 -0400 Message-ID: <20240717200709.1552558-5-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0071.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::12) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: ae453853-f68b-43fc-9335-08dca69c11bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nPIxEncZ3rO7iGQcBmwGgwhcCQWPslMTUDfRb9zuOJY58FEsJbWlq8DO5Xvn?= =?us-ascii?Q?BvVqSI3chw8LjfF8+jSWn9enUJdAQIchlpmku0Nqo6+t7dUUBSQrg0oHsWWU?= =?us-ascii?Q?GEENx/LqqxxmxyA42i2KLEQrF/Cg8b05YCjs62cc4Cwz9MsFy87eBWfhezWu?= =?us-ascii?Q?V59RFp/PvEWV7oG1O2LRpHzmCxkkgNZQf98dd2w99xdqMSZwpCz6D5mfXxW4?= =?us-ascii?Q?mUAfK34E7w8Rs0Hz6XlDrf8CB4hRbRKetCp4wnTyItDB4IlvGoJSEuG9+B3o?= =?us-ascii?Q?9EOmv1Dk4GDYJiWPcoxFUQUlSvyMr6R7gbk8tQFQuzKpnvbq6yEhPcV36vae?= =?us-ascii?Q?wOj1bCXPddKh3R6XrIX/Y/pVoRB7Xo7c445waePayZTvo+JY8ykZ+HzEpSF9?= =?us-ascii?Q?7T3C452rpjwoSjnVCnG3iLOfC6/DDfyCpopTQLbDyBg2JmFOyq0nSlnzrKkS?= =?us-ascii?Q?GC4qmzFzJ3EfW4gB0wnPXksGxCn0M5z+XE0nmatiigtTlZu+hSKrRSc2OuCK?= =?us-ascii?Q?PpiAkbLRF114p6dZq8pFaDezFqWBdFswtYPoBPhmJhE3iuKL59zqRxc8qkNM?= =?us-ascii?Q?NpAV4kjYf1CH0xY5T8QdXRGz7E8WGbviPzmIVb2bEiuy0TR55FLabu436qct?= =?us-ascii?Q?2VcRETOpxQfoAi4afEmAAJ6rG6pV6301i0ALS8p4phxyo+Bn42S9nNTgvyP2?= =?us-ascii?Q?c4TBzhCYKJ2rEgA3uMnhXHAjT4pazcZeFNWlXsIBum0CeJEES8aUkvCoFtnt?= =?us-ascii?Q?+A6N10S9PjqMWtRIXUrSJVOTHF5nG3evZyDnbYq7TRBEWG4w4diD6jDfz6oi?= =?us-ascii?Q?DnfCR8D3WXppNmtLAvl1xNUVejxkmsUZduGWV63qGkkn0CxVM39MQ5z+95lD?= =?us-ascii?Q?DfxPzT72xJe1K4fVsoxDRvN+3bvGWOIloUjsdhEf6pkhNwkJS2XzS8xivv4+?= =?us-ascii?Q?3Jf++aJmpyXWVfnHNHePbAms8Su2QruHT5MamTwrZ7lOWBw+TDCvA8Hu74F0?= =?us-ascii?Q?cFhKsiR3+G741Tk8DyI7lGT40uFYsoZlgicdEAodsBLx1dYpTEAy+D6fH9nU?= =?us-ascii?Q?jOwmLC4BLpxnTKdSYR5XfoEXjQUJK2ldFhjMo7kHrDNScz7zP9mE1DD74448?= =?us-ascii?Q?JsxYCeDXy3NsFHhPyq3HJt1Owz6CyOBfjkU7AmiNpBtDw1jfvimOMtO+2hpy?= =?us-ascii?Q?XPFE1/Tmk4B1jIgIRh/feOSimmTHJpzgz6Hgd2X15UwE7GeOvEo3hxW6rCjt?= =?us-ascii?Q?ZOy8wp+YAi2iBMGKC/14/MYU5/fUo6WDHs/+vmWz9zPWW7dB6pSoHzsW+E8P?= =?us-ascii?Q?9uZURj5I4X8uBoMi0nY/xcqhAkjGMWJhItym4LmDpxB2aw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?a0tHpNWWlTOjyAIsiF+b5cwOWaMNq6tJ1HAych1wkNhTR7ZcpfjJj2876ui6?= =?us-ascii?Q?3QCCfcJBEXhEIhJ0D016t5hEfeibGKYVMEHeO0MzdiLbazbtzBqOaTBnWDuB?= =?us-ascii?Q?VBZYFpGlcjkgSdz7oicC/u7mYMqBommIpgPClGgZKtWVQ/9taGAvPwrzXY/4?= =?us-ascii?Q?bAt+DejJGfqN6dnBsZ01q2ytPtgtd7fLlilJceyFfLypIvDsfx8YpZi5OT0S?= =?us-ascii?Q?3F27RH8tvYxwMPxHNlZz78jC9XhzYykznuu29rlVlqbD7BI7Co8NRhF+Xhnn?= =?us-ascii?Q?qwROAtTr4D6AvfeH1D37t+26Wb48JA2ktSbru5FUtN9mJQagtIdeeq7McjfY?= =?us-ascii?Q?GfyIin38+TMwGLx8dxuKNS7TR4kBoWnQ2vwiGoCk1Wc6fNm4mYeZH5rXR+WG?= =?us-ascii?Q?Io9Y+oBNkyeISzgCHPQUrYI/E7kfRFpcdWr6O7uC3N9+lV4ur7MthltV0Omp?= =?us-ascii?Q?Gn1GndSejjhIgZbbuUEB1qv1FAyhcIQ1q/NltqjuMBRd7knbRGgVX4mDp19u?= =?us-ascii?Q?T5a+iEdtUpSeF2l1GEDA/AEli/tpejPcseR2uatSQ0eRWytuxde5BPAoOUJy?= =?us-ascii?Q?BtlpySw6hxWhrLBcUJozcA8I3y+/SSNWqDCNmuUwR/T072GPJGUNxmHOS7kh?= =?us-ascii?Q?U1hq+GCcvGxFmBSDMOSKtIieupr2Fpk2ljuAiRmWHKEnd9GYFP/jVPEpdSMr?= =?us-ascii?Q?RgY2Fic77iMxbawxpzs1dVdDIAe0V2AyRGtnogytFCu0lbIpoJUELdKa0fm5?= =?us-ascii?Q?+9rjA2qYIjZfAgGMdtG6EW88FCq27GB9TYAZF4Y1YIKzJUP7IHqMIFL9SXOv?= =?us-ascii?Q?6sZB8LnzL0z9a8s63RwxsbKQR0TRWL5mGFRu93JQ+TYhqQF+2pzIcBOcChyy?= =?us-ascii?Q?adAqHZuqutgUFNpomABTDlHng2L1ULu0iu7Ng6tI7oi+O6ILm6YSGHKfGE/7?= =?us-ascii?Q?ZKqMOke5bmZOY9mQd+dg1a+flhQxwKrRO2hy7cUtam08WYr2g9QnubAL5s2o?= =?us-ascii?Q?iOQpeuYMoDo/J2cXDXkKZoqVUUc8GFW2xMSCUzElfWVvAfiOKgbYEKGmFgTz?= =?us-ascii?Q?0vlrxp4uDCXdLcMOdNqnOMCGJuqkF0OBdsB5JZsweGxNd7QzY+ianv3Y6SBW?= =?us-ascii?Q?xNx0Abny0cafmJKCIY+DlFn+wGpJvVdhJksolrU2Y2t4JVNBv7vItc8lA2gM?= =?us-ascii?Q?lYLMpNc8KqIXN+9vTekQZYZK9RMLnjGDK++HjfRNsYoCMp/Rl0tlfmvQIYFi?= =?us-ascii?Q?4zHTZRp5pzc7ZYBAjctNSTMFLoibbiPkdnj3Q/Mis4Y2EBBP+VVnYswuN0yR?= =?us-ascii?Q?2CmaZliG2iT9Zefs5j2oDkPCM2i2FDX5xrwh0As6DPiIggXZl4El3Tbe7KV2?= =?us-ascii?Q?hjsYWsZXORyM7FsxmN8UwRK0W4c0B1r1dEF47YojEKxl1fATMbGv5hlXDqSV?= =?us-ascii?Q?3aM8ODp64Jy5JNuhtwbuYdbaJJJnJZpC5uWRYUnBPr5rgKermdyu5CP8cyus?= =?us-ascii?Q?dN1A0J8gZOpUtuWqCPQC9hKCJWnD16hDX39mlJA4zY+4UMdD9jZNB9G/r5EX?= =?us-ascii?Q?iE6i+lE9AZlMBcYSVG/D5i6VSa6d2X1NazByy+px?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NS4Nzs6qgGRGmZse7D9tTRmDyzSW7LZXx4yZiey/MB4BRWm4aHqOwOSJRB+8UigIZTdrlxNzkjxRFgcecjzeaao7f7qHrYXnEjgtvQk6p6/sFsSDheZXG56sk9wKWIZqvVfQBWFIMq3CAQ01CGLJs8jo8fC7GoNZOnbPS3bbK9C+nIL5OYckA0cshb1Yd/gl9FkPnA0DS4y2CGWocq2CzU7WZUfVNwIblK5BBFK3PpTXxbMpeyEv2pd1vPTr4D0RRoBp/qDI34F+0YXb7Kr3OsK7mQA4zSdlDjqFDQeF9UNtcVRhTvkZrrVxO9fk/og5eHwbi/V2cocNUyRkQSIgUbkJEaYElG3g+gBg+p9gPJChjcKntPoGJoBXKdtcriFWt6Xv9PJVsqALrQ59dK783ylTZmz+NmcjYyLejqebXODG6x/wjZxMSOO4Y2HrDAObx41ktKbigc33TmPaYS3s8ijFRJDPk9+BS8AJsrblU1/io810VFG5C0OBKDs35eYE8YX/qpFNbL0j+83N+TqKn3QSM+HoZsdcrtgiTXQ9eXhSxbHNxRq5njG/raD+7RsX1L1K6Sp48gtIOqmjdqaudVV9ke24rRFR2HCM8mXRtm8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ae453853-f68b-43fc-9335-08dca69c11bf X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:22.3466 (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: WHZKY2WALSEfZx0O+LxA5AU6WMqqr/ts1p7oHrsLQNzcA/M0rB8i2QCoKRA1v8UJUwMZBhJPuVHBbAwf8C2tHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-ORIG-GUID: pRLOhoYPNISsJEM7B4jIiACYZXIpw5QH X-Proofpoint-GUID: pRLOhoYPNISsJEM7B4jIiACYZXIpw5QH Content-Type: text/plain; charset="utf-8" Create vmi_gather_munmap_vmas() to handle the gathering of vmas into a detached maple tree for removal later. Part of the gathering is the splitting of vmas that span the boundary. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 80 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index bd3378935c70..0d03fcf2ac0b 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2655,32 +2655,30 @@ vmi_complete_munmap_vmas(struct vma_iterator *vmi, = struct vm_area_struct *vma, } =20 /* - * do_vmi_align_munmap() - munmap the aligned region from @start to @end. + * vmi_gather_munmap_vmas() - Put all VMAs within a range into a maple tree + * for removal at a later date. Handles splitting first and last if neces= sary + * and marking the vmas as isolated. + * * @vmi: The vma iterator * @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 - * @unlock: Set to true to drop the mmap_lock. unlocking only happens on - * success. + * @mas_detach: The maple state tracking the detached tree + * @locked_vm: a pointer to store the VM_LOCKED pages count. * - * Return: 0 on success and drops the lock if so directed, error and leave= s the - * lock held otherwise. + * Return: 0 on success */ static int -do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, +vmi_gather_munmap_vmas(struct vma_iterator *vmi, struct vm_area_struct *vm= a, struct mm_struct *mm, unsigned long start, - unsigned long end, struct list_head *uf, bool unlock) + unsigned long end, struct list_head *uf, + struct ma_state *mas_detach, unsigned long *locked_vm) { struct vm_area_struct *next =3D NULL; - struct maple_tree mt_detach; int count =3D 0; int error =3D -ENOMEM; - unsigned long locked_vm =3D 0; - MA_STATE(mas_detach, &mt_detach, 0, 0); - mt_init_flags(&mt_detach, vmi->mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); - mt_on_stack(mt_detach); =20 /* * If we need to split any vma, do it now to save pain later. @@ -2719,15 +2717,15 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struc= t vm_area_struct *vma, goto end_split_failed; } vma_start_write(next); - mas_set(&mas_detach, count); - error =3D mas_store_gfp(&mas_detach, next, GFP_KERNEL); + mas_set(mas_detach, count++); + error =3D mas_store_gfp(mas_detach, next, GFP_KERNEL); if (error) goto munmap_gather_failed; + vma_mark_detached(next, true); if (next->vm_flags & VM_LOCKED) - locked_vm +=3D vma_pages(next); + *locked_vm +=3D vma_pages(next); =20 - count++; if (unlikely(uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas @@ -2752,7 +2750,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) /* Make sure no VMAs are about to be lost. */ { - MA_STATE(test, &mt_detach, 0, 0); + MA_STATE(test, mas_detach->tree, 0, 0); struct vm_area_struct *vma_mas, *vma_test; int test_count =3D 0; =20 @@ -2772,6 +2770,48 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, while (vma_iter_addr(vmi) > start) vma_iter_prev_range(vmi); =20 + return 0; + +userfaultfd_error: +munmap_gather_failed: +end_split_failed: + abort_munmap_vmas(mas_detach); +start_split_failed: +map_count_exceeded: + return error; +} + +/* + * do_vmi_align_munmap() - munmap the aligned region from @start to @end. + * @vmi: The vma iterator + * @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 + * @unlock: Set to true to drop the mmap_lock. unlocking only happens on + * success. + * + * Return: 0 on success and drops the lock if so directed, error and leave= s the + * lock held otherwise. + */ +static int +do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, + struct mm_struct *mm, unsigned long start, + unsigned long end, struct list_head *uf, bool unlock) +{ + struct maple_tree mt_detach; + MA_STATE(mas_detach, &mt_detach, 0, 0); + mt_init_flags(&mt_detach, vmi->mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); + mt_on_stack(mt_detach); + int error; + unsigned long locked_vm =3D 0; + + error =3D vmi_gather_munmap_vmas(vmi, vma, mm, start, end, uf, + &mas_detach, &locked_vm); + if (error) + goto gather_failed; + error =3D vma_iter_clear_gfp(vmi, start, end, GFP_KERNEL); if (error) goto clear_tree_failed; @@ -2782,12 +2822,8 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, return 0; =20 clear_tree_failed: -userfaultfd_error: -munmap_gather_failed: -end_split_failed: abort_munmap_vmas(&mas_detach); -start_split_failed: -map_count_exceeded: +gather_failed: validate_mm(mm); return error; } --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BD7F186E2C for ; Wed, 17 Jul 2024 20:07:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246866; cv=fail; b=Tgp7b23lu5MiYZld39hxkJ9Fqa8hMl5STXryQpCBko0J7/BCYhHBKPNz6LBFuGsvf3kNF3BS2dMBUQ1NnWTnxTFul+yFzkPdKkWPgeoE/nhbu3b4I1N4Ys1h4D1WdOTEHp5ctGeB0YcGlFvF32YvqJxMWym8u8/cFUM9/4uCu/A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246866; c=relaxed/simple; bh=ifX5J4u1vbCHvQsZvr5APMemaWJ0rns0q5T8KAO0MI4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=IYcsxS/rLVJ44HKOhkr9T1qvctZ6oaPmf3uY05cvPQ1b88aL+6tqjV57RmGBb8fkPEG4ierPfkanMeWUDG3A9FTUOPJAs7Nao+MHsB/kfrdanlx5x98+zxmiRrwFLuhgCMULPWeBzwcialowBpvcEPfPFHyIOrLNAP27pl9DSEQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=gJMb6BQo; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=voiaFBI4; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="gJMb6BQo"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="voiaFBI4" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJsQ5j016975; Wed, 17 Jul 2024 20:07:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=uZF6pfcItsFziTEqk2v7DiOKJeCOiZuix0/xFXNniOo=; b= gJMb6BQoVbVc+JPaQCTfcqCoeSkvW1mMMHOVtJARBkz4d2eAhQX8EZxKGb3iOXRY JXNmjOaTh79AZfj8G1G7FTdtgPz0hUB5d3TuT7tle5zmoyrpuOHlf7Nw2dYP511G Xpx+UuvcJ39pFuL3+JOKpg8X8DnRoMV+OYPK0SMAmU/nOXhOACVmV+RO0PFMkIaP CMU3HnrutPrk4ozPkLhBQgMemWSvEieUoBvHfEWUFMtx3nmbonjJYpAjLFnmEGa8 b2IqMhIbZxzJRw16IWfqft7dYkdX9gyAvD+1aZlzG9oIDmQu20+dV2Bsgvu8ULVe vewvJ4VZ+h0hqlUT9QxXgA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40em3m033e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:30 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXn006940; Wed, 17 Jul 2024 20:07:29 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QhRR4fCZ5aiLfxiXPvzhCSD9hLd38GqTlHpzfqW4Kt3SaojloB9nREGELs/Nbf1fyt2dh3Zg7hUw1LEVAyTMETrNc1Qdhpp54ii252p5tx4M27tvLqeiabxb2rZ9syb+IUKhm3eat1+jsXLe+84xW7DrSa252X6Vx24bsQRFYrK+bQKdrrBxvQOJh58ClUq9NnaXOTi7G34Tn1NzEt6ELVyUV158Xm7lvWxMIclY2OtrDgVa0ni5enZBdFJIFL52F5PG7Y+JIxev1tApUMmpCWqp0EXFXfMrRzF1xCdd+zN/rv81TprPTjk2DmLosO1VStbMQ4mKMrdWfsdFPkj0gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uZF6pfcItsFziTEqk2v7DiOKJeCOiZuix0/xFXNniOo=; b=CSWMKBgDJ+rQCUcR51s31PMI49ibdBHMdUBDs0mpoQPz+EggFwl1I+tGUZDHEZfsMgwyeEL8K8pJ1xyjRzxdb04vF/UaTlclj2qKaTcTeZ5AhYsRCH+2CMwXPWGn0JQQSh3B0gKuCmbovT3fl3t2RfYqC9bowTcBxdi8wQqNWdp4ydSLaxEK9SlL4lkzrCuScYQ6lwwyivEupwTA2pM3Ems+9it4N8PZhPISal+k27bI7QWXcHZjpfQBpCG730ANp1FIqx1o8UnyZYvt+luIQS6y4oeVwL8g2Y8WGGgRcCifOEr39y/PHq1NJZC/FL1PDkjuddG8sLcfv7DpLK7uJg== 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=uZF6pfcItsFziTEqk2v7DiOKJeCOiZuix0/xFXNniOo=; b=voiaFBI4WpMUrVSqlTHz6tXWrM1SmW6cjkhEC2BZyB96DVIiTU0t6QPdVFPAU1eR87HYKs8QmBv4sGeqs+e7hsaDEjuH/6azBuxJyAPkoq8aHjoCg85oOW00rv697OF0b80zUNeOPiZTakjE1WjZ4KgGE8BwyXNbJHKurPHCluY= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:25 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:25 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 05/21] mm/mmap: Introduce vma_munmap_struct for use in munmap operations Date: Wed, 17 Jul 2024 16:06:53 -0400 Message-ID: <20240717200709.1552558-6-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0157.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ac::29) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: a27bc2e4-c53d-41a1-eb90-08dca69c12f1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Bxb8YUMllyaObAwzYDXTHQNyI8wmnCRUCx66bQ/dP2YLNazlv4UyRL+OoZ5n?= =?us-ascii?Q?RQrMmjLoBbtkzfGf8/r6p/6N0ISV9ETQ7IUciWNDJBj1P+735BD71dh/XDxz?= =?us-ascii?Q?OGQV7lroW++EVMu9O4RM0uC0y5vSDeeJkeX8jTq/i4hh8D992/YgKwHfjGYC?= =?us-ascii?Q?kSx3kaUUH+jUuwmxiavgbbPbbynxKfigelegQjMvlc5xeCTxYpkV4XhOdeej?= =?us-ascii?Q?gafFZtVb1tq2Mh3R6FByRdHfaEiS8dRiEdWQUgwGe5rHEfdCHXV2evcRlP2z?= =?us-ascii?Q?SsnJKByHmZjMUpZZqWRD1kAqKQM9zNpSLS0pJZrgmLuDko3ximjHvshrf+Ha?= =?us-ascii?Q?A6wPX3tsVWzPGIhBrDT6QOAwJbd1ntH4JcFlheowQL3/M6nexBE/qIGmDx42?= =?us-ascii?Q?yJU/dKDq5L1zjcsxTrkOrwvThuTJq2Bp61ml4e9XzUaqvYf0EWQJNvLp0zmj?= =?us-ascii?Q?HVqlGXnqZR8h4qVrcyn4X/B7VJ2xzvFfmtO9zv7s5Wuj2N0IXszG0c6u1iou?= =?us-ascii?Q?zmFdhCS5V9WHaWBu5xmfbhXB39Km0sXVN8iuuoX35T55ZjU1PeZeZBA2D1Pv?= =?us-ascii?Q?WZHv9GfCUZNHYOe6Hhxi3UE0/EHOxr5LqLPiAzV7TnzLbq7idWoPQrQcEBnE?= =?us-ascii?Q?PV4DCnUmYs6bTvMT9YZnKO00Aay+oSGq0Tfv5dN+V33kUfDfhFxRUnddLp5d?= =?us-ascii?Q?rkhtWQODJi+gDFjYs46s4Ey/Uy9DpjWT2059fTSnya0bUCfEluMBGVE81rSe?= =?us-ascii?Q?wwQFYEKmB6j6okFqIEt3T+ckF4FChhXu85snV7DKoCd891MI4SzI4d0KZrI9?= =?us-ascii?Q?Dw7TrQPIXhRLdQvZR7H395P+2xs/fzeLb5O+aS8a0EcmhJ6GC0vtis4qdPoh?= =?us-ascii?Q?8D2DTTPDzz8nyShowH368aIpRHE3qhd31c0xP+3FLePoc+g/1hekl5whTW+o?= =?us-ascii?Q?wST8fvQJPDPkwYiCpz/+yw8ndkNh4wj9ybdSE5yUmoSYqVanrmz7l903hs/Z?= =?us-ascii?Q?z5c4M4RatodLgtF1FaHuQwC7XgDhvS3mvKxr8qywRmk8yi/FrLn52rARJ18s?= =?us-ascii?Q?a20lI666mUpND1j31l4Ec3qF5+dlujMTfjtsYIJbmISHmg0q8mBuFiLeOKsG?= =?us-ascii?Q?/cBOuTedvUufN+VwxmP4CqGk1++RO039rZJxVmjPyo6wLcJohv8BL1nWx2br?= =?us-ascii?Q?2sCmYZ5VSrZ6kX1d+u5+ouRqlSoh5YmvHmtUpvI8pVeg1D7/K0eSDgvLUxWp?= =?us-ascii?Q?01ZJSSvGKi/tD8Oc8BpUxq2ZwtZYp9EaQl2iraqhSmeXOjKGNSOyo+glR16Q?= =?us-ascii?Q?k94fg9gDVZfB4L4bPU9sKMGLAuqQpe+BSbeHmDdEqDyj+A=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Cd7pERAF4HhhZ4isPqapwnb/RNKrToyx26Vp9n4HOJs42HMR9v3AxrQwtRnE?= =?us-ascii?Q?H0ZkwnKvGs/5wco2ZsFppBbK1oVit3ikZTUcJGxDL4rNSdEZWcQHMYL1wv8d?= =?us-ascii?Q?AliRzYJpPWMuaWVTnFcNTO35+oRCxkbjp94v97ZVcDaq7FO71KMg2JQPmQe9?= =?us-ascii?Q?+RcnyUSYRIHkK9Y7T8cReeo0+MF1kr8ClFaAV0kBkJ3hAjSTRymisrtBPGRx?= =?us-ascii?Q?BzBKZGyNx3ZIwysf/vmtHcFFYo1ycqI193JjLcBhjCTikaVeyjP3r+3YTWIi?= =?us-ascii?Q?uC+x+ieWpTchrTYpuEezBUDO5nWu4LJLvc5z4zC714hpHQv/S3F+pilNWcaZ?= =?us-ascii?Q?ipowi6aeZv6UdAMztaQxZLXKEc0G3GevMpWhAwUFBYGcKIG+8B91hgn3BDL4?= =?us-ascii?Q?2j1AensabwEAxPQoGkVgtjInB/Uq/BozD7FxVCw7d5QvsZiAzLE0rI4j6MKv?= =?us-ascii?Q?OjAp/n0MzP3rjhbTse8VqvH654eqp/34iZGg0389tL+oibS/Otc6WOqK1jIS?= =?us-ascii?Q?za2DphbyqX8aYq0ic4DP6aZicjX/1Vs45wN2uGIj+Y/2P1lj3B6ZQzjdFw+N?= =?us-ascii?Q?aG73dLofFEq2GxPOOmvBAOL2DLL11tOaLZ6nEzU+8OSHER++MHfYM3nK9x64?= =?us-ascii?Q?/Zlm0/EVFpbJwJ0qNC7nLIksxLeJVANPY1sc/9NHJXBcRsO22g5fIn7i/0Zh?= =?us-ascii?Q?CcnUKgk1Qnh9SxvYUstQ50bnYyreXBCK/PQgkAdGahbg46WM1HYjc0Js7aPz?= =?us-ascii?Q?Kr/QfTw6Jz4riAbaCI/9QXX8+YXD2VCf+jtd+GeZvgodsJvzriEVvAQQKuS2?= =?us-ascii?Q?UAyS4cAm7/CmxZcVxMJQKRUydKjl7Q791lqb4DTt0ISqrz8SG5MDBGX/qHHw?= =?us-ascii?Q?UAG3bIHdan4Rx4mrJvDUo/8RhvqNn7NCTuVFzfsMhSh0hJLeCWRHLGA7mC89?= =?us-ascii?Q?TVz60pzFD6okJ5krDCHWrSrKZfEugT9z0QcjFHGBBj5B3WR8FcDVO8nllOAv?= =?us-ascii?Q?7LrwgkY0C8YW4wrTFBN0BXIh3j0D2/q4cTxnqmhcbdtzXacivXJdFA4b5zA7?= =?us-ascii?Q?Kx35+pm8dhUQfkYSA1tBKjcX02RkmFYxgfoSnRlnPthjPAU8UEbSPG0hDb66?= =?us-ascii?Q?+hx0MvgzdnA1HiSYmx19YOe5autHG1DLNh5Pt87WdJWbZuk0Bxe3jW1ALa00?= =?us-ascii?Q?QmD/aToxc92hh2v+wu40pmtwDpcW6BBaCP1nkXpjSlwqDrE8u5HdIo1JbCz+?= =?us-ascii?Q?B10/JbOjmK/xTodKuAEsWuu9zTJdn62SZkqMSYgbRpThUhslSjfgYtMVq9Lt?= =?us-ascii?Q?mL4HHB3vClXp4QIwebrCE/RpsgnUMGympB4u18/TY2IH+jcxN+DzHXm0ArOA?= =?us-ascii?Q?xHyas+NtqG5W/JM2wslWLtTZmPwU9DSy2SH+EBwhHvKs/k38bdc2FEZpe8IB?= =?us-ascii?Q?dwhFnr72MZ8nFxMEh/hJ0QegL/ifixDGZDFC7n0N+W73ewKaHLki/5Yy0PUJ?= =?us-ascii?Q?wivkVr5tyhlSEhqCYnWIhFzwwXGjgOIt4TuxVqZCsDJDJUvTnH3MMsCl7Hno?= =?us-ascii?Q?i6seuvVxzg6htAFJB3szB+R737HHoJ7+vOCQ9UAD?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: OU13lqNopdZ/4hgG7v5xLiamO9xUJ9mVtgKMfQozVkKhLTCRez6et//n2cq+VE1+F+plogWkVJK7BgMmcBe52KmsEOPbWX4rQIYzSlcynqEVerCkx6bQJ8siVOzvc/zqWyOo/pWKHYYBuBixKmrGhlQzKBZrtccOdUbot+1Nk1Xq+YXgujm/ltB+aH8hszPKMFVRM1Jols1ZReopC+LK/gQoG3gzzGZ9kWev9WhZLRCxB85sHwW5Y20ajqcQIn/JliqTbvYN373IiB49kJZnif1H5l4mrzb5RgthQs0EGHoLdjQiMOpHAOCWB4OWr3rm7gWkfMySa+xNPnxNHIAmrhYM1hS8QLAfCj10knTaMa6D/+zNsLuCphQV9PXEn+gI2cuYyGbAEqgEYkiipeT8qzBWK4cRAGDIvqk/hLND7lknwK52eyUBPUXyu3++mqRn5t1Ua0KfR6o+KHDXo65KTeO3fww2IuXjEvySZBPxWYFZeGY/EiauBKJTE4XFZOWIKHE9HxER8HNAE1J9TUClfcphYkpsPMh1PfPKlVicmum0kxpfqotubY4oAKaF0vQ70PR+3fasL1bekWPDUglJRRp3kT0jdL/8+DRBMNOQ1dE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a27bc2e4-c53d-41a1-eb90-08dca69c12f1 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:24.4742 (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: DTyE1rSR2WX2ugtLGbkscImFa+GoWakwaJ+2eqDlwZHGNps68iGfR8B6KVDc/Jr0vX/5X8thCuB/sF4fWdzjNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-ORIG-GUID: xuuZ5_ra5CKDlYTId5vGajqy8BfQ9eIO X-Proofpoint-GUID: xuuZ5_ra5CKDlYTId5vGajqy8BfQ9eIO Content-Type: text/plain; charset="utf-8" Use a structure to pass along all the necessary information and counters involved in removing vmas from the mm_struct. Update vmi_ function names to vms_ to indicate the first argument type change. Signed-off-by: Liam R. Howlett Reviewed-by: Suren Baghdasaryan Reviewed-by: Lorenzo Stoakes --- mm/internal.h | 16 ++++++ mm/mmap.c | 138 ++++++++++++++++++++++++++------------------------ 2 files changed, 89 insertions(+), 65 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index b4d86436565b..9d0f4d1bebba 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1481,6 +1481,22 @@ struct vma_prepare { struct vm_area_struct *remove2; }; =20 +/* + * vma munmap operation + */ +struct vma_munmap_struct { + struct vma_iterator *vmi; + struct mm_struct *mm; + struct vm_area_struct *vma; /* The first vma to munmap */ + struct list_head *uf; /* Userfaultfd list_head */ + unsigned long start; /* Aligned start addr (inclusive) */ + unsigned long end; /* Aligned end addr (exclusive) */ + int vma_count; /* Number of vmas that will be removed */ + unsigned long nr_pages; /* Number of pages being removed */ + unsigned long locked_vm; /* Number of locked pages */ + bool unlock; /* Unlock after the munmap */ +}; + void __meminit __init_single_page(struct page *page, unsigned long pfn, unsigned long zone, int nid); =20 diff --git a/mm/mmap.c b/mm/mmap.c index 0d03fcf2ac0b..1ed0720c38c5 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -500,6 +500,31 @@ static inline void init_vma_prep(struct vma_prepare *v= p, init_multi_vma_prep(vp, vma, NULL, NULL, NULL); } =20 +/* + * init_vma_munmap() - Initializer wrapper for vma_munmap_struct + * @vms: The vma munmap struct + * @vmi: The vma iterator + * @vma: The first vm_area_struct to munmap + * @start: The aligned start address to munmap + * @end: The aligned end address to munmap + * @uf: The userfaultfd list_head + * @unlock: Unlock after the operation. Only unlocked on success + */ +static inline void init_vma_munmap(struct vma_munmap_struct *vms, + struct vma_iterator *vmi, struct vm_area_struct *vma, + unsigned long start, unsigned long end, struct list_head *uf, + bool unlock) +{ + vms->vmi =3D vmi; + vms->vma =3D vma; + vms->mm =3D vma->vm_mm; + vms->start =3D start; + vms->end =3D end; + vms->unlock =3D unlock; + vms->uf =3D uf; + vms->vma_count =3D 0; + vms->nr_pages =3D vms->locked_vm =3D 0; +} =20 /* * vma_prepare() - Helper function for handling locking VMAs prior to alte= ring @@ -2603,81 +2628,63 @@ static inline void abort_munmap_vmas(struct ma_stat= e *mas_detach) } =20 /* - * vmi_complete_munmap_vmas() - Finish the munmap() operation - * @vmi: The vma iterator - * @vma: The first vma to be munmapped - * @mm: The mm struct - * @start: The start address - * @end: The end address - * @unlock: Unlock the mm or not - * @mas_detach: them maple state of the detached vma maple tree - * @locked_vm: The locked_vm count in the detached vmas + * vms_complete_munmap_vmas() - Finish the munmap() operation + * @vms: The vma munmap struct + * @mas_detach: The maple state of the detached vmas * - * This function updates the mm_struct, unmaps the region, frees the resou= rces + * This updates the mm_struct, unmaps the region, frees the resources * used for the munmap() and may downgrade the lock - if requested. Every= thing * needed to be done once the vma maple tree is updated. */ -static void -vmi_complete_munmap_vmas(struct vma_iterator *vmi, struct vm_area_struct *= vma, - struct mm_struct *mm, unsigned long start, - unsigned long end, bool unlock, struct ma_state *mas_detach, - unsigned long locked_vm) + +static void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, + struct ma_state *mas_detach) { struct vm_area_struct *prev, *next; - int count; + struct mm_struct *mm; =20 - count =3D mas_detach->index + 1; - mm->map_count -=3D count; - mm->locked_vm -=3D locked_vm; - if (unlock) + mm =3D vms->mm; + mm->map_count -=3D vms->vma_count; + mm->locked_vm -=3D vms->locked_vm; + if (vms->unlock) mmap_write_downgrade(mm); =20 - prev =3D vma_iter_prev_range(vmi); - next =3D vma_next(vmi); + prev =3D vma_iter_prev_range(vms->vmi); + next =3D vma_next(vms->vmi); if (next) - vma_iter_prev_range(vmi); + vma_iter_prev_range(vms->vmi); =20 /* * We can free page tables without write-locking mmap_lock because VMAs * were isolated before we downgraded mmap_lock. */ mas_set(mas_detach, 1); - unmap_region(mm, mas_detach, vma, prev, next, start, end, count, - !unlock); + unmap_region(mm, mas_detach, vms->vma, prev, next, vms->start, vms->end, + vms->vma_count, !vms->unlock); /* Statistics and freeing VMAs */ mas_set(mas_detach, 0); remove_mt(mm, mas_detach); validate_mm(mm); - if (unlock) + if (vms->unlock) mmap_read_unlock(mm); =20 __mt_destroy(mas_detach->tree); } =20 /* - * vmi_gather_munmap_vmas() - Put all VMAs within a range into a maple tree + * vms_gather_munmap_vmas() - Put all VMAs within a range into a maple tree * for removal at a later date. Handles splitting first and last if neces= sary * and marking the vmas as isolated. * - * @vmi: The vma iterator - * @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 + * @vms: The vma munmap struct * @mas_detach: The maple state tracking the detached tree - * @locked_vm: a pointer to store the VM_LOCKED pages count. * * Return: 0 on success */ -static int -vmi_gather_munmap_vmas(struct vma_iterator *vmi, struct vm_area_struct *vm= a, - struct mm_struct *mm, unsigned long start, - unsigned long end, struct list_head *uf, - struct ma_state *mas_detach, unsigned long *locked_vm) +static int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, + struct ma_state *mas_detach) { struct vm_area_struct *next =3D NULL; - int count =3D 0; int error =3D -ENOMEM; =20 /* @@ -2689,17 +2696,18 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, st= ruct vm_area_struct *vma, */ =20 /* Does it split the first one? */ - if (start > vma->vm_start) { + if (vms->start > vms->vma->vm_start) { =20 /* * Make sure that map_count on return from munmap() will * not exceed its limit; but let map_count go just above * its limit temporarily, to help free resources as expected. */ - if (end < vma->vm_end && mm->map_count >=3D sysctl_max_map_count) + if (vms->end < vms->vma->vm_end && + vms->mm->map_count >=3D sysctl_max_map_count) goto map_count_exceeded; =20 - error =3D __split_vma(vmi, vma, start, 1); + error =3D __split_vma(vms->vmi, vms->vma, vms->start, 1); if (error) goto start_split_failed; } @@ -2708,25 +2716,25 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, st= ruct vm_area_struct *vma, * Detach a range of VMAs from the mm. Using next as a temp variable as * it is always overwritten. */ - next =3D vma; + next =3D vms->vma; do { /* Does it split the end? */ - if (next->vm_end > end) { - error =3D __split_vma(vmi, next, end, 0); + if (next->vm_end > vms->end) { + error =3D __split_vma(vms->vmi, next, vms->end, 0); if (error) goto end_split_failed; } vma_start_write(next); - mas_set(mas_detach, count++); + mas_set(mas_detach, vms->vma_count++); error =3D mas_store_gfp(mas_detach, next, GFP_KERNEL); if (error) goto munmap_gather_failed; =20 vma_mark_detached(next, true); if (next->vm_flags & VM_LOCKED) - *locked_vm +=3D vma_pages(next); + vms->locked_vm +=3D vma_pages(next); =20 - if (unlikely(uf)) { + if (unlikely(vms->uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas * will remain split, but userland will get a @@ -2736,16 +2744,17 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, st= ruct vm_area_struct *vma, * split, despite we could. This is unlikely enough * failure that it's not worth optimizing it for. */ - error =3D userfaultfd_unmap_prep(next, start, end, uf); + error =3D userfaultfd_unmap_prep(next, vms->start, + vms->end, vms->uf); =20 if (error) goto userfaultfd_error; } #ifdef CONFIG_DEBUG_VM_MAPLE_TREE - BUG_ON(next->vm_start < start); - BUG_ON(next->vm_start > end); + BUG_ON(next->vm_start < vms->start); + BUG_ON(next->vm_start > vms->end); #endif - } for_each_vma_range(*vmi, next, end); + } for_each_vma_range(*(vms->vmi), next, vms->end); =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) /* Make sure no VMAs are about to be lost. */ @@ -2754,21 +2763,21 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, st= ruct vm_area_struct *vma, struct vm_area_struct *vma_mas, *vma_test; int test_count =3D 0; =20 - vma_iter_set(vmi, start); + vma_iter_set(vms->vmi, vms->start); rcu_read_lock(); - vma_test =3D mas_find(&test, count - 1); - for_each_vma_range(*vmi, vma_mas, end) { + vma_test =3D mas_find(&test, vms->vma_count - 1); + for_each_vma_range(*(vms->vmi), vma_mas, vms->end) { BUG_ON(vma_mas !=3D vma_test); test_count++; - vma_test =3D mas_next(&test, count - 1); + vma_test =3D mas_next(&test, vms->vma_count - 1); } rcu_read_unlock(); - BUG_ON(count !=3D test_count); + BUG_ON(vms->vma_count !=3D test_count); } #endif =20 - while (vma_iter_addr(vmi) > start) - vma_iter_prev_range(vmi); + while (vma_iter_addr(vms->vmi) > vms->start) + vma_iter_prev_range(vms->vmi); =20 return 0; =20 @@ -2804,11 +2813,11 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struc= t vm_area_struct *vma, MA_STATE(mas_detach, &mt_detach, 0, 0); mt_init_flags(&mt_detach, vmi->mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); mt_on_stack(mt_detach); + struct vma_munmap_struct vms; int error; - unsigned long locked_vm =3D 0; =20 - error =3D vmi_gather_munmap_vmas(vmi, vma, mm, start, end, uf, - &mas_detach, &locked_vm); + init_vma_munmap(&vms, vmi, vma, start, end, uf, unlock); + error =3D vms_gather_munmap_vmas(&vms, &mas_detach); if (error) goto gather_failed; =20 @@ -2817,8 +2826,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, goto clear_tree_failed; =20 /* Point of no return */ - vmi_complete_munmap_vmas(vmi, vma, mm, start, end, unlock, &mas_detach, - locked_vm); + vms_complete_munmap_vmas(&vms, &mas_detach); return 0; =20 clear_tree_failed: --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D61FB187850 for ; Wed, 17 Jul 2024 20:07:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246869; cv=fail; b=eBaqhvWpTK0gl908mCtGz734vOU4UwvWDMCPmwS7t7Lkt+/p8EnVRodnkd7ySEe7AcUPzUlaCMuAl3+nLLfv481fIBcA3aFKCPbfWPbFAOy3Eq9//Xe8MFkWX6EnPRZ/tSYMj+RIgUkgSVHD5vTT3tU6WTaBZLGyo2Q66hvO9M8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246869; c=relaxed/simple; bh=sXsnaUPNx2s7xu38GwZZGqSmUoOvaXfbJLoh1yiCk3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=eNHefdq0blnTapd+k8tAajcRxWTOhyyItKq0ceSRS61lr7/oWJ8j4W5F3WorfIodjaBh7RJ4r1jyydOyKE9U0tHmaFptFlBAI1lyZB3JERLUXb5/F7xCfIBY1Vy+5P2TJcEjZ+ptHn+ivbFXA1FRAOU/8gFwdah/J7TKVuMMg/M= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=UEOHCqPv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=o2RCFJsz; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="UEOHCqPv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="o2RCFJsz" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJtlDn031584; Wed, 17 Jul 2024 20:07:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=tD/0zTBFlIy2X0qEJP0lFciqbADB3HhcYy8G490XlQE=; b= UEOHCqPvhcJhliieKdzkhIxyN9qMci3eK5c/N/MaZJE3xNzVrIzA920wNZDCNCLt J32mDh3DNeAj6Do5/096814Vx2/2UEsdbhrKOWpjoomOivICj/iQwmluszgfSOyC zwxlFamfyOJXke9MUyRPUIrS2d6MB7QOBkhFUgOL6djdH7pdWHx3kdl+nPmDh73F lSSdNj18Bmq2vpkEz6Ngy4cPvav3Xv40G99Oj/QQYXy4Ot5Tk78jw4zVRlgsoJnS wgormYVg5sLKSdSiznhp/6CP8s8S5FG1FW7qqLwk1ELqXMpkX5YCVbB3goAuN4Ix z1vSaW80HcGurqgFOuyw5A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhpr0qj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:33 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXp006940; Wed, 17 Jul 2024 20:07:31 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZRElpd9xBDE8mhBPJl1G/HQ++kucTHhRj7G3Sr+QGFRvUWc2NtQZxoRY0mj+YgZWowaKseEg/yrulpyrLKc0S/Nq0jWy+rWOSR+VmckNFkGm94yf5+5lbYQL4MMKoQbo0annDkxdFiqlIdWbGKgavoTI5KbazWLJixEb1tHNCQblZKP6lBHSqrpvy+4/qouAu7NE13jKiZMhm1ZhQRKjnFHTLdoxKd/W2wLGTibq+3slBltMBfo461P3f7fb7QkI1SOvebaEcwK5nYXRJElQqQjMShLFOqxHq4k/c81yF4IbXr47iT3Byht8/+rvPm8xGCrFWNbe4p+S7VIZwodAGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=tD/0zTBFlIy2X0qEJP0lFciqbADB3HhcYy8G490XlQE=; b=K7KX4eHUZivoYjWJRGFcJUi4vDNg/yisvkcOp8VoNxSqdOHPIiH9KSjoPJZULyh+HMYFOwRIH8VyIpV9C3rCSdRwfiCKXWc4pmfLsUht7xFHlu3jL18xErLJeXjBfFLzYikZzoWb7gNtNI9KOgSkCCwwejh+TeAqau597wHajYkmTbvHRQLPDu+RQoPCcYv34EDZcT3T3s/yuTlz22My0TV7myEhAGLAIl9H0jMrNre27gFapbplsOGwKXB0oRUk+AjtfWisAB4c8klZihTsFfRbuGgST/2s1FkzOtWSgn7O7Qi+65zkD8APLhZEBYRYnL0OsQJHAPEEUFIo8QGy5w== 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=tD/0zTBFlIy2X0qEJP0lFciqbADB3HhcYy8G490XlQE=; b=o2RCFJsz33b5sRj08lELKRjgC9J5K6flbTgv2rjTZjhmx6pEK8vcV0m4gb8USE0y/6mpoYMBYxz93nFO2nqexzX6E4j3ylz4fckz2tXj/QzlWirGnVmjavwar8CCtDWhxjK29XCh/d8RAb5TTPeok9hX7+SidftH1lbJtUn7aWs= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:26 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:26 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 06/21] mm/mmap: Change munmap to use vma_munmap_struct() for accounting and surrounding vmas Date: Wed, 17 Jul 2024 16:06:54 -0400 Message-ID: <20240717200709.1552558-7-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT2PR01CA0026.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:38::31) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: ef419b56-51d9-4931-2f7a-08dca69c1461 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9nGc5X9E1SbyP5TrkU9tpJEb8sfFGDYF08E1Q0Ec+V1yj8IQTLTLlN+h/VZn?= =?us-ascii?Q?tcdjcMwB3uOSIckbB6l0o2AaW1DiK6KJ6Iyw5Ko+cxRrySKN54SMiO957zrj?= =?us-ascii?Q?lvS+42fdJIWj9ct4mofnDMIMpwGTp9MBax5leCFwgAx59wq4MnbekqNGcUIe?= =?us-ascii?Q?Hu4FDWkaB0nv/VqThNe2ZDnYjbaLYMDNBxKQ0aDwBH4+EsW7D0XyCFtfHB/B?= =?us-ascii?Q?LhBUmnHEdBkYYMMc65sSNuMxbBkBtsAYYPer6tlliT1DKoKbAADdTkiE0FGa?= =?us-ascii?Q?ew4ovZZb0fKqu8uNXz3SQg+Hh+KMQgthzhCIQ+6XtRaWFbSY4d7Q2di37Z4S?= =?us-ascii?Q?wa7gquc/IZ5WVHklYCwFq0WkmhPn4TjWv75W/n2CGI5CM+EGaempzdhAxci2?= =?us-ascii?Q?mJxipaa75I/E34MFDJ53Mt8tD9cWpLvF5uhqS8TtAN13GSrNTKZXuTkP4Xx5?= =?us-ascii?Q?p3Y7W4dpd6aLcswhA8K3oOHRs02dJp13H8wDzEqx092XUQmE6pa6RtKnIkqP?= =?us-ascii?Q?ua/b2yZ/VucNdKkAB6i3CLDMweepHCtAa5kZwA59hIKEZzPdV4HsnZ5L1Ncp?= =?us-ascii?Q?+3Cry7Eg4SJ6NSfjYuV2jl2Lw8HIN0HcUnPsJdDYNxkwNQtPprzP79K817AR?= =?us-ascii?Q?gNTOb3QSrHAJxr+OXqfyt00FVRaFyWLchtlomNIyQblTdPZE1bNVraXwgrhq?= =?us-ascii?Q?OzcEtCIOZszPXlIusf6Rq0gEu3VfrdUwXVmGLNE+hnBdQXEhHPewoGfwXp34?= =?us-ascii?Q?Tx72eHUVPdSDJmwUtmhZVTlfeuO5HKObG9/vIxA8ajxADc0QdqQTRw0fhXLP?= =?us-ascii?Q?i3aIGV4a671Cv7InJPvl1qpwC4PxUSsUNoVe7JAxszl13xahcIkXlqY0ydnT?= =?us-ascii?Q?IRoop+72oGVBVwBJTJUGoGH/KftL+mqUgpnMn4SFC84CBSFz2ZpgUwnHVKtM?= =?us-ascii?Q?f7JOyPW7I5yqI3NArldpUVM2bBhK3CrtU8A09X/f2qhsRPf8ms0mzStBhGrf?= =?us-ascii?Q?etlwYhbii/KbpQ1vgElvy8WcHkI94hicggThfig6Pd4CqyRbWE1df4Ux/8dq?= =?us-ascii?Q?35OGFnITS60xMt6IBF1q4yRpcViLxdoopK1K57dXW/ikYtAn2tEUqh7RNRyE?= =?us-ascii?Q?XOtkg9y+oCKBo6xjU+aVvp4mV/Z0rrNc9Zc2VVwN9lb23+3t5uh5GW0od/S0?= =?us-ascii?Q?m0N97ITipsmDex9Mm6WSYiBUjPjnyC6HCQImmZTk8oBF3MxFFPHMqH0VyqkT?= =?us-ascii?Q?IaFV/0qWCPJ1nzerJqIq04IbdTOJrKuoEVzu4tnanXBXR70joMtStrjH3Zaf?= =?us-ascii?Q?xR/C5szA93DF38KIQ1GshZVamNT+kUzQ8NEAtxFh+2YCtg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rfuvp8+mtjwSu+I9A56ykuX/qrwl5DhTOBFHrFi6JSi2p9VjmqBJUygF/wS+?= =?us-ascii?Q?Wp/5QNxnrx1b0tLjp/OgDdEJTVGbkov9Z4h3Ftr4e6/wEg4djvHOJXxg8KoX?= =?us-ascii?Q?39YMrITdIhhyWbHE88TNiqRY9AhS9VQsFZSMfpNYA1NjJy2JeOD/mn9kh3o+?= =?us-ascii?Q?qL9BPDYUtzK5MLvF05PpuOq8qZfdNT/o0aR/r82aS0bmH4c17l27fVYD9G2A?= =?us-ascii?Q?Bfpxyy1ZjTvkhgk1lkXgTL6r1MYdGWjsivystxdtpjVwAGf8lgb8wxD0xZIv?= =?us-ascii?Q?QxGgwpYvObvBvoht5Rd8/fltLIFR6XTjVZo6a/+mQcfo+qFjO3Ouo3HEKx4w?= =?us-ascii?Q?zJ58Bf70P6njU5jDBwm/R8ZPiuwe91vfxL9ifr9sdAo+MahgcMwj0jpo+8hu?= =?us-ascii?Q?ekYZyECbalIa7ROHfmld3WbKEuhzYGwbZRjW48JnFIWqtRwfrlkFtVCJYW1C?= =?us-ascii?Q?4Pu9WDzeEQv5u0GqNJsUvAQb1mP0ZgOU1dq7bcoBRjFs/YWsIldau++20WSx?= =?us-ascii?Q?uhT2l6wQX8rux76tm/+svnIC+kHpjY0Fzrz49s3ovj5/rzZDcXBI4tftHCrx?= =?us-ascii?Q?Y6g5D/G0f8y/EOdFinAPJFiQ6K83GPsw09bh0MD/1wXcC3O9aqSAC20MNDD3?= =?us-ascii?Q?lcD6RY6b81o0ELmbRFhHm4f/R4uwHdYy6RSHpAmlX3SOxLiqbcy1jVmbNwrU?= =?us-ascii?Q?jsHsvJKMTV2vQ/2c124v9XS0HXWYbxPtygNd9F2NT3zN1QWFG//u9t8NS7XP?= =?us-ascii?Q?duDhKuFgSZyVM3RzVd21h9Yp9KDeX8O8PtzTRr2R3bb61n17w244QwaohAvF?= =?us-ascii?Q?VbemCYng5TLleolqoz3xSdTl6/wNl0R73O21uAP3BD5SpmldWp6gZ6waVg3X?= =?us-ascii?Q?Opqt5SZnbwCe5hZe0d31hYpE9UbHFA6gBgeqw1V9RjfYhpSZLfDOMLhGMWN6?= =?us-ascii?Q?63vYkEYZPeicaqCiCNI/1ImyFmt3mfpQfHm4G45AgOxDm3eC+vSmocJ+19fR?= =?us-ascii?Q?PD+JHSsk+6aIRvqQgGA7/7EiW1ZjRcTPnP1pWXbFEqth3P10dA0LsLI/zJuh?= =?us-ascii?Q?2Qa2CtUP0VgMffMGf0XvpIzBI1Tmm6Eo1w/tHEFleOMa5MpLNK8IKBKGTcwS?= =?us-ascii?Q?E++2jKhkTuVHRAQQFIKznZiv/xetL9yViILXnHtIRVnGXewJ+o0NeDA2hB3b?= =?us-ascii?Q?mBC8FX3C56g5X3k7uCnnfYGv+95UVbTFa7S5vG5tXghaKR0ZBoclxlZ3i91C?= =?us-ascii?Q?O3w39+WZiVHKDiQZXUaYrpP7nsA7y9uI/Z9Hgeo/V9cRGskPfpwDsfffMfhw?= =?us-ascii?Q?vDmOvImA5b8qp3UdoPjuBg6HycbM9cPlWcQfyqiXaAcHGzdcxzGj/0AqcfVn?= =?us-ascii?Q?eGZ3/PkCkd0OpnqNtgkZR0i3gi+lmKnyILNuR+QpU90wkfFaGuKxf3c8vKyP?= =?us-ascii?Q?ZCU9w/HVomzcJITDP+sZ3j3YiWjg9Ax0TRRIhZw87um8+bWAVylJTUpLIiSZ?= =?us-ascii?Q?MFls6CEjBaX43RVGqrw5DkH+3nskXJsUsNZIYo3+tQqaI2uJiELAuEBK3sJG?= =?us-ascii?Q?IIGy1J4d0QaId9Je8lvhHRAzl7UVU6QtfqyFy6uv?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PyJ9K5P+U7VVUm3IX8Sfzb0Sm3Q840Z0ZJ/A6VBmnKEaBJ0ucmm1rjJrNuaqHyGbzPQu/IGm7Uy1kN3qUesZ1dkuau2X5sYzgVT8ykWHSiUrTCI6mLAog7gBYPvPxdsPpWJNROZG4e+tp2PEXbUkg08AEhgHcdGWHyD2R1PnOLkcgXcJdOgFWwB/ZVRctU8Vgd7nNZcuU4uCr4uwst8nUegv2aZSDNj+sm+0dEmoALq36a4aWvoXNkTGGfj1JXDSfT/qo8QXTSuUkgOv5c/LtaPLyad7Z3Z9QFbcSBQNVdWxet4Pll9DvQnq61dwt56RvA89USoQS3s1s/tC/QShSQM42ApSRKF2WQ5w72leRS7H9FrEFCStiquFF0lSp1py3/drzbw/xRKZzFRp7efm81vDl5HXQAqvTkA0VmRc+n5gqq9Anaor0J8MUH7JJ/XwZrNUAiAFObtw9lF4EVuw1kSV27URWMfXn6HwXcatuSWY+rWqW6euNRH4xtgc2WHnf+QRvGprv9qpbjRYvp5xo2Rub2x4U9ughsi97UNoY9T4Zj6e0lC9uqNUUDiRWMHiBqqzzMA6tUWu7AGr5tgCjn+pmykAuuXte6Yw9WZdTIc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef419b56-51d9-4931-2f7a-08dca69c1461 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:26.7693 (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: xDhIvbNrNjGt/VOKHOCSmMAgTf5L7QJ/Kx38jeuPqa5wFuNjgF68xAOeAhpIzpZ6gX9PW1lfkoApkarE5mTg4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: 1lp5xNXu4R5qAyxKqzPfYsmeLJd5spJy X-Proofpoint-ORIG-GUID: 1lp5xNXu4R5qAyxKqzPfYsmeLJd5spJy Content-Type: text/plain; charset="utf-8" Clean up the code by changing the munmap operation to use a structure for the accounting and munmap variables. Since remove_mt() is only called in one location and the contents will be reduced to almost nothing. The remains of the function can be added to vms_complete_munmap_vmas(). Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/internal.h | 6 ++++ mm/mmap.c | 80 +++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 9d0f4d1bebba..02627e269d6b 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1488,12 +1488,18 @@ struct vma_munmap_struct { struct vma_iterator *vmi; struct mm_struct *mm; struct vm_area_struct *vma; /* The first vma to munmap */ + struct vm_area_struct *prev; /* vma before the munmap area */ + struct vm_area_struct *next; /* vma after the munmap area */ struct list_head *uf; /* Userfaultfd list_head */ unsigned long start; /* Aligned start addr (inclusive) */ unsigned long end; /* Aligned end addr (exclusive) */ int vma_count; /* Number of vmas that will be removed */ unsigned long nr_pages; /* Number of pages being removed */ unsigned long locked_vm; /* Number of locked pages */ + unsigned long nr_accounted; /* Number of VM_ACCOUNT pages */ + unsigned long exec_vm; + unsigned long stack_vm; + unsigned long data_vm; bool unlock; /* Unlock after the munmap */ }; =20 diff --git a/mm/mmap.c b/mm/mmap.c index 1ed0720c38c5..62ff7aa10004 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -523,7 +523,8 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, vms->unlock =3D unlock; vms->uf =3D uf; vms->vma_count =3D 0; - vms->nr_pages =3D vms->locked_vm =3D 0; + vms->nr_pages =3D vms->locked_vm =3D vms->nr_accounted =3D 0; + vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; } =20 /* @@ -2388,30 +2389,6 @@ struct vm_area_struct *expand_stack(struct mm_struct= *mm, unsigned long addr) return vma; } =20 -/* - * Ok - we have the memory areas we should free on a maple tree so release= them, - * and do the vma updates. - * - * Called with the mm semaphore held. - */ -static inline void remove_mt(struct mm_struct *mm, struct ma_state *mas) -{ - unsigned long nr_accounted =3D 0; - struct vm_area_struct *vma; - - /* Update high watermark before we lower total_vm */ - update_hiwater_vm(mm); - mas_for_each(mas, vma, ULONG_MAX) { - long nrpages =3D vma_pages(vma); - - if (vma->vm_flags & VM_ACCOUNT) - nr_accounted +=3D nrpages; - vm_stat_account(mm, vma->vm_flags, -nrpages); - remove_vma(vma, false); - } - vm_unacct_memory(nr_accounted); -} - /* * Get rid of page table information in the indicated region. * @@ -2632,15 +2609,14 @@ static inline void abort_munmap_vmas(struct ma_stat= e *mas_detach) * @vms: The vma munmap struct * @mas_detach: The maple state of the detached vmas * - * This updates the mm_struct, unmaps the region, frees the resources + * This function updates the mm_struct, unmaps the region, frees the resou= rces * used for the munmap() and may downgrade the lock - if requested. Every= thing * needed to be done once the vma maple tree is updated. */ - static void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach) { - struct vm_area_struct *prev, *next; + struct vm_area_struct *vma; struct mm_struct *mm; =20 mm =3D vms->mm; @@ -2649,21 +2625,26 @@ static void vms_complete_munmap_vmas(struct vma_mun= map_struct *vms, if (vms->unlock) mmap_write_downgrade(mm); =20 - prev =3D vma_iter_prev_range(vms->vmi); - next =3D vma_next(vms->vmi); - if (next) - vma_iter_prev_range(vms->vmi); - /* * We can free page tables without write-locking mmap_lock because VMAs * were isolated before we downgraded mmap_lock. */ mas_set(mas_detach, 1); - unmap_region(mm, mas_detach, vms->vma, prev, next, vms->start, vms->end, - vms->vma_count, !vms->unlock); - /* Statistics and freeing VMAs */ + unmap_region(mm, mas_detach, vms->vma, vms->prev, vms->next, + vms->start, vms->end, vms->vma_count, !vms->unlock); + /* Update high watermark before we lower total_vm */ + update_hiwater_vm(mm); + /* Stat accounting */ + WRITE_ONCE(mm->total_vm, READ_ONCE(mm->total_vm) - vms->nr_pages); + mm->exec_vm -=3D vms->exec_vm; + mm->stack_vm -=3D vms->stack_vm; + mm->data_vm -=3D vms->data_vm; + /* Remove and clean up vmas */ mas_set(mas_detach, 0); - remove_mt(mm, mas_detach); + mas_for_each(mas_detach, vma, ULONG_MAX) + remove_vma(vma, false); + + vm_unacct_memory(vms->nr_accounted); validate_mm(mm); if (vms->unlock) mmap_read_unlock(mm); @@ -2711,13 +2692,14 @@ static int vms_gather_munmap_vmas(struct vma_munmap= _struct *vms, if (error) goto start_split_failed; } + vms->prev =3D vma_prev(vms->vmi); =20 /* * Detach a range of VMAs from the mm. Using next as a temp variable as * it is always overwritten. */ - next =3D vms->vma; - do { + for_each_vma_range(*(vms->vmi), next, vms->end) { + long nrpages; /* Does it split the end? */ if (next->vm_end > vms->end) { error =3D __split_vma(vms->vmi, next, vms->end, 0); @@ -2731,6 +2713,22 @@ static int vms_gather_munmap_vmas(struct vma_munmap_= struct *vms, goto munmap_gather_failed; =20 vma_mark_detached(next, true); + nrpages =3D vma_pages(next); + + vms->nr_pages +=3D nrpages; + if (next->vm_flags & VM_LOCKED) + vms->locked_vm +=3D nrpages; + + if (next->vm_flags & VM_ACCOUNT) + vms->nr_accounted +=3D nrpages; + + if (is_exec_mapping(next->vm_flags)) + vms->exec_vm +=3D nrpages; + else if (is_stack_mapping(next->vm_flags)) + vms->stack_vm +=3D nrpages; + else if (is_data_mapping(next->vm_flags)) + vms->data_vm +=3D nrpages; + if (next->vm_flags & VM_LOCKED) vms->locked_vm +=3D vma_pages(next); =20 @@ -2754,7 +2752,9 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, BUG_ON(next->vm_start < vms->start); BUG_ON(next->vm_start > vms->end); #endif - } for_each_vma_range(*(vms->vmi), next, vms->end); + } + + vms->next =3D vma_next(vms->vmi); =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) /* Make sure no VMAs are about to be lost. */ --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B41EE18C178 for ; Wed, 17 Jul 2024 20:07:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246874; cv=fail; b=Ey1VSvnJt2jmxL4S5DEgolAchEUMlv70GM2cFBvdt/LiYnLh1qTjSRpzil7uq8F/2oiQKhYzOn7DydHmQIWjUmA+YSHGbXBCt2NJd46xwMr6R8n9mE/G0IZ4sllAI5vI1Td0Q7q6YcT6ufZ252G1khoYUSypCaMlLZeUNu5X+og= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246874; c=relaxed/simple; bh=o/vxcAtBQy4UY2vf/sacRBA+pJQ2L8jcqQcEGuxhZRY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Q/aANWFsIePRlOGnZQaFR8HwMAprmYXRFFUxQj3f9x5pQsiMgV1s577oDqREQUM1Bbs0k8uR0dV/2BEIRCpnC9sqej0nqRpLPpDTJ8ZO6SXI07epYIh6wBNY+WeNcivZYKAjxboqO7y80Znp+Qn+Gm3EF5LjPnYkYeYyc7Xu0RA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YnCg+waC; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=0N3mKt37; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YnCg+waC"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="0N3mKt37" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK4ww9001760; Wed, 17 Jul 2024 20:07:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=R72J2Rq+pSM7hD2A/i8y70d9fRxZSFkCgc//56gCKE0=; b= YnCg+waCSG6RuuK/GLj84Mntb5/ucduftPtXPkwlmsMp+LPXW9o4Qd+ZPoFaLVRW PYDfmD+sJL0dwpEzFoZWTAfSmtYQfmvobDaLSIXxFu2y/g2yJZJszb73kFk9MmSP XombzOSC4bzOz6chZ/r8psvwbZ9tT+BHNgGH76Hkng9pmtYV0NWihp840WZr5VJc n5QU7DYmkslW1Tvba7ShztRIGDfEW/WtKtBjoHRYEp+EAayjWUv7uBpJ7C8Hbt5q XlwiStWuLqASrEVq+u9Rjb7Tzf7k9cBppqAhWG5eqVwFoQpz7bVF4Ue+VbWgE91f 0PppHHV5klbkIysRI0X/hA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5r07e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:33 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIrJXq006940; Wed, 17 Jul 2024 20:07:32 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwey1fcb-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=afWhwIemtrElLX4i+QbK4Vl8ERhZCye+kLI/KNx6FJYXGIq3y5E+3OHpFmCXksZ5iujdv7ycFqLSjXs4N7GpK9cD6Mi0c64u/iyi8F55I+NxNwCpk8zldtkBJs13fQXWjQ3YRnwoRIQEO3OKX80r5efSwiGHgmVxyXFYKotNDS7fDP7UJBxxQO2xgP73/ZwAbnZyaCvw5EXmneRtnorFUMy2T4hHKp39O9nxWNZS/7oFIrMZZgMlsNhxqjPQcyMZQZPYsntqhCKH0W2SrsusKN2kxtvQxUOm93o7qhuVAj/fVGtvStntHUU1mJ7FBcmKx8Tk4+nxPPBXPeh+I2z3Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=R72J2Rq+pSM7hD2A/i8y70d9fRxZSFkCgc//56gCKE0=; b=EDQhMJ3FMwPIi6FJ9DWaEl8L/ZzZvfQjHiS2wfaXG9ps/lrOrplbiDYcm4S0WlSIofEXzDBtWfSUKfDaPlCk/rXX2pSolquWPCOStVxP2udOtG9NCnfDJ3utfaTKB3bW7MZisCLs5PvE2CJt7y9CqwdK4NJQGYwATMJS8JK9YYJXD0ftMu1pIUhU4AiRggDzxEQOpG1O02WMSoSybncDrz8w9NN+sLtefs6sS6nuWFb2iBvrfa+JRSyXFNMbmkrIH+qHiNH3O1CLlaETyA75CdCiK3O6DoRd1uDbWks8n8r7rG4eSB+0F2oCqQhIKOtLEn1DMvUaqD5LlTSvHOqdhA== 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=R72J2Rq+pSM7hD2A/i8y70d9fRxZSFkCgc//56gCKE0=; b=0N3mKt37eX7BEO86r16/p8a1fYT5MykxS5W4SnGB88SIG8ejAqHX5XbLhukJ6bUHaMfejVyumhFwabi2wMWxtqR1vSKamnoh8bHgP/8UblK5PDjgRDf0yo0f1R2Cs+rxHQsNSC9s7hU6eiVWGaJM8Ek7Ltov67ez8+USnKacs9s= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:28 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:28 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 07/21] mm/mmap: Extract validate_mm() from vma_complete() Date: Wed, 17 Jul 2024 16:06:55 -0400 Message-ID: <20240717200709.1552558-8-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT2PR01CA0002.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:38::7) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: 96490cb5-e445-4164-255e-08dca69c1552 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3cuBf45e3BBp8JbBVJAh3WLSLtq+OjPRc/qlSsPhQwTcjkOg+Lnib4ul3r2j?= =?us-ascii?Q?CyRLK86B+chKUeaC2KfhCA1RyrQ1AVz228DCjf3QCxhDwmzJa3cJ2/Tw7JvQ?= =?us-ascii?Q?IHBUSQ4t2/iPUKpx74NfXq2sRakN9l0vCyLyIgXJOa1vn2n+nf3m8inH1Hh7?= =?us-ascii?Q?DwW0T9qHfnmLNrtgg4R82CHsn5OFa9n73+SROOlTQLQWtv/C8jTD1OmufSoI?= =?us-ascii?Q?pPPkZWnzfD9UbD+ikOli6QL51ASfZ73adr1lHYaLOLaLyBX+uSKu4LxHK0CD?= =?us-ascii?Q?b1KwXNh8TmWPz2EPCHI7avPZ0oRVayFjteYExX037w12eRsABKaC+CsMQdaY?= =?us-ascii?Q?JXh4bVd1TODO8mvvzd8r0Zws4TKt2opo2aH+LZV5lix8W3JZq0xk/VBS7F1R?= =?us-ascii?Q?cpcs6gMjSTjl7FGMP3AuIGhuwQ1HUjwLtS82iv+DNNzAvjaZ6flzdaPfegA2?= =?us-ascii?Q?J7pH6QN7Ij1r+dFa3Bi32oq+oyJ1CSeDUMZGktPfgXkUjhR/3m+0suGjBEEG?= =?us-ascii?Q?j+BQWGvz+rOZIUUJpYkpNCCwznZ0kF64qr98jcAMxO1OcitAkUbuRYhbE9Wn?= =?us-ascii?Q?+hjBcz9ovERWotYwpnTX0f6iWy9T9DzgS6LfRVgsCvW8PE2gtdMhD1acZMtH?= =?us-ascii?Q?0zGkY9HGkT0OUVIG5iidJy6Z3J1c7DJk+Xlr+GADqzVlnNk97riWdrVqJ7wt?= =?us-ascii?Q?g5G8U4ssof6L+3b+MGj1bwfTLHKYzZ4XmxfrZvQwa2S3QHfL3OQzNtgt4W3z?= =?us-ascii?Q?orMu7wZbtwkdxfVDfux+4SsZ4yHiPKwEVw5GRI018LGWGhqel2SqSS9j2AVB?= =?us-ascii?Q?1/w47pAXZ9nVFsZ0GACj8GqZGfJxA2DKA7uv5XcDMiapdz4JrdshH7Y4PCS2?= =?us-ascii?Q?Uk3q4/FjxOzm5GlLn8fgh7fvSxyEyritaYPLCFMTwcP2vsx5p9SYS98eHkfJ?= =?us-ascii?Q?BjS5H09+MfyRHzZ6BV0xuqqh5+o0fspIcnxNaF7dY24EGktONh5f+BNfdjnx?= =?us-ascii?Q?yl0QmElux8VkGF3vmigN5sJoEFFMiBOgr9Rl8mqGejNDu3/cjGG/4clG5hkS?= =?us-ascii?Q?J6sx7d54OeWZfVTuSuqto+wvzs8GCVvEqT1fjTcEGGZj5XCKTa8fnIl136bV?= =?us-ascii?Q?/Zj/xx22irdNuNzArhpxbIr2P0bzCFRXWuKqpxwrXFEbn2T16VfI5fkoRlkS?= =?us-ascii?Q?1IBHlSRBfhKrQLFyDDQytPYKFdHrSVS1PduQuKPaezhhmy3CFsbgzDLNrfiY?= =?us-ascii?Q?hd1j3Mt40sKtzydqs/5pKp2xNjlM5JkxapXPzXtKSzRP1EGX+L7aMHi3aqEF?= =?us-ascii?Q?4WRYkO+zU/tNtAkx2s15StDbvL4GkBYzbeNdIhL6W2hQNw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WE15ZjdNkp4V7zVaf6V3gbWBbaOYjLr5PuQtouOOTRHk5lBbz+mXnyLOPyEW?= =?us-ascii?Q?7eyUmRjYGCX+ib4KQEzt9PmDrb9h3ozlqjujiFllUUpfkHHIq/3QRSGjQ30g?= =?us-ascii?Q?Qa9sA5ZnLGg8XeZaCjjgONXebiSUxNoHGxHsm0qBqpGSnJSCMPWeRfi0zz7J?= =?us-ascii?Q?0L4/o7Q/fNkdcS85KYyMu/ufLbmTJgZmO7roLy8SOFwF7qjRbs7QPWgwU0AB?= =?us-ascii?Q?4obDp8bMctNNBW1WSc4yB8jqBQiAeQ8Mb5pHHj9CzjbShHyPsWUoR50CAl2N?= =?us-ascii?Q?ujqoVRe6LuV85qH8EqVLFFHBr6b5XKr03plbopRHem423YxjxAL03n3L63uw?= =?us-ascii?Q?x9AdwJVRGp2PFWwUvcHVTT7ZrRtVRx9g3hGnWHJfRhUJjpxlV5xbwbJkZeEO?= =?us-ascii?Q?VRryOor9olvRwWMGjc4ojMxAUWV7SnxtFMzNGOWl7iyVkuXkhEv2k+7Am4CD?= =?us-ascii?Q?ISNl1gNnpMhKMAeW7dZpVnLlyPG2csHNdN1oFF1EwTi1n+abz0Mw7AY6QPD6?= =?us-ascii?Q?kT6Yc4zb7sWqtqyFTmzKHtAbyzWrfkFn1HQ2aCHuRbLzYX/LQTHmZr3aGJlm?= =?us-ascii?Q?9IjVAD9O4mjrdA2w8Rkn0Aa9Dhe0zRlzuBtzQUvURoe5KPpc31O50D8Cz5r7?= =?us-ascii?Q?EMtzLRe4X4arq+JqXRLxpXvl+mBUBB1EF4JP7nyTU3V7z7vyWqASlmTs1Dtr?= =?us-ascii?Q?WQdYacwJEUP1ttZIrdO0hJY5IZ+JS+oenpatRZUip/U7uXKUTL7yiYtFyGfI?= =?us-ascii?Q?HWdWYHO1RakNX7qSGJX6qFlGIb293hfRIl4ZhvvHDYgwiQt9r4/VX1d8Z1UH?= =?us-ascii?Q?al8fAfuTqIFoTfMacW4lFCvrfQjGpqe4LYD6CqgS+cyADcZxAGCmvRcLagrT?= =?us-ascii?Q?f9YdGp13/cE0ses4pAi2ZgFhicYf1vs5wXa74Xeaq6HTMhN31JgF4VMUFnrI?= =?us-ascii?Q?BoaB0xEx8cG/TOogZxDOd+nc2m+EKL3x1Aqbd8/4zcd4AruO1hic87kuPdws?= =?us-ascii?Q?neeSOl7j7vV9Tpad0TEKMfaPOPvHwqohzFSLiyffoepwQX0s/kl+DzLejXGL?= =?us-ascii?Q?aTQWm5K4qvWqShl1VknSUKan9mQrvaSFptniie51pWOBt+KkA59l3m8MkjDS?= =?us-ascii?Q?/tcthWywrkKK+0nC0u/JTv3slq8JLxnTi0y17hFHP+6b/CbG5bCRkPKZ9QKN?= =?us-ascii?Q?DDVjxbAzqmv9LcKInt1KRPEnKKhczDIkiFcPsVVYiM0esUoyS9MII7eF16k9?= =?us-ascii?Q?X/KmbdZaF6hKcBY9QKgGzxn7Yid2IBdclXFaMcyGkx5zS0KWZ97jRPa+hD9i?= =?us-ascii?Q?DmDsSLaBd+TyPoLpk0XH4YYZ/o/lvcHNc9xiP3MCV9QT7X2+kakguuaS4nI7?= =?us-ascii?Q?bDTJQIb7S+pzdPLB+N6Y9YnGcZaPv5kS5Ke18ctcICQW8QGYodM8d/09VIxZ?= =?us-ascii?Q?3bY6so35c0diwGPfraetdHoFV047o2+x5ky3TYTOQBfFMQYAmyxNl77txh+i?= =?us-ascii?Q?3/3LuEBsXhKJUwF4tGCcbGWyDUn+dIKAit/h7hbj2RaFqiSn+9rX6Y/sVFKI?= =?us-ascii?Q?/D/qW/ZPcudoxy/IF9MwY6MAm9kZrMB8Dz4gJG8z?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5+ZyUoKFQJZkgOtWR1XftoJpF6+a7CZmH5uWV8nvYSCeiunwUdRPnH+7o/7Y+OGYY/pYCegwftUHP5YpjUkDUJCgJYutOLgukdhx53+mdbGeKRHhWL7zol9T3iP78hpx63Khe8uoXzwVI2aQPJ+Mmeoinyubsysex4qvYBBEt5Hx1Ztwhx9FR/zcbpfzVfUWJ1OzqiatITZy15o/SvuBFAIpuD6ec6IaJWtQTSlfmIGlkHmWIonFDyE03UXEMcGNotSQAnFgt0XiOATy+5u8Nsm1CXpwgYqW8LTYjD+BEmJld7Fua/Wv/UcMuFHjLX6e6VZt0UGUPGR8BClJYZfBbvhoYIpNxn4ayvtAtuWJlgWZjYqctUOCYuKp1MtUexCExWmKx8J2av/UgcLbJYw9BXpiBl4wNZ4uDeNy0bqssT3tRvUpLZhvhudh0rxBq8zzLHaBC4YlwR/vXmUKhdBc1Xxu+9U+H86H2MjligJYxTE9No/BwXBuD0Yh7yhFVZfqeTmQZlfC4L9xk+N0A2GsFU6xOeniy8BTp8bSTwmACvokW8u5b5XMq7SpBScc086hrJg+Cx7uvIaDh46FZlkVYMi10Owi+HuwqxuhFWKOGso= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96490cb5-e445-4164-255e-08dca69c1552 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:28.3994 (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: fvfhnHAjnSjwMxY/pZriZ9KQrL7ZHHL4EX1fRArRb5lp6a7lH6tzjLmWtbJoQzLdjPYiPP4huU1D+y8/cs28jg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: Cp1m-mtI6d2amT0j3kFnT_RNDrFgb7RV X-Proofpoint-ORIG-GUID: Cp1m-mtI6d2amT0j3kFnT_RNDrFgb7RV Content-Type: text/plain; charset="utf-8" vma_complete() will need to be called during an unsafe time to call validate_mm(). Extract the call in all places now so that only one location can be modified in the next change. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 62ff7aa10004..1c9016fb6b5c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -646,7 +646,6 @@ static inline void vma_complete(struct vma_prepare *vp, } if (vp->insert && vp->file) uprobe_mmap(vp->insert); - validate_mm(mm); } =20 /* @@ -734,6 +733,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area= _struct *vma, vma_iter_store(vmi, vma); =20 vma_complete(&vp, vmi, vma->vm_mm); + validate_mm(vma->vm_mm); return 0; =20 nomem: @@ -775,6 +775,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area= _struct *vma, vma_iter_clear(vmi); vma_set_range(vma, start, end, pgoff); vma_complete(&vp, vmi, vma->vm_mm); + validate_mm(vma->vm_mm); return 0; } =20 @@ -1103,6 +1104,7 @@ static struct vm_area_struct } =20 vma_complete(&vp, vmi, mm); + validate_mm(mm); khugepaged_enter_vma(res, vm_flags); return res; =20 @@ -2481,6 +2483,7 @@ static int __split_vma(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, =20 /* vma_complete stores the new vma */ vma_complete(&vp, vmi, vma->vm_mm); + validate_mm(vma->vm_mm); =20 /* Success. */ if (new_below) @@ -3354,6 +3357,7 @@ static int do_brk_flags(struct vma_iterator *vmi, str= uct vm_area_struct *vma, vma_iter_store(vmi, vma); =20 vma_complete(&vp, vmi, mm); + validate_mm(mm); khugepaged_enter_vma(vma, flags); goto out; } --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31267188CD8 for ; Wed, 17 Jul 2024 20:07:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246871; cv=fail; b=jxDhmBpUeHWrdheyHt3X1f7kKSfgY64RQ1Zza0VzuRkC1m3ukS2FyAykdeUk+odXH9sdPNSEuRVkB0X84kX432PS2t1TZT1w00Bfsnjtrj2eeYGAy4HosGxMk8OVapzDg9JmBiNTUbF1dRifScDjkZjht8XZe/fOFXOqmDyfpyY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246871; c=relaxed/simple; bh=SPC04A4gl7qVW535wKd38FTZ+QYFwYocvr8pZPQC/lM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=avHkSgMS1Jlm8uu4MN6dAJplWWubzJINsldnAkHK/AKAR2ESg5s7K2f4uAAFj8KlBL3J4k2NTXjxhk4ZH8Sw97vSRvJjpC8UlceN6TKTrYuwLWe+0v9dBX0fiTQlBMFtJww72oe1HHKc7PI5KsyfHg6jKOx/82023WklTuv+SeU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=WoP01W6O; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=gRdLmOrs; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="WoP01W6O"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="gRdLmOrs" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK5ARp002719; Wed, 17 Jul 2024 20:07:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=LArHVtRPmTnLL4Ka/8b8U968Rn79AaiiLYmA/o/M1Rk=; b= WoP01W6O2dx5J7hrolTh2BTrFkXgiRJxWftRVO31nsM3ejb7sWpyblYNhq9FINFy qVKK9mkd3VOsvh0kgA3NI29r647dUcjOGcsr4f5pG0mgydkOuvSCN3qREgEfjjV4 sBqL6pDZwKaWiy5ryxnxOKbLIHnuSpzKkY92RLhkcxhFU38wC9dVqh0CcDxQe/94 VzflUDHYMPUMAn5PDcBHO1cTVx/e11aGTxc1oVcI+z8bJ+1v/yXXcJcYmJLzb4Y0 x9Q1GnXOJta5Dvh9S7TgnhBP070GXMXkF+sBpIZuVDivfr0fFOxpuL+QA8y8FnD/ pu39rxOJqzqkNkTrqf2UpA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5r07h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:35 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJbBG1031594; Wed, 17 Jul 2024 20:07:35 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexugm1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=obBGr4I8KZ960gCY2GseLrSq8ExxoDbiAMMGnRFUltnFB6bOfbiAoSxwUO/FC/nev5QO6kXhqc5h4GquHALFVprCI1ZSZTfJBDjQCa9tKthojmmIpvCtG8YiUllyqCwvs5xS54TpVlFAUgYHxTE4PiesnQyMN3uV07NyRAlNCqpLLoP8Xdh/P8q8gHBNvlb2F3m9a8v2zLl+L+LlrBBjumNWdR45/z/454UhP8keYSgayVkGpEzO1ThMyqvQEZwKTuUQit+hr2K/nLGMub/QFNLxN7RJe1CI/CfNKPCcdUQU15i/sCwF0UT20QCg9UhxBth49ydxe1ceQ7T1lllZKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=LArHVtRPmTnLL4Ka/8b8U968Rn79AaiiLYmA/o/M1Rk=; b=BeFR2QXhKkiBecpgHGQVdRusWjdyYdCBNVh6g5Snm+JIRVfF+likh8Opp1Yk6r7uensTSAkoa9qUKs/iwbBVItWF8hoD2U2put/Ihi5er7u1KmpeZyQ3RHEuPSU923GZi0HuO1LuDLmtTkP+lc0UaessujRVUR7rS5tEzWOwF/Zox2o0VBK0IzVGr612OlYpSJkWp22AiCJGPgT7p00YN3itnmCu6U7ua8/3H9rccK9R6hfhpiUi48qt5i6BXePNKw0yUfUOpXQXjW2L+yigyYN4QDvDIn4JgMe0ZVblonpMrorJQ8X6PmNLX/2eia3P0shmg5k+r7OeMS+ECdfH1A== 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=LArHVtRPmTnLL4Ka/8b8U968Rn79AaiiLYmA/o/M1Rk=; b=gRdLmOrsmYgbKwkN2IRTRnzii38TAxpQu0jytbhkXO+OmES4ROSQchMdT9iIQfHjb9kA4JSckGzrfaVtfk08EsVRkEKmdiTGl5Af2MJZtNXaY2J++XCJlkkwh60LlWky9ByYNZNTT6oNEj+KA50L16KKkJXy5f3kSLJKW8R2XfQ= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:31 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:31 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 08/21] mm/mmap: Inline munmap operation in mmap_region() Date: Wed, 17 Jul 2024 16:06:56 -0400 Message-ID: <20240717200709.1552558-9-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0108.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::7) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: 79b33095-407f-4e47-bd6b-08dca69c16f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VtiqM40uxJX7F0NidoNF0nGx7Ppm2TEWN2JAkHwGa3B8PhvOiB10Hwyh1JvJ?= =?us-ascii?Q?GXwQCDTDtPuZYwBHT9g5RhaSDh5svtYbo8isASJIDzVtJhkxiT3VFL792SKs?= =?us-ascii?Q?4CXtQy0wghJhO/4i4tvWU42hN/UXceKm3Sjyu3iUTEmm9PatoWHV0eVKa37x?= =?us-ascii?Q?8yXrE0Y4I1QLH8MW2UVD5M53mdEKklJc5iunaqjBYWkbVwp0j1JeUlxwLlk6?= =?us-ascii?Q?mF7SjAI1ZuTi92PYnpZlDMtAanKWNHSMy/OtzhrUmXE58rJep/H8tUZdi10T?= =?us-ascii?Q?28JywznEYH5HH+8XkqUFfePmW+OjL83DRD6rtLPMhd3GSV8ylDB6Lt03XiTp?= =?us-ascii?Q?tpDd7ADKukmb8x7770WQpHmD0D7aY+lKxrn4QRJa6oeXO088Yj1KVVE3hAmZ?= =?us-ascii?Q?Ql41Nj+H4oYPFTM/B3ogrb1wOjLc0Rpw2NM8YuschadxBZ5dEPU0eXAZm46R?= =?us-ascii?Q?L+aZhiFMDhjhszWzA++QCoSQxkmjIjhDtngrP4UIBn4Mdz5+n8VpnKdDlMXJ?= =?us-ascii?Q?GKEEfQbjYGaT27XO3d9ODD9D6K++4bqWo2gWsTZWFlJ8FOLGr/hX7DB6/Eqj?= =?us-ascii?Q?5f2iAn1+uZPpg53REWQ4G2oI2Io6Mio4esqU5GjtF//15D7IOy2Jpx/AMhq6?= =?us-ascii?Q?gWxfD5yFn5P5rsMykqhcXoAJdalqgFYvm/wrxaZ13AwpwvtIj5ej/JSDMuwA?= =?us-ascii?Q?o3Lc//ych3o+oxdPTwuoy3OGXvwFwav8vjA3msaSWXcKFmvxqfHNtIgNbgaM?= =?us-ascii?Q?FCMAshg6GwCgzgkAYyZeXqILW6kTD8lVpPu96Fyi5s7AVl4F4VWQ/i2NPJQp?= =?us-ascii?Q?Z+Ax165h7GWmF+b0OJPryjgU0QztbplR/5gntCr0sN4UaFaw4MfB0MrZtxX0?= =?us-ascii?Q?VtaCd4P8tgJgvWLj7HMZpmSGeIgGPJ1h1GW1lFSGE2fNMq2N87NeghzsgNjI?= =?us-ascii?Q?/pqoZuYnodZXVLRdATCeXuOB6lGoCXPDP82ZrWgfgBxVv+moCTCKG/6uy2Hl?= =?us-ascii?Q?VIc+hJ2GnFyUd4BgDfCeIceoUY/x+1wNcpVK6FL7l83TOCn662P5hD8E9FO7?= =?us-ascii?Q?e6oaaRMo1jZ+30+QEkGyjeC3WopXGnj790iXK/D6YMhaime4sBC/iHzzY05b?= =?us-ascii?Q?TkjR/T/m2vnM3b3ObMQoHNQiTjp3OjkDLOouPJpaHoYeXNQfGJpmw0E5MxNn?= =?us-ascii?Q?CckFcNla8lkNus765/xUS6BgvthzBIVVDWUdRExcfSJxflLk5bREkkKg4Ecd?= =?us-ascii?Q?bK4JupPiNX1YPPCX2zdQGLLBff9S1wIUaxgYzs6Anj7pqLsXrSWNqemX1xUx?= =?us-ascii?Q?houOMDl2b5N6QR42Qn7Q4BpcERobCRIBuQm8qtNmweDbdA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?z7WN8qd3KH7iEiTEK1PxhX6oByaCv6RImUO//W5OkfxVvppVsPEldeIs4r1/?= =?us-ascii?Q?DoTFsBv+B+SdIPDhSKO1tn6bLgvwwUfVyjA7kncIK8tDXpujrZEuxyzOZsb7?= =?us-ascii?Q?l8ybT1BBvgh7W7DzdnFyjRFTNKB+F98AE0ABSOb4QmUx60LKghzWnmMT1TTj?= =?us-ascii?Q?jdjL+j+k0C86sqCZqKeTH6UYPR7PSgkofaTMe6sb/Zr+uOd2czh5n1lAN+y7?= =?us-ascii?Q?D5qJvdXB43UiLPWJsm070U73aasWcJovQTr4or0SEQARpwksGOVEMOFptCYQ?= =?us-ascii?Q?tQ1f2fz5slKOSLJDOjnGryQdXTlXPqKmF7PT0NWXQhNwQUqtrJHA165Ygq0S?= =?us-ascii?Q?p4Zg7TvMh9fX2VuJ7a59t5HKNBxeRUE2QZLzpJRK+rvC2ZSHQnuAjThX38pC?= =?us-ascii?Q?peBX0ZorMbuXMUA22Ca/KVMtytYC2avxRCmRwuYoiYd34HUmCzoyoppEyZGq?= =?us-ascii?Q?+/BdHGZv8IyVOTQPUeQ52OQaft7vR+HFNmJlTPNkQKASqvclXyAEL4TkJ+x5?= =?us-ascii?Q?0BbB3iH8nf353PNWgS1e0g8S7fSkJum99UXK6/PkJjSjQxFgdug203bv91Gr?= =?us-ascii?Q?A/CFZWa6ctFDTcN+mpuPrro3dBXKhvV0rPKvPPvpYdGxKneYRlQ07ckFF22s?= =?us-ascii?Q?fmG2iUlqmMNSEBP6ICW4MBY9rK62wobRBYYuJJBLmPmIKNsCFNZdw6D3xtxY?= =?us-ascii?Q?TcsqWZlypthszBMylG38b6l1PXFMA4b8JakFn1L63oiAf7WNQR6hYBNq9EV0?= =?us-ascii?Q?QlE93r1pKqOSCwb1fW/ZkMWW+aDR08ZEWnvzj7ITFNA2AoicMdieGBsvXHhq?= =?us-ascii?Q?0A3Ujm49DOw0C1JOyMBpQi+3K03NOECgKPlTs8hP/G4Edm7hczwJZ0pC6wED?= =?us-ascii?Q?JdwM7689iTud7ZZ+6ZcFMhzHnAWBKFbnPhgjR4PUznYcL81jB3xf4BfRm6h5?= =?us-ascii?Q?BKxENADagTq4N8D7oWlVAHauGDex4ZaDLdnz5bZVOTtfanJcntZQv1Lq9lPk?= =?us-ascii?Q?rMMQK8Loj1BiG2/iocDNCnTUKYximfQn+bwDbq91R816jK5JEXHBMUdoJdLQ?= =?us-ascii?Q?Mw4hHCei7bpio7neR6SV3UsAU+eqrYu8ONbPjyLWfs14txTBhtVDGq6eOZxl?= =?us-ascii?Q?R66m1s2bk7ADeCKcf10zMzvXTa2FOomJz0bMVDEbqKmvFX7rblPmPuddAjSy?= =?us-ascii?Q?UZcdTj34KE2hY2XylhS5GZ85krwnv8hRsUxFBrFvbP+nFnHnDHxM1m0ZdiLW?= =?us-ascii?Q?nxaq5w+ah8d3xLleHlTQ/D2yPWRH/VqDlbTtK4mkVIkWl1KyW2Ae0hwcv80p?= =?us-ascii?Q?nN8nLPvj+jJFwvC2QTnIZUXvqCNXIvx5V02dqoNfW3YPIhafQBaZ5toSV/6J?= =?us-ascii?Q?sOierPf+uKGPICD4VYkQ4GkufwE08FAnVNfsfNdsPMX9RGJklR1FVRLHWcll?= =?us-ascii?Q?0rGS7gFiEwl0RrtL/QqUsVMwca7ceVllcAp65kSNAoMCH5yMaJctjq0XABJ0?= =?us-ascii?Q?6QkCvlKAVewDbLnIQZ80CiS3LI0qDkRFBwqqvnXCqLLA8JeqacxQpEVUC+xx?= =?us-ascii?Q?djew7REaUNRvKip1iHN35zbX0VtWwO7itiSVaD4SNdDQbD2jckZy44yE/YO7?= =?us-ascii?Q?iQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hg04Y/uoTAYKoHdE23ks33lRiMzFCV8JFUb1SCHZub7a2/CGvDFZ2/0GZI3jPC1o+fN6dtru6qvH7/Xxew9gMI9KjyosM5yyV3tjBlItWaRdnm0XgCx28P6L1B9Ff3bPs9arvc/kfUSa9adNRNXpqayybwtc9QUhSFF4GsqQMUetkUoute7l8wTdsTkdQzKc6Hb8D+3ot2bgC205A0inQPzjxahXFMfcdHeNFSctKKKbmueI9TQtw5nDKKRWQmohE+wvfPW7bpmBTtvE4rJIQC2DN+yyTgQnUerNB5MHyUbDhy2vO5zcKo72Lvr4hPueh/eXZqan0i5C38QfTXd9Co19vJUVHDWaguaH7wEGde3akALf0TjoeAPeRQHclgTNPvXSOGY/wRst7cmfQ59h288SC5iPP7GPWsHdu4ixxdHrwQ3CJ7ertvI4pBJZq6bIh7335zWKRO/HA3AjazH9C1GtLMrE38ORXHFYx42xd6Mqki3xDmhQa1LYY3V7AvuzDO0aBedE/QJU2B1uEKbmHLeRRAcr8uHAzZxRgBxIijHlxaNbVWv/4eXkoiT+nU27JnQs346jXQKg3K1LNfYeeZuNTGYr7vgBD4vhDOEjZhc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79b33095-407f-4e47-bd6b-08dca69c16f5 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:31.0914 (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: tFaQsn6pQtmetdFzbtlWdRTaTAlTWXHEwr8nyGoNxtoG4FNNpIJ58AAcfsale5Nuric7ooHTbT2rQcDBmTcCrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=993 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: IseVej541CAnO5fNrz3YmBtFU580LOpk X-Proofpoint-ORIG-GUID: IseVej541CAnO5fNrz3YmBtFU580LOpk Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" mmap_region is already passed sanitized addr and len, so change the call to do_vmi_munmap() to do_vmi_align_munmap() and inline the other checks. The inlining of the function and checks is an intermediate step in the series so future patches are easier to follow. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 1c9016fb6b5c..49b3ab406353 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2938,12 +2938,21 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, return -ENOMEM; } =20 - /* Unmap any existing mapping in the area */ - error =3D do_vmi_munmap(&vmi, mm, addr, len, uf, false); - if (error =3D=3D -EPERM) - return error; - else if (error) - return -ENOMEM; + + if (unlikely(!can_modify_mm(mm, addr, end))) + return -EPERM; + + /* arch_unmap() might do unmaps itself. */ + arch_unmap(mm, addr, end); + + /* Find the first overlapping VMA */ + vma =3D vma_find(&vmi, end); + if (vma) { + /* Unmap any existing mapping in the area */ + if (do_vmi_align_munmap(&vmi, vma, mm, addr, end, uf, false)) + return -ENOMEM; + vma =3D NULL; + } =20 /* * Private writable mapping: check memory availability --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2ACB31849CA for ; Wed, 17 Jul 2024 20:07:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246872; cv=fail; b=iZh46kjPJPBk2Jj+k3hIr8rvYAD6GC0xR2xgTA8viikWDbqGXEaYyBmbVBa02S24ziNASVP6opgtrBYH/0zTQNrkAw5iKHbhnE5m5AOjPKOZmpyAKRt8n6aoDDQC+Br7VEdRzJ0Qj+sqKrLjo5vo9MJgdN6NAUpn9+zICUcbNY4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246872; c=relaxed/simple; bh=Si18alZgatmYZ+sA/uPhGx7TAS4KhcTU/ETDkETbPag=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ShXj5LHKGcEdZZut+jmXtWoEwouTBYtsMmnc1foEuicKwIm8yImMGN9izcnUfrR1XkETyQIjQv5z26F1A37OjtFXB28YeFmSjsTwgUD5b/Bd7bE/JSY3HXmAA8wIZxeY8ktg6i4WrSC8s4UBB2V66bGaHTKMGGx8y+LvS/wNjLM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=RFNTDkub; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=0J7QU0v/; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="RFNTDkub"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="0J7QU0v/" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK03GU028095; Wed, 17 Jul 2024 20:07:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=X3v/lo9AxRmsHNZlKpTsm76kEoN8cW2y2gHVgYbRbTg=; b= RFNTDkubyajNzrJwx6ZDN/vhGbvEDpeqiNNi5Mnf8b7JNjeHq/cJsTq/rKcWCctw nYSlz6c8fwzJg/pq6UZ/8gzdkqbrwWN2PE+OizSrk26/ZBInbJSh/yjzubP+OR7k nZGy/5HO/FpYvk5E8VFQZlg6yFgXPi7O39X2RET+q03xuTKGxY7Dr9cIc1ixFCra lbEDuIhZ+Go2el8crt6pPT1G9AJ9oBbt3pHRz6YYe069lZzUnbCnRl+3PSHnBOqO SPtaHgtZpVkQfrUCgp7UVOdWcPukSXUOaUJrI8hzEOy7jWUmT3D10QSgEgUAMnNN yLGtYrkbBKyBuLxihvJVnw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emkyg19v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:36 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJbBG2031594; Wed, 17 Jul 2024 20:07:35 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexugm1-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hQvRXb8zmbUCmIFsbBkZQxh56Wpz0vk+MYZRGfCuMMBH2s74Nd9ArCzCU0sVvff+H4iusG/zy9YFQVLOotAmhu53CnqxANZ92x5dIKzGPEk+t48JhO2i4TcsIdEt+js4zY6R4yVKsiLGXqhgg7TTlji7ugb22IeVbvpLUuXw92h/XRUUtzju0WkvNIJSBJ/lBfb6ndLlA9UVZ4AmhLh1gcFto2qWvXWLBzIc1CACOtuSnX4BIyzhODTr49XflsHSL7IJv0Kmf7FJuLq6IoltYrA5l4N2wCnQajt2bYFF/kRH3Hn+7vWEv5K3dDVcdYgQiU3t6H+GZZml3yDiD6/TYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=X3v/lo9AxRmsHNZlKpTsm76kEoN8cW2y2gHVgYbRbTg=; b=U7lcyOBhem7ok97IUqR60TLgCUE41U8s/2WYUDdRFkq+KGnrsJH7XupLlGf/b2p/RaIb2K1KZGXmCTt8LveHNJZBch4SKpj3oqjo9rUeHtZtgGoO2cDdy4Kk59Jyum5goq3D5ryDtZadkImBdXXySW0W/t3zitxNZ1AfB4F3Wl06wxzQvmexuGg6LY6QdacQ5GndYtxTUeThct7a5zjo9xng8ICiMm5i3xqMLeVPJhidULRcyjDLz6CzQmHi95rbIfLIKaPLivebrCKIyDRIKCOp5lRHa32jR/JydNfQ+//vXRmNY1mrnxCnnhonubVZkRYmFiHK5bt90QqURSzliQ== 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=X3v/lo9AxRmsHNZlKpTsm76kEoN8cW2y2gHVgYbRbTg=; b=0J7QU0v/k2GR2ZevAnfIOJl8WdKqeRIo8UBdWowgkkioJX8GKFVJnFnkX4Kf14laPxlahfF3gL6DbDYBm6glmw4Wt/giZw4IxSaU14AHi6orPWmoSTCng/sDHqjxwJP2+e700tUQFWyAGuZWTFVMFXcaGpfFUyjP8uGE7tL+YR4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:33 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:33 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 09/21] mm/mmap: Expand mmap_region() munmap call Date: Wed, 17 Jul 2024 16:06:57 -0400 Message-ID: <20240717200709.1552558-10-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0143.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::18) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: e8a147d9-c97c-4eca-7d80-08dca69c1832 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?41206tqtRPNEeQ9WhAN39w7Pq4AoKu76S1UzR+/ebq19EOvcNBqnzLhBbgh6?= =?us-ascii?Q?ccRyCfiASN1N8Jf5oe5qO73kP1pRHyKIufnSb9bxC82R5c7/rwl7f1sFjcAT?= =?us-ascii?Q?eu8cdQoFmJMiGNyE7k3BvglPxB8lx2bcWkN4y7YUWOYGbCi93RQeaWSgWTtU?= =?us-ascii?Q?4h0/vLGkC3d/SzM9BbHLqRZxyRTrCtckfnSwdeMVf9kFXd4pwIZ6HKqCtTBK?= =?us-ascii?Q?6UQ4Qj0q5p/AYoS6vV5HRjPS1Ko70oKjQ9IwLr783DlqVR2OM0xHrAp091MC?= =?us-ascii?Q?jUrUFmVX1u01S3D4TB8EkCWZdtAg8ndUcPlZwetzSzyECcvCSbbgBiZwSKvd?= =?us-ascii?Q?RtG0+pDi5X5I9bpqd/zW4t4qWBJ38qzB6+RLz7k75ZXLHREn/nZZUACIu6TR?= =?us-ascii?Q?2+3c5e6hjO/eEiZnbv6/9d5mYdSeHmEcEAIW75tLUqtQ2zdnYmP4cP61ypco?= =?us-ascii?Q?pefEIHBB8MsH9giHqhJRSdtWB3txFbEIFhga5rB5E3fqs9bw+CaN7bwXS9Xy?= =?us-ascii?Q?fEvDadac/pVkC98AQIhcOJdrKM9Vx5l01fFFWT2NFOSD8VtIAdSvOw813D8s?= =?us-ascii?Q?YWBTZDyQeyhUI86IZ9MYCv5VzaXvtqL/NkfR0MxS0cRsNCk3pgDdXmscCc0q?= =?us-ascii?Q?3/QoLUL8kF+VojrtNDVfDBs2zjm/SodXoOW7AAS7MUfeMnYWbsnZ5xPVdp11?= =?us-ascii?Q?G4+9p8IvuqOOYbyaAUikSbx1l1bwAQ87RaNtUvgdZEwj1cVUFhSpGNFh1Zzi?= =?us-ascii?Q?Ltmh7ewrTKG674N/mRZjGIDlZyjzY9RH/PbfWFo7X31UW/PHDjJ4xGNu9IsA?= =?us-ascii?Q?1Kbf5q6E/IaoD7TlF2qyJdrKW/zZbApMi0yIYmvF7OgVgbUwxgZcetiowoXD?= =?us-ascii?Q?MT0/nO3b/Jkz0fuwkwjgvJe3mHhsvLUaY5O/R+g7kqRAy4Jm6eFP91vP69E+?= =?us-ascii?Q?7eyWXsIcwbMnOelT3EzWJI83gVkJfuGLZZBwhjoMOkuV0ysAYCuLsv3g9SAF?= =?us-ascii?Q?0+VDiSXzCLZ1s0UJB+m7yGhhf9s1+B4xuj2oc0wdtVIsImM+x65jhpa9q02A?= =?us-ascii?Q?W6PXEtFwxOCaXiJr7mXS95gV+MHqXCWE/Aos7rOH11carGteE+s+UtLyeAhe?= =?us-ascii?Q?lbBSPlgK0iLU5MVJAxdlAC8+PdKJcpkxdGwwFJa88Ye8CssRUCKezGTFrBN7?= =?us-ascii?Q?sVzHFfZ53tiifaeN3fz6HTLql+WGGv1jQKOZXhumDNdxRpgfF8jSRK6Rr5Pk?= =?us-ascii?Q?bRtRt7oUW5YiYLGMd0aAsO2L8FnbKAZWQzEJ39AYx3aPXTpcAS96bS4MpZa5?= =?us-ascii?Q?7Ou2zWqAvXnMdlN6wqpPiu1JRPzUQZdrEg0PdyXbRgGUig=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WnmxuffSVt9xLy+ocvHFaNjXDLyLnpxzY52MfnZimpsVahBBI12NW9rdbRyx?= =?us-ascii?Q?njnz1T+tkmoKhlGY8kDXzvY0/FENqZM2iOLUIagGz9dQevMUwCFnTfJhsFtQ?= =?us-ascii?Q?r8ynFPLR/77P5CpYC9mXlLS8KAH4qPpQ9j6Y03gCIyw8GGSdn7ixDJ5acF6M?= =?us-ascii?Q?DOuBcjLdtlwMI9MHV6m5oCcL/FGIkHz7agUatF5QSLrpXrRasAPuFsrNdCPp?= =?us-ascii?Q?Lq5T6nDNAksg5Y9nx+9EBPEnTHyx/pjl4XsAxGiewNI66soUjpqVq5MedOPH?= =?us-ascii?Q?lGOuA7ET8xOuEYSlIlN5Knrym93a21J5B/gXxSOQo/aoOUqMjeMUS76v9NTM?= =?us-ascii?Q?iFXcr0YTx7EFgavyX387v0si79euUG5XQ4h5f0txPAqjYsIJ+uAJZvvk2adI?= =?us-ascii?Q?/TmLyeeVdUrnP6cZqMN12QBWvpvYJboVxAiQPUrhCRQoAsUP98s3DZpBz3ER?= =?us-ascii?Q?ow7npqkA51881yWpquIpUOrd8ijd+oV88m6LptTE0ZuI8V3+j6bEPHH8Pd6r?= =?us-ascii?Q?HnUNgIGaNryHhJeySQ6DR7N3q1/lcp53QnQlNhoKk5DnyyAh5NgdYaQ29lCJ?= =?us-ascii?Q?1LnOFRdRrwPGPmwG3tANS0h6LGK6jcsTbEoEpQV70C/sBFeakWEJBYe46i5p?= =?us-ascii?Q?CcX16fWqC8AucFeC6p/jlv1ZxguDfjobhDjSsJ16Ac1907l+9C5Qcf1S6fxY?= =?us-ascii?Q?MAYmYdDqKVUamuX+P2Sc0pC3jWMVItdDX8z6J1MBImSzf1xAoKTYrosEtqmf?= =?us-ascii?Q?/+W7/LkDyHK3Ic4s/PhxpWE6fi3w/u0avnmb2PMSMB41Aid25+5TwA+kgtsl?= =?us-ascii?Q?biSTCnLoNtTco5eV9OtgpsK73IVablf+CpzitUfTXUXoBhaaevUgWtwzhEFI?= =?us-ascii?Q?D/83ueIs4yJZP3X7V1Q+DLPySPPBMC6CiCVzunPj3hydNyT+3at9+Io8VIEP?= =?us-ascii?Q?+4XLk1Dy2QX0ocpiUMbmGJhsRiNbLlOGpQgHBrwFVmMKgrWfLytZnfqFlB0G?= =?us-ascii?Q?uU2xLnbLRhM/oVHEb1oNkK1mXsbY7ZIS/mUpMsSh374wQskwwruZmN4NExrr?= =?us-ascii?Q?0EJQhiputvIJcKve7hY+4t292kSd+POLdYHo3vANrGRtnmIHTYg3qBpBWGNA?= =?us-ascii?Q?JRgse2YiPF+TULk9iDAWNMjn7Vum0ga5F7bvYkDsxLOrNfvHerHK446wLRHl?= =?us-ascii?Q?wKu0KQRfDbfebJhBHBoiQRkcUBtHh2UumDt/pPUp+GET7SgvjarksxvVPExe?= =?us-ascii?Q?kA84DGBoA0O9UZsy+IzIJcTjTx8FPUD9nAgt7sgkNIqepQlJJ7uGoHGfnln2?= =?us-ascii?Q?zI9uKMRrlFyTS4AScZ33b7Qdjtm+oOsgyqZGCL2zykW+gKXZv5vP7p0YHr+7?= =?us-ascii?Q?ExTgYRzgpB8k5/e47ybe+Z9j35eCbL1drVXUHIvF6TtMLGcucrM6ZWrZt9Ut?= =?us-ascii?Q?EaBeSGDQJW/PHZEiAk2ucOMRD9oGdWRbai53ljazjo9riRK9VSZbo9UL6/6k?= =?us-ascii?Q?YR8yXQ0OeoOEeLCihkOn8/w5Jm/f8beSLg1eRmKdQXbYWzkSaAns5fKJxxpO?= =?us-ascii?Q?990IJZ0H2qdu8jQ1aSg2+TyqpXb/H8wj1dd2sp7Wc66NqUIqK94mLkYdhm9s?= =?us-ascii?Q?SQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cjJ7uDkTt2KInEx9KwwFrvgRni8Vq39WuR/S83bYmXlMhBT85AGiyTdrUS0G7KHo4ajnsold/1X2LfBu76wrm6WqdPKirKo+JiksFuwjIRn4CmadvpU7KDV2Tu1G0tepM8tdB2etpJRpRI0an8dggChpdtpaGh9PMc+485hhKVEScgfhR12JViJysgYTC40MepJmXEd+dlHGR1d1r/HZoRWKchK1dc5dVCrPK59AKL2qN8B/VhM2bKR1n05A+DxzpF2YVXm8IP4MXHzXnmcJ8bQKlQC6VCoEwQXrL76ute/tC685iTktknlbMq8yk47ZkEYpbcPbp8AHXqgaWgo2HWMQPBNHC11mLWCIkKmOnWEnyNSqJj9RI1wQJBg3kfVg0eWFmkjpGCxpxEQ4bLjPejI0PZknI9LVRmSikUO7KjRl6hvNACnsJgwnrWR2e1YEqR5Ed5OAo9nAmk0FM9TrLAv3QHzDbqFu9bm2hSXXl9v+JKGRT5DqrWEyjgOTAVdBHWd3lpBPlMbaJuomHbCsl5JQG1mNtPOvAAe7/vy4kqoY6cBpP2KOwrUe/50IeXrKpaEpcVn+nlzqCNVha5pr2a3Y2kr6oZ+yoB4zFQNnPd0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8a147d9-c97c-4eca-7d80-08dca69c1832 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:33.1850 (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: 8hOQI+OhNe6qrhjsDcmGKz/njdzYbLpzB7Ar8GgvlH5FCXg5VLHwqQBw8K90sRKmdlyWE9DrrfY3Me1ENGPV4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: xWU0oLElLrmHOswr_d-TEfm3l9tGAdl0 X-Proofpoint-ORIG-GUID: xWU0oLElLrmHOswr_d-TEfm3l9tGAdl0 Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Open code the do_vmi_align_munmap() call so that it can be broken up later in the series. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 49b3ab406353..a1544a68558e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2916,6 +2916,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, struct vm_area_struct *next, *prev, *merge; pgoff_t pglen =3D len >> PAGE_SHIFT; unsigned long charged =3D 0; + struct vma_munmap_struct vms; + struct ma_state mas_detach; + struct maple_tree mt_detach; unsigned long end =3D addr + len; unsigned long merge_start =3D addr, merge_end =3D end; bool writable_file_mapping =3D false; @@ -2948,10 +2951,27 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); if (vma) { - /* Unmap any existing mapping in the area */ - if (do_vmi_align_munmap(&vmi, vma, mm, addr, end, uf, false)) + mt_init_flags(&mt_detach, vmi.mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); + mt_on_stack(mt_detach); + mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); + init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); + /* Prepare to unmap any existing mapping in the area */ + if (vms_gather_munmap_vmas(&vms, &mas_detach)) + return -ENOMEM; + + /* Remove any existing mappings from the vma tree */ + if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) return -ENOMEM; + + /* Unmap any existing mapping in the area */ + vms_complete_munmap_vmas(&vms, &mas_detach); + next =3D vms.next; + prev =3D vms.prev; + vma_prev(&vmi); vma =3D NULL; + } else { + next =3D vma_next(&vmi); + prev =3D vma_prev(&vmi); } =20 /* @@ -2964,8 +2984,6 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, vm_flags |=3D VM_ACCOUNT; } =20 - next =3D vma_next(&vmi); - prev =3D vma_prev(&vmi); if (vm_flags & VM_SPECIAL) { if (prev) vma_iter_next_range(&vmi); --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B395618C358 for ; Wed, 17 Jul 2024 20:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246875; cv=fail; b=WWRbhm9+oRJkrHAcuI6ONYnF7IPXhvzIgevwVajtxeJ6xvHH2qvFvgZUhAU4NNiMiLrinnnMqdeAzfjU5ZQ+0Vd321dPuPan2NTMZbJkxdylEFDDu8S2FcxD2sOR9AzOkqbm2LlKB/zZBpQB+5b2xd0fuaBn9KpgOHonxIagpG0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246875; c=relaxed/simple; bh=IhMOLcuSQN/JHaFm4a7nERN/KbYH1yWudUpYznD0MmM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Zc1sdCJFUEraUboz32Zamj6OkcPAz0IiGjogFgMqaFzYSXRIB45rrhLNbGBv9+XhUMiAEOusyg/C2SlMQmlb5zZCLzNPdm1tM3dsSzB4kU2rTi3REEJhFn2y6K8YbjhBk82396IdJNPrpjkIw6yEM686w1DzTrmJcqHq8tVwHng= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=LfS6mrRI; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=fQcGhEC9; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="LfS6mrRI"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="fQcGhEC9" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK0js6029063; Wed, 17 Jul 2024 20:07:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=S37ZWrf+uGjTlHx8kEYsOJHDQEEph06qnirTptSS0/U=; b= LfS6mrRIfemTMAlMIdrimYUoynbGPKJ+l9SGCvjRCSjk06gmaZikCIhBcisw964/ M2tuld2XJE2afpY9ItpNykqXn9lV4lWXuECpNLlCQTlkw7Nc+g0zLP7xyMK3Bzkh Gi7qnibnuDcvS+BBVhx4pCGYuyuw+EG2CuNFjCeQenA3SE//6XdW1E49G9JR+mnd mjcDxKlRI8J3t3acQfMbnybgylEnTVCsFLaLp0C7+6SkgqdsvsEY/QWCne6ukiM9 oUxEwF20IG3f6OgQI7UL3K5MEvCQ3blUGlH8VSXHqFMkCt4hhCRWLLTfZ6+/Ev38 ZI2P3q1RcZKNpgdnwJyd7Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emkyg19x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:39 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJmtKI031693; Wed, 17 Jul 2024 20:07:38 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexugp1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BZ/ZwiecW9/6oMuncH6VVKvKsY0NvK+CfK3CvzQoVLz4tytgWumvjMw85uzmz5EPDt1gxP8vHVZqhRjztZSFkfAk3y1izFGPFMUsZVYEl7zUj2GwnuFq2bc/TQmMsSrOtv8YnEnxGQ1a2mMTZCCrrCrryb4zqE9mxRa6awcSndHPEGRfo4nxhz0XzB7VGqHrfLs8KutQZmtzBgUZB6y1PBaYRVN2sqkyGbHQmP6abBPtlD2XeQ19GuYmAhdP/R2BIjSZfnJ/HjcSPxqidAmS9ve+Mvplo8bhBcTJ7NMYAf8QrLqLlKVJPoP0E9Su1TPAy6Q3lgRGuAA4tcOo+0Ho6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=S37ZWrf+uGjTlHx8kEYsOJHDQEEph06qnirTptSS0/U=; b=p0oe4vs89fd6UGGhEroClw7ydAdzakJiPjh6p72oY4EqgIr3RToNvgoySakZRIjPyuJpKYK4OyxHOZ9hdvOHjGRHFEuKxfOhqFK+cHkGqiOB5vp0GfMoZRqP+BDG29RnMZC2wPNFk+13lyt8QhdvxByGVTRq2mxjttbPyyO4hvr9Ij4DjLFGHewStPM9ztxX3aq9FIwMJS8rd/yZDAjQ9bjoAR+ake5I0D4jyuehKXrdKntBRJmOb6oPKZ2vjuT2wgYp4911NlyMSbSQShdo57+ZbPWJXkgsaM0LTIBnZNzVxJRGoOU50CMhN9sTPMnqxHOew6EaxNBY+SLNHHvY1A== 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=S37ZWrf+uGjTlHx8kEYsOJHDQEEph06qnirTptSS0/U=; b=fQcGhEC9os9r923QtdTBa5LlRjykSpYFHuDM9k2OsPtB5gy7CAs5ZOkY8NDcybIuoBvvy3Jr31LdWKCJRxd7gQrqpOYabHf2oZvobUKeEWvs/XsnBlF5eipeVkpISD96oC3EQ7wjEA6W/ppTPT+0kX+JlegKuva/8mReIGppe50= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA0PR10MB7303.namprd10.prod.outlook.com (2603:10b6:208:40d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.29; Wed, 17 Jul 2024 20:07:35 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:35 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v5 10/21] mm/mmap: Support vma == NULL in init_vma_munmap() Date: Wed, 17 Jul 2024 16:06:58 -0400 Message-ID: <20240717200709.1552558-11-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0136.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d5::20) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|IA0PR10MB7303:EE_ X-MS-Office365-Filtering-Correlation-Id: e3993f67-2566-42ad-0cab-08dca69c1994 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7PN68O8py4iovjHTdV4p2GzTeG8afpWCx49mHftk2xFhZteOhQJokObg/kg6?= =?us-ascii?Q?IacHaxRzJVyXgh6lq8UA0QoUf3xrZ5SXi3U8DYWhqp2SsnjAi3oAikLnzKe6?= =?us-ascii?Q?yOPM7yn9erFlJ2b5H9jRl5BISAC0JOV45ZUoG9j1AZ0y+RSoSnJuzxAqyxBo?= =?us-ascii?Q?FgxP6b+HadhKGj7ksyjxNtnTDZhVdpbpD91qQuXaCf+NEUB5FPbs+CnKceEE?= =?us-ascii?Q?OSRjrZrreGxz76HbR0dFI4r5L3iAMKQVAPGubuPfNoGADdwDcXAevhRBKtY+?= =?us-ascii?Q?AUiPqRK8wyONOcRBm9Cexd9lVg50w3qiKFDkZA8Rt7NFgVSGVxKaycuSqweA?= =?us-ascii?Q?QarhQQhGdCGwy9EbImXDrNHPMTXJr8nLWoDBwaADeXbpBQ5ZflJpRpmXiyRC?= =?us-ascii?Q?ZSxVc+w6QZ5jbBCHNm82L+IM/r0jyJaSKxh3pwsUc/CYKPOqzfcuwwfTtb8J?= =?us-ascii?Q?MJQSUfqWQgmxHy3apbDt7Fl54olm87xyFbouvsSS/l7UEkAT4z9iYOO8Vkgh?= =?us-ascii?Q?8TxXzhpbNXkydf6uwU0FHEykAe4TdR/U2W1xsnRo+n4xdwHCyyUH217DJsXX?= =?us-ascii?Q?tgAXRL2eW1eR6FDH4WDyJNvO/95uQfQRoB9/I2NGBRa5KLY+dEDCGsnULfQ4?= =?us-ascii?Q?dl5B5UWmYUAD5fgNPaPMrqfBndZCH/x3tcqM3w2/hvXtH6o3VMu0PCg5ya2u?= =?us-ascii?Q?iLhTow5xYTCf7XD4xJwxaxMIW8RrqTOqr1kRSwuKzWeZPwjUdEq7FXGaVYtj?= =?us-ascii?Q?n6g08w7aZkrOZtAfFk5pNILdwSKRHwreUi6l4TdO/f0p+6mlC76MZHR9t4st?= =?us-ascii?Q?2/1kBP1Yv5go1ShX7mI1Fd22qT83SKAbDgDlSa02f7ygIm5VdzzUsR0oDAJU?= =?us-ascii?Q?TwUXE5RyyblmPtdFVKiXm4zkYhjyW9Wo5oE9wGUEhMgIko7o2j/v+2a731l+?= =?us-ascii?Q?IgaTFhNtweezoyabIbgKePFR/ckKi2Wa3QWtr+Vd3CEUS0enoHcG0/LLgb+L?= =?us-ascii?Q?N0nWcwN2YK9rSC5CG/z5VMlWMLcJywNxYWb22zo5yh46E1lY+H+oFPwmtc8U?= =?us-ascii?Q?WN+0QrMke96Kh+QEbZLsdtqsRygq0OyWL/D/euzu4ilumalFL+b3rLd1GoyB?= =?us-ascii?Q?WD79PyXQ41oRV9Px93xdZ0l3U2I/EqdhC/jU/14qNYl/RdPwEEz4T9gfiRER?= =?us-ascii?Q?R5PK+YzskogVCy1P7mCc5YiNIWlW/fjC6WB9hQK9pAGLJyVZ+7A+P3uY4LoT?= =?us-ascii?Q?D02xgIsqJzmwXNEXnu5GEYTeD8e18LyvoV8JZOBDcnzdo7NS3eiByo5U2vo9?= =?us-ascii?Q?1EoZsBzR/kQ35pdGG55TS3aux0tAEc9c/QfJ8P4fyD9ikg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z0NV3fsPhkqRQIfXskgBEphkl2zMJCosDKGBghYwvz7s+Rh6/eAc2K0eo4Vf?= =?us-ascii?Q?CRrdZlbeOj3k0y7xMpLwX9R0sRASHuSeH5xLy4URMPdCKFtNJ2cxUiDNvgB+?= =?us-ascii?Q?Xg8Jg/fYPPg7gH0WmQKo2H/1/8vO+SQE83hfrqnOAUsnBzjb3Wzun+3Phb2A?= =?us-ascii?Q?Pz34G26NRWXWpFq0FTTVxvc37jWggQzFI2CS0h2NdRcsGjJZIQ6kHC7uQFIz?= =?us-ascii?Q?7eDmZ8IFwG+3qivcdtXZThx9ov78jLN7bE7kNSuKTnEw0AHog4xJWr2Xbpdi?= =?us-ascii?Q?69VgMqHHYUC3vPl9klso8Tp4CHuMsMqRkd/FgodYplpu+GO1CyX3OcfbujWb?= =?us-ascii?Q?o1T2IcDwdCYTb5sAbzfD0l0VDvHHOVlZMxtSFes8PZzzubl/oORI6Ojej6fu?= =?us-ascii?Q?Z0kQCo5JEIytsaqAcSFPQquU7ZgdK/vAzTjq60yJ8HM3s5+vJR5Hh6/Pc1BA?= =?us-ascii?Q?anMdySUR6lr8oF4FZpjEMed7P2Q8Y3C5YOzpikhl9i7NDfXOaTxaJaEzmEvc?= =?us-ascii?Q?NyRPghj+JQUu1aHl/1QkHJ25i7WyT7/tE3x8Sn+V8qD+p4iKmVZ3HGgMzl+4?= =?us-ascii?Q?vXHJJPPTwDwyNtfHCkOedgWYxynKPaumK09j5zfoXNKFjwHkJOUsvCDqTSpc?= =?us-ascii?Q?MDTyQEUDi7qct0n/QZ/hEF5QTxMaSWk+kBHqkotLmt8PMJx9YpDZin/cvHOm?= =?us-ascii?Q?lr3uUndZR5ZwO9n7yMC0KqVQ8linmLhDfP43m3WoznZJH7/jRCqhnaVnfbPf?= =?us-ascii?Q?aWrwocUVJp0bu13KDJbYMhHA+Nyys1IZ30aDEek6KrSCfxcA8p94V4EW0nNl?= =?us-ascii?Q?MkeC0SXD4cIasILcGDcemnfUFY7BBnlwUeoPHNTviw036IGcy7CiD47MZWml?= =?us-ascii?Q?7i17oGY6iA+WbJUCgQIG2lk+ZOK/Qbfv8Znh1c4QSAVE9Hb8ZVeofV4bjDij?= =?us-ascii?Q?ZJtF21pNQ0QtNtgfrEapb+O6HELYlNHNlJsrWqpOe+wRR83ge1vthQpML5DP?= =?us-ascii?Q?ON00CGu+bvTmKTh4S5VN5WHrejn+tfXQrineTMKguxXSE2blzdI9gl/SFxmK?= =?us-ascii?Q?E3akwWXhbCQcINuRhrkFYDriuj3QFUnvFRcHxmKZFHyOeB2R5G21TZ7QJK4q?= =?us-ascii?Q?76rx+zD5RHvN1Y8RbhLMWHwGPJqw8jcyVVtiKtGvY/Kx+J2QcbzkomsBTerw?= =?us-ascii?Q?LPbPqzgBGzYJPgwf/7s1jOYwuBqP/aN2cPIPlovKOr3b9EXCOuK5yIO8oTIF?= =?us-ascii?Q?Z2qtV20gsbiohhCJRaEI0iWGIQuMjPLuo4Ie7M9SenQioNgedLcneBekU/bE?= =?us-ascii?Q?QMFKKc8PJ5oJKboWxJMCyJsdpovMUXyKm2PWuXhKNiYLH3DOO8bWfjuN9YzD?= =?us-ascii?Q?u+Bs0CPfT4SO8HK5+d72AjIf6BsQx+S5SiCtzl3+tVMMllzq8LWZQvMT6xQr?= =?us-ascii?Q?DI//Sivsy6v6/E7gswWCmtbjXpkzEGKhetBvbzm+wRLixpnEHrLVSeVcm0vl?= =?us-ascii?Q?3g+wSKokv5aGHV0v+i2lTLbCu/EF1POT+aMxH7ZJyFzOdW5t7C4l50U5+hks?= =?us-ascii?Q?t4Ka+uPkShfNF8l31p06z90MKQPoS/dOA88E61vaPAsRaqAN5cJavgFPsXzp?= =?us-ascii?Q?TQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Z2z9nbA7/+vrgtoAXCHJhKwnxubioLjulJu8Vd/UGcbJKzdw8R4ZTpJW6nQ4t1JpFmDnk1VeoADSwuq58Uv4E28tvC0SOPOoHvzsTtIi2D77skflS6ELs7cnOoeEKAdreYUppQ5XhlyMJJBEJWDBoiTn/J7qNkPHp2Qy+cT2DKOXlNEkooGSHnPJg8PV9dojPfcVOylmvj1rp7DstR2bG7LzMfB5voH465xXTTnTvAZGzAjCuEPPYWxy9SqoLHXqFSPyX/wcPLmW+8cjioeOqevikEf+qTTZ9vHIh0IK6fiq4vUHpIaUJJIb/ISARKkSPiyb6b3I3sMOxBvKA8D1uPM4B2d9pbA7GBrcjFGvzq1/HQ7WNmXFYv423QSsLFs8cVTOwYCgUK3sapOR95PIUeVmDDUkAY1E+Grrqu0Q5wZPwBk+SN0hlcRh9UtCzQGN6SUOV3lGefZJuDiGQf52ZUiDdV1cettkporl+KO6y0mHiuRPqXuk5F4rhuAY4Vkt73hIbK/pl4Qj6+eRlvQMv27mWOEVuZhRSNetZmJINJiAXsxbCPEVgdWuhASC0v1xjOoO6VA9o7U6Gp+YlOQ2sntA/mWkFQfnsonIdX9AAg0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3993f67-2566-42ad-0cab-08dca69c1994 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:35.4887 (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: 57YsfsvxnY3Xcr44LgGMAFFFpDH9pazZ9hO9yK+dPJlChGbik0wwh6zK2DGDNX6FWyJxvAC07Cw8wZdjW7gzUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7303 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: wwNEHToBeP4Sd4mr0IdCfKDHLKEjCElI X-Proofpoint-ORIG-GUID: wwNEHToBeP4Sd4mr0IdCfKDHLKEjCElI Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Adding support for a NULL vma means the init_vma_munmap() can be initialized for a less error-prone process when calling vms_complete_munmap_vmas() later on. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index a1544a68558e..722bcced0499 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -517,9 +517,14 @@ static inline void init_vma_munmap(struct vma_munmap_s= truct *vms, { vms->vmi =3D vmi; vms->vma =3D vma; - vms->mm =3D vma->vm_mm; - vms->start =3D start; - vms->end =3D end; + if (vma) { + vms->mm =3D vma->vm_mm; + vms->start =3D start; + vms->end =3D end; + } else { + vms->mm =3D NULL; + vms->start =3D vms->end =3D 0; + } vms->unlock =3D unlock; vms->uf =3D uf; vms->vma_count =3D 0; @@ -2950,11 +2955,11 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, =20 /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); + init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); if (vma) { mt_init_flags(&mt_detach, vmi.mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); mt_on_stack(mt_detach); mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); - init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); /* Prepare to unmap any existing mapping in the area */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) return -ENOMEM; --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84A4118E775 for ; Wed, 17 Jul 2024 20:07:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246877; cv=fail; b=YvDfhXq5lAXLjFzOxHYvNXBRJ/MqtQM0ZtpP6olbxKHMS9IFX5tV9YD6QeySTvepeKzDtykVTviMwBVgS5i4l47VhhEyJHYc3FM27LJIP2qAg9w+oHszgi51NrKvfJltDlC1Bm7QGLOOUcieu024NqTRJnwwGnyW6UhuwWw7Eh0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246877; c=relaxed/simple; bh=xJxmN5x115knj8YHBsl8g4MkGD2sqZ/v96rW0dQ1rD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=t2ZgC1kfzG41g4FwUI728vyk3wpGoR50wEQFDvC+B0u9h13oivI7OsTmkZxnVXBLdJ7WTlT75iHoz/qKe/xpOijjHN8bpay740S6nbbcSbeNI7Bsm2KlmzT+zF5aqa1n2aJKA0awwL0X6wQT8JA5FS1KAB3+3E0dq9L1gQ7T6Wc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=AlfLpGFu; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=RbNIVLfl; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="AlfLpGFu"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="RbNIVLfl" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJuBtC031509; Wed, 17 Jul 2024 20:07:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=3Bj8KrJIkrFa0UxRm7NqOhO5QapamAHPGNHPLG+zTDo=; b= AlfLpGFuj7ftMkzRgbhvi8lL5wS/JOJ5PpPDMm4fKjOvQl7++v3nL9xkmN9vF6wx yvcR13NLAhUMDGwnB0NyahpGuMbbW9cnNXzMGNcCZnQ/OdZ239mB4dtoxQIsKKeS NlwfJ/ziBQeNbKW72MWUamFTUA/M1FzG8EXEN5d8yXJsSZfCJtWOQY3uOoyAUn7q Nf8jJrErkHfStSV5Om21o6obi6uJBGQ98DGLWNGMa0SKOBfNMrZ3fg2JdqSbz9D/ 48643/+RaBKGHHVJmqqbnT490RZQZ4PhOsJyvTyKD7d2ycmMv2VgZyan5MG6hjIv cH1jtL5nSOJ8QzocIN7QMA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhq80r8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:40 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIn9iR039514; Wed, 17 Jul 2024 20:07:40 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2177.outbound.protection.outlook.com [104.47.73.177]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevgj72-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UtA++rpKwTYlNQtVQRN6wOWsNGGEIhfWnYAU7DNpmD2ZVLyF4/orZ78ftMzQxoNOnAqlnnUpSFUJCarXbZaMbNZo8inDXzEwm5X62xjzqvxyvU4l6sT88cvD867WIisINoZvQTHZeOMisGOG6MhFCsQHAR0qm4KVH0oWT8asnyYJBCg/Efv4dwIRkpnAAY3bDbTBpFuUEsQ9cZQmTubHlK40ZT5gQJQ4sbDpk1mnvKOtBSGkthPC5p2rSB6VFA/Sk9GkIVwcea+yJNWrwGZvFdQWALK8+nOrLkRuuiHmiKVY3+GuXr8fGQVOtGS+Zd29XEo9ockc8wH/zXevzJVqDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=3Bj8KrJIkrFa0UxRm7NqOhO5QapamAHPGNHPLG+zTDo=; b=Xrvujn+wZSH3jL95JxXKJv9dUBfIeuWlpBgl90woJHGEnf/rVnRHFnVV4F6VrbYBZfPdJe53gjeBqodJMx8G/IfaMCpk9ebuacOAz/gQFstglX2OzG5KPWJYgwI/TQIpNzAmwj5V3FHrMbq3IcIA8h67a9wbLqDl1B04DDqmXggTG/GIQBHaGroom2luV/IjvjhS3hE52Lde5mIzHYu6CDs0QMRG8DusqEBE1B27J6sciJwuyADXPrFzXlPB6PpsT1VJEpEpD8H+meBNOOJlu6lkoA7NYtrhc833vbE2LHrYXsQs9ttRuMrbTZPi4S5XQqpR2RwNKObAQWqW134nvA== 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=3Bj8KrJIkrFa0UxRm7NqOhO5QapamAHPGNHPLG+zTDo=; b=RbNIVLflJo3qWh0SwBNjXcHX1E633/r3cK3YrpB3qsXssN6VYzkXuRlWI0L6BSh9miskgX4nrZWsx154jZSHOwHLQrp/9ChCsP3IeGzlrADtuJn63iGuYEb3G+RjqNzk8vtuEtDzDPBe83WasCTgHLFnIhfBfPaDrBBgyooc6W8= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Wed, 17 Jul 2024 20:07:37 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:37 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 11/21] mm/mmap: Reposition vma iterator in mmap_region() Date: Wed, 17 Jul 2024 16:06:59 -0400 Message-ID: <20240717200709.1552558-12-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0100.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::9) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 08b92855-87ee-46d2-6b68-08dca69c1acf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?D5Ab+TmP5AjB0RNJEnE/B4aEE7a/AIsdfNZx2Ci+yirYtHcIrbzpzNRfN5tQ?= =?us-ascii?Q?JWEH2BmVyXbfi/DUeM0ST2RkpvYFqjao4Nh/z9KWdIGlOxNt1C1So9wMJLG5?= =?us-ascii?Q?BuB35xb8wWC4wXL1AbDxdC3u8j56u/M8o5WHCmRzqDtcDK2fLPH/DAFRxrZ3?= =?us-ascii?Q?x87WMaxQs9J73eBgB6IP5tJS2+DLDFePhO2x9jfezrrWMKJfh0deR68LQ8y7?= =?us-ascii?Q?C2joo49+W7IHvqZNRJjgaKCfAVHfhmq0FxtkK7+AzXctcMftAjMOO9tDgiZB?= =?us-ascii?Q?lRBJ0I6CnX5dmhWruPXDWjm95mtQqz0Bzs3SnYTTFMWhHB41vWrqy6MQQAtd?= =?us-ascii?Q?2pcDAR6eYk+8+BRsVAJfFQgr7kcWKw41Z/c5Ydep0ME7yZ4Hqka/hVW9Af3Q?= =?us-ascii?Q?w8A9H1BYbT+W0ls5srsdRSYEZSvOz3JXmu3i7XKJ1l8mokAxlw5jVpb3ERd2?= =?us-ascii?Q?CbLtJoU226acCayJdlOLRZWcKYgkp4WLzjhcn3Nt7x4UmA1Hv24quLR8uToy?= =?us-ascii?Q?LudBeSP40rrmGyiHQrudbaElnVMsUl1hGMxO+vzsslOUijEGnD3X+ecJfrPi?= =?us-ascii?Q?l7XHKPxIZX3oPsaxw2hcvc6BSCg8KBfIOuPo5xqnDVab0Cd2VQBTps6nMUX/?= =?us-ascii?Q?USi3vDkCmFRQBIgr95+wm8Y9nWRREpJsxSd0n3aAs2Jsb2Nt3sYCsLP710C5?= =?us-ascii?Q?H8pLk6K5mJley/JPF/2jFU0Jg82N0PcDWvxZroaNOBux6GtV1HpAiMTwIIXG?= =?us-ascii?Q?IMx/DHHnuYdAdmBKlEkzpJcQ0lkinSxCqYzf0qPvJp7MWMgFZ9b7yTTRegJG?= =?us-ascii?Q?9bHQSgXnnyD8muxwGbtijGNmBqORH9HBa5FKkVb4Y57zGAX/x0+/QhxsupYn?= =?us-ascii?Q?vUjZKIuEUykfZ9ivgZn4Zd7FmDKxfzOMxkdo5WNor2uEE6mEOgL5xI05ykhm?= =?us-ascii?Q?Mc5otlH4FbUjFuRmoaSYurJIaTkBr/B4QxEGQ1M/SrVChtyZ/FI0mg+ujXV/?= =?us-ascii?Q?7W14fi+L06/dajeWppooWzPrAQRH8V4LzdUNIyfYUCGQSygY5SWB+uf5O/lk?= =?us-ascii?Q?9tgfC+dggSUR9J787DNjI5a0BCyJzYhf3JVg5e32pvy8r4fdlERcaS3BGSVa?= =?us-ascii?Q?5ok/6o4T/coRmkeJEczasilpPWZ1qcn+jsevxW182hMSwFbXwakQPeAj6G/z?= =?us-ascii?Q?vH50oN+Y5CRkez88NpFg9zrUo9Wsrs5I2Ra94rqLlMopz9mZR6Al1wRxA4iR?= =?us-ascii?Q?ORCWmLtq6ULsHwqkH7t/FiFC+bIh7a3V7xpsjMwckHiC1H7ETj2HqKQgLojR?= =?us-ascii?Q?V8M9RV32ik3nZMmuol8zcqvrQi58uTHDdNCJjSn8pjKqOQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?j4KMEPnmblXQVNTpBmkw+nm+TK0F42zdB19M2oqaw2Bi5e13eLifRJMRnZBn?= =?us-ascii?Q?sVMziuY4KxBTqF8gz48l7BUUKrCsiaK4Zl/EUrlIZBZmk3faOLi5OmRJnLIQ?= =?us-ascii?Q?eIuDmDgJ9ui2vVJF8nIxu9XuJHQHjJpjYcVONl/pTCC6FErKN+tnlvisGloW?= =?us-ascii?Q?+rgLEwvhl3tPfdjq+3ZOvwAtCaX+lKb5cgzkUCQxOv7PijjghkDWenM+D81/?= =?us-ascii?Q?8dcE7gk2qWmxBLkr9u0t9m04Ot5m4LrWY0ytpUrUBMVsPhn8k4VmRynt/ACO?= =?us-ascii?Q?ITFdFy8cjhao9wbDRUBWYDPiw9jSFjqzsguL/ZLYU+a6WV9wBzQ5qFel4t11?= =?us-ascii?Q?h9oYrTfovADCBDgZyIGL72vsUs+t0ur9icdJ/YjZAQfl6BCyeGinnIeryFre?= =?us-ascii?Q?znw9VxWWxXgN+gp+2I6JHKpunBk52O+yqaChge6KeqXFx73rKhHvRJg0Y4S9?= =?us-ascii?Q?yd8to8DfMV3tXddm91gM6x2Ime9WDlQS7ToYYIIEBY+C/govjeyzcSuKRc9m?= =?us-ascii?Q?Wuf/2jlxj3HSV3+mLo2kGxi/ZSbgI2+RhGMKQ+eUkA+CtyKwB3s5JPJmV7Yn?= =?us-ascii?Q?5rDtdx1sEGZMhj7vhnx6D8IH0Qsx8RqqJ17i5ZsmkHoyFi1FmEXGAVPCpqOd?= =?us-ascii?Q?9G5RYhrhdyy99WqDWarq4AB8i+xSsuRkC2CSm0gkOkq3LFCjVfoYArB/uy66?= =?us-ascii?Q?G6YGECVtviuFjT3z1dibHlWy0lmFBZqPrbpI9a3JcMUVvn3D2RGU1Q223HP9?= =?us-ascii?Q?feaSp6zWVWeJLCbp8zHVsNxIoE89vD/3zJ+yA2xHL4rqQP/FPLYuozh/GkbH?= =?us-ascii?Q?H5cO5SWyzxW1iIDlrA7YOYm/zKUDpMuNpofGf+Chn5OQ6UqFP1m0iFLNaxyg?= =?us-ascii?Q?OKTDaFCmYnsta2aGQcI96ph0XxShcEYwpKtcuG2xyCFbvAdRLR6gRplFv3nZ?= =?us-ascii?Q?PKfCkyNDKMqKduXSsrZa8DohVv8wVXd/ONDguewGZmSARBakHlOXZCaq7SAv?= =?us-ascii?Q?xAA8mvD86fWAUakCcoB5FBM23wrlbsG8YDBWZFlsgIKoNNlSEDgZAEOcuKWp?= =?us-ascii?Q?TuOxoMcMV8dE25KXY1FjexlSZkTWZ9pSx2/eZTMaxI9oFF8d95On9gTrX5cs?= =?us-ascii?Q?othxcxYFrYYhY69YA4owENLk5En8doVi/kJJZ2epWWJt/SRsJGKJhQHTkNeM?= =?us-ascii?Q?ugLLSs5uKPGgJqnjAlOTdoWmULC6aH0VuLg9FMXyaGZ4woCs7nycoyO93U2p?= =?us-ascii?Q?LCiJOdVtV0TTZ06e/3NORixor0/mnBB3cV80dsbFi5A2W/ch7jPSAk5+VXFr?= =?us-ascii?Q?jPIdn90Fg5To4222WlO9OMRKAWn1Hr0dNI0ckxOhPdUfXB/p3SggK34j9JHb?= =?us-ascii?Q?k6jTx6YNQ2TQX2tObnjKlAgvdfZGxS0VlnFbELfq4Jg4dKPb3wcBakr2Ie0G?= =?us-ascii?Q?LaNsw1XxEwSOKJMsiXrl9aIftzzss8Tq7/S9XZwJGGVUqz0P1zSsd2VpUdom?= =?us-ascii?Q?oBux23pffkrsKWUn6sU5lZXV2sAmxo8X9WdxcBILv7CyhI2qk5ioBDef2UCK?= =?us-ascii?Q?JpJkeUjBKW2K0GMQFwc50fVVuqi0uH3j5wqkYZLcE/ZFPUBx9L3yAH71trMv?= =?us-ascii?Q?rg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: sQFCqefS3syRGKl+6bXWl6OCD/VuV21RJ0m5/k6JxudReUHKDBwI2Qjfgb6TIwdHBezpN1ERKTDBvD9SdAJSbCAfLQ+ZPllb9IodHgSeqR14lEAQZJ5sDV0UwgHq8e+98XX3KzNmexWDi0aRd/V3iYNZ231a7XVpV+PA+4JVn7P2uqK039ydPl7WrjWZtNgzRg7fdT8/L6D281f2F0gvgbkp1ljLh90idH0DNqsBdrau2WfkRIpigQ3vV5WgfdJFqFoyv6md8EbtHMZULEQVF1lmf3nHcX/eMHlUfsoorDw51EAAHfLLE6EyKsqVSPi9TM/ooFV2336x5bFqCaj4AU2LdRFAJVGUt8I9kSTOd9WL6V02g0CIagqIfskipV0Cpq8KiXjrsfIFwHE3YHmyghDptc+S5/u+2vuz2fen+fMN+qSLe5bJm8BwQ09+fr3IjU6YgH3GgFLBeylnSvEdf3wW9c0xCBLZO6/4rx+hFPysDBeTMx0C1hxOAI8DDW6c29dbTcTHyiDsoE5h/F/p5B2TRCB2mZWeIgw0ooH58S2ivDPwhlBwwV0eUTdLgRwhdkX2pt+DX79bdnhb1d4RL0uln8XVb6tHJLrRyxmroP4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08b92855-87ee-46d2-6b68-08dca69c1acf X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:37.5645 (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: ykEWXC3jiiCmiO7ZOkcCvBBKW0EenzlUZLc/cNt9XNUit25qLDs8KavWyIA/H+wNdJEeUhDkiBO7qhJ30mmbwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: qw8n4dVjJkGOWYA9FfT-AVfppFXzQndA X-Proofpoint-ORIG-GUID: qw8n4dVjJkGOWYA9FfT-AVfppFXzQndA Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Instead of moving (or leaving) the vma iterator pointing at the previous vma, leave it pointing at the insert location. Pointing the vma iterator at the insert location allows for a cleaner walk of the vma tree for MAP_FIXED and the no expansion cases. The vma_prev() call in the case of merging the previous vma is equivalent to vma_iter_prev_range(), since the vma iterator will be pointing to the location just before the previous vma. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 722bcced0499..b940de8c6df8 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2962,21 +2962,22 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); /* Prepare to unmap any existing mapping in the area */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) - return -ENOMEM; + goto gather_failed; =20 /* Remove any existing mappings from the vma tree */ if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) - return -ENOMEM; + goto clear_tree_failed; =20 /* Unmap any existing mapping in the area */ vms_complete_munmap_vmas(&vms, &mas_detach); next =3D vms.next; prev =3D vms.prev; - vma_prev(&vmi); vma =3D NULL; } else { next =3D vma_next(&vmi); prev =3D vma_prev(&vmi); + if (prev) + vma_iter_next_range(&vmi); } =20 /* @@ -2989,11 +2990,8 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, vm_flags |=3D VM_ACCOUNT; } =20 - if (vm_flags & VM_SPECIAL) { - if (prev) - vma_iter_next_range(&vmi); + if (vm_flags & VM_SPECIAL) goto cannot_expand; - } =20 /* Attempt to expand an old mapping */ /* Check next */ @@ -3014,19 +3012,21 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, merge_start =3D prev->vm_start; vma =3D prev; vm_pgoff =3D prev->vm_pgoff; - } else if (prev) { - vma_iter_next_range(&vmi); + vma_prev(&vmi); /* Equivalent to going to the previous range */ } =20 - /* Actually expand, if possible */ - if (vma && - !vma_expand(&vmi, vma, merge_start, merge_end, vm_pgoff, next)) { - khugepaged_enter_vma(vma, vm_flags); - goto expanded; + if (vma) { + /* Actually expand, if possible */ + if (!vma_expand(&vmi, vma, merge_start, merge_end, vm_pgoff, next)) { + khugepaged_enter_vma(vma, vm_flags); + goto expanded; + } + + /* If the expand fails, then reposition the vma iterator */ + if (unlikely(vma =3D=3D prev)) + vma_iter_set(&vmi, addr); } =20 - if (vma =3D=3D prev) - vma_iter_set(&vmi, addr); cannot_expand: =20 /* @@ -3187,6 +3187,12 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, vm_unacct_memory(charged); validate_mm(mm); return error; + +clear_tree_failed: + abort_munmap_vmas(&mas_detach); +gather_failed: + validate_mm(mm); + return -ENOMEM; } =20 static int __vm_munmap(unsigned long start, size_t len, bool unlock) --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10D7018F2DD for ; Wed, 17 Jul 2024 20:07:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246879; cv=fail; b=MeM5HWQqZUIEgpkosCnq+T5JKNCOaC2pgUaN/DJfV+Ksd5/XHLc/Ian0BIKy1MsVpuyZJEyBCioEmyOFE7hv9MNzdftzrwN8pEhEDOLjuvb1eCF+UH6xaxldCJXdP6wNmFDX8W7XuuKsiOQRPGEndxs+YJdioPeMkz+lgozZwec= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246879; c=relaxed/simple; bh=a8UflelC67Ra5U2Vax/Un5kR0AQLbtT9H9mZeqS9dMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=W486ZSNBqpJbi9eDldXj/CMQHdiTEZ5Cgs84ivv62O2/tV0LQCEJNTe+4rV0e9lco2vOV/pi/AyiPYkG+Hm4evDPYnmTw9wFAgi7crPbm+iCjYoCxd9tRqSE1ce/oti2TShyaQY5w0S3tJIdXminAyEq/pAhW5d+ALewulFUEyQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=OSGj4Mwa; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=fdUqpcad; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="OSGj4Mwa"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="fdUqpcad" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJtuGd032011; Wed, 17 Jul 2024 20:07:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=1TtzgtfAgfJoN12sNHXK3gwWMxm7+yNqFvSCP2hWL+g=; b= OSGj4Mwa1q80GcM+cf44hAuyqlkPlz1Om4ioa9G7BRP0I0/OMdMOufli/Q11npva ym+nSBmySs0LJ4LTlLT8MYccsZfrUIfnTwnKPVN95iq3NiwvKTV7tJQ2PHvJBxAZ mbkPxtJQO6FSfEQqPkZoA3DRUorQtYG045nXjQfa/lWB+flfgHQs2YHqtlgfclqM OFTJ8u4iCwLoaaWfpVtxj4Y8t3lXkuYg++mLORNgQx8q5Jd893NNelJvZye+M16u eiKPy41iww/m1/sm83em1sJcgV/+eZdD/jfsOtbaVSYO+3DEPTEvwZ/huGE7vLC9 xgSRe3JHHS+r6VjouZzt+w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhpr0qs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:43 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ4sq7003630; Wed, 17 Jul 2024 20:07:42 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2040.outbound.protection.outlook.com [104.47.56.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkja-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cgpkYaPVZntqAuUBzs/v08bb//fKwmyODrJa7wVsVnXNC10gSnJeYacakgCX13S+WuwZ8yHxnPG+lGIiZWCNKtahRaN6H6zTz2fehG3BGz3W5Lk8y2z6t9sdqHhG5OfYPaxDpJqC0nRvePcRC9bGOChYlkA2GqXt7AQSJqjCTXqlKE1CWqiReXeq0lXG6wp2D//Uc/SXEWReAUZsBjchwrxg1A2m5jUyWqMJaD/hKkjC/PRnbeonvhiNjM2umxnaUEveOzS9v9lk3s62qHTVhN7w9zn78xlsgX6SL1YdTPLW1u6QJu7SeOmyxYcMJP3opxB8xSuoigKKhgOjENY3tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1TtzgtfAgfJoN12sNHXK3gwWMxm7+yNqFvSCP2hWL+g=; b=sKA+Ilgl+KapwzyXeJzC+bckBGNM2bDOrKJDbQp41v30wdGuKIconvU4Yewv+ZY6n4Do3tXj5lCVRjs+hDur4GNAsxJ4R6hRetKdNJE4J6TSiCeKAyi8FG7/uj4QE89qGaI4F05fGRKbDB6d8FkTkrrNErTwixVmS4+9dulTcewgKMlIyb69FqRPHPQVNyDE90rJezjc3WYnF//PoP0tyY3wE/wnZ01g0aJs8eJDrJdmmvJeyHuw4OjGiJ2COIpL2hbE0dTd7hshZ51suuMCtlKtjoCHTLzWFN2+YFfyp0OyNNEHdxo7oEIgPgN/8RzLHXUwicBcCpgxJfWw459Nmg== 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=1TtzgtfAgfJoN12sNHXK3gwWMxm7+yNqFvSCP2hWL+g=; b=fdUqpcadriZAmrLMjmdvgl9+aqRzWlqs173uGR7Pm4TZq/en9uJXBY2zoe/XDIwZ3i0LHhvzbR2bzgZWvwHETI6qFREwv5z2ySPN14ZvTUJKdF71L3/cPorMTY9rm4mGRDVIZmkVCiINpn6ZuUwNcKH7P4ZVVMU4ntTUSO6T5mM= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Wed, 17 Jul 2024 20:07:40 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:40 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 12/21] mm/mmap: Track start and end of munmap in vma_munmap_struct Date: Wed, 17 Jul 2024 16:07:00 -0400 Message-ID: <20240717200709.1552558-13-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0101.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2c::10) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f2497ce-a893-453e-879d-08dca69c1c5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LSd0jL+q0u2kUs6RAOByPRGWWSeP0S8mnk9INejQ0SXIj1xrmQF+Lsh+Ztyq?= =?us-ascii?Q?abRkKb4iGuZi18SKqgp1C3xS7/uc4Z2lT4CWZd775n0k99ODvLw0APuOpPZn?= =?us-ascii?Q?AGpvJJK2V569SepWQTVMuo7nCDpgr/i3xFCrZS8HqkE07hKtgIeq7hg9BauE?= =?us-ascii?Q?LBq2c6qr28zGn6rF6zvSQmRFJ+Myj7A7sc9eFea8yAykI7ivnoyiQZIFLhnz?= =?us-ascii?Q?Q82r93viLvplM4yclT46KXT4Z2wCfwVD7mVhiJi+keYK6O2YsipSjuoyUol4?= =?us-ascii?Q?ZkuIvV50QlZ2mkSCTGDmSNBJJ3pkJgVkbfsDvjrQ8q4QIM/tWgu9re8zy8jh?= =?us-ascii?Q?CB8eBoZldnFdRwbOBX2VjorAZfuv0hAgdRLr5s86Vw+76UHC/dg+JZCgtRzU?= =?us-ascii?Q?ID13yeLCcvis1JsnGzxVhfZOWQQnT43Lpmg8JdPOIKBSM2QRJdJeyU9fg2PK?= =?us-ascii?Q?usWWc5lORRmCc/2MboqeHkT91qUSE9UxnPbGw9hDrIlzrKfpjZHLYn9ybD1m?= =?us-ascii?Q?GbvxA/346D4ZiYZaydERsr4U9aZjDqwdaf1OG8nObAB9Nm1dAI6D3QP933sY?= =?us-ascii?Q?hblTTlEVzGzZb+0Hj3z825mZbQ3OM/v4oObo4YuUHvKdepLpy9TrqqUIjgrH?= =?us-ascii?Q?UU551nWd2u3QGkoR5wt5aQy8NgSw9Z1sktXdA4BMBS9uxv/OQPZB7H6cGN6m?= =?us-ascii?Q?FqjUblFdraNwkvrMIfHIefDbPYEKXP9vxKzVhKnG41sizCsdYX3w74yYPvA/?= =?us-ascii?Q?1YQRM1PN7JsAigl9uOLb0h5tGjR1ZJqUYQBZwB0RnOruKg/1H0TNCWlk8A8d?= =?us-ascii?Q?xgUc1kCftPk9vnm5jyXNwnIfz0wak/8081ZAoeOwZW+0Lia6odTPFYtreBQB?= =?us-ascii?Q?qwShp3qSXQtJNZ+j+0jCYU1Hsay462gRH3ZDoQiplEHVu/PgRFH/G5dMVXs+?= =?us-ascii?Q?apdqywsHIDor4H0gct1Q1o/V4zGKkzd1/ZUdG6+nBVZCo2eSgr/qb31RJ6NA?= =?us-ascii?Q?a+QJxBNzHeIuxyEDYu+QYvuEA7O34JacFQMzTWVIF16hbrRo97UZ0a1zcUBD?= =?us-ascii?Q?KEOkicJGIGtPOlD0Zk0KGIyXqgS1wDZY7n88qVn/qC46kBkOwH9Qu+C3qVJw?= =?us-ascii?Q?etYBeMWgh1DCR+OXGn49rG9g38ZRTM76LwuMZ/otdYV+gQ3gRoDhJk84jIyF?= =?us-ascii?Q?IgNn4SZZach4wS2STPD9FqJK0lcQwhYQsJPuqgLxC5T61vVDGpcnWMNXxtz4?= =?us-ascii?Q?DgAqDKbjQvt2GJndEgoPo3MQRwZ7IQokgWADr2xb5u+rnQWNKBYQImmQb9xZ?= =?us-ascii?Q?BrDskkl8JV8aN7H9PlmHGph8fO3ZooM17RsIvUy9ueWBLA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3X8GE6puGwoEYmhJQk2OdM0P5mWK4EhjGWlxnNodHk3hVTscJnGkDQvqPWlN?= =?us-ascii?Q?apl0W+3OyTeIe/VjB16Wra5q2s8WK5W1EYPHG80mk+KpD5Mn4yW5r64Vuimn?= =?us-ascii?Q?0creO/SX/gRFl2Q5buBQr/wcWp9Lf2F5nPvS2C581f0Iv2Lj01jqWsHTDDqj?= =?us-ascii?Q?7Vqbealkqsve+bg6iJ4Z/E2lxcg9lkcimOGBqafEYZxZCYPnV9Akp/rDvTx7?= =?us-ascii?Q?wNTS+EHu91xjVA+QeM/M3lTHADb/wWNEGVbTNMXrfGc4cBrkrbJJwcDNSVts?= =?us-ascii?Q?znXf8cJwcODrQtMnFz6ecy8hB3UF+ZOMUyFwPeMtA0jOTTHhgPwN/ACmu+6C?= =?us-ascii?Q?iQ7nk161OaLKBqeuA2yhPtDVk+Yv8LaJH7WVn71hrqLku6nR0oI5BRR0y2DC?= =?us-ascii?Q?eN1iVAbVGcza4X+o5i9PXr5ZU8MePZLHJ3qDfDHqfJd85b5Uj5jV+eluXWDY?= =?us-ascii?Q?wfY0mj3T2Lfe8heUVD+d7GB+fvZCsPhPXayN0q2eb3AkU/K36EUfXNsqnB8h?= =?us-ascii?Q?7TznG8sl/8QmUnxXMXKvo+Y19gVbI/sz9ELQ7oez0zG6hkhd5hlogHpwCsZy?= =?us-ascii?Q?BNW8UpREviqDj0mQ4bESAlrkyxcm1dxvCXO6xYwbCJbI+SMGiB3KPhq2LqOY?= =?us-ascii?Q?iDvgJSTIX6EGtXs83BHZ7UfYmclVgtCqPtbAHr9O1tYgSpukFwimbv058yJz?= =?us-ascii?Q?i9gHzTUuVB7yI/F/OODoNc+x9xo1zBVAuvENqAUjtusCDT3XxiZcd4rg9JDC?= =?us-ascii?Q?Oe/hBfHVVTIH8V/DRq/j8uoViScfPt7kDD6NmQTTBuToeYhyf7LIZZOnDS2Y?= =?us-ascii?Q?5J7kiSLmGM33/iomZ6+ov6hyNjOXQNp2eG8xrX7+Jxd9jS3n2DCS6nEJWs0d?= =?us-ascii?Q?7lrE5HVJvpFfE7BDwSwTwlffWvK3DmTTm/OAVKlgcaHqVj71XIumZoYaA98m?= =?us-ascii?Q?fySqwJHeDMc0u0bumlkdA2JUF2IqGCuEcScRd+30tbUKaZGfidluLuT8usBQ?= =?us-ascii?Q?mByPrZhAG2AVAIgq/ZWnOrMNvKu8TWmeq3YA+OKa9YBlZhYi7ErhV7rw6yvW?= =?us-ascii?Q?Cz+f2tMjGIaffplwMjLXymW/xsgQunrI0EsdIps0Hmfbh6bWo3z8WrZdeYVB?= =?us-ascii?Q?WVG40wFNZ+ane/NJ580+mr0wC2rZIfak9eKlEWWUTE8Lm1DzCq9gDUVjgpUT?= =?us-ascii?Q?t9FwKBMlhUNMJwcIWpTCL+/lKuQJhQHqWMqaRnWx/61c7dFdIqmkTOym+QXi?= =?us-ascii?Q?2yDGgrHTjz3OUJRnjNb3aVY7Int4tIzihxEUz8k+sKaI5wUEo/0M69zqcsrC?= =?us-ascii?Q?MB2nbPqxi/1yqJvh9CHAFJZX4tWvlvV8dVDcQcLNyVAfbLWTXWAvjOYW6oaO?= =?us-ascii?Q?ANtrjm3wwIWNyv3vKSIHbO9jXRxn4bHJCwiwurImQeq4OvQQvPeKZPgz18HR?= =?us-ascii?Q?RFBrh9tA9UI1htXyQh7Sstr9XOEsS9esDyuKlhtANP232CNs9h6ycANyC9tw?= =?us-ascii?Q?QkeNb/pPyjq1ekGoC8jMS5E2oer5gBK5t0s7SsLHpZ+/rB1t5VIF9wny7Fqp?= =?us-ascii?Q?FE8dJNIgdi1r9whyfwRCGyBfCnavO/GBMM6STGqulcCtoPA7vfR3WFADcPox?= =?us-ascii?Q?Kw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: UZyXF+2HwiIG2cbnKvil0FqC2tBYlSNg0gVqf6HG/g+WbWTlxSqh9LA+aJFiU5AWcKvXiiRBoVPhiz9tCETQEaoP0VErcFpQt7SL0zP+iTZTKENJJYRET1eGq49EDa1c5noRHM8MJp6NYaj7itXYxA1y6iQEKjwSNHelLiL2dSZjCg9VeeWsFYS/91YdUSnt2H2UH/iVbBdspdnImsWHUMzjnN2izDJy5QUPddS+Ob7uz1fNOAy7d48yE4tLwVhZjNMzv3VNR55bWSdfnYoNmpMR6LTHcIwevXeob11v3hzdvlICYZtzF1iSjRhk1cwUcEeT2rkdw6UHk8JlIKuEFVxNc3r9ooK7x9MfFUuIxpROA53zjr4JucMDVmPmCNHHhOtuRtfLlW3TBDp0Yzvpv0qDplEQVGOInotaJgrrwhZKb4yg/5kUxhmZCbLeNPjA5klfGkjPecojJNO668GW3bXXSwHtG70PhBRrmUR+E7WoGrsysxTaLhZTgbJp4n8v6dYODee2glurJprBZTUvKUadlf5JwipMCwUbn7h+0U+rPRIzxpvTLTE23cTwJMen5mDRdr23NhmMSyIn3jQcfJTodgefdOfayYbdBNS1+J8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f2497ce-a893-453e-879d-08dca69c1c5c X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:40.1834 (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: pbUt0/S0Ri2UMXBjMQ0xqcUQP6XjR8Pwu6uXOYTxaYYgwKWwP0l/TiYXWoz2ggJ7N+DDd+FFqd0I2PkkK1k8LQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: I_zVh1YjHHwW-IVez-UO1U83I_cf5lFO X-Proofpoint-ORIG-GUID: I_zVh1YjHHwW-IVez-UO1U83I_cf5lFO Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Set the start and end address for munmap when the prev and next are gathered. This is needed to avoid incorrect addresses being used during the vms_complete_munmap_vmas() function if the prev/next vma are expanded. Add a new helper vms_complete_pte_clear(), which is needed later and will avoid growing the argument list to unmap_region() beyond the 9 it already has. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/internal.h | 2 ++ mm/mmap.c | 37 ++++++++++++++++++++++++++++++------- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 02627e269d6b..ec8441362c28 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1493,6 +1493,8 @@ struct vma_munmap_struct { struct list_head *uf; /* Userfaultfd list_head */ unsigned long start; /* Aligned start addr (inclusive) */ unsigned long end; /* Aligned end addr (exclusive) */ + unsigned long unmap_start; /* Unmap PTE start */ + unsigned long unmap_end; /* Unmap PTE end */ int vma_count; /* Number of vmas that will be removed */ unsigned long nr_pages; /* Number of pages being removed */ unsigned long locked_vm; /* Number of locked pages */ diff --git a/mm/mmap.c b/mm/mmap.c index b940de8c6df8..7cc1f47122f6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -530,6 +530,8 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, vms->vma_count =3D 0; vms->nr_pages =3D vms->locked_vm =3D vms->nr_accounted =3D 0; vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; + vms->unmap_start =3D FIRST_USER_ADDRESS; + vms->unmap_end =3D USER_PGTABLES_CEILING; } =20 /* @@ -2612,6 +2614,29 @@ static inline void abort_munmap_vmas(struct ma_state= *mas_detach) __mt_destroy(mas_detach->tree); } =20 + +static void vms_complete_pte_clear(struct vma_munmap_struct *vms, + struct ma_state *mas_detach, bool mm_wr_locked) +{ + struct mmu_gather tlb; + + /* + * We can free page tables without write-locking mmap_lock because VMAs + * were isolated before we downgraded mmap_lock. + */ + mas_set(mas_detach, 1); + lru_add_drain(); + tlb_gather_mmu(&tlb, vms->mm); + update_hiwater_rss(vms->mm); + unmap_vmas(&tlb, mas_detach, vms->vma, vms->start, vms->end, + vms->vma_count, mm_wr_locked); + mas_set(mas_detach, 1); + /* start and end may be different if there is no prev or next vma. */ + free_pgtables(&tlb, mas_detach, vms->vma, vms->unmap_start, + vms->unmap_end, mm_wr_locked); + tlb_finish_mmu(&tlb); +} + /* * vms_complete_munmap_vmas() - Finish the munmap() operation * @vms: The vma munmap struct @@ -2633,13 +2658,7 @@ static void vms_complete_munmap_vmas(struct vma_munm= ap_struct *vms, if (vms->unlock) mmap_write_downgrade(mm); =20 - /* - * We can free page tables without write-locking mmap_lock because VMAs - * were isolated before we downgraded mmap_lock. - */ - mas_set(mas_detach, 1); - unmap_region(mm, mas_detach, vms->vma, vms->prev, vms->next, - vms->start, vms->end, vms->vma_count, !vms->unlock); + vms_complete_pte_clear(vms, mas_detach, !vms->unlock); /* Update high watermark before we lower total_vm */ update_hiwater_vm(mm); /* Stat accounting */ @@ -2701,6 +2720,8 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, goto start_split_failed; } vms->prev =3D vma_prev(vms->vmi); + if (vms->prev) + vms->unmap_start =3D vms->prev->vm_end; =20 /* * Detach a range of VMAs from the mm. Using next as a temp variable as @@ -2763,6 +2784,8 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, } =20 vms->next =3D vma_next(vms->vmi); + if (vms->next) + vms->unmap_end =3D vms->next->vm_start; =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) /* Make sure no VMAs are about to be lost. */ --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D126818508E for ; Wed, 17 Jul 2024 20:07:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246880; cv=fail; b=VYj5kKe1IqVnSg6wfbtRWzVCKnaO8kdh9xoA9DAVKJUHaUt1pNbAJr9iXiygisLGLjBN69ddH59FtoyDCA7V7CzVKfnGPpjT0iVpYFfKnHslGv3PMqq4MTGYENw2g+1OdWdtdM4cEuxMX5cJ37uOE5QJror8FF9wpr4/aU3wkT8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246880; c=relaxed/simple; bh=45nDv9T7y87NEtN0/HcR4bAqsQL+M2hf9dWj6Q9nGJ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rYIgwDXvfRF9I2f8Tzi2Qew2gV2/EZ+F1VCLkgzwA7zoVLDqjEM619NjEyANGIbqohAlbjyoxXZpmCZfqhiaGWc/uK1YzOiBKrWIdlJRpgzFeFtGm7zArlOdyXTMKoIDyvyfec5rtjfNJ7GeU0Qnqhv3kRuzhc1ZH5C1+O+sT8Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=AE29rS9d; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=mefy1aLO; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="AE29rS9d"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="mefy1aLO" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJu8A4000345; Wed, 17 Jul 2024 20:07:45 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=/B8O90wsTqrG8aGCnP35NaLGvZW5iIPaZPRpBTO3Ycw=; b= AE29rS9dWRNMzwIHxueRmLCZ+Yo9Z5rzITMthaioavtn2a3hWIZANYKgKwZSBHcu iOxsg5yZGcC4n+ai68b+zpOdaACTp6wZrpSZEEv4jFn0rw5/j7Eqk2OAvNPwaoRd LXbPBbUiEdJxwYs9fdf/d4SdLpb2hGdBajGHF7y6eoGd5diCP5IR7AokMeO5/5Ry CAjODzFpI5O34u3UkDFitNeebEUxgr4L2EN37V3cgoEtgfb/rTECNQaHmoGwLl7g /5rykrZfowawV+HVHJO/9f33BaB1UD+QSRQ6WlivrNHebt3d507JdEo+mCh+3PfV W80pFUYIOfhCkjMWYDtshw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emhpr0qw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:45 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HIoUnx003734; Wed, 17 Jul 2024 20:07:43 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2041.outbound.protection.outlook.com [104.47.56.41]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkk5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A8MfxNUMD12fP+cXcq29wIdNu+VxasFyhg35DGf4/vGcrbCTlNOCMvyAPkQl3fi8mCUS/zJ9tAp/zFy+WXWPWwZQCJeJBHcc3Pm+qMWb9j1E78PUuZL3hRMgyGbZUoh/q3cJGWejdwhUqFkLKiD5QidHAN1wS0GVcSOI2H6gPtv8NnPj9pFdsiQzXyMYTGoOYQGZu3xp4+lsl2CgcSKBgIn6/7k/64UKpFPSaZMcKQNkc1sws20yXWOFB0eJNt/5Q+EN66IG/HUtONlctMmHedSaXnASXVeoqXEZEpAB6WNIJLk+PuX8KbYKZeunwXw/VNq3F8TxGn83b51UN2xeHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=/B8O90wsTqrG8aGCnP35NaLGvZW5iIPaZPRpBTO3Ycw=; b=KRKMiNmeRvS2x8brdxuw5gNHDXyMtgflY1plQrjFtfbtbBN1/386rQLK9gyTutW6OXD12mEHCLfg05DpECLS7TKVwH/GLMlznnjqO5kJrObyTYlRr9JUBe4EYetqhaRhBl179ZatSA33TxW/ULVg/gnx0Rt/6hcIfsdCvW4JxtH1QI2luJxIwjkyzSxfRiGOYG0+QHiDjnYoV9lSZuXE4ijzlFVFjXJ8ILZvSwU4zNB4zsekzkynxIHXNNn/4Gr0UgpXePnmoVm7CLfrbQKRxrKVVoovv5W5w99pV3XD4Cy0m40pd4iUv4b55Gmt16BZmdbDSX+QinIzi7dogl6LQA== 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=/B8O90wsTqrG8aGCnP35NaLGvZW5iIPaZPRpBTO3Ycw=; b=mefy1aLOQDbw6FEsfMVG2YZ8VI36CITvKjgSJM9wKdPM0WFrHZQPdZ9UuSLbrvzBQry5U+J+F4y8MkvPWGTsyR7X5pJwYLeTKgIi9TgSBBLVKw46qCTNWDopK0/Gr3lWSxHIgXXP7la4sLIrrD8CYHQEHX5+pW3Wl2iuuAKDmbk= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Wed, 17 Jul 2024 20:07:41 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:41 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 13/21] mm/mmap: Clean up unmap_region() argument list Date: Wed, 17 Jul 2024 16:07:01 -0400 Message-ID: <20240717200709.1552558-14-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0083.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::11) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a597975-915e-4510-be67-08dca69c1d1a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?J5ev+TkQCRJWM6Wm2bxTsIJJ0guU7rq4uKLiU8zIz3lo+rYLk+S0Vqp1Lcdi?= =?us-ascii?Q?tGmvxmM3QTTYoPFKF7CDizys+Iq4/Fdvw8sfyZYQ3I0W9KUlHrkWMoGFvNNj?= =?us-ascii?Q?StzbJUlt92VqjKHlROJ67pN0wNdry2z5wD36apBpyChQFYjXebTGyoG1fV+a?= =?us-ascii?Q?6U+OdvvfQQRvFHfkwLkfNMQzeZ3dphDZrw9zhZSROsunC9NRz5BL6uhq2HpW?= =?us-ascii?Q?bvKwTk6zs1G8Lcj8oc0kGGQiC94qEYSRUkA02jjsE/r1E26Djv4kJSR7rkBK?= =?us-ascii?Q?AAl4YE7f7Spm31EAUoJmWpaNyvTXGHIuQ7uaCKAnzclnam7ee9eyqK4/cckk?= =?us-ascii?Q?rm+rjapyc+/k6ZQXQQXhSFH5oQTr+qwpCXSkbMVBMmWw6MiypPEUAFoQeIrH?= =?us-ascii?Q?RRCJEgN4uLqPPNOa4AVjxHc5vrhncPtvOXC/VbUsGZhwrQ5OICNGnzCynEs5?= =?us-ascii?Q?+SStZ11yHnkt7WRvNQ9c4xvtH2doGikwp80FbJmk6Sgy106ZZMkba7Deypzu?= =?us-ascii?Q?VxTA1vOJKFZzQ7qMloVostt2l7x1c08rg2eVH5VPZwsRQUq04adl7QK2ika4?= =?us-ascii?Q?3wp0zJ4mbv8R3CIv0v5ZaUErdINMmO5yrxg2ctgPrKPfCNAnMqJpoNy49Xn+?= =?us-ascii?Q?E/Cf/JR9me0WT1vkmZIFYFo94sOLnEjiiSluMQtTWc5HFYs/Nr69blnFwoGd?= =?us-ascii?Q?tJXJVigrBjE1cx6Ys4SUHdLdBAe35SsKb2r26hTwUsjp3JqN68rEiae1Ummn?= =?us-ascii?Q?go4QSSBMiiyP8xDHze6UqiKkRs7ZhT+8AwGjXauqSVimPZNjXWgXs6Em/NqN?= =?us-ascii?Q?pBUwqefkk0sC1cVVIvGw1iPC+2b6y+jQXx8a2S2XoU/sAh4TH1ZiG2SOnSjs?= =?us-ascii?Q?qDFfTPn+tDe+CowSv0xNs01EPz8y2RWgK3uYDGQeUfSNqet4sRfTKRgMHSau?= =?us-ascii?Q?JjJqjTI/y/KStpyPIWku2WpfRAfwnQHMrk1YMXyi8tZsAbkz4ISSrjtsnX6h?= =?us-ascii?Q?JYmO8S4XwrBXPIr6rpycEt0Bt7z9IhggKXi8a6qIFUm2MyBim5LUKtCZ1IUy?= =?us-ascii?Q?Syn88s/337qpZeUC1DwM1Cn2bUT2qNvSevHRQIAW3jYvQaPV6GMy8tp3h6TR?= =?us-ascii?Q?rr8F1PtXlcfxmR05/lbcyydf8bJkfHt/CNEpWruMM2G47mMLYoAHK+IhTh8A?= =?us-ascii?Q?nzfACPJrC8GRmKrl5TEviizVlJojKWsAn0sqdZMbb5J79qK6yHrg8INVdpbY?= =?us-ascii?Q?vgWUXRgFsX2ezzYb4vBMnMjaZ83rl2yIdvGazazMQpwAbHfQrm3pv1dobMK3?= =?us-ascii?Q?cyh5aUTKMHGT2QSPQK2OLy48rXrXR5xJCDLSwsA3G+EchQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5A/uqbb/VQ7nuVWmspHKeWB6AbBAPqldn9dNHrGRwH/V7q2Km8vRtBHYUEi4?= =?us-ascii?Q?HDlbVRWrtXfwqinGaIL1z4tWa6UXIbX3MQaqW17kY/UxNx/Y6vneyueJ2ciI?= =?us-ascii?Q?XZYUBCnQT20qtii04IUhESiShWWJiNcT5xoprUSZZjJN+9A4riSfo8xPcsI2?= =?us-ascii?Q?LROLgdc+nMl10QXWX8qNBr+qci/XjSbbJ0vcxZh6O05fNTxuacuRbjgG47wi?= =?us-ascii?Q?HgmKy4CLaPqFk4TyIGnyvVC/6M8g7QJg0JeaU89o1k+NvtePwYMzTyejX3s3?= =?us-ascii?Q?RYmNfLUrq+8hou+mdoxUAxfJCcxByt0OJdtBBN8KdrbrHUDTFyZRJ+r0l/ds?= =?us-ascii?Q?r/nI9eOX54DeqDRzDfUOdKdDc+Zxu/rLhRtTj1EJCWGvf+bzCVKSses6qoWZ?= =?us-ascii?Q?NO9Uh6YXE0y4/AO6Ssmdaxi32ZNIjE4NsMXhR/E7SnBW7LbZna3SvQuzT6FI?= =?us-ascii?Q?5YxlZQxDqxvhaLuGy7oJn5YTdoI6MYOR+dgm5c9gjhwpWIVvsDqRhFuRm3QR?= =?us-ascii?Q?IKxJCCMQLa37fUIUMh/zQXAyaXNNB/IoBVlAxlEi3pH9t4GRUUM5HtboU2Jm?= =?us-ascii?Q?zs70hPrYHBcV2v02ZKuF5qwAkqFgesV9DBRzuMsB/fFlt6jzPcN5ZW9BVoAN?= =?us-ascii?Q?ioXEPVzq0ftIV1XBKccFMIuFzjoOn3uZk+PPDfkd/02eYpHxHrZ/312pPltE?= =?us-ascii?Q?35Y5MsFjwR8kIPEuoAhurnCB5j/d9kqnRspY2xXaVRyIl9Mydvqf0irUTM8S?= =?us-ascii?Q?EYc+H+6eeV9PXHBfM9qS9Geso1gMqylBcuCjvXXRf1X0ooEBraXROcxffbCA?= =?us-ascii?Q?2ltvcMwm7yXLWMe9TwkXPuwIHzs0uHzfyAImXDb8IeGhrXxLBp6YNIFt8pZf?= =?us-ascii?Q?xbb91HGO2BFSp/cyriZALdXAgZZYq9go6UIiIn5XJX7PNBsrPrHAm7ZduhTe?= =?us-ascii?Q?YshLxO01WBfrLUyoJs47RyvA2GrFOl8omMUDeoW9ce6wjqgWGw3UMTIk3BPC?= =?us-ascii?Q?8JqJQrO0Yn5IGhoL/fQnTAFMfvOBDVP7D+UP/pcjTS1I/++OHaJcm87i1JG/?= =?us-ascii?Q?gjsJs/5bkDRNmeeca5Bi0zj6oM64nD00l3l91ulJc6G0OJ/4Vc4xq7JXRCty?= =?us-ascii?Q?oiAEnYRacQOQGe3lH9fEOQpH17+14RAE+E5dJ3x7VSnV55ZKVqyani6zUk59?= =?us-ascii?Q?LVMugrdDk49BaQIvvpj4a95AxED3kxnME766fOyalOQphQTZr26fzxWz6jNn?= =?us-ascii?Q?AO0UXA8dp26q3NoJX+TFNk0HvCq5KFEGsH75a3Fr9SipYHNujTqmfzZEj2Iw?= =?us-ascii?Q?dhjer/+mz26Q7JzPSWh7rulhbeES4/yuGjK5PZv/9es7idqZrJCBQCYAyZXr?= =?us-ascii?Q?L7/rq1n7xp2cGIaPrtAmA49bDBDYCLZilfsLOCjyrmh2fCFMdNjlV1/VrMGd?= =?us-ascii?Q?X/IUoS8Vl8ky0GlVYYX9DDmgEEHnV4Hc6traLIyTBrcGhmWCF04vkjqHoiba?= =?us-ascii?Q?DssNU3cKZn5JZQy2bkoULxwV0jmqHbUGxIH6NW7iIX/k9duE0HOGHR+H7O8K?= =?us-ascii?Q?g30Vo8FE+oq8m5DIAAieLPq+Bor5aeLrxI7JBMcVvOJ3Mq34B4pVCCraHcDC?= =?us-ascii?Q?0g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gl7nqdsT3gwt8IUBYKr+M9ovsiXilqQwSK2fp/fdIPO1amN3/cEfC/5jZcUKXOpIE48rpUeIpkjgnQVn/uhLV14Obh/jqdaR8myIynxP2Ro6s+QCGVZSx7ewS6ziGL7pXg0K3a0AQIlbtkStbtKL50nX4ukL9sR7TYy1xxX+SkgynrFe4ENLnIEkZ219vtX4PVx8gC+Qrk9wwAYh1e6plJEITaVeaiucAuc/scx7lbsFx5sBOatV2F94SIYrCZ1T6LpP6jhWfJnO4JH1pSrDIQZTcXSfVO7NtArve6ItYWyqP/y8eNdtHaXAIgQMY9WdDLLTiL6P7Q4L5uFdtfYy/+JCOxUWG5upPhOKhSOX0VK5moE5eLZFWU/TgK7Kd1qIWhYxqkuEeuXJJ4+s18hMadw+wdISbUTGZ8Enh9ZmWRSCljssvXUSdb/kK/ExSBq52VQqNiNi0LymlQudgKdaG6pDkqkEyZSiCaGL+dRPxWDiEP2OuZ1ct9u/qePIATvkuAoj6NZ0DeNOd4AskN77txeqLedBertknJlEu2wmRrqd1rKxeqYd3gZpGIePIL3k0banOgrwIZ1bsPE0CurNdU8LF4ssr27GlyV7kjBSBRc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a597975-915e-4510-be67-08dca69c1d1a X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:41.4018 (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: XNP4b9aR35T+oNFYzieizH3+uPQqRlrlcgjFhtkzhbBKfK//4XtYk6V7AEiCIK9xt8vcbX2QC5tI+qL0Ye0w/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: hpCF9MCQ_rf2aE0WeE9MRVdzOzeNlq8O X-Proofpoint-ORIG-GUID: hpCF9MCQ_rf2aE0WeE9MRVdzOzeNlq8O Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" With the only caller to unmap_region() being the error path of mmap_region(), the argument list can be significantly reduced. There is also no need to forward declare the static function any longer. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 7cc1f47122f6..20da0d039c95 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -76,11 +76,6 @@ int mmap_rnd_compat_bits __read_mostly =3D CONFIG_ARCH_M= MAP_RND_COMPAT_BITS; static bool ignore_rlimit_data; core_param(ignore_rlimit_data, ignore_rlimit_data, bool, 0644); =20 -static void unmap_region(struct mm_struct *mm, struct ma_state *mas, - struct vm_area_struct *vma, struct vm_area_struct *prev, - struct vm_area_struct *next, unsigned long start, - unsigned long end, unsigned long tree_end, bool mm_wr_locked); - static pgprot_t vm_pgprot_modify(pgprot_t oldprot, unsigned long vm_flags) { return pgprot_modify(oldprot, vm_get_page_prot(vm_flags)); @@ -2403,22 +2398,21 @@ struct vm_area_struct *expand_stack(struct mm_struc= t *mm, unsigned long addr) * * Called with the mm semaphore held. */ -static void unmap_region(struct mm_struct *mm, struct ma_state *mas, - struct vm_area_struct *vma, struct vm_area_struct *prev, - struct vm_area_struct *next, unsigned long start, - unsigned long end, unsigned long tree_end, bool mm_wr_locked) +static void unmap_region(struct ma_state *mas, struct vm_area_struct *vma, + struct vm_area_struct *prev, struct vm_area_struct *next) { + struct mm_struct *mm =3D vma->vm_mm; struct mmu_gather tlb; - unsigned long mt_start =3D mas->index; =20 lru_add_drain(); tlb_gather_mmu(&tlb, mm); update_hiwater_rss(mm); - unmap_vmas(&tlb, mas, vma, start, end, tree_end, mm_wr_locked); - mas_set(mas, mt_start); + unmap_vmas(&tlb, mas, vma, vma->vm_start, vma->vm_end, vma->vm_end, + /* mm_wr_locked =3D */ true); + mas_set(mas, vma->vm_end); free_pgtables(&tlb, mas, vma, prev ? prev->vm_end : FIRST_USER_ADDRESS, - next ? next->vm_start : USER_PGTABLES_CEILING, - mm_wr_locked); + next ? next->vm_start : USER_PGTABLES_CEILING, + /* mm_wr_locked =3D */ true); tlb_finish_mmu(&tlb); } =20 @@ -3198,8 +3192,7 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, =20 vma_iter_set(&vmi, vma->vm_end); /* Undo any partial mapping done by a device driver. */ - unmap_region(mm, &vmi.mas, vma, prev, next, vma->vm_start, - vma->vm_end, vma->vm_end, true); + unmap_region(&vmi.mas, vma, prev, next); } if (writable_file_mapping) mapping_unmap_writable(file->f_mapping); --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EECB19047E for ; Wed, 17 Jul 2024 20:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246885; cv=fail; b=AHU3KQHwMBybsh02JYznSysIIp312kJRL1i6mF+tyPtkZzTtW/8JiunpL5dzSVgNmoZGWFJZtIMoLNyiZQ2hmnplYpN2ZGjKBjP3UuUV3fHG9FGYFR6nS0ypZ2RoHuWYV4237Vltqx9MclQVa6WpKBgg5lboQsHBD6eB7H/mU/E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246885; c=relaxed/simple; bh=LiSKtfxtf+kffqelJn+S3mG9S151c2l5J27bTgOIV9M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Yp3iPUVOQY34X18cjORPyF7lYvCL+nZCzQAhI+ZEyw8vh4pZHbnV2555osp3sTrC3oCkc8EdDJxghrGqnq6Bxvh0rAMbFjPcMwK7pdqhBPntT+J8Nd2akIcMmJx3X+sHlVy/IddJUUIN6eU5jk6jvhc7pxxPkYYtlZ8pL8ZgP6I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=F99lLj2D; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=G5Vz3w8W; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="F99lLj2D"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="G5Vz3w8W" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJsRWw002443; Wed, 17 Jul 2024 20:07:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=9BtKiGUugGEEWslw8NJfElcvJlWGE3OYXj7kTlHZwJw=; b= F99lLj2D0pPc2p9qzDcSqqZsqT8Tg1ZS7Y1NYvrs6lejysEY3jEiW+X39fNDgWR2 FN0UcxQmVQ62Kp5So0faA1W6mhPJ352cAdJ4cqO2E742CGDsfk93iE8eU6iZL8EC UWdZUa1Eepn1kjIZGEw19NEHjkrjt7Te70ZBa9d8yZwHL2HcEl2LjggUuzlL7wnf YkXmJ2TACG4jxjyLdTxzbQIrpp6lbmZJlxH/QMFylmd6gHt2JKBX56sosDcLcCQE qoy6AlGuBUNDZTnOQTMdC1vsSuqrE6RQh7gGtcyXZ5EI+xR/UaByLHZ5/zXARymO EohV7nqMiEMrmCcL+Vejpw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40ekxy84at-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:49 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJIY6I003738; Wed, 17 Jul 2024 20:07:48 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2174.outbound.protection.outlook.com [104.47.73.174]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkpk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PAKIgtkD+w3hmex/YZer243bNB4CarquBBfU6cyalT9ymOZ9vKsT3CfWuEl60fv8ahVNFCmhzMmgxvZJV+9JEAVElLi04XS3abqWnzf0Kvh/oy1KvRnR8mh5DQ/1seF4nUaEmhxXwSlIqGFxZtTCmWXG9MW+j6cdtYzE/8S879NANQfiSxOdBiUiBqyivh41LIpVg5jKJjHQg4Hg4CO31x9AbwgGwN2IwRrUAk2GyZCI4pvvNGz/2S+2H+bnohEAMWFl+foMXlm3iy2+PI1JhLXzKVgqJO05EbJkpklsSAcZllXh8FIEAc6IiiNOnCcqBlAoY06/41u8tZ79hn0Z0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=9BtKiGUugGEEWslw8NJfElcvJlWGE3OYXj7kTlHZwJw=; b=kRYeWNylGwmLKxUbOT2yTDfZlu8ItHUXaXEvbz6mtJIASYt/6RoYqhdHeIcbU3opCbImtjR7CieIbt9MSLsnTAW67pm5L8tKVuISrRBKSrY6BhzI+w9hd3ouC0ltvuyxY93yDWCxatPXwd0pSgdCPlxShJn8/IDD6A3rRcikQHep1NeuQABoJxRQRCxXXDjPAPy9Km5y5icuNwubU9zpBOzM0kZV7dEsLVN96FmmAQMcjDzNlxqyGM4vGLXI2jI9Xz5LBqbrmrf9RcAH7I7ChXcdlhzcFfLh2eS0px7Bym/+T904ctdvXonlDLs3VxThC+RWhDNDyZrSJjlU4wWPjg== 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=9BtKiGUugGEEWslw8NJfElcvJlWGE3OYXj7kTlHZwJw=; b=G5Vz3w8WbkVxrt4i5HAVfajiveBCZ3W+bG1V1S6snjbbhvwf9gLupvAEK7xCl6eYUoAPhJAYuCmlS/3yiU5WoBjdg/JnBkpkJw6EIxw1GmFIfybEwfwaoMsjfxNlAMIKp3IduWyYVcuIYJ1CCgB0I1QqvZadA3O9am+6UoE3l7Y= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Wed, 17 Jul 2024 20:07:43 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:43 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v5 14/21] mm/mmap: Avoid zeroing vma tree in mmap_region() Date: Wed, 17 Jul 2024 16:07:02 -0400 Message-ID: <20240717200709.1552558-15-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0050.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:111::10) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a15224a-d056-46fe-394d-08dca69c1e24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LHfheq0Y2q19j7hVrCrf7J7M0uIUEyeWWwNv2xa9XKRZVfgBKwT9Y08USxZV?= =?us-ascii?Q?6o/7Pw8iO3q2bggkeuKrz10geSJsDTTF4OLsOJsrKR0yEshloyiBvLooSflw?= =?us-ascii?Q?Y3EqUVEtYFcFVg7rqOVzpHKK5Ld/QKwFmd68H2dcsILl4aDlNYNnx8E8d4iY?= =?us-ascii?Q?2Bnu8xPdEnCTd3SOdY62VMOHFbuDjrpxC3EZIKLdYIwUIAwKoZBeUCB/JwkT?= =?us-ascii?Q?nAzUAN51SjQZCWnhl50o3b5yGl4C3jY03K4OzAC+DOWeejdr8vyXgzgbO6tg?= =?us-ascii?Q?r6lfSSQVxrzB1X6M0gW9wqI5I+O7ru2fH+MVxo/x/EMJ8e3oLx0Lya4XdLmS?= =?us-ascii?Q?sJPdlLza02Ov0yrRTYVc2nBvruvywyU9pu1HYgdg2Y0UoI6cqXk38XXynq2B?= =?us-ascii?Q?E4e8ceBbiV9jvYAuUwQJrhI1EJBJdFmNgiB1+DjmMwVN6+cRQydCLoDxcWQh?= =?us-ascii?Q?lF6pmSc9rmPS8myXLPvu2p4E42dWiFf20+Q5dQw4B/dnwvrBwqkRFL/6Geri?= =?us-ascii?Q?pH5gr+MSfaF+EE+lDgJa4lo7Q4I4fdfXkzEcKa6BV+JsRx0DIg8Q8CJNPiUy?= =?us-ascii?Q?5ZOJZLaO0L8nr8gzYuwxaBN1SiOP4Qltax02LtQS7JatosenvWXDU9tawJJs?= =?us-ascii?Q?r6t/cyJ3HaZH4rad6izLJBedTzwibAQosR6PTp5ORGbdLaqRSfrwoj9x7WAN?= =?us-ascii?Q?rc89WQUXIJj2oPXUVBLTyV5yJB88iXEESaxXfKwuBdGPafsEFPtqDHfinUWZ?= =?us-ascii?Q?6uMlM1S1ESivmLJpQ6c97PtJkCEIOUu/A3+n4o/nSU6NBqmJJXH6eiQrEgvP?= =?us-ascii?Q?Z0kf4qF1MvAwwGB/BBpSQmRWBr34Md0+jeEN+sZZVRrdRFxpZjF1pNNkBLrG?= =?us-ascii?Q?SoDbWmyf/NMwflr1l+7LQ/a53vVNpu2YPMl7ww7k71oetFbHVI2pxEkkXMjH?= =?us-ascii?Q?T7HDtTyLeTxCDNrLEp4pRfeqPMdugQ1NQ1mH8sZItxPwJeFlo4tIYSDurWr6?= =?us-ascii?Q?zQPk7mAvMAq0sRMzeM/R0N3k78LLZT7njZWP6Y7rEcBqTQYgqjGBThTEfvTM?= =?us-ascii?Q?kHKNYLEN9id2ytyretSazrWPcZK4eI7zs0T175aTbj7WEPiGZa5TBMuSFKeM?= =?us-ascii?Q?SvfGG4R9fE8aUZwMNTqV6ofKnTqDZffK1OmyxqBcb72YeFJmwT6li0uExSPO?= =?us-ascii?Q?oY2DiSXiRPkG1rv1pCetCMlPB3R4cIDr965v5JsvWEwXaz4x8r7/8bP8/kq4?= =?us-ascii?Q?fYXj7Q1XTPblHyP2IK5pyLPrClGySZQuaDD2/1IsQ1FMdVwixPMFOBuGg97e?= =?us-ascii?Q?auhBpR9j7dlzTbIxw/kdJI031x6XVUElRzjdfUmxOMgsLg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9Jnmiif3feMX6wIxaPvv38Eq/S8UwFz5x7aVLwW1AH524lZVDqcLgXe9cFMP?= =?us-ascii?Q?MYWUXxAfOB0QlfD26B1QKvjS5X8l61zxjgKQaZdlJ8+NLQqC7mDJJpFhiD93?= =?us-ascii?Q?qTM5GTCBwXq5RRqJmLH0bv1ODDXak1uphwM7uVJyGU8wMpdKoXBq+iMQ06IF?= =?us-ascii?Q?3vwOveGyQ9TCv0/8O7ZDexsWGV0j4KOWb4YJZL/oYYVC6yVFl2dCNcCbXBBq?= =?us-ascii?Q?yIdPWvzLrplaJlW8KPLRr2LZ9WZtwk7kpmzsi3peXW81HbcTPaaKtzJhTgfB?= =?us-ascii?Q?1jQtcdUqItdE3ZGr4h4CSG2OACUtesp1zj18nvsPcXTI51I5wLuvn/9BEg7q?= =?us-ascii?Q?QYDJjwXC6fC7mKOmC7vB4w5mhl0Q1RNIy2aAiD7OnLwLsc+/lwmS95t/FHyy?= =?us-ascii?Q?GIIvRo3ro89h14jRhptMIYCZtIRXOzkYIKr1p/4aedU0rC+PDoZLlfnckNj+?= =?us-ascii?Q?rjWKFR6/sLKH1shj1Lu6HA2paBUWUjHxY6ziS2I+We3FPySwLEWeaCY6kMGv?= =?us-ascii?Q?bbvPKldYDIsvV4pyW4eQDfrR7GsDG06b3mruREndbMPS23RzlLJ4UhASauS4?= =?us-ascii?Q?C256PfCTktrD4DW5gn65MW5/OZWlUu8QJpIa/slpQYjzpyRPQpDSKcqPyHeM?= =?us-ascii?Q?mYm8eiaxSOp0ihOzfqZajzqleYMvIzppqM98GS47ViUDlhx4m88x4uogj5v4?= =?us-ascii?Q?qGlmY83MG1duGLcDJpmGsPGDD2wVFpvSspH0Hcwmsob+67wDl1U/ead/zcGK?= =?us-ascii?Q?LPxsgltqvDQOGfVfCjzUkZphFyOb/9EZCzLMKcCqB3sQ9JauoHKGgeYSsAne?= =?us-ascii?Q?fdVOUyMbkFhiNHYqOiIZq9o7OALKOA6HMnLn26cASJk6N9RtsFQ61vjcakQv?= =?us-ascii?Q?LoIO5iPxHTJPweOvvnuRq1Lf+scyq2UE8Q3nF3bG+xz/bUumSP9Tx7RX6M93?= =?us-ascii?Q?eZSIeIz1McNF/0mTqBcAHbm4Mbc1TOFqa73SYSHss/BWj0rpICiOebZoHQaG?= =?us-ascii?Q?UBLb4eg71YMVaV0+mfHqHkIRrTU5VP3qq+wUdykrTQhV2k8cgu5cobvdmOUw?= =?us-ascii?Q?0E8DmT5HKt9D0r5O5qlqdr08galGWoXLQ+YTyTjXadLggzqPnvrM105KIvB/?= =?us-ascii?Q?NiCvuhru7oMjUJHyO0IVFTUoE7rY/ZiewEZc64U+oJzdyRe/0ut4UxmoCZTS?= =?us-ascii?Q?SmFZAuMJSpKvv1OLFTE1ObV/liOFQudqbuVQyFqWy66vwZkKZhZvFd1D9L23?= =?us-ascii?Q?qb33jpZVmUXSSiqmtph++jTAOn5gP+2Ef4du29vJ+vM41Gqz7pZhsXa/6byI?= =?us-ascii?Q?Ig7LgFRyrkdITzwKh4M4gmlIQoYIhBoYEUhzOlu2N+mbEvI4KyByUM1hGl1w?= =?us-ascii?Q?6GpgMz1QZJHWwBONmitNbXyU2Vh+lhG8nLEF2Bg4CwAw7e2xKWUDuSj/t1op?= =?us-ascii?Q?wlMTjk5/J2LmUstXHevyAMGR6vx/r+W3ie3ChMb2gT4Ei3kV00jot5EkPzZh?= =?us-ascii?Q?pcoo+okrsj6ilfGSL1fyKBWIC8b0pNRO9NwbKz6lY75pu5zmk69GTGudpHhC?= =?us-ascii?Q?aHiLLV2Pj7LAc+/ZYrlMkAo198l2vAxm1xSypYzVKVObq6GYoj19jxhQfYAf?= =?us-ascii?Q?pw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mC1P1SEDK2ZsACtWdFu6WEKwncbMM8f8sViK+dnAqLaQc7+N7n3gm9UkHTWJ08zwvgJY8vrgQK+jKx9sBUDMqV1NuSZGffb+u2ijL9EBIWlDySTiTRUXMlvNXz17HsGlIZfqOEfDbo+4erqbVoOauqUD9YqXBuMdwRuCxxA0EL7A2tJFEznmGy+nnQM8gGgTAyMt3LtuibE69xLeCICIUoTFzxffBl2JdqhPTSxt5a3cb41hA2diLq/3551K80m9MLgPJXNyFX7GWqKYyOo0OcOMEvtmhWWZNrfFxtkAm98KzjNjePFvhA7Qc3POsq6N53SBeK0cO3tCk5sMx28rEEfs0bunS7wkpf7qA+yaguVEkBKQbip49FLBwzPgqauiiZs9FltAoNHsG0LT4PQnStDqpZroBgWr/UE4Wrp0QDkle6e2QGRJt8wwb4nZpM439XX0FYHUYvWWR7wKjarqzaxvVnizjx5P20HjX9nB+btwlunIQgBPc2lntu3E3uQbgJO1wESuoYjqGTnVOlRJkj2mdk0+WJRc9vE+t9MxpoOY+IjoVHTtki1lI0JGirXpXc8/7XWjZtYaDp8O1ctQDbSuYATzVhXzVpcumk+eMo8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a15224a-d056-46fe-394d-08dca69c1e24 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:43.1842 (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: T8pJMxzRvvaujBu9QWKuJdr84/+XZDyRlvL5k37GkaAxdDjbFtEHHKLC0NFRHiVdKpB7ohePI0KsefAj6Mbkxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-ORIG-GUID: 8pxu8IA42-a4_-5pWZhOhMGtHFSc9l3C X-Proofpoint-GUID: 8pxu8IA42-a4_-5pWZhOhMGtHFSc9l3C Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Instead of zeroing the vma tree and then overwriting the area, let the area be overwritten and then clean up the gathered vmas using vms_complete_munmap_vmas(). If a driver is mapping over an existing vma, then clear the ptes before the call_mmap() invocation. If the vma has a vm_ops->close(), then call the close() function. This is done using the vms_clear_ptes() and vms_close_vmas() helpers. This has the side effect of needing to call open() on the vmas if the mmap_region() fails later on. Temporarily keep track of the number of pages that will be removed and reduce the charged amount. This commit drops the validate_mm() call in the vma_expand() function. It is necessary to drop the validate as it would fail since the mm map_count would be incorrect during a vma expansion, prior to the cleanup from vms_complete_munmap_vmas(). Clean up the error handing of the vms_gather_munmap_vmas() by calling the verification within the function. Note that before this change, a MAP_FIXED could fail and leave a gap in the vma tree. With this change, a MAP_FIXED failure will fail without creating a gap and leave *a* vma in the area (may have been split) and attept to restore them to an operational state (re-attached and vm_ops->open()'ed if they were vm_ops->close()'d). Signed-off-by: Liam R. Howlett --- mm/internal.h | 2 + mm/mmap.c | 119 +++++++++++++++++++++++++++++++------------------- 2 files changed, 76 insertions(+), 45 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index ec8441362c28..5bd60cb9fcbb 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1503,6 +1503,8 @@ struct vma_munmap_struct { unsigned long stack_vm; unsigned long data_vm; bool unlock; /* Unlock after the munmap */ + bool clear_ptes; /* If there are outstanding PTE to be cleared */ + bool closed; /* vma->vm_ops->close() called already */ }; =20 void __meminit __init_single_page(struct page *page, unsigned long pfn, diff --git a/mm/mmap.c b/mm/mmap.c index 20da0d039c95..0b7aa2c46cec 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -170,10 +170,11 @@ void unlink_file_vma_batch_final(struct unlink_vma_fi= le_batch *vb) /* * Close a vm structure and free it. */ -static void remove_vma(struct vm_area_struct *vma, bool unreachable) +static +void remove_vma(struct vm_area_struct *vma, bool unreachable, bool closed) { might_sleep(); - if (vma->vm_ops && vma->vm_ops->close) + if (!closed && vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) fput(vma->vm_file); @@ -401,17 +402,21 @@ anon_vma_interval_tree_post_update_vma(struct vm_area= _struct *vma) } =20 static unsigned long count_vma_pages_range(struct mm_struct *mm, - unsigned long addr, unsigned long end) + unsigned long addr, unsigned long end, + unsigned long *nr_accounted) { VMA_ITERATOR(vmi, mm, addr); struct vm_area_struct *vma; unsigned long nr_pages =3D 0; =20 + *nr_accounted =3D 0; for_each_vma_range(vmi, vma, end) { unsigned long vm_start =3D max(addr, vma->vm_start); unsigned long vm_end =3D min(end, vma->vm_end); =20 nr_pages +=3D PHYS_PFN(vm_end - vm_start); + if (vma->vm_flags & VM_ACCOUNT) + *nr_accounted +=3D PHYS_PFN(vm_end - vm_start); } =20 return nr_pages; @@ -527,6 +532,8 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; vms->unmap_start =3D FIRST_USER_ADDRESS; vms->unmap_end =3D USER_PGTABLES_CEILING; + vms->clear_ptes =3D false; /* No PTEs to clear yet */ + vms->closed =3D false; } =20 /* @@ -735,7 +742,6 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area= _struct *vma, vma_iter_store(vmi, vma); =20 vma_complete(&vp, vmi, vma->vm_mm); - validate_mm(vma->vm_mm); return 0; =20 nomem: @@ -2597,23 +2603,31 @@ struct vm_area_struct *vma_merge_extend(struct vma_= iterator *vmi, * * Reattach any detached vmas and free up the maple tree used to track the= vmas. */ -static inline void abort_munmap_vmas(struct ma_state *mas_detach) +static inline void abort_munmap_vmas(struct ma_state *mas_detach, bool clo= sed) { struct vm_area_struct *vma; =20 mas_set(mas_detach, 0); - mas_for_each(mas_detach, vma, ULONG_MAX) + mas_for_each(mas_detach, vma, ULONG_MAX) { + if (closed && vma->vm_ops && vma->vm_ops->close && + vma->vm_ops->open) + vma->vm_ops->open(vma); + vma_mark_detached(vma, false); + } =20 __mt_destroy(mas_detach->tree); } =20 =20 -static void vms_complete_pte_clear(struct vma_munmap_struct *vms, +static inline void vms_clear_ptes(struct vma_munmap_struct *vms, struct ma_state *mas_detach, bool mm_wr_locked) { struct mmu_gather tlb; =20 + if (!vms->clear_ptes) + return; + /* * We can free page tables without write-locking mmap_lock because VMAs * were isolated before we downgraded mmap_lock. @@ -2629,6 +2643,23 @@ static void vms_complete_pte_clear(struct vma_munmap= _struct *vms, free_pgtables(&tlb, mas_detach, vms->vma, vms->unmap_start, vms->unmap_end, mm_wr_locked); tlb_finish_mmu(&tlb); + vms->clear_ptes =3D false; +} + +static inline void +vms_close_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach) +{ + struct vm_area_struct *vma; + + if (!vms->vma_count) + return; + + mas_set(mas_detach, 0); + mas_for_each(mas_detach, vma, ULONG_MAX) + if (vma->vm_ops && vma->vm_ops->close) + vma->vm_ops->close(vma); + + vms->closed =3D true; } =20 /* @@ -2652,7 +2683,7 @@ static void vms_complete_munmap_vmas(struct vma_munma= p_struct *vms, if (vms->unlock) mmap_write_downgrade(mm); =20 - vms_complete_pte_clear(vms, mas_detach, !vms->unlock); + vms_clear_ptes(vms, mas_detach, !vms->unlock); /* Update high watermark before we lower total_vm */ update_hiwater_vm(mm); /* Stat accounting */ @@ -2663,7 +2694,7 @@ static void vms_complete_munmap_vmas(struct vma_munma= p_struct *vms, /* Remove and clean up vmas */ mas_set(mas_detach, 0); mas_for_each(mas_detach, vma, ULONG_MAX) - remove_vma(vma, false); + remove_vma(vma, /* unreachable =3D */ false, vms->closed); =20 vm_unacct_memory(vms->nr_accounted); validate_mm(mm); @@ -2804,14 +2835,18 @@ static int vms_gather_munmap_vmas(struct vma_munmap= _struct *vms, while (vma_iter_addr(vms->vmi) > vms->start) vma_iter_prev_range(vms->vmi); =20 + /* There are now PTEs that need to be cleared */ + vms->clear_ptes =3D true; + return 0; =20 userfaultfd_error: munmap_gather_failed: end_split_failed: - abort_munmap_vmas(mas_detach); + abort_munmap_vmas(mas_detach, /* closed =3D */ false); start_split_failed: map_count_exceeded: + validate_mm(vms->mm); return error; } =20 @@ -2855,9 +2890,9 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, return 0; =20 clear_tree_failed: - abort_munmap_vmas(&mas_detach); -gather_failed: + abort_munmap_vmas(&mas_detach, /* closed =3D */ false); validate_mm(mm); +gather_failed: return error; } =20 @@ -2945,24 +2980,19 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, unsigned long merge_start =3D addr, merge_end =3D end; bool writable_file_mapping =3D false; pgoff_t vm_pgoff; - int error; + int error =3D -ENOMEM; VMA_ITERATOR(vmi, mm, addr); + unsigned long nr_pages, nr_accounted; =20 - /* 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 =3D count_vma_pages_range(mm, addr, end); - - if (!may_expand_vm(mm, vm_flags, - (len >> PAGE_SHIFT) - nr_pages)) - return -ENOMEM; - } + nr_pages =3D count_vma_pages_range(mm, addr, end, &nr_accounted); =20 + /* + * Check against address space limit. + * MAP_FIXED may remove pages of mappings that intersects with requested + * mapping. Account for the pages it would unmap. + */ + if (!may_expand_vm(mm, vm_flags, (len >> PAGE_SHIFT) - nr_pages)) + return -ENOMEM; =20 if (unlikely(!can_modify_mm(mm, addr, end))) return -EPERM; @@ -2979,14 +3009,8 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); /* Prepare to unmap any existing mapping in the area */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) - goto gather_failed; - - /* Remove any existing mappings from the vma tree */ - if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) - goto clear_tree_failed; + return -ENOMEM; =20 - /* Unmap any existing mapping in the area */ - vms_complete_munmap_vmas(&vms, &mas_detach); next =3D vms.next; prev =3D vms.prev; vma =3D NULL; @@ -3002,8 +3026,10 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, */ if (accountable_mapping(file, vm_flags)) { charged =3D len >> PAGE_SHIFT; + charged -=3D nr_accounted; if (security_vm_enough_memory_mm(mm, charged)) - return -ENOMEM; + goto abort_munmap; + vms.nr_accounted =3D 0; vm_flags |=3D VM_ACCOUNT; } =20 @@ -3052,10 +3078,8 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, * not unmapped, but the maps are removed from the list. */ vma =3D vm_area_alloc(mm); - if (!vma) { - error =3D -ENOMEM; + if (!vma) goto unacct_error; - } =20 vma_iter_config(&vmi, addr, end); vma_set_range(vma, addr, end, pgoff); @@ -3064,6 +3088,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, =20 if (file) { vma->vm_file =3D get_file(file); + /* call_mmap() may map PTE, so ensure there are no existing PTEs */ + vms_clear_ptes(&vms, &mas_detach, /* mm_wr_locked =3D */ true); + vms_close_vmas(&vms, &mas_detach); error =3D call_mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -3154,6 +3181,10 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, expanded: perf_event_mmap(vma); =20 + /* Unmap any existing mapping in the area */ + if (vms.nr_pages) + vms_complete_munmap_vmas(&vms, &mas_detach); + vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT); if (vm_flags & VM_LOCKED) { if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) || @@ -3201,14 +3232,12 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, unacct_error: if (charged) vm_unacct_memory(charged); - validate_mm(mm); - return error; =20 -clear_tree_failed: - abort_munmap_vmas(&mas_detach); -gather_failed: +abort_munmap: + if (vms.nr_pages) + abort_munmap_vmas(&mas_detach, vms.closed); validate_mm(mm); - return -ENOMEM; + return error; } =20 static int __vm_munmap(unsigned long start, size_t len, bool unlock) @@ -3549,7 +3578,7 @@ void exit_mmap(struct mm_struct *mm) do { if (vma->vm_flags & VM_ACCOUNT) nr_accounted +=3D vma_pages(vma); - remove_vma(vma, true); + remove_vma(vma, /* unreachable =3D */ true, /* closed =3D */ false); count++; cond_resched(); vma =3D vma_next(&vmi); --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E343190074 for ; Wed, 17 Jul 2024 20:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246884; cv=fail; b=pNJMkPPkSls3n8l1uoSY0+JWeu+uGz7qR8sKl6O9lID8wnkGXwiZnhv2DvPZCwNtDs4zmg8ekXYUYph+Ey60K4CoHNa881mQhGQZSJQkCUKDkTB3SU9rpwRNdyP/cp2ldUR3hiwBPo2bPkEF3RC/3b/IZQlrM6DdSvSY+w7bgSs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246884; c=relaxed/simple; bh=eEExHOHq4j7tkHp9ro3kOjJjyQXpaotOoRKT5wkyWAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=HOuuvckVfCblijorwGYsbDKsgCNxq0nJRYcQ9RlgazYfXaUqt+5nunaAYj/OV/RQ2ywYjeFWhfJa8OuTzDfmuelozU9Nbk9CHEO9c+qS+z/UdwyIW0PWEK+waSD86+7aR1BbRD7k9jf4woqjHtGudGKuZlsihoSTy7QWtSodvmw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YJtJR1aJ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Rk12HtaU; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YJtJR1aJ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Rk12HtaU" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJsRp6016980; Wed, 17 Jul 2024 20:07:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=0BaWiKTmL5k+MzajqRbdkupIu6HCcw1ZcSuzW844wgw=; b= YJtJR1aJw2jVohMrMmS0IF8HW7gRhl8vuiFra21mX0eLONTEIVAutIYDhc3Y1e9C +B5fgP+gpsEH55dgufX/YEd3erNP+lzDqIAKQbZnwA+Y8o0v1eLCgTlRsu1evczu 9C42ua3S+6PXBjkTOFDp/P9O0CPYr320C8eMDosT4WMKWPfLMha0/4YunULAUpi4 9+b+9hGzq7db6lUY14cCUqEN6P2E59r9vAC3sqkCUEvgzFzo9Fkd8yxrIMMYpGVK G5skKKI28bzO4bHQsUsfRWPC2sMvC6srI8imd0DLSogU00BJ7jW8LN1927neP24e 23OK6vO0b4lGERJH1A0djA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40em3m033t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:49 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJIY6J003738; Wed, 17 Jul 2024 20:07:48 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2174.outbound.protection.outlook.com [104.47.73.174]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkpk-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=P1Ld24LK8hRV3kTR7gZvwP4mXjXjiFimV4j+4IVYeeT+PfGh+FyKXERZGkOSr78wpX05WfzporEG48lUHt7oOJfAQHrvfe8NeRkUnrXWvkQwAYv6B48c54GCCP9ZlXjgshcLe9SR/JNzuM3Eo8aFp9a/w5RIazz2xs1dl3tefErvn6stFc08y4OF0aLdVpiZuKbr7LeJkAXblwER+nGyYvrC0P5Cgiyc6cYrTqzFQv7/bIChG/GO6QV4qRNLDT59DG6DR/6xBHeWDXNfp6CKd9cLx/NdA5/zOIthEgQP2aepdHGGPYoGrwjRa8lCvHERgydzevoWJ++faJOhHK8Ngw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0BaWiKTmL5k+MzajqRbdkupIu6HCcw1ZcSuzW844wgw=; b=cR7+T6CYQqOh8gXYPnSns/Kr5C3Z2KZVN1avTxW/GFtfW6ppYzyB/xhhTbxtlrP+IF+4e+JbdVSmUr8vD4Xp8gAtOjaepQMb5U1aTM07mlvdK9U764KYJrFjaVxT5+vVXRIr02qyiBoqgx5pezDZJONiEuGXYb6jGalKvrlq3GI0H9wwf2rzPAWDK6WyEkKbWUBcTbIY/XEZazVtsYBGTtSBlqhQN2ROz2Ojb2oL4hhzmiG/r9ikpTdjHegqX6vfg9zGZd+1by+8ox6TH3aNmcuOWI1D53o91XaG1GgVpHJOy/9Fbg3fdSycWKk0yyCg/ZA0lyaWb1btYBHflC8YCQ== 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=0BaWiKTmL5k+MzajqRbdkupIu6HCcw1ZcSuzW844wgw=; b=Rk12HtaUqHvgf9THmGZWRndZAQ6BfD9gERU1HkDDW1wvcTr8sRX6EpU/e94b8WlUFkfYoIKYHPIrolX2+1wldo1iEWC/mGCwnAUCAstjLkzJ9qxZG1eoUTXtWjDT1o5/iRPHMrGC6qGw3uiDQSd+Gm4PjHS67IoJaRjmMUFZt4A= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM4PR10MB7507.namprd10.prod.outlook.com (2603:10b6:8:187::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Wed, 17 Jul 2024 20:07:45 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:45 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 15/21] mm/mmap: Use PHYS_PFN in mmap_region() Date: Wed, 17 Jul 2024 16:07:03 -0400 Message-ID: <20240717200709.1552558-16-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0034.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fe::16) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM4PR10MB7507:EE_ X-MS-Office365-Filtering-Correlation-Id: 5dc7fadd-b0b8-4e12-a5c4-08dca69c1f61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?V+wEtXyUyFDe/Quihil2olE7jxBr6Ir2knpvIlIz3cYwIFbTwStJ5YyF9Uh4?= =?us-ascii?Q?UNi9G0Ffr4m38Vr7Sb1UssyZo/61PzrVkbWrPhKEdKUx9ubi9kalSqJYPhQ6?= =?us-ascii?Q?pJshj9uQB/OV2PybBR4wgAapvnZ/ojLq/+x40anwoPhFG2v73ISkoT+Kawqh?= =?us-ascii?Q?RfaijejCrL7+rEoUL8VpMhx3gSBBIs24EqVi4TunxP9pdaN95a1LUf251ipA?= =?us-ascii?Q?lqessfvqdJx7CIfjaSGI1iw9DajbHjpj549KguMpEi+Az4hfVJdHgWmAYi9F?= =?us-ascii?Q?+Th+6vSuSExURiKEnQ+V1bUSpGS4pKP9yzhObbf1n1g5HTUBXiZJtPE2WfZG?= =?us-ascii?Q?+mIAWwio+HFsTOZ+xGV48G5eh38RuzSlWoZB6WDpW+1LgBc2zG3UNu1fuhjR?= =?us-ascii?Q?GLs5DnCRxS6GLaPOfz0HtgTQNUqEep9oOyW5KwOhG7L/c/d1NgLkiEcqACh9?= =?us-ascii?Q?jSmn/zMrK76aDGisYzogrWiQ4L8RpCY7axJmJcohgYjBabGIrIKadLtpwhmm?= =?us-ascii?Q?AfDQgJGMf+nN4rk/cLB88E8svOLZkmKwe+1MuyRdMHJIZcZI6DY5Jjo0iZuY?= =?us-ascii?Q?5H5RUnncQpxBycbE3lmFfaA/4+0ahxtgejoXsxmLixcl4e5RCrz0QfEziFxx?= =?us-ascii?Q?mF+Pla3nTstgjlCtHQyD5AYubqO2kJMD64U9cc11rlbZIDGyzDv5jlTvfX25?= =?us-ascii?Q?+ALp9u+nk/qUM3PXjuj9eQ/6tux1GR8bAwSS07SHciGO4+8Xt67sxJg2xVvA?= =?us-ascii?Q?DH9IAtujGA11xYWSOGMNiZePKzi4r6j/zUC/c9H9loPrrEGLsF/FX/hRul61?= =?us-ascii?Q?voEXT4xoX1aHKwvmOh1dp9FLj9jx5U3BFjyFNdWRRBavp8k+qoGu4pmC9iMd?= =?us-ascii?Q?EVnK5WXqTHVwCtM0FuFpuUs6/N2TFpGtAYkEhUW6JlWtJXJPBB7A4X3lacmE?= =?us-ascii?Q?04MlUiqjpva5DJXU9GxSDKtN9+JeP0fZhOiswoO5gIJHFFcEAO0i2qnpl+tF?= =?us-ascii?Q?RLdzM7eEEymQy0FGXuWFQL0gaU3Mx5jcY8JuysWFHFNRyvJPBPO0FJ/2e6+W?= =?us-ascii?Q?C9u/gDCmbVXpS3YzcETZryxW79LezUF2SAQQGjpLYG2IzrQUXx2XRU6cFhGI?= =?us-ascii?Q?1eGbsXVFKyntFI55IGqVVRgEcpnWAp6Kq8iSBCv5cuhdwl9u7Kv3vxbEKJe/?= =?us-ascii?Q?qxLJwfhEPrLfT8rdCHYSs2eVn9ih3GKGw4achP1srQWGg/mrixgQsVU7vpAZ?= =?us-ascii?Q?ZhSsMwcQXotFOmaN8zQcyovp1oPkXXI0k1bqDqI4bCHVfAdeJMaKLg/Efemb?= =?us-ascii?Q?j6n9JPO+Kme8eFHBCS+se2P2YUVvs1dehduYhPtI0+f+jw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bc/OnrVn+Hzg2nyFYy+aXmqOjw7rqNp2rq0rbQMYcfmS/tMiixig/wEq7ACm?= =?us-ascii?Q?FWVx8fSEPL2u0BHfgXJeM0P1+XcmlOh3xoJG6LLl1sH2YmKjD0ZQlhnfdm3V?= =?us-ascii?Q?SFLnLxGGqZv7YS70HDnuEa0H5VP6N2HYepD+aUxpRRIXB8WIei8S/vcKSmBV?= =?us-ascii?Q?FWtaf45p7/jiJb+dmVwdeuSMS6/AHdV720BTuZ8tvUawvk2f86VLVgMdu3rk?= =?us-ascii?Q?yuQO/0WKXgXXcc0UJ8ASY+N9UJ/15OdTQmov9HSgMz6anG8cEMd69GR1So5v?= =?us-ascii?Q?Z4GruEY8jEIHMtrUw+scRylLjoo/MN6WbCoGoV1WcSNLhv8GK9lftGkwzDTn?= =?us-ascii?Q?hDEPFQ+33Ffw+1rrx38eN0/F+It8nRqxTSRVx2AWQJCRziU0GqUhPqJ5PbzV?= =?us-ascii?Q?GaJp+nLGLuwMue/2A+BIRHQlYPLMqOqEQEGOa1TRyQfPO2uSz+exjAFU52RT?= =?us-ascii?Q?h6u4DL2T4l7Tmlshe49ZziyafSEhqyF/Okock572taxpsRjnJ7j+7ToAyGL2?= =?us-ascii?Q?Ki85ZpyjJYONbdH8qWxcx9eiE275E4p6qmBHrqgdzIP/bk2uAYXO9nF11N4U?= =?us-ascii?Q?GInG/VktJ4Y3G9KZ//rEAMiW5SD5N2W2yxjMWZLimFUQGcnXY6yda4sROnvz?= =?us-ascii?Q?UqsD1FF5JMAv8o0X4J4DYqQ09ZwFz85vwiMp4J8gGnHJalnJSThkYOvPb2Mi?= =?us-ascii?Q?vMDYyONBaq0YSDrWXhZ9nwXOAD5Wpq2k6S4qw4dZt2VCPwFJfoBlqTqe/S7K?= =?us-ascii?Q?gBKu9zZ3D1L9QYyj/M2qRRb8RTk4GYD7Jde7NwiJQRTPInRpMAi56VroxStS?= =?us-ascii?Q?nDt6144DzcPXnnzaQ/a5+kPnexW6KtIzXWfWlf4kFdZUNn+wwPqNEZ6I6n4D?= =?us-ascii?Q?f9pTSyZT/1XyWiJ2YMxCg2IVSU14YmuAJc/rD5bXz7wCnQyLXtLRB3W81d8n?= =?us-ascii?Q?lvO9ApJ9npqjyr7LSfCpadL73/8W/pP27jb3BfotjNicIl2TvBB24BLDLQqF?= =?us-ascii?Q?wOuM3B6yHwcu2UKpfGlV3eyqIVeOSkFS2/dsnATrf6IyusvhfXdCMku9k82D?= =?us-ascii?Q?hJ49h4JWZ7UPDoLmqKGygtsilc0SSYbnxyrHaBmfUcYRp7OftyYldo8Hg5yJ?= =?us-ascii?Q?FWbhvYM7Rp9iaYS6zS49fuOMyLBF7b1iRgmqgL5Oki40nwI8QdJkW95AMVqv?= =?us-ascii?Q?maP9ThuiFnjTT0FyHXrbqjNq+XI6sPZPE0/41pgnsP4/zxchrqkBUJpB2ne3?= =?us-ascii?Q?j7S0Nj916kuWzZpknLaUI1jrbG1KAqo3hz6F/JTbKq/x2ksBc6XSqto/Sj/Q?= =?us-ascii?Q?Dn6XFr+DrnoRQNTvR1Go40O1iu3xKHRrFTKgSCEhGSyk5lg5S0CqIA3ABwHC?= =?us-ascii?Q?eGlOAOypTTJL4ARBuiaRlzdH7g/HoTQhWiFFnkbU8egQbnhvBqlBhnpR3cnD?= =?us-ascii?Q?9GebH45BFZaxeLvlyK3taZEfmkjoA+9TE/J5yKfYKF4c84nyxJovwnUixIyk?= =?us-ascii?Q?ZnYDeHrA2DipEyAlhPQD+mg7Oc6GHE3mA6ZBmU1s93Ih03bxLfXMMfpmtSHW?= =?us-ascii?Q?BE9jZnlFdoMTIR1Df554kTAB4dtMVP9GokPKlWHcuqK2ZymeuUbEXFd2Iq7v?= =?us-ascii?Q?vQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GOOj/1HjxAgxkUosa4U3StxeFtLt/WpgJjqO49Se2g3ZjBz/evLeWxcXZOCm4CDanGEvNc/rDjF7/JvWZJljcyoK0mUssPdKNNfSYKoLoMg/Rldh3ppg30UwGLkDDPc5jwNAX01TP58ndyVcHRmF6GxTYaG80PxsghwylocmtzTkKx59z64irnIWBh9tlcoGsbVxHuZco8NJOCPj4wdmc8BXgT8zO3N54uQS/R79K8n6tKOvQuTWN35Zn5qsJ1cNHq3ui/RqvRibQxhaQabZbvU2d0Jq/p+Iiekmd/XJq4jlIx5ZDGtUsP+fCdiOQoyvkVPZypJoUxM2+qSjLx6HQXJ/VpbkXShuKlW+QfG3PSmG4MqKNhHXgxUA6Dy3WFI37b3SKR6KUzlburxR6KgnO6FPmP17b3ua84uZI6riJQ3NNaBQfNO0DVItAZAXV5IeoFNo6z2C5F/STGNuBeIzTOYJ/f4AmVYsGmpryMMVWMMrDurrP7f/QnsQ78jbpfaef4kfoLxGGI/1m7FHzcH6AkbzfrG+dBxJk7OO5Wvxp8HRP7bWkcn6w4cS5Ti6BrBaROwFvCn7XysHZbhLvzVhMk3Tk8FtRnUhpQNKLFtxTXM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5dc7fadd-b0b8-4e12-a5c4-08dca69c1f61 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:45.2592 (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: T67CdT9UamGa5FNdKMa2fU6v4z75wr++3s32tmTvqVbr6N5HzH0FrGyCnq/7FLs/3VMZeg5AIevREB10++ejcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR10MB7507 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-ORIG-GUID: i15cWQNC84QuNNyqJ0Bp1gfmyk4gk1gx X-Proofpoint-GUID: i15cWQNC84QuNNyqJ0Bp1gfmyk4gk1gx Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Instead of shifting the length by PAGE_SIZE, use PHYS_PFN. Also use the existing local variable everywhere instead of some of the time. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/mmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 0b7aa2c46cec..45fb8725a6c5 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2971,7 +2971,7 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, struct mm_struct *mm =3D current->mm; struct vm_area_struct *vma =3D NULL; struct vm_area_struct *next, *prev, *merge; - pgoff_t pglen =3D len >> PAGE_SHIFT; + pgoff_t pglen =3D PHYS_PFN(len); unsigned long charged =3D 0; struct vma_munmap_struct vms; struct ma_state mas_detach; @@ -2991,7 +2991,7 @@ 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. */ - if (!may_expand_vm(mm, vm_flags, (len >> PAGE_SHIFT) - nr_pages)) + if (!may_expand_vm(mm, vm_flags, pglen - nr_pages)) return -ENOMEM; =20 if (unlikely(!can_modify_mm(mm, addr, end))) @@ -3025,7 +3025,7 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, * Private writable mapping: check memory availability */ if (accountable_mapping(file, vm_flags)) { - charged =3D len >> PAGE_SHIFT; + charged =3D pglen; charged -=3D nr_accounted; if (security_vm_enough_memory_mm(mm, charged)) goto abort_munmap; @@ -3185,14 +3185,14 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, if (vms.nr_pages) vms_complete_munmap_vmas(&vms, &mas_detach); =20 - vm_stat_account(mm, vm_flags, len >> PAGE_SHIFT); + vm_stat_account(mm, vm_flags, pglen); if (vm_flags & VM_LOCKED) { if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) || is_vm_hugetlb_page(vma) || vma =3D=3D get_gate_vma(current->mm)) vm_flags_clear(vma, VM_LOCKED_MASK); else - mm->locked_vm +=3D (len >> PAGE_SHIFT); + mm->locked_vm +=3D pglen; } =20 if (file) --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32F2A191F77; Wed, 17 Jul 2024 20:08:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246889; cv=fail; b=bPX0RopbL+WWKM5/wrl88lMhYKps0a9i6S6BKwcg916Y24lTDtQe7ht90Joq4e7Wc/EptEE1dgANXbMs3bhUNKO8/fmnYNOerjUCxgMqCeSkK6FIM143ZLFmCrINM9Lu5gDyLESWHis/x+hPf3jakCEqQPc2r6sISN5CNWv29ss= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246889; c=relaxed/simple; bh=5qMaW8IbpjTsguxhxxc6li1pOrBHANASz+3pOMZPGjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Q7oXphWQH16/C4R4WBEsXoiHoVG4U9JLTcBmaYO3uP4kCFpEHsVtRmSBmfcup/OJ+JXuqzdhNwaCYRxbPl9Y7BofKCj7sDBnEdJWH+wXdNgaRmt4o4IvCTXeu2gCZ/WzoVjWlo79hKoDZE2+dEwcdQgjJEyzkBkbrfXGLau6Qso= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=fbcbr5Pg; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=iV0/F2gR; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="fbcbr5Pg"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="iV0/F2gR" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK506K001775; Wed, 17 Jul 2024 20:07:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=MCbfSOiY26c0tug8tqf4PmH91ko+wJF0zouXoNIkQsY=; b= fbcbr5PgkKibnorf25EFp7YP1VgRx2+IcisNa1tOhzkpGfdp3g2qB5oN9IYljiNt /xXevkti+GUGbig9fNxm605fo1v57uryEIlw8pnGNxdVvNvw5P8vIy/GgDNcz49b xevGR5C3foGAplAT8jTFnBCi7g4vXrKIduGhhnfLFZ5u3ODfqOcTyX3ZKHv8aYGs K70QFk9F6rUl+s7n2Zn6j/y41qM9Os+F/xEjjMa2wEvlLEPEJq4YfMegNKlEsETi ZFzZRY36B9um4IQOlmP575cfFej2bUqMTEq3aYfSvQG68J9t+gqpKJ9W2ObVuzJG mMs6dDGKPomOAs0546tUng== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5r08d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:54 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ4sqC003630; Wed, 17 Jul 2024 20:07:53 GMT Received: from outbound.mail.protection.outlook.com (mail-mw2nam10lp2049.outbound.protection.outlook.com [104.47.55.49]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkte-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=isvng2+bqIeHvnXEkQjGv6omCKsHzE0pwv8YMikhufc27wzT8Bs5MttC1e56YQ56fAWzTgCCxJemYzorMWaO0aDIpEQ7cJY2cCXOGWSdR6vCjUkeQaEYXq6YBzibZxiS7G/FhmRtYzDnUx1duRESG+xoHVRKV2r1VBIZrMltC2M1bmqtaNebbw4wAuKoZFa+9iFR7C1h7VGr3bCO1220Jd1uOm1Bmo0HYPU32kezGwG6iX6hMnyYPLzqRGC0vI/2t1uUsbZRR9Gvt8kzfM/7Uu5X3p6/w+TgDuvbBhzdPomQjInppwLN6bQALMEsCDwXfJGGKTixxi1RXAeBhVarWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=MCbfSOiY26c0tug8tqf4PmH91ko+wJF0zouXoNIkQsY=; b=tiGj2uaxoL+JVuF3YBwvED8hYABrcR8ZeJQo3F4SdcIVNCWhCbGx2oAQfIfwzx0s9789Zz3mWmyVv2L+RtLDNGJFCJcCFBaqZ8tDxvP9dXSc1J6YeEciIhL57PzZEQOSUgbaaMYvYrsVjbFlHF3iSxcT21UxNNLZOlKXlj9neGAtsSdvSRobW1Ro/EHR3OSMlJCwhTwitJj/dHY21zRlmfo2F0XxuJ5AvJea4hq3I98m+cLiLupjZ2bTjzBPAHiTbZjLt12oY4Oc41EeA35bWPAlh8z4h5CCtCvjHzpXc56Mo7PRKUw4+O4/+Ys5QlLKJ1w7rtIFahqIa+YAUJLlMQ== 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=MCbfSOiY26c0tug8tqf4PmH91ko+wJF0zouXoNIkQsY=; b=iV0/F2gRQRAVbH66OCrIl1dJy98XxjJHGQbD1Ow2xptRKwvHW5S3g2lUOXHIOm0M/ZIhaxdt9cTpLTVs2YnzL6QzHT0t3MJRdHAIQ8MPnXMtrGn+WXoTrSIVrmneCTgusS3UGC3QkpGHl53EA/kbm41Z4s4mbQWMNkiv0/Wb2ro= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:49 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:48 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , linux-security-module@vger.kernel.org, Lorenzo Stoakes Subject: [PATCH v5 16/21] mm/mmap: Use vms accounted pages in mmap_region() Date: Wed, 17 Jul 2024 16:07:04 -0400 Message-ID: <20240717200709.1552558-17-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1P288CA0003.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01::16) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: 9cc32298-6e7c-4f7a-3ad0-08dca69c213f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TAyRJDSWQDWgGC+3RxkdDK5lS91gdClMsni/yUfZ0V/BsUGi25uwLYhAQNTr?= =?us-ascii?Q?0Wor/4Abj33AoNFdoHEpvoHCsoXQZSybJ5Ry4UnKSFKiK43wmKTAAJtlu/8e?= =?us-ascii?Q?pX15b6wxTLUmf+s1EjZM1TES0bKb7jFLRUK7YYv4f7pBxvqY50HnrV3CGO26?= =?us-ascii?Q?WAm6GTuxgVl4/vTh94n5jnURFfPzmzt1K3Ce2nlCfRGtbgC1LZoaYu28u6uZ?= =?us-ascii?Q?afVHMEM+RoDxJiCbhid/sx7cE7bETvMHZFc5NHmpD6xXvIv+A9v0VMqct11g?= =?us-ascii?Q?5TR+zNUdnwUACzMONpcigp3860bUIxtn6nsgsLADqA7Q1HvmCNCBSGHW9ipD?= =?us-ascii?Q?5rtPtImPS6CNPm22u6zP857cIPFdXXR2nuzllnZdS/9cHVjLBM3HUR/RCiDU?= =?us-ascii?Q?mTEsaI3RhykfKzguYXt0ErD4zhOnCxNNHjnYJjbfL/aUQRHaZubUsn5GkEZx?= =?us-ascii?Q?WXL2j9mbGSsc7nlhyqRncC3KbyZ54LVdIWy0t702ZZkuxZAHUptRQM1ndxlJ?= =?us-ascii?Q?WX1Kce6Dov7LwfInndgSrcbH9DnWmieTQOfFgZZvhBMx11dYdkpuo5T4uBMW?= =?us-ascii?Q?cTXzClUwcGBezzcXdMDE5iIvCCFvRFKhk1nfaC4HUZQIaX3brABIiHBCvFak?= =?us-ascii?Q?DL2fiq9mI4ZW9MGlR7UclnkbI7GLdec0y4Gk0C9RqHJCZnSHJ+RCp5rKEwau?= =?us-ascii?Q?5ZwwcuIzpqfWukQyslgeURxXPJVaVy2ia8c4k58M8rtqtG+ynA/Yd1ftOXUk?= =?us-ascii?Q?Ezq7blJaYK3IEasMefsLyFPsucvWemfn/wGUZHk37moyyYxpYPV9qgsJ5SOE?= =?us-ascii?Q?vdYAJvFnizvp+u7kcNvwiLKNIqdS42ZpRWxhKRM4LAs6DTtgNnrdESO6wYOQ?= =?us-ascii?Q?B1qfzf3pJqqZRoiZaZTcvjYlGbKodW67Mvc3rDECDH3r4tPqOfPXLx15QBwC?= =?us-ascii?Q?opXmqQHLM2IXTrGEI9Vo9Wm4X/8st/WEGeU774kieJJWqhPZAVrJabdya6gO?= =?us-ascii?Q?eeDWIf1ydG4ZBvwJh6ECCDluwAqPIbk+cA9QdC6dbhFN/X00m0BgcuOZbQBi?= =?us-ascii?Q?jc3C+b/NE5aI0XOjVOolLbZjk46/HHXmqv/14awV/lbtkfWdrvt6CVcEgdui?= =?us-ascii?Q?ciMoURi2IDmiV75QiODChZOogAwBqLkao3M1YOsXpMmyNlZJI7WoWosNTwQa?= =?us-ascii?Q?iCh4dFHOyP/KROuf38LsA3U4N9IZefpn2EbBOvPDOUgJYrlyOlxbF4N5gusP?= =?us-ascii?Q?jRfIH1JuBpo9+edzoHSg6P68FQvOokstyJAfPdnHwdYr+T0YHiRLbzgeAw6a?= =?us-ascii?Q?Y88dYm/6VAZtVfOJDPYIyTAwFLAoj8hNpB+ZJGn8mRRMIw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RsHnykufyRporE+RyPOFAcvrQl9fDrnoSfcdG1NEVil2DTSYJFcgYuS6TqIL?= =?us-ascii?Q?ePuB4LFJ0c9DwcP5eFzbN+dTN65qw9ZKlx29EBN9Rd9xzJiQIxpkd7T7axgv?= =?us-ascii?Q?d7dTubtNnDSOlxHHV18xF6DHnt0QkM+O2ywL9YfssR8PHSlOZXHPW5RkHV4c?= =?us-ascii?Q?1+a1Jqjtqbapy3vOMg355CveMFRa6GF0BvkoaUjNyVj6RTNnOyQ8B0CL3y1R?= =?us-ascii?Q?fL1PAqmrXr3hQxKXqF0nh9ETPQe195Vk0V9Od8leEISq6rsrYx2eaP4EIJS1?= =?us-ascii?Q?GN4rlcBRZ/hKx1ASTeEueds6G8+qDehccHAAsIw1uYngRDvFh6cMvtyT3rjM?= =?us-ascii?Q?NTIOmkrj+V4gJmLZFPIYO2LFu1IQPZ8lSyfxmQvzGxQBfrK1eauCkUUmlAYr?= =?us-ascii?Q?uFxuiPOkI4q8zUmLckRN0emSbfULLaDYBGiCxvoefsWekUqpzLY+DJli4BVE?= =?us-ascii?Q?H86icv8Esv1gRUi2udefgcgEJC7Cq9Djh9CJzfi9Tm53loJhqRE2g3eocNA+?= =?us-ascii?Q?5kVRvZ4OFP4WI4AQYzV9fFuLuWPRLZz0IMIjI3HDqjCUTyn/Nq8mO7Z37TjY?= =?us-ascii?Q?9yITRv95b+wSnsUpEnFpHeNY6NVOEsL8k+TcCDSMFKucObC+YnA6S/jzLjAj?= =?us-ascii?Q?sikDx95l8XTbDhkzbtsJed3PilAHFvwlc1ojI8wxBEkUcc2jBVfBV78e6DO6?= =?us-ascii?Q?mRBLkMRkV1T+ZChDntGl0H8wSW04RrSxr7wKcLx/oWL5ZU6DXXuXuocFZyau?= =?us-ascii?Q?oLEnMkjZTkiFb32OoLy5nQde584qUPzXl0Msx6lMiqH/yJL4471oVPeySall?= =?us-ascii?Q?KU9Hy+eBTiend84cqYOzY45r7oWLONTl2b4xczBtFnjfgUa9KAg16lITmJZI?= =?us-ascii?Q?9/SZfJFyEPBMR4K9M6wGSXZaiNDJH3FVWRJZk250FvRb+Q/qiPWC7in36J+D?= =?us-ascii?Q?vamKQrjZpt31IB7Juxt4pYbPpetWem33WeM9nsQT0bk2gR4w31H3/QX39HJT?= =?us-ascii?Q?tNiYOIQ5W2gWNWBQwdV6wUkUyED2EzQquZsV/lh4+eVI0TTu4sp/UO0YO/aW?= =?us-ascii?Q?+Cb2fE1z8MW5ID7qhIhdKjv2VJLQGmrlPA5exyhoxSlZtfThY7oWicTgCr8d?= =?us-ascii?Q?WvPhQXd2yGhLQi0QvXtd07AWEmCoa9iWsn25hpK+LzZPydJZLYfDoayo4P/P?= =?us-ascii?Q?HcOPkMoVin3nRPV70YUC/r5DwRblyhvqCRJA9tQ5bjlSpGgjTi19D7p3ZjWz?= =?us-ascii?Q?erhLl/PiTq0cYWvWQvlWqjfM5I+r6rnskSAgrLfxNDRZXZgLxXU3ybQQ66ib?= =?us-ascii?Q?sPTuZP39ar5j9mHs6LY3CL+1iTn8ve+pyWrQas+ipp9+qONcOzVaNhfmY5FY?= =?us-ascii?Q?xUlaDHRbjCgsrqQFRF4VaV2k3+ud/WbOegqMacRU5nTmqIoRPKjzY4HT3PWs?= =?us-ascii?Q?Y0JodSoVwDE8ZUIBVLF0GwdordruHgjbwVvC1W6u4p9va2cItPIrXNDHPpZn?= =?us-ascii?Q?d1ZDdXYala0uC1Ez90MhOYhYeRtQL2kepenCZjPxinWY84SCXi1NDbd6r2K9?= =?us-ascii?Q?/T/XdX8F/9E38mkcvlhDFkLqoIJRKv+7FvcBcYiReY2dQbxADdi4trXdq2WQ?= =?us-ascii?Q?+g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BS9eoddiQlpbVQLkVZzBRseeAXbE3bSlRWMI6lIiiVlmgTo5rDJolFJcpd5BXK1cislj9KDLQeYiTpzJex/Rcoti6/9jCC3KuMDYkaTQStf289+LPO5gAK1s6+SIIhK0hZKJyXQZJWiwcopyhtgslKzhhyUxFZhKrI606sQpTZrL6iMW4Av6taP8+NvHuyMmn7pOdgOefGnYF8lnIX8/SwAorvF3HathMtuoonaERP2FRPRHkuHll/qNzFgFDBcnpezaqT0UcFdBMqS/0AZXx1NYFa36l/Lhx3hPk4H6J88WXIbk5+/VwDf8tqe9oF9+GO1G+L9QXp78zKSRd9bqqIU6XGIXu8ZS+OEGjxl0C3JwDS3lNAil/2ZafM7ALyewsVmU1FLCwX+p9tbLLt6kIlkAmLlgAH6KMU/9g32ThXnSwGTIntZlQ4/cxJPv+Yq/lUwP6G+izJu6LHGAdFwa8Os0u6d3jbpIy22Z1siF+Jjlx8Sr47JYZPJpE2/B1PzIuQ1b3AcJowbcdAjAnn4mbkFVnCjlAwJk0YvoJRkG9V0LZknoIadwfW4/EAvYmawykMXW5sD45e292Fuy6TOxnpKvUx7Ym6uHx8bIgNOR80o= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc32298-6e7c-4f7a-3ad0-08dca69c213f X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:48.3854 (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: JTolng7QH+bo7vQZGWFyqcjAOUnyUv0F1QMzjdyn+RkSdlKISRlnX7CAeMJAe+apWGHz8231pI9qqsUROJv79g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: E8g3xFjVZzLUZjxdi8zZspmxq34O1EtV X-Proofpoint-ORIG-GUID: E8g3xFjVZzLUZjxdi8zZspmxq34O1EtV Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Change from nr_pages variable to vms.nr_accounted for the charged pages calculation. This is necessary for a future patch. This also avoids checking security_vm_enough_memory_mm() if the amount of memory won't change. Signed-off-by: Liam R. Howlett Cc: Kees Cook Cc: linux-security-module@vger.kernel.org Reviewed-by: Kees Cook Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/mmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 45fb8725a6c5..9f870e715a47 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3026,9 +3026,10 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, */ if (accountable_mapping(file, vm_flags)) { charged =3D pglen; - charged -=3D nr_accounted; - if (security_vm_enough_memory_mm(mm, charged)) + charged -=3D vms.nr_accounted; + if (charged && security_vm_enough_memory_mm(mm, charged)) goto abort_munmap; + vms.nr_accounted =3D 0; vm_flags |=3D VM_ACCOUNT; } --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 984271922EA for ; Wed, 17 Jul 2024 20:08:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246904; cv=fail; b=nfEAkGKr+X07aItPLI8USbClC8JSjAEHkSOtlOT21c8e4ue4oEmLSDgsHm7LYyChIs48YSKd+P8jH07b+bCBgZArwEp1DrRkJ2BO/l0yNZvpH1PzCKpwGheq8YczZmrG6svr/LmOSjwbvbnm/10dQNnqUEZeskoKJSsr/LsOR+0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246904; c=relaxed/simple; bh=4d5Bi2/mxwjUMUMToxq4hNoi26qoD+1HKN1IkSX8w8o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=GZXkIbO3gH6KNyGNl9mu1+elFRbV8+cELMqn3UwoK6gfW1B2PY8spkHAWHjbYJOm2giITWCdtAo0QKoJKKc6REDDaLPkoJXE1KJgUOmqBnYMaNAcoAmkUmA3YBQFd1KN5/kUUlINMjFnFDFpCskRUXJZ7C1PI+NF0xnSGdFA6fo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=KfwXfwWK; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=IxHpVFHs; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="KfwXfwWK"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="IxHpVFHs" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK52fc002035; Wed, 17 Jul 2024 20:07:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=o9g1Ew5lheBoqkL3ar2Yr4AYVb1OEZDZlsoHSIlKuKo=; b= KfwXfwWK+pHabxvJSmP1m446MA9Uv9zQ/fSAjXiei/yMHV3gCdBi4w+CRNsuSMFE 3Nly+PtR4Yu66njyfdXmzrHU9+hoRWQqM4xMRApfhaW4erme4YIHU5yZuoELr1Xw 9Z47gmpCChxnZogR5Q+wJr8rnvFdSE/n0ApWwM/hSMWX8KmxPo73bKl8IwRhYoev m66mv6Df9823Db59uPHxm6EUjmj4dDapfdZjB5sbk0CdmoDciJqxlT/nRFS1AZvo Te9lAW4BqKrb1bDOiF6ZE1Z/7MxZG+19nEcLgGoFYcjhpxi32Rcay9z3njMugqfY yX+DC+wo+l56IA67FDPpuw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5r08e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:55 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ4sqD003630; Wed, 17 Jul 2024 20:07:54 GMT Received: from outbound.mail.protection.outlook.com (mail-mw2nam10lp2049.outbound.protection.outlook.com [104.47.55.49]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkte-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kuQVEvJOocmNHgpCTBF+mr6TJtFT8m9DVPrDaXQn3Jl6/kLPizO6L9VXoqjP8UNCDHxUo75FmcQRs9ks5bagWZ3xTj9gKRsXtSff7nVAHAcrSH7SYW5UQqBKmq7rdcgRUTOEWyjYXe03uqZKCYUuSizOR9JZEluq87EXRreC+E3l0fEj5PQoMukXh7fIp0WSzew2LZSCy8dQ/fEL3cz+RRm8Mcvfip1FI1h8NKQX4QSHlbGFd6nyGM7wQmZutUjmDLm2p3bhlKhdBDJgcKNHCTzKWmncW+eTbSf9nX44/IU9fYbE5ggErqlOTIhE4DUtZZS/4BPvL2ZiCCW6GTe/Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=o9g1Ew5lheBoqkL3ar2Yr4AYVb1OEZDZlsoHSIlKuKo=; b=YiFop29XNZQmS1WKdLJhHysivVL+jnzN95bGzIqe6cxKKYDRg9yeh/qs23cwqQjSfQeZ3+jtAn0WAMWyx21QJjVXbVO9UibmBT9bq8BxNa4u16ufbb36B83X0EcfW2jbFMMZHrv9LbQOlJ3MvYMCg9RtXwe2BmKry6TsCj0DkTT2PrD/YTRKLc+TciDTX2ebLZDoKiLaf3jTfPp0isY6HzNUbg5TCk8O9IND4p05jbbe6lhcWeZD2xkKy2eE06mICYhdQsARRV9Ps8tCJrATxqNuv6FCoy+FB5+JoFuWS9QXhAYd+Nvq5Sq6m0wPzLDvkJfboACfIhZO3/V7/mFsGw== 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=o9g1Ew5lheBoqkL3ar2Yr4AYVb1OEZDZlsoHSIlKuKo=; b=IxHpVFHsjYUCzZMf/KEuS1kTiOgDD5cpPhUrla+5/fjzl2lAT/FKbUzlhpBly2stLUc1LXDy5k5Ox+QRdzQquL2/X4le0MuvkCBARCYAEqiU2qcdwlskTYWHmOMkV6RLkZxhKRJmd0Srsfbm+ml062SJIKyAl14+hCCka5Rye0M= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:50 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:50 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , LEROY Christophe , linuxppc-dev@lists.ozlabs.org, Dave Hansen Subject: [PATCH v5 17/21] mm/mmap: Relocate arch_unmap() to vms_complete_munmap_vmas() Date: Wed, 17 Jul 2024 16:07:05 -0400 Message-ID: <20240717200709.1552558-18-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1P288CA0019.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01::32) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: ac801e0b-9773-40a2-03ab-08dca69c224d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ecPflbMCTYZKw2oRdZ3ftVm9mNoGwBIbEDu15UQPwGiygFvCdqa7gBhe7lFK?= =?us-ascii?Q?yRV8nwxROkAPcN7SHmepf4/5pAueLSyBG+tHn2Ph9BA8lKJWBNMy9OWXFTgy?= =?us-ascii?Q?yLqaQRTZFEbEaHRHakKj+lDoaQZg9u8BG3rKBb/1ZcgBligr0WyRvXZ5VROz?= =?us-ascii?Q?Hj8QpdVyNbEAREWwHS4ASrWXjlyC4JUnwSP1vzw0yDUKD+VQG8iLQetipaMz?= =?us-ascii?Q?dpd5ozTr8hLelgtM4oqRmcZ5VhQeT1+cfQEpOlOhi9pT3Zy61xTyHr2xD4jS?= =?us-ascii?Q?kHqx9ERFLmqEAuPW3iy+m8DPCVURlTYXnZtY0V4pnaBTTMmrwkQKxmkjKHi4?= =?us-ascii?Q?dmgRtr2ojZPwVdWEqaaMcfbFj5JIl97agN61EvoMge+pqL81q6E6WR6x+yqE?= =?us-ascii?Q?wkDwtm1cWgOVPO9+QPp/0Fd5/tLELGfA1enii4Tk/ESNTH0mILiCYf7xVEbT?= =?us-ascii?Q?4X4wNiVKZdIp2u7YffXvLYOaVAJtCOH5d4FGpv2CNbQQSu79SP0LOjGtUeuY?= =?us-ascii?Q?kEgPSJK6td99dtj2WkRgV/rxmx2yaL4WmVUraBtNrcwYfVZ1CrvN9CIvy/2w?= =?us-ascii?Q?WDL/WX/zmsvs1PEQKpktc/mY4CfHT/3+JVv8p8jyJyj6x2XsqfeR/bkur5EX?= =?us-ascii?Q?FeJoM9htwb/6dEVmId6yWE2HaWpjGD5vtNV8HFiPkbw9gYNVgV4SjcT595/P?= =?us-ascii?Q?R6uevxtGMsUM1OOJ9puU22aEJHkV1J7LC2lNA3TMABrg6SA62IpWVIv0lxT7?= =?us-ascii?Q?qdBfaQUd0dfu484pfgdseZKE8Wzk8hjrB3w/YwWqnMmTIBLGz89B6VEz+j0h?= =?us-ascii?Q?HxqhBv9m6yxZr1IVumeQWUS/6mjqOthyA+uzhTmhxJTVV/qPiTV8l2hjKymm?= =?us-ascii?Q?uZu3gcK5YQ6YU5bVzd66CCliHCTxusUEjpg/9bXMdnN9TEXttMh1VVoEmc5G?= =?us-ascii?Q?3FiwaMngxEe6HoYyKlNENGgCbLk1aLKNudRmyseXjVdKpQcC+I25/RvE5Qv0?= =?us-ascii?Q?9h8OIvLe0GHkn978+b+iOcfZrX8V1HOuypyvArixNC/fBHvoTPhKDzD+dc9F?= =?us-ascii?Q?93+KTbzAc8cbP6krKUAZFhPr9UdBzvc9LvoBsFNlxi0OqhYSLxJo4pTaD2Bx?= =?us-ascii?Q?wTtUbbb41XNcsN9vRoYzE0iZuL6+xBXLJUIDoqBo84Gb5RvgsR7ESJqr+qO6?= =?us-ascii?Q?27GJOvzcdfZ2LJ+NcrxEeb9qDpPqhgpyukr3fMjSjZ7zAAEIxmgXXbAD6FsG?= =?us-ascii?Q?AFw6LVaY71CgBmZh9uv/WMEOj3wkW04q1UQOcHMbi3a8InlcYzSWNgUg9ViQ?= =?us-ascii?Q?zGioXmzpPB+7UitCofjnuKl3SM6abE+m5dJME8doSaoaaA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Vz81dko8udaUoR4OXplzF9zohaOWy3ObSdsINyJE2om/HCUPo1ZlIKC+hJcZ?= =?us-ascii?Q?x638J7GFqW/4rDH+18vmGTfzBrJWAVmffQPnbEvFmdvDfaBVNtitzE5PxyLS?= =?us-ascii?Q?ZD5uNSkr6APGn2/ucHDl+6PnrG5Zxw3UzxqcJ0rQTF+9lRX4sG73+ovGdkcx?= =?us-ascii?Q?NGHRZqb+U3qUBg+M8OP3Itgwrimxvu5xUEaJgj6ZlPrkjqWKBb43U2DneX+G?= =?us-ascii?Q?I9i3koYsQxLGMwosWY12AjSTMZO8sqU3wE3wELSFY5fe4WKZyvVGBgPO6MWJ?= =?us-ascii?Q?/OBmGglVE4PNuKTzQuNZ7iuY0GfGQc5puuHXA1aX9HvVBFJ3HuLfCeVo8i7z?= =?us-ascii?Q?29xQF8B+zK7vKyYmACeVCqnG1qWyznYBQx9Ol39rGaLuw2dJXhIwTLiEZxm0?= =?us-ascii?Q?1Gl8v8XGDzlfDF65rHmFQQXD8Z/0scUw6G4XpJsvoitSICPqzyo8KV3BYhIY?= =?us-ascii?Q?fnlHKwY/g0en7SCZ4ZI6/sIVbBOh3itRQSMX5dNK+o/iJBpzznR41kYubCFk?= =?us-ascii?Q?/c6e9QFLmHSk7TIBjQFgvR8ZHubQ/sFqNOK7FQ9YFtf6rLF91w6CJKZQcKtb?= =?us-ascii?Q?0/k8uJ6nZ8rOGjMYwehSs6mhCqqE7QUU76/cpMBzN72PTq84Ax8E9W9I4Xdp?= =?us-ascii?Q?1kIkPvk6Rx4Owi28pvSwHTo4tpY+X/7LY8sVyl/LQM5j180XlTaIQXTPDM1G?= =?us-ascii?Q?+c+5kB68Fj15dz9BDS5gKRfzl1zAspGmJkaU+0WgwUS8p7/lQFI//A0WuQtH?= =?us-ascii?Q?Xsv4VtWuZm0k2hO5+BKCE28nboS9gIAyoF9uone/GQnzud2aSj+qy2zhKDaP?= =?us-ascii?Q?grNcjqbUkchGj5eCzdJr0iMggYL0Kdw0/Min/2MHVnem0bWiebKII93sTwdD?= =?us-ascii?Q?OIfWEK9Mp9bPmY1pAZoGJHDR4RXCSMLrIPY6LHJPsROphIWeyQ+ulp/MwLHA?= =?us-ascii?Q?SpCEnFUnQCt3kibgTZEQIowR0KN8sVZTkJ7mr3llJQgPZweV+aHZJh7s7mbI?= =?us-ascii?Q?rL+1BXHZfvkiQnvzpGaMJh7rK5aUmqzbf1elXFsUkOgSkZ2uil4kF18/3UTn?= =?us-ascii?Q?jjg+c1CLhRJqShShz/J8EZvzixRQhDgyo/g4ElNOM9sZjap65pGM0aHVzXVU?= =?us-ascii?Q?G5fTcNdH5bAiCgZJdWchOSW3hYdyE6+yHSH9nW90pE3qa2aILn4soh76dQn8?= =?us-ascii?Q?JhzhG4kHNMiGc+l/MIOGjX0Q/xj5tyVEkqyDB0HHXk4A/Nn5RNDh/kxx/cOE?= =?us-ascii?Q?dXNX1neYMItY8rX7KvS6CxHrc37TIXAwlhme19thGZRZvra7rfyhyYr54+rz?= =?us-ascii?Q?ADv6ltd/0n2D7ffkAr5gASS0KOUGZqKxZ5sCDqhf7+NAeeiDXn2WP+g4OrL7?= =?us-ascii?Q?YQtxBQ5vvhN9h3bhKitgEYNYacPalKYZA7VBP5EnxVbH/4Xnj5RoQ0wxfa0k?= =?us-ascii?Q?Sy9pBy6flT/nnIi7VSdI83bF8n5b3NkHGp1kuUNNHSIkdMaPBfYA9zXCB/jB?= =?us-ascii?Q?xlNeUdGxKbT61VWfqv2YoDMFRRiFiQrzKaFWDcrHwtHxfw+cK9l1FCe9q7Vx?= =?us-ascii?Q?J9xp5vNE+EaO9Kc1ZM39+WZgWDS/kLEOk5JQN343XzAmcfeb383Ws+3cu4Qc?= =?us-ascii?Q?yg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JINxM18Nx2rfJymBGPl4HW0gdRoQ//rXIWPzQMRJL5Syl20whj1NsH1puLGPKm0FUcmGsoZeBaH80FdGnncYKY7QxWW2Fhf2wvjf3LRBQWxUA+ErRWHD9QRC9gyH7hSGdmOwDnqMp/VuxAcb93rIWYF8dilOEqA/oH3S2x46vL/PhlAgHvuc+UTZ4l5g55lSQw0LXsb47sQK8wPOg4hGdLXdZDgyzTT1CAUNCffI5kYepAtBgoaq3Or5BFXdA5rfMkm69q0Cj/Sl+djCXcZeZJK43j4O/XKAdZPNvW8Y7hkiXYDAkopVmwN3g5mSXwoa2RNPc+c2QnYo2djPDWhxL85rj18rI+25CUIrbawsdXCRx5+Hfo2UkVW+wMfwXKgv8d/XdhFlNWYbN5h8aoVEoaBSYI63hXAJmLxUX7UMjiBEUebL0yPmwU5p2LmLcaglQkeUBpEq1edjfixT3PyFNr3QNbaDhIZNhtWp5WTeBSm53jSf81b1ytohKg8FyP/RMCoFElWe4b2hZKi7/c6NRnDpAfM8UIlbTgw9q5HD59FBGMJv5Z+vqjCaF3pI4vaSBz5KRRC56BRjT+BPRO7RtjqIL4dsD1UBcy4svr0Ekic= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac801e0b-9773-40a2-03ab-08dca69c224d X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:50.1756 (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: FRCLXHTvzE+xdt41KmnG/n0IIk68yCxhXwU/NTIN16wTRo4Ths0YwTZZf9fBAxtM1cmRv3wzJDBLWf5ggXvAuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: FuZlo-JsEgFiXD7dNhTSTk0QHtpVuOdR X-Proofpoint-ORIG-GUID: FuZlo-JsEgFiXD7dNhTSTk0QHtpVuOdR Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" The arch_unmap call was previously moved above the rbtree modifications in commit 5a28fc94c914 ("x86/mpx, mm/core: Fix recursive munmap() corruption"). The move was motivated by an issue with calling arch_unmap() after the rbtree was modified. Since the above commit, mpx was dropped from the kernel in 45fc24e89b7c ("x86/mpx: remove MPX from arch/x86"), so the motivation for calling arch_unmap() prior to modifying the vma tree no longer exists (regardless of rbtree or maple tree implementations). Signed-off-by: Liam R. Howlett Cc: LEROY Christophe Cc: linuxppc-dev@lists.ozlabs.org Cc: Dave Hansen --- mm/mmap.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 9f870e715a47..117e8240f697 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2680,6 +2680,7 @@ static void vms_complete_munmap_vmas(struct vma_munma= p_struct *vms, mm =3D vms->mm; mm->map_count -=3D vms->vma_count; mm->locked_vm -=3D vms->locked_vm; + arch_unmap(mm, vms->start, vms->end); /* write lock needed */ if (vms->unlock) mmap_write_downgrade(mm); =20 @@ -2907,7 +2908,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, * * 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. + * aligned prior to munmap. * * Return: 0 on success and drops the lock if so directed, error and leave= s the * lock held otherwise. @@ -2927,16 +2928,12 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct = mm_struct *mm, return -EINVAL; =20 /* - * Check if memory is sealed before arch_unmap. * Prevent unmapping a sealed VMA. * can_modify_mm assumes we have acquired the lock on MM. */ if (unlikely(!can_modify_mm(mm, start, end))) return -EPERM; =20 - /* arch_unmap() might do unmaps itself. */ - arch_unmap(mm, start, end); - /* Find the first overlapping VMA */ vma =3D vma_find(vmi, end); if (!vma) { @@ -2997,9 +2994,6 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, if (unlikely(!can_modify_mm(mm, addr, end))) return -EPERM; =20 - /* arch_unmap() might do unmaps itself. */ - arch_unmap(mm, addr, end); - /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); @@ -3377,14 +3371,12 @@ int do_vma_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, struct mm_struct *mm =3D vma->vm_mm; =20 /* - * Check if memory is sealed before arch_unmap. * Prevent unmapping a sealed VMA. * can_modify_mm assumes we have acquired the lock on MM. */ if (unlikely(!can_modify_mm(mm, start, end))) return -EPERM; =20 - arch_unmap(mm, start, end); return do_vmi_align_munmap(vmi, vma, mm, start, end, uf, unlock); } =20 --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E2CE191F92 for ; Wed, 17 Jul 2024 20:08:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246892; cv=fail; b=VtYxRS6nlc3Cwx/JqSVm4rrHmfx0JFw0/XUT3xTLU3cCz2HvR8Cwgwta8KpFQpEVPq2Hj2sULuswJs7kjJq0fuIHj0l8W1G5/ihiYh62Db+mI5LrZDCLWpSB/sF8bGpEgM5u0OI9LoyiVaM6xPng08I7kB6scyJEBnV6y5gFx/M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246892; c=relaxed/simple; bh=soi3+q14YkcEnpDaJGQdtoh+LS2uxS9UQ/SNG56UKTw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=LsEomizpaO5Qu22AeMqmGVTQ8tpO5iYlBuooqzEPUAeWokna07YpcU3FE9FpUBnynzDpOJd0L2JMp0mxheqJmMQ8vc3Ed+jPQYExXUJBDtgkSVjtOPj1xCKdpZhY/KC/h4vIrucoaOSTsV2QyoVyWHjNQX5CMS2Xl+E/97LEPOM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=GLOGm+kS; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=S/LT+9rU; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="GLOGm+kS"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="S/LT+9rU" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK0l05029078; Wed, 17 Jul 2024 20:07:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=alInpUkHwx1KRSQLZZxXfT1SsoSWLZXvIxTDx6NvE60=; b= GLOGm+kSe5xHMd3+JFkSs+s9NYkB7jcSZraM9bl8vbkLTtZfZQN7fIaNgni8pOr0 r/q0vHyk2DiDeqnup3zhhpQt7z3pTUvhGu43Lh9a/td3WPKCJb4P8QOA4+n37QXH UaKYwAqQPlruswgpH/t8FA9FTHyGesJZVTAMQNIqFOxfUW4F+21jF0hAJ8N7AhO6 g5/VQzrSZf+6n0xmVShg0kP1tHVtAtv2zNTR7OzW7ry4lrRXNLOhbN5Vf2koo2NV 2ZsilOM8QCNJrXgNQFnCfXhiBpWYoZ1NpjHEvMLEYgsratD/qr/6b8n+cSYZCt1n zXOky597WqyWCEU4878uHA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emkyg1ab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:56 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ4sqE003630; Wed, 17 Jul 2024 20:07:55 GMT Received: from outbound.mail.protection.outlook.com (mail-mw2nam10lp2049.outbound.protection.outlook.com [104.47.55.49]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyhkte-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GWSwpNNt8hYYkaPQPYySEA6Wx05kYZK1KHCvWH/cy1lEJ1fhEbQFPfrOoaqri7bABpZPk6FISCALK0572SAtagjPOrlP1LIs1++EM7lp2hHNUM5UtHA84F76Sc14yk6zoP8JILlzXBLkuaRzk7p7qyAwUYdpv175VWayWsbkRmD8RrmEy+SsIyQDPGwDu9CnrFQsGtK7wxL0CLqsfGjJSILXvuQNY9dbZaNRe+KeEmr33MhLTrTskU3MhR1E5wgnTAQdR3wctqPtcBMbWJd8FXhqr+95NePTFLRL938bu0qcyS/T1kaFVobbCoyPd3/aWMyJvs7TcEZ+bAA9T9JePA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=alInpUkHwx1KRSQLZZxXfT1SsoSWLZXvIxTDx6NvE60=; b=eMsRC4yXab868fs5LVJdMHUYsjTONmHJjUHCiPpHzxzgMWBexMUFq013lKhC4CzGQgh0ReB71DZbjJ0pW6PQMrbmSatSR84jM6vuhy2J3i/0Mn0GWifHmwdRS1y7Yzjc3p21TuI6uuyNJ40+8hdl9o30VjpgIPYlN93iQeKkdSdMi0nfi5Ehl54FyU05zE0GMngkdkew+NfV6CiT6c+Bp1K/SfvbnYN7TkOvaMKoywNPZMymxD/Im7kUN3FtZGGS05+bQmore567AtToz1o7Rv7laTFrx6njCuOAf/Rkw9kYYMXOE9zSwd4gOzEtk+oxBfYHEtvBzRzNFIFNTX5H3A== 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=alInpUkHwx1KRSQLZZxXfT1SsoSWLZXvIxTDx6NvE60=; b=S/LT+9rU3+vdTLZ0xZ0dSkcl5ULbi/c1Gy1l0Bm1sbtZbLRzh42phEJbmnSMtln7PFnbPc03H18/MUtf+/OLZNfkusyjr9TnK/vKjb6S5kfW2qUYt1SqFenI0nLnqQIhsJXsws9FrrvnxS0RrnUs6tuqG9WWK10ytEWu70/g5Ik= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:52 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:52 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v5 18/21] mm/mmap: Move can_modify_mm() check down the stack Date: Wed, 17 Jul 2024 16:07:06 -0400 Message-ID: <20240717200709.1552558-19-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0173.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:110::14) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: c3c92b67-8c43-450d-5433-08dca69c23bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KlTHHrTq4JCijQKufpxcTlZYryu7vlg8Q0TBMX0Pd/k/1q0/7pCgK7LNpmJG?= =?us-ascii?Q?hcpDgK7RRkQzrLtPFyW54e7+bP6ERZCROUZRU7ZrwQNRMr9p/uxCPnVP93Ii?= =?us-ascii?Q?Ja5CANrT5SQ93G53tw0+F510NGTPg4xJ3OwYSpE/d75fvOKZ6fUHwGd62DxZ?= =?us-ascii?Q?xlapY5W6QbqJYfD5QtS+4Sy1qTclV0FbvHtpv+U4ayd+5BNCssTwUz8KE5oB?= =?us-ascii?Q?Pq12jpnXA7x7HfPdjwp7s037OGmliT6bNT8wd+Jr5xGhrVNQ2Pe/MyqSkHqc?= =?us-ascii?Q?lm6IC7wbmxDm/Q6lzxR+FpjAqcGJ7JX6hKJZn6fw3H//m00nV2VdlsnrEBLH?= =?us-ascii?Q?E7yaGWZLVlpmMLZf0mgAr1ZOE5gPGElaBA+X0A89mvrXixkk18tkuvByJM9g?= =?us-ascii?Q?H5SD3FFiNUdhG1JaiIKo8kB86NRq9QtBe3ynocpUMjiqkrKGXnDpqiX01hEV?= =?us-ascii?Q?b3R402HOIl4j7CKDpxStbqvO6Lfdo8co6DnCR7Zcyldd3acXzZpA18HGCtvc?= =?us-ascii?Q?UuHF/Uj7dt8Q5T85nSFVQg0hlTNfFrUaDnSCNsre1mNtKYdmg3UHA2d+1iZH?= =?us-ascii?Q?ZGBSxX9MOfH7hnldcHbpKH3XTrSh9SlJhCdeai+8rwJuDxM0fZNNubHN40w1?= =?us-ascii?Q?/vo0KIouIKvx+aCP12QwVm51k8JuiWNpj59jtCesbrHgoD2iTTqNCdQwbElI?= =?us-ascii?Q?3CDbv/GfrVz5DCZue2PB9QfdcJ+qbOY91Aj0Y13zNGuA5yC2vbTpEUnOe7j8?= =?us-ascii?Q?BP5dAoKVeSuLblfklCI2b2Ps2yWwJxOtdRiVJ9zlx3lQs9SxhE4Eje9+qERB?= =?us-ascii?Q?jMOEuy0FUnd4+wZSCWJa4gNeE5d2lXLF3+FKKXJMsJ9Y7YSjfZPyQYbwXL8J?= =?us-ascii?Q?Cu/l6JK2VFtum/6fj4yHgHZf5nqL/uHxXPxIE81WhYrUI9XIGTuXSEFBBg1D?= =?us-ascii?Q?0t35GAaoVsfxmK84evTCcYgv+5EritSnmyRnqvzsrtdfeMW9FN2NHnEFLXM+?= =?us-ascii?Q?ZsBbaQNg5Ha3/eVCVLmch0AE4vploawEQFTee4ow1TFOw1pAqVMy6KhLo+Xo?= =?us-ascii?Q?ySSbM3vVvUpUIqjA0Jr7GMZzdIgR0rUc+5iHH0PVQEaC18P15kumJuDk2yY9?= =?us-ascii?Q?/zOMSqOFiBFl6tjik6tfHTEPvxcMXc2LGz3KqKji/gToGauih/cqwkHITc9i?= =?us-ascii?Q?88fDjDIg2pPVvzPovlo0KB/DqmbjAxdae8OrfSgHygL4XhqcOamkytlNkclU?= =?us-ascii?Q?Ekvm+hESxuGUbkf/ATzsv0AZ2Wgi+piJMXswdoqAhwGPYHnrQtrmD7HNwQ5s?= =?us-ascii?Q?kuMRDBYhUBN637rakxrRAII7znuvuqN9FLF0QLtXzMz+cg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Kf9hry9eqkKKPG/VEBvMHSurQK+d2qnpO343TBLKrsKaJAvoBc6UQPVPmBsi?= =?us-ascii?Q?FFHBnZCoAhdX+scXP93D9EKva1awFNwn9xBagwpPq6e3IgITw/5qhivP19KJ?= =?us-ascii?Q?YOrLJOBwXlggdVZrPbMi1jGmKSFA9ToB3asMhADaaVgVmbfzB3WK6LqegYQm?= =?us-ascii?Q?ftGtXrR8JHi2LmGlVXRkeKeFue3RIOboLJPpufdShk5Adl7RWQGKfdL0XCeB?= =?us-ascii?Q?mIaSxOXBmTj2q6WoVzWZtv47C3cJNM/zqTlsfXU54b4ra0NrrPGERNNcXtyG?= =?us-ascii?Q?bHH7mmJ12VKbyaVrfVK8Y5JGClee8pH7T8ppoWGHyUF/1T64KJ76Czv/5b/J?= =?us-ascii?Q?w6k/o1GklYYCqnCWbskd5drv8tIi+Fjv25Zp26zxAFj2UsY1lDuY5s6bVv/k?= =?us-ascii?Q?pQA0+pEoN0vHlCJIcetGzMDnyHI0eaAVDe6M5Xb/7cQ6gbRSU2i0vHbJ+9oy?= =?us-ascii?Q?8R6knUSa/Unq8WS8rW0pn98sIVBqsng8bKmGgmzBx/88ei7VW3Og4vXEmgFC?= =?us-ascii?Q?oKxEMGh73SHg8XTSWQQ/NPjaELigfS9pf53gmResCA/ZqJbK1RlaMURMzCQc?= =?us-ascii?Q?otxK+eXIuTtFELiYUQ+Ch0lGFYRuLre1AHtNt3vVGOpq7QiCUczn9xjPYxvh?= =?us-ascii?Q?6xetstcz797OCqEsZ8cGerivu+ovLwXuYOONmxFhrvSFYBzeWNUMXfhcCZFh?= =?us-ascii?Q?1+qHHXMdQTF3d89o7Ns8/92tnaS1D2uC8ja93+0P3jt9Bm11tsZL4dX2xPLg?= =?us-ascii?Q?pFDNDjEVOc6AEykoYuMt9PMvntnv66nRX74sFOZikX8Nw9+KL7MdJSrin+xS?= =?us-ascii?Q?X04scjezf/0wR5krYiEcdGIFmmiciapG6pZCIvY35JNSmgayD8wzJd4Hww3r?= =?us-ascii?Q?1ibbGfmeqeWkTWArZhhjY2g6q385qsWdrlU2akrQe5CEOImbYSCyuX5+eenD?= =?us-ascii?Q?HVuPQY8Z0KCOK8rEugMnpg9VzDUkE6EnJbn69ncellA7AQVFxvB86WDyCLhV?= =?us-ascii?Q?Ee+UBg3XiQvTQOKejZKZC7y1SMsga5fGMdKkGT4Rn798o/zNNcMmBsmh8nv0?= =?us-ascii?Q?m+Bn9Ln8ENBQ2rZaSlX+rVXxFNhOn1Rgz9vD3rEXp6zqbgeCHklpiO8AQCvZ?= =?us-ascii?Q?TTbaWvUbqmZ/7Mz4wBMq4sigR6mrxzg9udY3vSao6g1uLkzstG5GbUZAT/1V?= =?us-ascii?Q?A4sCslDUaTSpdnw6DwWVkehNKfEd0nYuAZB4JaEK3ZxfFu6nkeMfDchrTxr4?= =?us-ascii?Q?oJ859xLX9OTHV85O9uIp+M+c02/z104qglrh5n1rzFmkfK4ZUOp7aaQ9OeSg?= =?us-ascii?Q?vga6CQTLO7p/uCK1HtwyRVUIQ2vZiniPw6WCs3xGpLcuF64VxSLUh7btO1ta?= =?us-ascii?Q?VMPFRf+9m+7n3i9i0s46sY1EPj83ag40BnYyM4Ry2k8eFPDrKQKgP10Jthb/?= =?us-ascii?Q?Ep7N+mHNEZ90SHw7i2Qn3GVajuQCIJTgrzyyX9imVsj0q0e+8mSarUCNxcMC?= =?us-ascii?Q?3w1OHCx4dUNsxwCPYqY1IU9GXQnqZ0UCLYimM/snPQ2M3LARTVlrPY/Qtw5w?= =?us-ascii?Q?gh9LoVOoiiPjMNPgkwamspOzQ2ilUSCivRLSXCgw6o2Vhx4dvW1K6DLQRAX5?= =?us-ascii?Q?Ww=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: qRXQXvt01rDLnh/7Ir+OD1oeb0SfNRC4YUaU25A0PHnuV9CO3R1x+FtNYL9+Bdge/rlCvmmLa720G+NbR46OVvGZEJ6vIeZJSb10rVD/zuzxrUsFvi9nnsNKmeMN/PDg8D0hsxDa7lL7QgpqeX8ol/ZqtM68BK09Qx8UFWcveGGIKonwphiLMeiqu72d+OiuSidtE9pSFzD6vlNsLmX0HAenCMHgwWTHQ3U9mbFSN5HWETyJ+lrOl1izXcD0Z3ypxxTX6tGWU+Iowb1XVRvbn1eYHQr3Y6fwCsPuU0kliCYtF606llyK8MNV6lkKD5X2ugRRXBFGoQFPw7tX88RClyS0OYGIgQbwQkNKEqDer31nnUrhvP2/IusDY93If97Po61RYEsaGyyPuHDzQx+n6zKNp2GRSCj8FnmeFCCB3qioIl9GXmV9jWR4txnkfYzD7zRzJTqkfj7Z4r76AEdk0tBeqiYeT+Qcjz9m/oSAl+vDRiezq5wr0yOrUxHhubddtP3H/sErNTLJEdg2oDY5Ba16JgOL2RCBfQfVgpj5Geks7iua1BcWBeyyOYc00qcMdDqGLxg3xBBAjjfJbWI1fEl/SVjHyGUe3SoLK/pUWps= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c3c92b67-8c43-450d-5433-08dca69c23bd X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:52.5441 (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: 6l3ahmWUFFrl8jcHaQE4RWejIES3zvXD5HK8kgPQV5wDneGIbkASrFEwNQ8echd21+ZAqDoFnmAiRG1shZUZ1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: 5ES6hINEOpLpXYFxRKR1d7GPaRdROhHL X-Proofpoint-ORIG-GUID: 5ES6hINEOpLpXYFxRKR1d7GPaRdROhHL Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Without an arch_unmap() call so high in the call stack, the check for mseal'ed vmas can be moved lower as well. This has the benefit of only actually checking if things are msealed when there is anything to check. That is, we know there is at least one vma that is in the way and needs to be checked. Only call the can_modify_mm() in do_vmi_align_munmap() and the MAP_FIXED case of mmap_region(). Signed-off-by: Liam R. Howlett Cc: Jeff Xu --- mm/mmap.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 117e8240f697..a32f545d3987 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2877,6 +2877,10 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct= vm_area_struct *vma, struct vma_munmap_struct vms; int error; =20 + /* Prevent unmapping a sealed VMA. */ + if (unlikely(!can_modify_mm(mm, start, end))) + return -EPERM; + init_vma_munmap(&vms, vmi, vma, start, end, uf, unlock); error =3D vms_gather_munmap_vmas(&vms, &mas_detach); if (error) @@ -2927,13 +2931,6 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct m= m_struct *mm, if (end =3D=3D start) return -EINVAL; =20 - /* - * Prevent unmapping a sealed VMA. - * can_modify_mm assumes we have acquired the lock on MM. - */ - if (unlikely(!can_modify_mm(mm, start, end))) - return -EPERM; - /* Find the first overlapping VMA */ vma =3D vma_find(vmi, end); if (!vma) { @@ -2991,13 +2988,15 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, if (!may_expand_vm(mm, vm_flags, pglen - nr_pages)) return -ENOMEM; =20 - if (unlikely(!can_modify_mm(mm, addr, end))) - return -EPERM; =20 /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); if (vma) { + /* Prevent unmapping a sealed VMA. */ + if (unlikely(!can_modify_mm(mm, addr, end))) + return -EPERM; + mt_init_flags(&mt_detach, vmi.mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); mt_on_stack(mt_detach); mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); @@ -3370,13 +3369,6 @@ int do_vma_munmap(struct vma_iterator *vmi, struct v= m_area_struct *vma, { struct mm_struct *mm =3D vma->vm_mm; =20 - /* - * Prevent unmapping a sealed VMA. - * can_modify_mm assumes we have acquired the lock on MM. - */ - if (unlikely(!can_modify_mm(mm, start, end))) - return -EPERM; - return do_vmi_align_munmap(vmi, vma, mm, start, end, uf, unlock); } =20 --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F4321922EA for ; Wed, 17 Jul 2024 20:08:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246895; cv=fail; b=DqIuGdwVI3Bj/lwCf3tVULKiOVu8p7qgIGybFsfvLXJl9VAOhuH65cDYbOx9dV30g3V8+o8+DPdqOgCC1d3bd2B3bey9LLd5MunEPbmQh9wqsLUR45DldQ5H2ZbC86T7edyWKfb+ba4DoUb2u0RmYopnt2qQZQkni1vfXaUyRvo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246895; c=relaxed/simple; bh=92IBaHVc9AS7zQaJWPZ9Cwer3tcFTV7it7oCsTYo5N0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Cpcr3MhPuAJflwP9WYYy6foUzyibegTvRoyme/xK9Mw57Epw2urCXH9tEECFPsdAnOMfQFgCdMXETqjG2Q1176td56Zw01ws0hbsXdm9ncMarZBXkKPPlRgkJ8Z3FIFo4JCHmHy5O478qnmNko9KCotxRFmy7IvFHn+13bdMZsY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=HpAHzNR9; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=CFJBvBNq; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="HpAHzNR9"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="CFJBvBNq" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK5ARs002719; Wed, 17 Jul 2024 20:07:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=1JOtMp6ytkbFmdJPiX5X/B9862zAZNwTtK3hdHWBpPk=; b= HpAHzNR9yFPcLvRudQklQI4H493/DxD7zuA3SlC5gAfc6md8ccwqp3KpPJxIfpWe XLFd936DhId1/4MF0g5XXxISSW0vykiQTRyNB1eccE32sIpKhtXgQJv7VvvhtSig ImZuvbegtX+rkj5elZ1XtWOC49pw2oxPhSMKW1Iad7qGAZzEj9ghKOoMCYDnWmFS GDNRIKlfNGvwGfxdMLfbaNhVZbTZ+QTdpyHhsYzqoAA1OBQFax+sOmfugfpFW3BY iscURLt0dtu4Iudqw9yWhPGlzejk29EWaP6f6t+2ukPUQwDgxyzTfi4aW/jbmhjC UI/V9VC1t1Rn8xminiFkUg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5r08n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:58 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJEjNZ020154; Wed, 17 Jul 2024 20:07:58 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2046.outbound.protection.outlook.com [104.47.55.46]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dweyh8qh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ye4YG2AJim55+RJiaKZBVInQ+8vHneJvfNVl7BEJapPfa6AfPHgbpeJe2ATrO4Aq3pO5BJACr8MfiqIYog6re0Ra9k9WDtDRiHlylzmD8U4ENYkpTam12/WukivoKUgt/T71iOaJdedqO51uMKh4+XiWcwckHPoT4feuYNBV7WG+LgO6jw6k2riG21M94rC4fnBIJvdE/g8OQaaA3I/IUl6c+1rqDC5H2gBkw33lCB0R/VkonIWjhU4txjKe5TGOk995zZo0WgsFQUGqcFB6aPtCebrfgF6MEz0d0hhYmmzXOcgmfBXPp9d8/eBxwCQCYWOfvV0A4m3COZVw4W6ROg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1JOtMp6ytkbFmdJPiX5X/B9862zAZNwTtK3hdHWBpPk=; b=SEGHyDLGHjW+mQQvSvNK6E9VC2o76yfgxOP5pMInXiaIwPSqrTfvSiqrWDlrKpZ+t43cjozwypn7889x8kkLFH8lqMqhAbuqfMgfiPO2zVJ8uB1jquSfYP8x+T3LbZNJ8ksWs3fpAvodAdFUXHk4/KOXomr8Rb5u+AUVR7MZjQ8FcQnSRwlokivwKCWzb+OjfEcxPpr1ly0hxnWY0BzCexnR32ysXzSnrYRHJk5N3gXTdHWe7zH2E5dPZm2VUuTh9EIropmsNOwI6WdRHdNl/L1Fx6d0pBovONwCFhwWHQ02eBby457WUu1/S2JMWRYCJrmMfdMBAMyi9Oe4TXGJvg== 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=1JOtMp6ytkbFmdJPiX5X/B9862zAZNwTtK3hdHWBpPk=; b=CFJBvBNqLV51Z9DMzlTWzNRZbnFDGRNOdZLnBjdteEsLhe1c639A81pdBzY2fd3Mkfdv31yXWjYrtmdHk5hHz/4inb9jf3VSUlmz3f48n5XJn1pkn599FjVljCCePjPY0T3B2zvwsv8yQQqbd6GyoXes02TSDM0t5CBgjhuSv9Y= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:54 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:54 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v5 19/21] ipc/shm, mm: Drop do_vma_munmap() Date: Wed, 17 Jul 2024 16:07:07 -0400 Message-ID: <20240717200709.1552558-20-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0275.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:109::26) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: a499ed3e-3afc-401a-61e8-08dca69c2513 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?sKEDJ/sRZHHtTrmXPumU5lSAlHN2+zSKMoibKTow+6ZlDjW92f+2kQ0Kt9/p?= =?us-ascii?Q?U/D9PtHufMQQ4bw2DrBSBtD2vyvxZneHZYlyT8g1+VxdrNAb2Z8+YrGYoCGs?= =?us-ascii?Q?ZBmtKEPEaG0CAVfXuH80h+3uwE58AOn3/KFk91k1EEL03vLKgjiQRekvpf7m?= =?us-ascii?Q?u9AwZKIysQ1WxdHeSpY3UZ/aBlnqr5EGn+c4lSqt9ZDZbtT3dHfGyCXsWjjN?= =?us-ascii?Q?89PrnPfX/SM74H9/OyQZucSoPVZHaaR+goy+Bny5mYimHSDLqcqPlrlabwvK?= =?us-ascii?Q?cgpyL0RMY2vFxqTJGseriM3pzmrHYu8dVXkzTpYzQ7P6rXSQb8Fbf8HRMlII?= =?us-ascii?Q?YBXKr8lRBFEuG7FBmNwORtk0G1Bg4z+fo2NWURvYDfBDk18nPNg120BpvvTf?= =?us-ascii?Q?kknh8DabhQkeyhfDbWtATO3Uaonlu2t1OZlNQEIIhjTyV4ynoP4iOCztaYyL?= =?us-ascii?Q?ihtlHsgnyVE+0kYWkgjeFnbOFa39X4ikuz/PyA7s+kjX7nBgJE5J2paR9w37?= =?us-ascii?Q?jevcK0FYiQJBhFAyclFKutkM//jG6GlOCn+Skqd90kbo/bRrxLiK/hp9wwcA?= =?us-ascii?Q?Db1LN1eiz3i6KMYi4gOVMl98puEtph35Xls5ytSQW95CUmA3LFw9mvUW6zEv?= =?us-ascii?Q?CcyJPPRDiXHGgDy4/Snupf/iOTLn8AWzz2VpbiOrwX43+lJVTlSyQmzYlvok?= =?us-ascii?Q?h9Qi3nCDosrueb9QEWVMmvEI1nW3L/2xTMluwhh+qG30Ca3sqjrduK8y5Dck?= =?us-ascii?Q?XXc7skvKZ4uk7hadGEiv8vYXMCsv8GGh/VEuzLCgi7kjfufzBB7xqmZUU1UN?= =?us-ascii?Q?41+d/vpTZ81LDd205Uiof1FayRpQT0CkYz/1FiZpYByl4PmcfNs8KWmYjVW8?= =?us-ascii?Q?Fix2ucA8lty/M/dN1/md12ry8v3C1kMU92k4smRh3sVMo6H6eHX9moAFd5Mv?= =?us-ascii?Q?FcoQuHDse8yfO+PsXECEUpNJwocDV3/lGxtIaf/XWnCYklhmGmtdxtBCqTkH?= =?us-ascii?Q?+dlKSWiIdOAcIyplp9HsyvdcNZNRzvVbFH5BE4vwVG/lg0gQ5YDCvR1sHU5B?= =?us-ascii?Q?L6dszmjU/uO4pxFjxPHfOv/4GDSUJAjPpUdvSIKnWtOkl660Mlj01/Lv5tbW?= =?us-ascii?Q?PN7uZnxLtMQo8XZBj/dL3QK7IeEpBz4qye5TqzEjuH0iTHVLHn5RSv8YhBoE?= =?us-ascii?Q?zgGooGta+bbYAIRZ/y3CvWWLAHO8iqdu2lAAzG4+rhTy6iAdsOWfhLV6vNUq?= =?us-ascii?Q?yz3sY8f2PJ+fC57s8t0YlDVGWIjkKH19AYxBReCQIvVYBImBCu0ZfhKWLWsR?= =?us-ascii?Q?0ZdivSxwYJDxCSNQQufNb/0BPxEvxJM6TXOsAvaUuDDHPg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k0ixBapY2mCl3f6/1vhOlv7rHCYjhFDINbdQINzf7VeTCjhzGCpevEe2d2qs?= =?us-ascii?Q?JESDS2C3QiUS+cM1iRgtw6TwVhaiKu2eu/wLTqt1JUXbK+E1Tau/K8MeEOsG?= =?us-ascii?Q?fFzanWhi/PNR13vGROaeesNtrCagx69K+IGoJKspA+dtQQBEDMdlXJL9pS4D?= =?us-ascii?Q?Pwlz/9pJZgLgkz8CgrzdtCsKFWUdehtX7d/qT+zQVUCx/LBnNDNrzua+vSQN?= =?us-ascii?Q?ITF9ORnKBeZvYJNz5t2I0XeKGp5vxpj4yAS0IaCxbr0Sk6ZypINmudDzsu+o?= =?us-ascii?Q?trTlszdygUleHdr/AqZVal1EH4dTItcResrI4lCPpZFhJe+YWWqzr9GtAB8D?= =?us-ascii?Q?95PqVbkCnhHBpsovNIRFR1VziO3VxOOpRSNOBsEqShOCJ7rthEolWrKlE4ZL?= =?us-ascii?Q?cpx9LXxedMSTwGUSeqlZOTt97qGPvoG1vD4iXkYfRVJK6b3dbI5dLXBCjFjT?= =?us-ascii?Q?L542AZTG2QUvaPj9qkfYyRr4LRglg6/U7SElQLCXyJYKm8N+t0Kvq7Nwvp2t?= =?us-ascii?Q?vD2R1rSjG30cyaxFfu/WxblE+ZS3tk591kTkv6OmDv4L5RPYMH/rUU+YXsO2?= =?us-ascii?Q?95pFBMbfBZHhS2I9/UhFQXNOCZTLvc+wzwBOxLJwMI3f7O8caPzFxn7bwg3N?= =?us-ascii?Q?Sl0ePcq+uncIHzvUsQ3N1+YdAY+Rdzb00Y/EEFx0+jbv+SgQ7LbIK32a+bIX?= =?us-ascii?Q?Knd90bQZYMNRAqiJqB5HdMJWegLIgraeXWbDCDltUNV0a0mzA16O5uhFyvmV?= =?us-ascii?Q?8fcziSqKn7Vxzi2KZlsRCyBOiVDcoVU06Vmi7kRKWHYTdWGK3AOpO0eknu7m?= =?us-ascii?Q?VynXjg6/0l/ExoWemSaNTMlrpDMjmCcwMZd/9UYKdIeR19kMmWDhg2E0vfZ1?= =?us-ascii?Q?V6obMxsnXwxq1Yc3j3+JZTZHJ8xFSeEFGFaRVcilUYm0oAzr1MEp5rjvYIcr?= =?us-ascii?Q?durRLZcXWaQrz5KYL/UGdc/GmKXzqhbTxiR1Cgo0WZADb6xZ4NnFTajR8LwS?= =?us-ascii?Q?6yEjvd6nZhRXsCqmfez6MePOWXci3q2b7Sh/uliRz5lnzocM8M0zqmw77QXg?= =?us-ascii?Q?5Tle2NqZ5NE8A8MCDVOteUt9XJPMf1s+6UnrylCJdxhuxlkbcIiRDklAXx/7?= =?us-ascii?Q?oquNZzVJMpg5p/7HJGarFJUqiXb66LMSLxznBXkbpSwWzqAL7nXohXQtkh73?= =?us-ascii?Q?bbtp2n9eW8CgR8KCJ8D3tJKjGhFIqUdZBYi3dm4d7kfTkb8+OyKOz4DNH/7S?= =?us-ascii?Q?DpGbz+09n+G6cjs6AgzgJBwmthGJKPMdyshmqOjp23SsZ1APIEcels5yoUNd?= =?us-ascii?Q?tLqN0/mZ54TLj6jiLaci8ZtzUTGXNbcsrHvNmq4qkc5TtaNgomnVTqoVDCXx?= =?us-ascii?Q?gwJ0sEBTThvICVRKoWv/1woTH4yPgot45Hp2agxnidvwoaypQMBWkn7M5sOP?= =?us-ascii?Q?jud/YRivrC+LEVD3JwnGzL0Mv4wCh9+H9x3y6S9MjF+IXe95idp23jW3WSx/?= =?us-ascii?Q?O/Di9yUgdT8ge8/FKpZgkc27CD+EgEp9Ib6suM3MA7vX5cz/EWhjEMU1iuQZ?= =?us-ascii?Q?42CwXfJK+jvVT6tq239Npisb29keWVz7Sg83Jml2OflqGF53ruj1hCH296Ae?= =?us-ascii?Q?4Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 7yXKUITeRxxi23orb1uLZHjPE6ZpBIJ++YflZENKnGa6m4BZiIeTo6elpaoZBQL/ZEQLv6tI0wXBJ45k4ini8C23MgBgA13gAHa6BhIPmnIUT3WBZpJ06ttsa2GutrBk7NHP8DWdla4ip6H7MCK0yXtvAtleCaY2MEzRs78A4yydTi9hAv2dqX/+IFFmz7TRLPULAmejIag5XsV0kVg2EcN87W97l7yi2S9nzaC14WBrc80HtjC6C26kOUiYU4SM6MmjwzWv2O+MsVbqGswj43x7ApcnzDdvpTz3Cjl0LrDF5lGs78EpAkzcbu8pFUZlYQK796LppiHLdCwUyTXJnyB5CFv2/jlb02rJfAfLARMi4RiPcsX6I0JIBIIW0daukXhmrJshBaoRDeqKzQvi6mC8eeNObWtEtiQkIZZO0+7L+5uw7t3mMfkJj1qj+cSRQy3AeECMmmHcyZ+TQEOJHO1IWKHjAKIzjOBuEBBvXrLe8HrqONLauoJFF1fM6WYSAGQquhAeEEmhpe4yAFvrnVUgAJ58ThFI2ohLNNubejM4yLKCSUhBdoy8KAAh/Nur9ekzdiQHBOcyoOPHfHTS7a7z+Z8rXEfrvRLC9VAgU1k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a499ed3e-3afc-401a-61e8-08dca69c2513 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:54.8300 (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: cPGPnt0FJv+IyJm9sivBVCZWSOvbc1gFkGLZpc1kuB7tNSh+o9SCJpVTZfykuJh0A1S+qCrpxTkpljkJebFX1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: z14d3hxX0ix4cqEGz7T2ONAneHPtAb3D X-Proofpoint-ORIG-GUID: z14d3hxX0ix4cqEGz7T2ONAneHPtAb3D Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" The do_vma_munmap() wrapper existed for callers that didn't have a vma iterator and needed to check the vma mseal status prior to calling the underlying munmap(). All callers now use a vma iterator and since the mseal check of can_modify_mm() has been moved to do_vmi_align_munmap() and the vmas are aligned, this function can just be called instead. do_vmi_align_munmap() can no longer be static as ipc/shm is using it and it is exported via the mm.h header. Signed-off-by: Liam R. Howlett --- include/linux/mm.h | 6 +++--- ipc/shm.c | 8 ++++---- mm/mmap.c | 33 +++++---------------------------- 3 files changed, 12 insertions(+), 35 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 5f1075d19600..49a24c023153 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3406,14 +3406,14 @@ extern unsigned long do_mmap(struct file *file, uns= igned long addr, extern int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf, bool unlock); +extern int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_st= ruct *vma, + struct mm_struct *mm, unsigned long start, + unsigned long end, struct list_head *uf, bool unlock); 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 le= n_in, int behavior); =20 #ifdef CONFIG_MMU -extern int do_vma_munmap(struct vma_iterator *vmi, struct vm_area_struct *= vma, - unsigned long start, unsigned long end, - struct list_head *uf, bool unlock); extern int __mm_populate(unsigned long addr, unsigned long len, int ignore_errors); static inline void mm_populate(unsigned long addr, unsigned long len) diff --git a/ipc/shm.c b/ipc/shm.c index 3e3071252dac..99564c870084 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1778,8 +1778,8 @@ long ksys_shmdt(char __user *shmaddr) */ file =3D vma->vm_file; size =3D i_size_read(file_inode(vma->vm_file)); - do_vma_munmap(&vmi, vma, vma->vm_start, vma->vm_end, - NULL, false); + do_vmi_align_munmap(&vmi, vma, mm, vma->vm_start, + vma->vm_end, NULL, false); /* * We discovered the size of the shm segment, so * break out of here and fall through to the next @@ -1803,8 +1803,8 @@ long ksys_shmdt(char __user *shmaddr) if ((vma->vm_ops =3D=3D &shm_vm_ops) && ((vma->vm_start - addr)/PAGE_SIZE =3D=3D vma->vm_pgoff) && (vma->vm_file =3D=3D file)) { - do_vma_munmap(&vmi, vma, vma->vm_start, vma->vm_end, - NULL, false); + do_vmi_align_munmap(&vmi, vma, mm, vma->vm_start, + vma->vm_end, NULL, false); } =20 vma =3D vma_next(&vmi); diff --git a/mm/mmap.c b/mm/mmap.c index a32f545d3987..ca752317adef 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -269,11 +269,12 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) goto out; /* mapping intersects with an existing non-brk vma. */ /* * mm->brk must be protected by write mmap_lock. - * do_vma_munmap() will drop the lock on success, so update it - * before calling do_vma_munmap(). + * do_vmi_align_munmap() will drop the lock on success, so + * update it before calling do_vma_munmap(). */ mm->brk =3D brk; - if (do_vma_munmap(&vmi, brkvma, newbrk, oldbrk, &uf, true)) + if (do_vmi_align_munmap(&vmi, brkvma, mm, newbrk, oldbrk, &uf, + /* unlock =3D */ true)) goto out; =20 goto success_unlocked; @@ -2865,7 +2866,7 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, * Return: 0 on success and drops the lock if so directed, error and leave= s the * lock held otherwise. */ -static int +int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, struct mm_struct *mm, unsigned long start, unsigned long end, struct list_head *uf, bool unlock) @@ -3348,30 +3349,6 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, sta= rt, unsigned long, size, return ret; } =20 -/* - * do_vma_munmap() - Unmap a full or partial vma. - * @vmi: The vma iterator pointing at the vma - * @vma: The first vma to be munmapped - * @start: the start of the address to unmap - * @end: The end of the address to unmap - * @uf: The userfaultfd list_head - * @unlock: Drop the lock on success - * - * unmaps a VMA mapping when the vma iterator is already in position. - * Does not handle alignment. - * - * Return: 0 on success drops the lock of so directed, error on failure an= d will - * still hold the lock. - */ -int do_vma_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, - unsigned long start, unsigned long end, struct list_head *uf, - bool unlock) -{ - struct mm_struct *mm =3D vma->vm_mm; - - return do_vmi_align_munmap(vmi, vma, mm, start, end, uf, unlock); -} - /* * do_brk_flags() - Increase the brk vma if the flags match. * @vmi: The vma iterator --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D054E19246C for ; Wed, 17 Jul 2024 20:08:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246896; cv=fail; b=CNrs2V4ICvrZc0qe2skDiN+PNOzaNntM9NVMYfIV4tTxD5AK2rEgsT0aCZX0rcQjnqWlhPqUW3llmqNCjcoOj/SE+bJRceWCbh/yMU20CCc25kWUNNTbui92Q9qFlCnSKVlux8TICrD98K2+xkrJIqjycUqbWBw+itm8dp1vku0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246896; c=relaxed/simple; bh=QfDC0mpheV9PFb6i2zs2NlfgTcNaTwy49v3X2Kh45Ww=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=PUBNr+ockHNMxXELdcW6TS41bY+Ld17H6TlSMAER9Iq0/8RjaHx1VIsuqFYKVDSuyulIdqJ+R0zAWYhoKgD0eXtX0GijI9qtJ6rgFDuHOlqvriswELfD0L21u1FuzMjL6R5EHWZ+rELIsEny3TqhxKulVNjkCbCi9ZVVQ7QQPoc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=oCaIEyoE; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=uT53cubk; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="oCaIEyoE"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="uT53cubk" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HJsRsR016988; Wed, 17 Jul 2024 20:08:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=BpN5Sb+yntfE6ooYu+FyKWdD7AXq/Jrvngs/MG7YjtQ=; b= oCaIEyoEOOKweepnRY/O17gDQ1KYf+NiviAOEN19MseRbz8orrvJYpuYufitJbch 8FJCmDpv2YtIcafbr88bWrj+3FwqkQW2XJflTGkY0u8WiUD07R6NCDQnQFngs4xy nam+SYrNboE9Rc7lZP+p4plijOoq1vQ+cveBCcAkFvsYBdNorzExGH0zJ/E0xuC3 aozqm6iifoVFN0TeJ1PmlwJjLYwwcGGp3Qo91aCHnhx9RwPanHXZAe/KKoNpzWEm 09rceZyySoYd0zWXHnrX3H6lq6Pj8sH86yhiJ7S28W5ybK9ZWP/gF9lI/2gdBNi1 q78t8eVEEQefJ32f0hqtDg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40em3m0344-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:08:00 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJFPQn021621; Wed, 17 Jul 2024 20:07:59 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2044.outbound.protection.outlook.com [104.47.55.44]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwetrpdh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:07:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TYYAjfuJEdtoe8HscfTsht7RrpE00gqgYTMaDwUGpv1Y0QZvzaOckc1qc19L9Zi3xdIpBF2wFUBLiM9Z/WAdZ2z+7TEaWSCh9P6kWUowY8JMCeT5bhmhPVjzDiN+SBKfp/hYKaG9TTd7qKi7PPFhjiBpP1S/YKPnZr3VUnxywuBRYIjvoBgviZriS5J5DkCqj2sIvH0dr4FONyRq/cGTU4T2qx3tGwL/UaY7Kgi448OpF/poUIQ+ED6O66brVUamWzeuCGZ7NP+o4pepxWRg+CTBpPPu6nZ7nYeZC+pl3f1nURNAM8y0nJnzv1J8PGjpkP+09mUPi9f1XS7Rgcf4BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=BpN5Sb+yntfE6ooYu+FyKWdD7AXq/Jrvngs/MG7YjtQ=; b=pdSgowjc72smq3Wh68L0XgDgeBt7Pfp5rhdW6XiKKwX0eCrSYfuUmRwq2g4F6DcjlPqyYefDUNTLTFZYE6t56wVbxxHr54UKRqtN8TTZHIgZsrmeccY0qlNTTcv+5DwNMNkprIzDopDRol+yAS9OcTTkPuLvEOV9JnlFLJtXJtPYuUHPtq+mNhIdurh/2O6Ee5eoCh5qK/rbPGqjz6PwIiif/N3MGMp43tdAOhehwpgV8aKo3s5bA57lhbcnHDr/rw93CG8MkWZL9F0zgu3lcUCJ/BtqPGPZyqb6ATDWda1DLmrADaphxD2099WeI1wHE9y/+JhY6zELv0WGHmkaCQ== 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=BpN5Sb+yntfE6ooYu+FyKWdD7AXq/Jrvngs/MG7YjtQ=; b=uT53cubkZd08e/vKU+Xi0owlAcr+NyteekPZpA4YSl3o5Jh1Tm3byvpBzXhlS3KpaEVClu3CjtBzS89OnxrgByBO47QfWiYSRcx9bb4k9BNlmbRmX44MEHn2MgZ1peoMVyf2MLD4iSvwUjZkTTm3GVEgQfOKvCIBvuPFcg7SIMA= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:57 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:57 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 20/21] mm/mmap: Move may_expand_vm() check in mmap_region() Date: Wed, 17 Jul 2024 16:07:08 -0400 Message-ID: <20240717200709.1552558-21-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::27) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: 6742c728-1243-4ea8-c0c6-08dca69c2680 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?d1XnepONywIkVt50e1BlPFGlOKT+LeJE75heLCj+ba+PuS7UytO9fOPEFhQC?= =?us-ascii?Q?CNlPBH9FAaZNggR2nRmeACvC1PjIkCFZpOLI3Wrh152HJEZHTvRK958dxB7g?= =?us-ascii?Q?+TiqWL4JuSqC/nMYEDrS64KrpPdaicaj3WocpH8TOOZ2/FJNuNtQer3TqECP?= =?us-ascii?Q?8jKReRvEI0y3u7+UcVOPa7Wq/LsXge1z8qVms6jh82RciZgMLT0vk/oavomm?= =?us-ascii?Q?pkvupavp2PQInJveYh94dA0ehLbd9GhkpXM2kGruy2sd0B92tjs21BG8bzg7?= =?us-ascii?Q?7mnPgPnaGGgPo/6dVt7CS/oNg8KhpwfYTrt4CYV1QBDuwTcGp0TTnO8zIsH9?= =?us-ascii?Q?S5TL4KREphgReZvNV1v6jGH6BgFIfs4vqg+8KCsp+YdsW2LnOBsP9iB4fHJ9?= =?us-ascii?Q?6cdtunxhcLOpiE9Lkjq7Dp8a693pKeB8pppCETfkZV99Nd5DuL1a9dn01Ecy?= =?us-ascii?Q?jIxB+cNQ6frrCGu1XjtloZZAxRkB4ZnEZhnCk1x5hAe+dyeODqTLvim90DUX?= =?us-ascii?Q?zf/HkxR+fBB0xv0rjU5ROcD0mWGhfwpUO5cCM7TKetdOlFPutJM/BqrXtC8Q?= =?us-ascii?Q?G+gbNqNB5phLjjQQqPEOfiBlbnWLZ3DdguOm8jhiM0qHAM3LaYu1rnKTOR+V?= =?us-ascii?Q?mYTXqJNe/1/E1Km+eLNXoiljL+KKB6NTkyqJ6Ex5VQ3p9kcEjs9+FRZt8trJ?= =?us-ascii?Q?mCAXBbJ/+lQNIA1D9/72NpI3uEZLCRbUlQlYnAkzmASlyOGc0bAZX2DcSoHZ?= =?us-ascii?Q?HKy/eMJ5sbOC+myT26+PsrbVGPFxF81tNTMxhJ3diNdABG9m0HrEhq3smbN/?= =?us-ascii?Q?l82TQZvZBjdfB2b/8iBqFOt8dIjhAAal2c0cNVO6TOaVR2539SNcxW06B+hm?= =?us-ascii?Q?jyOBezoMsliJSF1sVd0hlBZ3NcTTxq3KamFcdCtlvotGppGzwDDePQZCi8W4?= =?us-ascii?Q?hGDB8zH/PdLqU3ZSx48r+AQEkDphy9YQfwgeMHt1vmsD/10KYBLTJtGUvg3w?= =?us-ascii?Q?fQDmg6kN3CmFpd1hAl1bLDscpIWtjLA+J6wcGHu7UyfQRNJPD8QRq5dD1353?= =?us-ascii?Q?ggsXiRiuUGiWREWIv2zwUzPBnb7eEnXwm8/syxRv9HOFsP4NbtfcIj8rZUR7?= =?us-ascii?Q?HEGys0wl1Ax4lH7KSSlWQSdhQvPOVHC4gEeqUJw8Y0g6JXVFeuReRWVhZ4qy?= =?us-ascii?Q?QgN6i5Wn9AHJJ9AGT5FOr4u4XCImK++JsgMSlBDIWE+Qk7utCWBWUNvCNXv4?= =?us-ascii?Q?XC3VZEvVmf+CAIlZBBOFUymHTwOQ40qizUwnMfrTioLmIP1mZ0eESNSaBWOp?= =?us-ascii?Q?ujeZJ8/xspRlRNgZkJBrJYRE8QgCXVzDpRuwEWF23j6IIQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?85KhO5mnJdpPwZ1pWRPBOPcKwXrfES4Xmos0QtJmHh+CRhFxHgAiha9npubT?= =?us-ascii?Q?8MFZt2kMG+FXIzLKD0mtJKmt7gfPAWGhKLLjUFRBmAdkgcTQ5momUrl58LPW?= =?us-ascii?Q?z0DIvcZn91mFneIsciNRsA12Qlf2FP5NfUenrpuVD1d9a6DxqUI6pXxCE9UN?= =?us-ascii?Q?Y9rzmltnswbfWo4I+5RPB6DgZeYP/t2QfD43zfLHHquQ1oJyLIicT/76wv4O?= =?us-ascii?Q?UgW6VlgEFHnUF+Vw0l8zHeshO7M11GpbNb6kSlzw8Czq/RI0P85zVMaFSrsI?= =?us-ascii?Q?wQbqRq5CRDckrETegDqchu7Zm58PHFx7p4KdJdpoF2NMHzJDL8czqbX8qA+V?= =?us-ascii?Q?R/xs7yubHUSpQJeya5pR4l7KNrcjtvSlQqu//DQINVPEKK3mwn0r7RdA/EJx?= =?us-ascii?Q?old8emJOwi12zrNIGZiXxxDbzZxLE1Yxf4Yiu3A9lVpAOMQ7zzX7YdTO8c6H?= =?us-ascii?Q?SB7abAhKa2P+BeFGQTUdH+cP6ODXVYOmO8LirFShI4ZWaUln94gaEVedMibM?= =?us-ascii?Q?GHv2qSAcluP16CwIJiWIRdEgzBiDRaweHF7qj99JrniB3Dq0i96r+7CgKHmE?= =?us-ascii?Q?lhTMWxOvi1/V9CNTAgJWz3bFHSZqjt/CFPyEI0sWsRWBXdN7wb0FX4BuO16O?= =?us-ascii?Q?DX6CNW1DDPDDINW0nTVzEwZChc8RGbCR6WzZBB1gL9w0v1NNkAmE4UaSx5mi?= =?us-ascii?Q?bfoJg+6/4Yb6Z7sMcM2Sf9bH6dBE19vLewMcJ4p/9AwOqreZSoEYWtIPXANI?= =?us-ascii?Q?1OxNLh5K5KQW0m7HflOpcitdbP8VX/g5AFcdp0NXyOExQSUOkvTi1pyyEfjv?= =?us-ascii?Q?Klr5AJ4kgY4unczXNB3WDIt+Reft6VRGA+n9Gf6PoQ1yacugfwMuo9DihaC5?= =?us-ascii?Q?onXbHSUV+IbUxEhlRBa0pcFoEmZcuD1v0XZCs6CkO17H4mUSHJqPIGCsemcp?= =?us-ascii?Q?3FjS2Nh3dj4y0InF/RnI5huNO/M+aLmHUhacUbhgPSAJIAd27hnuaz/brk4W?= =?us-ascii?Q?QXOC5k/SahG2Vc6JKfSU7dxoSebHnlcM6g2MH0Wh99PjASh/WB5oIl9yVB5H?= =?us-ascii?Q?1v11QTNmTVtKyKhLvCg+y/3adjykG3mSP0uT9gaUfwEf8JjdkmyW29jTWUml?= =?us-ascii?Q?8K4qvtNJ73TwuS/UMYnxy+2ttNucssCifbVnMLXZCOMWetc3bwBBDjGSejN0?= =?us-ascii?Q?6K3tfaXwoMrHojH5GEiukVJtLFZVTPAGwrVHVPcQLFrXIkP6lbf0yBOP0lL9?= =?us-ascii?Q?v8hRlH0zITKaGK1Jxp0vem1bsErKa7Mn2/vL7CMzalLZRYh9LtEMqU2aSDLq?= =?us-ascii?Q?7toV4wMmQ5XbE6jMX7DbcjghBmzDOMaosXY1l5qcbOq//GAOofkYl7Sc0G9k?= =?us-ascii?Q?94KvpP4KH93wwG6ifUGyZ3EGiWbOppofVrbzY5iX4uGATCiMa+7mpG184e4x?= =?us-ascii?Q?5Xv9Yfpt+4iEUbdOxe0UDo8M4oTP4WfASwkxoqtB041EIBqrGg/rWpcI4GgP?= =?us-ascii?Q?mexUJ/inHaQfwgYAlDidMmIfFFPhA76sEUe2g/IahDnVX4RGXbxqcdgE6Yaz?= =?us-ascii?Q?xxMcBjl4C588dREJMT/KttQ9lbMwsfPWezoUy28o2SWeosCsgbg+gBoaI/JI?= =?us-ascii?Q?5w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 0ukej8JiF1LNZymd6+Ehlb2vaGQ+vZTTEVdYZgfu/eMXNVFGMTzAYSZ6IjWvIbSlZkplLkE9sZYER7MaIEEqTDtmBtwOUh76pwbk/aWkU6VpML7QBNuSAfAYbXVHbBTAPjXqOi4D6uKmOQPmSf/Z5On+1Sq/9m7aKWlI6gNpXRCCMFWvzsfXkooWxTNMvCUKFrycQxKPsId7suyftdYPG9Mh5aqEiv7G1l68BPUd2aREiaPyrHIna1x1bBHvSkiIANtdvMkOsLabWRx/KWzBqudhb9PTwV4AnBzD7YPhN8JUA02U2AZDMDqZJ25IrVQPwzFXber7eVU+aENJHFaOacSD7uuOtGlWEX7tqKfUFH6+FKcaZc3WdOXKm0vqBMcQVb/FC9HwothXN8TNW23x4sjftmJOwuRvYBnxjHSQUbQ+GMhIxXBq2xRZ4bFCobTvsi+p/jaGCuAOfqlpZoLII7aRf38kIYIVwQFL7t79mCETD3lS8eSBXAQ2zbM1Xq1t/QZj8gZOkX7rJXxFqFLI3aMf202Q151PiFypJqHpa08EbxSEHIvHrtq2PYkqPnPTF6T+TlsCJXWxpRgNATdOiS+/rau7h24xFbLOFjhedi0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6742c728-1243-4ea8-c0c6-08dca69c2680 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:57.1984 (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: 8nYccWxoLGSDwzKGcR/BA9QTJc19dECB/2OVhXj+4Yn1qB3N5sSbaXCQ9q9vB1ahRavjTR+GK4eAQIeQJ6R7uA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-ORIG-GUID: sgIgW5COgo9dI4b_YDTuOfL861fMObY_ X-Proofpoint-GUID: sgIgW5COgo9dI4b_YDTuOfL861fMObY_ Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" The may_expand_vm() check requires the count of the pages within the munmap range. Since this is needed for accounting and obtained later, the reodering of may_expand_vm() to later in the call stack, after the vma munmap struct (vms) is initialised and the gather stage is potentially run, will allow for a single loop over the vmas. The gather sage does not commit any work and so everything can be undone in the case of a failure. The MAP_FIXED page count is available after the vms_gather_munmap_vmas() call, so use it instead of looping over the vmas twice. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index ca752317adef..5e74f5cb7be4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -402,27 +402,6 @@ anon_vma_interval_tree_post_update_vma(struct vm_area_= struct *vma) anon_vma_interval_tree_insert(avc, &avc->anon_vma->rb_root); } =20 -static unsigned long count_vma_pages_range(struct mm_struct *mm, - unsigned long addr, unsigned long end, - unsigned long *nr_accounted) -{ - VMA_ITERATOR(vmi, mm, addr); - struct vm_area_struct *vma; - unsigned long nr_pages =3D 0; - - *nr_accounted =3D 0; - for_each_vma_range(vmi, vma, end) { - unsigned long vm_start =3D max(addr, vma->vm_start); - unsigned long vm_end =3D min(end, vma->vm_end); - - nr_pages +=3D PHYS_PFN(vm_end - vm_start); - if (vma->vm_flags & VM_ACCOUNT) - *nr_accounted +=3D PHYS_PFN(vm_end - vm_start); - } - - return nr_pages; -} - static void __vma_link_file(struct vm_area_struct *vma, struct address_space *mapping) { @@ -2977,17 +2956,6 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, pgoff_t vm_pgoff; int error =3D -ENOMEM; VMA_ITERATOR(vmi, mm, addr); - unsigned long nr_pages, nr_accounted; - - nr_pages =3D count_vma_pages_range(mm, addr, end, &nr_accounted); - - /* - * Check against address space limit. - * MAP_FIXED may remove pages of mappings that intersects with requested - * mapping. Account for the pages it would unmap. - */ - if (!may_expand_vm(mm, vm_flags, pglen - nr_pages)) - return -ENOMEM; =20 =20 /* Find the first overlapping VMA */ @@ -3015,6 +2983,10 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, vma_iter_next_range(&vmi); } =20 + /* Check against address space limit. */ + if (!may_expand_vm(mm, vm_flags, pglen - vms.nr_pages)) + goto abort_munmap; + /* * Private writable mapping: check memory availability */ --=20 2.43.0 From nobody Thu Dec 18 06:15:59 2025 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B18219308C for ; Wed, 17 Jul 2024 20:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246899; cv=fail; b=InrRX7mOx1PlwDNLCRz6deNOMr0WppTwIj7JLta/donW3Sux4QwdcmFh1cfSF/DZ1SbmnNKOgBWUCev/DWDkgFdevnmQgRBEpwFvQj8W1VvGhXGDX/K+cju2tUSIh//sw2uqYHE/oWdGy7ICrqv6y+P3bcfCFqtQRmumRq9KOpg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721246899; c=relaxed/simple; bh=d4BvSrgcy6B1x8UykGR5Y8x9YIxqnUZeOk1c7Ub74b4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=oQpb4TkwdRNiNZe5Hyo6qolSyX5dDA9p9twDQLdXc6DmRRWEYbM12vEKKziBaur5qyFw2uYKXCNiVLwkYkairqRcKZFk1gpn5uplwH0RmTvjjIU52sYxq+ea7pkZXVFUqUNMaA+Cs8y3RPPtg+ZVAudv7GBrLwdSXSb8UTVjyCk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=OlqCdy9t; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Sfmag6f2; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="OlqCdy9t"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Sfmag6f2" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46HK54Y9023261; Wed, 17 Jul 2024 20:08:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=0FDbMHu5kyYedV4+qkYoUE3hPMV5ccTD7+pKpKjplPU=; b= OlqCdy9tdyXgj9G9cpmK/2j+F6G+Dqe6gO06VYJ/eokeKqxMqujBvAp2aMxXY5Zc aF4x9r8XKgpDvlKI37Krj5XJywdEGp6Mmc1nDybUQLuH7jHqjz1NmoZ9m44BBK1Q xjMtXyfBW6nQj3UzeagbN3jGuwRethaT3C2ggRuDYnPm2xBaI9OhG6NvYPGG3r42 YDwWD3JFxQNzr6OYEGudYov3mT4VyErf13BPVuvjHCXmXiO6vkM8g4QbLH5qHpNa 4ocNkDzAZTbKtIYdb3lMd3cjSKMK1jtkhf84Jf13yXjQncPD2KiF2LEXe9hhkp96 Rie4iCw/WDdcLdJj/Emz0w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40emp5008p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:08:03 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46HJ2qIT038872; Wed, 17 Jul 2024 20:08:02 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevgjqa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2024 20:08:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JjylnEV0Aq/gJQsQ/uLvKBLOvCnW/2z99r/BjRExPVVJFasPhF4vfkz6k7q46XniNLZg6BkLFN3TS4W7zxt9HLcMoWNJqMc3f0ZE4H5Anjk5662+XczJ/1mmtilv25Njx99TK5zihOMVJ1DDK9RRXY+2hR1XpK7kLbHe2yX+iXzqa60baXrq4Nuz2S/WSsWBoP/icChnhyWCLX0Ui7dVArxw8InWan/qonIpaBjFeVNIde4gxcIVUxtGNqgxmnNPqZ8exLV44uvBx3+oqybYpx+Q8c4/krXszxr5vI0TcLzNd1z9GI1QxIt5V5KmXY7Vzk5VOSYqX3fzHvYSFNPwmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=0FDbMHu5kyYedV4+qkYoUE3hPMV5ccTD7+pKpKjplPU=; b=QoNwtJnzNk2Bmlp1FnhX/+rqD40mr/g29EWuRRdfJ4/aVOoICPrimdkzPjAR0AgJ0ztCpFRoEAqUoF0I0VbNsSMgDFCr4deLgHVsQBis4dQFnzUStncGBpMEweozT7lS2mhfaiiWTyYMaNVNf/BIDOMoTq42anXSkiDJcuq7SCMkdnuMq6I+Y69T5DElQXc4Z0HCD/50/QZEWE9ULNSbk4pn3n58gddvUjjs8d7VVu/Xa4IkP7J9DhvSMRSUGSIyBNI5g1k9JwvFuD69RN4rCJ68Dcy8AQOkXBPglcgqdNqM7uivYQ6r4CJuZN39wiWqgAefbYDl9f5qcrnlCIVDIA== 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=0FDbMHu5kyYedV4+qkYoUE3hPMV5ccTD7+pKpKjplPU=; b=Sfmag6f2OwxphZhJWrtvY86OimBkICphB/PyHE6BZgpUUZGV2zRfem+/fsK8OndXJ7U2SX59bcEGt+GReoXhdRCAKOf8KoQ22xMfysyoHBx0kClvnC3d8ACTWYH34HK4rZvvzV/sza36W1xRgMLurb8HpJQkRHHvTVgNLFQu7ac= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH7PR10MB7694.namprd10.prod.outlook.com (2603:10b6:510:2e5::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.15; Wed, 17 Jul 2024 20:07:59 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7784.016; Wed, 17 Jul 2024 20:07:59 +0000 From: "Liam R. Howlett" To: linux-mm@kvack.org, Andrew Morton Cc: Suren Baghdasaryan , Vlastimil Babka , Lorenzo Stoakes , Matthew Wilcox , sidhartha.kumar@oracle.com, "Paul E . McKenney" , Bert Karwatzki , Jiri Olsa , linux-kernel@vger.kernel.org, Kees Cook , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v5 21/21] mm/mmap: Drop incorrect comment from vms_gather_munmap_vmas() Date: Wed, 17 Jul 2024 16:07:09 -0400 Message-ID: <20240717200709.1552558-22-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240717200709.1552558-1-Liam.Howlett@oracle.com> References: <20240717200709.1552558-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0058.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::7) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH7PR10MB7694:EE_ X-MS-Office365-Filtering-Correlation-Id: 78fbd985-9b02-436a-37a6-08dca69c27d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mntBeOd/xwEyv98d/LFYJftjVGJrNVbRbk3hbK6Tpw+lB30iXQ7I03I32UZ7?= =?us-ascii?Q?yTxGFbBHG5e8udD2CWskat9ZqQBoacy3zn0ie55GyIbQE1R7FUnra34wJ13g?= =?us-ascii?Q?ZQm+6hErbyc694cQ2UCenUux6CzuOCvhX3xrzDYS+x160GiTnN7hqC/b0Spe?= =?us-ascii?Q?sItE9i5YcYWSQvpYHXE2Hw+H6x/ELbjJwPl0kPpZlXJee3jhF8wV1gU/GVlP?= =?us-ascii?Q?uwPaaRjRQKBe3iBkzsS+8JC+vT72rX1r2VQ1tzSbo0Z5vxhNG5rk58huUlum?= =?us-ascii?Q?3CjxWDTs6mfmN7tu+cgRh601PYo40WYjLToJiFbOQSGys59aVIpVtRCEgisp?= =?us-ascii?Q?PuJzlq+QCcUAshbQo8PuyYUenPKPFOMgWyM1lLRzns5JPBWur3RcB4bZEm49?= =?us-ascii?Q?rw714WcPQVzv3XUrgP3BNAw1SNZ86w7HVD5ASlZ5EcNuANUE2S7kY2DZiiY7?= =?us-ascii?Q?gdc5T431MIvTfX4M1bXubI+d5aT5jIKOqQi7IcvqEEKPYqlZeD1UBoadTaVO?= =?us-ascii?Q?ZAfAODUopYIPiF4EQRKLubUeTQoDI0g9yRi9/scblpjZ/xTUor3I8r4Tsls5?= =?us-ascii?Q?DpN/j3FQ6DIbM7+DBOpQdV0u5sAFxG2w0BpFkLF1k3ALLKE82CLrSxAvgHhK?= =?us-ascii?Q?eV6rPpmh6TyjSmxpyaswCUKE5LOT1v4duzeyS/jUjWRihs3I1vRi5R581WPV?= =?us-ascii?Q?GPriq9Ne99Q39EZdZzoxLXhq/XUM3Td8j4TKxtoEuVUeB5QFHY7O9x6Sf5G+?= =?us-ascii?Q?ogAfOwggb0Yq7fWjLAuUHteOOqVciZF8inB9uGv7isX5JKFsMawSuwsAiiuv?= =?us-ascii?Q?n5o37GtAkPkI6TI8HBr5q+zCaWvvpRH4qdg14JPaAZ3v1k+4f9Ltaptmk3I+?= =?us-ascii?Q?yCxrvZ/4WSM1Dl9+xZKQkUTHLmB9Xng06wHoEuMn5fTZ5MbspfqBgq7Jpk4J?= =?us-ascii?Q?G8DO5JGAM9WWnMRlqE6/V0/Gf3t82/i6dgu9XoBBZXtak3oAzmt5z31Tuuv3?= =?us-ascii?Q?51NVr5iy3IAuMgqRMB+A7cSryqQBe4HZlDaT9ELu+gcI4rFhheZJAvLm3Yl3?= =?us-ascii?Q?3b9g1e0jdzFLqYUell67VJsgjNbqiRJRUDnwE3b5EV1CZAdhwsPNuB/XK9kb?= =?us-ascii?Q?ZMkMeBWNNzxyjqEpeJU530LWEdbtgCPYekNDA+420OjooPKaCyfkMkGnXlRc?= =?us-ascii?Q?84M6qpjHh0R9S/CLQd4GkTejAuVBGCVm/RMx/oBeuLinUNEbsrrg4pZv+gtU?= =?us-ascii?Q?6w2taaLhAv01BeaagaUdhhh64c4AQfSzCuCa7loFgQpHgt5/M1rLhBm+GNuf?= =?us-ascii?Q?Qk6P3Njlb4UX2dw1R/myKXIsmXyBf9jANTeFTBJrSeJQmQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5p6QsE/wDegjQy3eRMU8mF9O+ZdDA/NlRR6LK9pFXaziOr1OBUJCtcd56jp2?= =?us-ascii?Q?qLqle907iTQ93+ZxdVPWnfhhwcl9rRS1aq+lAiyIb98acrKOld+3Xox4+G12?= =?us-ascii?Q?RDhULJV3dNMLXoDzVOQze4XkaGZAUZey4+/i/GObD+CmOgnWeq3nSPaAjzKr?= =?us-ascii?Q?qzFT6PSei/QJmjXk2Uf4pq6ehbHBaERpO2j6C21m/vNXNcflfPil6Y+BtDIe?= =?us-ascii?Q?fc5bIBdQqTM+y+HZ/JlDxySR4lJoLS7KOUatnPrNCnx1HvcRUOkpOjga0+r9?= =?us-ascii?Q?k0airc8SvtkNOWDCaQTf+XG9n9MR542OYEkQTO90dWb4H+kssyhudALdQj6I?= =?us-ascii?Q?lEcLX7x7qylXDDF/pIY/8cMHwIoVe9/PQhh1xXPUasCIhmvg2tKnDxAC478s?= =?us-ascii?Q?WTYzHwfhFHq5JoVCx/PzuL2PykHFBxh+eC29bTONcJEkitth5J/y3OC16SDj?= =?us-ascii?Q?Y150RbUoKBhZcO3y3bv/4L7Znp6KyjXX7h6xRXrzMy+itBQGScsah3MXH5zv?= =?us-ascii?Q?IEdWQoxExj+AZewG+9Ojet3eoGw7cgi70YZ7Vd/1zJg99X5uCIdw34T2CBk8?= =?us-ascii?Q?jn2mISrA6eCV5v7uIJw65FUuJ8pLGMQbAsqR/1qhBiZkShusRWC2JiWVf/ei?= =?us-ascii?Q?CgahwDJ+22++g5hwG0k/HXG+2B3vmlmVTDo8Tz4g6DVBCgpLzgPYdwv+x6eH?= =?us-ascii?Q?NVyOiLdYU4BWsiy6f82E36BQ+m/svcGisESaZZ+9rPIhkNJMf4C4D9YIsbyX?= =?us-ascii?Q?tgtYGwMsia5l8DqXUXsecaDog60zyjYkJyQbNzl8Dtshvwdhwjs+pUDxPlop?= =?us-ascii?Q?bGxLHEaHqx49wGhA2iwjq4Owae2yECKeBNAWVw7m0gNPeyj6L1gXaMxgHHHt?= =?us-ascii?Q?HEGyh14cMKqUDQ0Q//DmML5ZFY6jxAE6mX6kt7846KfJHi7cdOvlciU252Mf?= =?us-ascii?Q?azDingt2lNI4wLSk5Y2eg6/JWtV09duFZsI6ZItYjOohELovabjdlZqxTb04?= =?us-ascii?Q?VSIzOb36RNcYTqI4oUD1/9JvzeSBMsh6uoz7kQ8Y+zlmlB6xZLbBE2aN3xoq?= =?us-ascii?Q?wY2yBCEK6IWB4/9kvy9KV8gj7r9jqocXuxGy/YX7rXJ6Ug1jtmrgX+QdSjhY?= =?us-ascii?Q?rH2S4i8Q2TUuvpvSzRhnFbS4SHUcBPwBV26sz3w9IBZRSrYC7lHNWF576JJO?= =?us-ascii?Q?Oo8TGMynQCYcxtqTWiYeAd4/m1hA4oGog78oyMeGwdoalg3p6Wbv1kvQaMTn?= =?us-ascii?Q?OP2eluJXa3y6GNYP7k5rD1XDeGDecuycYOaF+QCgyXkWAVz5e4g95nCuZmVd?= =?us-ascii?Q?pLyK7arcVbuFQEosXZu9XC2Yvbooi+c+c8P/FPTdh136umGGZfVZY/h7y9sA?= =?us-ascii?Q?2B9RDjMQ1jZf3tbQe+isneudJ0wXdvU/T+QPNquLzaZsXcpPrMWYiMzwHyBK?= =?us-ascii?Q?h8ehaBTCjRC1AfhDKysaEqVdE5D2qwIjK33bT9a+mboIbmapEMFFdBp+7Ju/?= =?us-ascii?Q?unvC+PNRqha04lqR28oqq5znHisU8Qjruq/MfzvOsVABBbma7RwIINV/tEor?= =?us-ascii?Q?pIRwq3W5FzTyoL43BRe2T0bZyaRH54aJmdU4zp6PZiN8cP6beN2IoLi3zXvY?= =?us-ascii?Q?9g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: XEIrVSRb1exaZ6u7PMjfV6CIyDNN3IWe+HIBmmeFIaNv1/xSqajlctMCkyopcUmnH4HgdSDWNVtTkwbcRIwuAVy7z516FPEtbis32xyJqPrz/F9F/bDa2YN6V5ciK/jHJ3TF46+sowwzkjvzfV4SLmJwGuESbqLqSV5SMDw7c/qBKMVgSlGVhJHNK1f+lYSMcTy/klXIbKPebawbpYEw8KfM0EWBhokKVAMeFKiQjYnz5eHOeow9SA0rg331l18NbKnnKnLXrzdfekcnk9UpTq9y+ueIzkVo8K0sWZe2i9VRzRJLBGS8K5Ke4qEkdPu7B5Wg8w7PK5TZgnO45Ja5EkVGHBQkhSwWnbySnD/7t2QNi9DGXamS7P5xgz6i5ez2DG/OK/uYU+DYbiNJZink++dRM4rm+NZZW59z6uGto7dFHJzq5nV/Bt7NBXFG+vkCQu+XnKuNkcuUlAfTJIjEDj2+zkWcgsDEFPrXKwPNWOJffSCVb3LgR/YpOOvqQUKk3gDCFi8VxRFUZOMVA4QbrY/l7ejxdMIPPXBOBfxigkRTcfxIS3Zk+l+l0z4IcYOwkJjMKJvpce+zYZTU0HsTEkN+oTt1yESPL1f1Ykoo4vI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 78fbd985-9b02-436a-37a6-08dca69c27d6 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jul 2024 20:07:59.4778 (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: RU/k7UtLDrodjU3TJCoxNhJ9k9IC/hcVejq8mTrfAQ8sbmSa7Ylo8h/lWSiTeQ43Zh077JSfE8rAawPhjGHdzg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7694 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-17_15,2024-07-17_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407170152 X-Proofpoint-GUID: AwpC33ZR5xbBRPdPCldc6582dugGfPRZ X-Proofpoint-ORIG-GUID: AwpC33ZR5xbBRPdPCldc6582dugGfPRZ Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" The comment has been outdated since 6b73cff239e52 ("mm: change munmap splitting order and move_vma()"). The move_vma() was altered to fix the fragile state of the accounting since then. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 5e74f5cb7be4..fa726116346d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2703,13 +2703,8 @@ static int vms_gather_munmap_vmas(struct vma_munmap_= struct *vms, =20 /* * If we need to split any vma, do it now to save pain later. - * - * Note: mremap's move_vma VM_ACCOUNT handling assumes a partially - * unmapped vm_area_struct will remain in use: so lower split_vma - * places tmp vma above, and higher split_vma places tmp vma below. + * Does it split the first one? */ - - /* Does it split the first one? */ if (vms->start > vms->vma->vm_start) { =20 /* --=20 2.43.0