From nobody Wed Dec 17 02:55:17 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 8C81F139D1E for ; Fri, 30 Aug 2024 04:01:27 +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=1724990489; cv=fail; b=tkFwRMsQzUpgFIIyBLegQRNePzkpOb38z8tcc4dhZlDkoETk1yY8iQw/U1fXiPEZTYOwtxda9om7hfuJ37+SQIRGr4yrSeD5L0270Qmcgu7PMxXkSdiS4csbYTfyteQB8wHrd5hGBmrIljKyD8nYNOF9z8z7hsoQOi2r316fPbo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990489; c=relaxed/simple; bh=BqQz40OqzPtGsqK+chLoMHo9IBeOINIsNRURO7HunHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=smtzhgahNQ1Yl952WbNf2e7ZYWQByuVljsTwVpuus1DsVtjxPtP62i9GVW/lht5OQaaq0ovqSxN28hUsf3bA/ZoE8tDdfLos5nCTuGlyPlohRE+Egg1KQPgOJ2fMpJrT2Rc+8jkirlgCO4t+hUqLAIk44BoKed5D3/YdCEgaghg= 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=SzoZ56Te; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=doMnEIvS; 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="SzoZ56Te"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="doMnEIvS" 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 47U2fnwk000993; Fri, 30 Aug 2024 04:01:11 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=+SgEZNii7vamI+Wr52WRA094htKGd868kPJiAHCbwa0=; b= SzoZ56TeDcjmyiefwjGSMryqu7MQErLbMdsOW8GzGZwOX4bDtMNhxqyyUtGFZBQ6 C8Lg1HHOuhEbesQMRsKSOAUTwrz067Rjgtj3q8rOZz51lO2T77WAJh72QP9hy4nV zHvLr5OQheNlfNspNi3ueDgxkkgQDD0ibd+1dCjOZQHVeVrpHsOo6IPSwE4FNmv6 o7wdVvvXmholE5B0WJiyfnYMf+kK3SOVSDS24BGkC0wYTd187KtD610QBfY7CazK YmKw+FMdVZEUZ5fOd5vMZ9zzkLgg/WkdiLtgXzSUromS1Q9u39fm7ntBiPRIJ1tW B66iuhZdTX5aI0dn7zlwJw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41ax0grrgv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:10 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U2Cu6V034855; Fri, 30 Aug 2024 04:01:09 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4189swukex-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wXhVpMwjWbONTYNn6T3Mau0KxOUK2fXthg4FHwxbDK9AH5GKfy4RC1JzSDHhmiGiLpXZUG5q3xHGNVkTxjjSGglvIDE584SHCdTvlZOduh7wIC25P44yE+z8vtuTxLypDrblDlmDATfgT+F/MkXsd1rXqO7Z7V4wE6YxNky3RolUc7JhpoF0phzcqzoANlwAjpR+PGXzhkNEQZhJdFTQp/9KHtiL/9MD/ksXBgVfHcnrT0i2PhvqbpBAWXzuRRS8a5Z4El3apXjoWWv5Atd5Jkkli5mSLxDNu3jPhIN8FreEjcG0CI1O8DJGn7vehSRu0oTnv7t8xzrGmuHYS4qBMw== 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=+SgEZNii7vamI+Wr52WRA094htKGd868kPJiAHCbwa0=; b=CuS9pIJDhGy3ddwvsPR1KPxdGhsUjYkMZ7kFWctJDhp6V70nT0IhhauLkW2Mu4AE45M/UE+lzu73nNZom2fvs+vTQ2BTSFch5vOjtPSXQf00HDo16eNgKLD87cixL18QnWizUbmFVEr3A61snDiZklOVWoAANweLsetat5ZJ5EfpRH/Y9/wZxX2WTqrAxYlczA7FbJnhNgXFacgj4RqUaSDmW+ux395AZY384mAx9czHyBweq7mtzxr6BtgPeYHk8aVvAYB5PEoqqzWN9grKhUtpH/Ehs2/TiM46DlGBrNaN9+AdI4pOmWrKLNPcUa+zYu4wXMSYu9SA5pAuSaQACg== 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=+SgEZNii7vamI+Wr52WRA094htKGd868kPJiAHCbwa0=; b=doMnEIvSHBC3dkgZa1CTq7gC2Etx6A2SKNHDGCyDIer7hyLaCd8aKX8ipNZ0PGTW1SvLACnZCDm1QMt/6aT7Y2t9up6olBQcAUADyf3u2ixmWgQwWA3LAyoqpSMafM8rt+2HlJt+GDAXkS+8k/rPEBZ6THP2ZaUqgk1El3P623E= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:07 +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.7918.019; Fri, 30 Aug 2024 04:01:07 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v8 01/21] mm/vma: Correctly position vma_iterator in __split_vma() Date: Fri, 30 Aug 2024 00:00:41 -0400 Message-ID: <20240830040101.822209-2-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0427.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10b::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 4599cd62-f987-48aa-1bbb-08dcc8a86068 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?cdi1d+3b2GiFa+Aki9HeSVO4uJSmuhVIduatZgXJ+ed74BQeOkLwPS4guWaQ?= =?us-ascii?Q?S1vR412SAIDz7YAz/lZKHmHKIwHc24yG2bEd357pDe1IFb4JuCpWk6OCIXHb?= =?us-ascii?Q?7sG/YOlAsOiQipXbJB0q5ga0an0YanQSpOx/paqoE0grDGQr+I+XPQceMjZZ?= =?us-ascii?Q?kSTICLf7TDQxg/hYGSA8f3tmKpYBpxt2XWJja4Uy0zBj+CUqkUyKXernSoI9?= =?us-ascii?Q?GwkF13UVy87mODr1g5rAhE1Y235mAGqOzKZ/4DGjm2daoDQu/+jGW31kSxR9?= =?us-ascii?Q?85lJGOU7m99huiOX/GW0WnDA+MsLlMYkdLd+LqJRn6ePi0HUIs9LK17A0Idd?= =?us-ascii?Q?IQgxcR+pPZO4TLWjccnINIRYpABmquPWDWdWHwDjfzDOqdTJsXlPXF5/3EBv?= =?us-ascii?Q?L7WEmo7C2TTVaTfk6OUMq3SP2Kd9G/B4xIC4wVaj92uO48CPJVwD3eVLNILL?= =?us-ascii?Q?1t/O3JdxHP2oiAXkuZPHlWyYeHbrZLYLLQqDnIIdacazevW8Zu7D8CeSjxxR?= =?us-ascii?Q?MRhoSJjgctXY/jww9eIfRCE3ryep36fgf8P+yjO2LUS7xF4C7O84YKm+/+sX?= =?us-ascii?Q?+aW7YmEjIiPWNc85qFow+g+c6+irt20rYkAKSAZQLQa7PEbUOb4o97AdXrbQ?= =?us-ascii?Q?hLAGHJ1ii2l0S00vjSQzfLTuuYYjesYhk8dzpj4FG1ueo+3WjbOhlqEVYTWW?= =?us-ascii?Q?DWMuvBno+S+hoJ9A/J+llB5ANJRQnDCr5/5lASIf9k+DkbJ9qFGA9ontHZFI?= =?us-ascii?Q?HyiPmACj6g6YwkXjqAvcxxjT3KfkrK+5ZyEsutdQikLTjQ8Rro16ekaTrUFS?= =?us-ascii?Q?N+VpEcAHpcBwebaGKIPrMT1W5OuAj8g/NEg7eC68Fv+gTspaqR5p1Vmewfqi?= =?us-ascii?Q?3LFjUGhsnGXYhfWkscKmFMu2KQTIbnJXUvPTc+F1m5IyXBWl/ahKggZk/fVL?= =?us-ascii?Q?UJYDk+FzksqrmRRvRwrnYQ8uLKvI46Hp92P+RCJwWXNQeQz0ves3m4JbjFgE?= =?us-ascii?Q?sEkL/NME2c0PE9D+UX/eMHhgtVjOR7FHnwf+ws3EEUAvYW3xjnB+qp9r7h2u?= =?us-ascii?Q?F1P2/OiRNzM3DH6N3sy1DaNxYQE2UbmhZqe2KCQsXJK/SnyfQ6vhkXdsTSi4?= =?us-ascii?Q?w5WlgHcueHqc7fD3xA6zn6rGHQmrsPX266R6MQQzxXMBarRsPUadvXhakFjF?= =?us-ascii?Q?fSKoZ/aKn+2aN1GIYe5PVPBoGgJ5WcywGhT/tPt19Sy2n6DLFA0qqo0jXRXO?= =?us-ascii?Q?8kqsPtuo4neiYuGilszUTmCHwEzDhXHAPLfgV5VOBIhgKlpGZ3ThAWIekrcf?= =?us-ascii?Q?tkJCR2AyhwmMnuC/jDIMAZOGT/Wv+mofeXKJI0do3hiwCg=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?Z4q4is07N4vxl+rj/O5sIbPPGcuI6Yvk2wjrfV5CQO6wCw8j9ENEswoLrgkf?= =?us-ascii?Q?IbThVbKnVBMOg9NpTCCL2yEOaaMxcmw6mMdg7y1CrfLiYw2hkScqFgLCj0Oq?= =?us-ascii?Q?f4alvbo90q8TS8u/oV1skZjLJti+TZ+HGVJyF0hjmndX0KKmlgYVWIJyMcSR?= =?us-ascii?Q?TEAj3zK5n52e1bUndrLd2D15Eowk9fb3x/zT0JUrvLUmnFr4USLxHpO3GhrX?= =?us-ascii?Q?v0t0PxYSqFYdMQGZFM9Kd8MoXbW5iENCk3s4i/gvkz7fH4KyhUGT6+rh7mul?= =?us-ascii?Q?hAX56tyiCcB9zjrscXlubQn7D/3iy+dle5OiIojh13r77vhm5hcvLblThiju?= =?us-ascii?Q?LJ985uCDKVj20mpQvKUh5rOH0ahIxBkmzV50ljnFhv2loGsgaAfbp39XLYL7?= =?us-ascii?Q?uXNJIzp42NpsW3VAURjRsnNhWeezXHhpz9t5vB33cdxbS3OCP4zsiMWUbXIQ?= =?us-ascii?Q?twen7THFG/fIgDl1ptCqL8/IMpyvdyFGgUi4jSO5h/FHbTy/sXXHWeQsUcC5?= =?us-ascii?Q?1UakBpCnrYy9alRguaYk0frcnEJt+a35u9Bw6us8NnbbRstPI7a06TqBGnRA?= =?us-ascii?Q?QB7bEC47VteJY5JO3q5wAHseKU1WArlnNUXS+yzST5pjlQGojXZ0rrDk12SR?= =?us-ascii?Q?RmrTxxaYL9PIDtcTUYpMTRzDAl5jUw7vSOj1bfpdSJ2hAygsxeKbUffHrdH2?= =?us-ascii?Q?OkIAF+N70FMyFeQlXASwxxNy6Xtvcpn95B8cUpCMwYtKkRgCeInuvZp8QnI7?= =?us-ascii?Q?Cu5I4lzwzEuV4ZjuU//ecv6OmV9lV/EJBHm8+IkV3WqbmaxPbI2mzFhR64Ps?= =?us-ascii?Q?HDJiifTdlzTjbeLfqYOazvKnPdepswvE3SoFeLFKbGqSqqJp1/oWDr75zwSN?= =?us-ascii?Q?uzAb5hot9zN0BqXhnmTq8FpsJythB43LUXcFhk6mTNhiIog9eKf2ILfnRC4v?= =?us-ascii?Q?jdOzvETrxEYxP1sYtxvsuxnIOrNfd6eJ1z/U8SinEWlIu6RXJudYVwgRREbX?= =?us-ascii?Q?nZH4Ndiv6nAzGpDRWtECKiPRscFUVPE/Czo7jv1zxjFpOIhFo+pky0lUD5pY?= =?us-ascii?Q?5at9GHckssLjXH+XekueK757sVKnk+GGrYxUToGzAe2BsGIHzcucLKPWMcQI?= =?us-ascii?Q?2QSXV0OxRE+WQsgnSpu9SUgaN5zoFX3Ylmk/XDyWa1zFAw/LtsV8/wogWcZf?= =?us-ascii?Q?BFX/ZO+mr2+MG4nYf9+pLNVGXo8YOJ/lYX12QievQMy1dEIw9/JKOlufCgir?= =?us-ascii?Q?zBfIwrRuO+drjmFCUdqwWkZCVW98myU4yMbQURHyzDP1oBb/7rRMeFsaar+i?= =?us-ascii?Q?ZWYHXvvoNKlO9oDyUdPxYHzNmVQ0DN1xrJy19YiBY9aPgqb7x6g47LMfNbI1?= =?us-ascii?Q?KvQx4ZGOb9eI0U4fWCW+OzMcIkDhCHvfKIV4qF1uUKbIqsvaItGW+IvrNNdl?= =?us-ascii?Q?Z2arKoKrhVSSySahvmydQQnZzOJsU84KdQ8cJ2xG3VccG0C82R5SnJYYTs3S?= =?us-ascii?Q?3Zz+8opslK4UnLMAMJkh580vlcqx7jF/yzihjvfB98pdGzmQh0NzV3LHdVM7?= =?us-ascii?Q?am1mzfjqQUr9u4sLHa2h62oKtHVlzlmTbNBx6Guz?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gR7uJof7Mk6dSMRPBvRJkABPXZULKGV0eSXf0Yd+LOniw9/sFOjtJQX9okDQyTtjHfK8eD6UUnhH4irHg31M3zvExs9+DWz3nTceghRxhM2AorYmmoJGBM4ARScmheT+1MG3PXawuHjNqEPK5eDycgPNch7H0tubUMtILhpGQwZYVInbkw2dRxpCeKaHQmeYRw57lWno/qNsnzQUkm/FNjw5wk7Vus/rXaP9t8gBZI8dmBM956m/PjUKAyZdNHPCMS1Q2lOUDTY+AGvD3YKIwHaRI2h8CVX4SJtXWhUJk7ddyANF9zG4TuSkNUFhMkUi+q7o8GUzbehT99Ag6P5LO0qm/B8zdhm0/qgHpG5cKMAA3BLH0oqJYl9xFR+kLiC+b9fVvcOMGKp5RPH12LiJm1RggAjLhbdUWLwrl/khyBU1dL0nGNm+89T3GQLuU/S5UDhE7D2YqWKv5Zfc8VGuEKCFBHCMGunaTgSHRdXRD5GfFD2JZga+Uj8gcXMMRFAm2hp3no/0BWD5sN1O3cG0335bNAUKSQyjGlhlcI9u0OzlyZM5QU79OTnrVH7oSMlQzi6WogLssGCJoDditDTkGH9BKQ/FLgY+XIvaJbUhk8I= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4599cd62-f987-48aa-1bbb-08dcc8a86068 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:07.8549 (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: z1dUxOCqWeCZHSUwaV/lazS62WN6f1kfK6QFwEZuoxKShqxuyKjDu8vl1ho5OhtYYrkPjSfocLxgx7ZtTE/O/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 10gfR9VdhwdVEU9Jc4MIXMsiPYNdQyJY X-Proofpoint-ORIG-GUID: 10gfR9VdhwdVEU9Jc4MIXMsiPYNdQyJY Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/vma.c b/mm/vma.c index 5850f7c0949b..066de79b7b73 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -177,7 +177,7 @@ 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) @@ -246,6 +246,9 @@ static int __split_vma(struct vma_iterator *vmi, struct= 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 Wed Dec 17 02:55:17 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 42D7C13E022 for ; Fri, 30 Aug 2024 04:01:27 +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=1724990490; cv=fail; b=qRr3ANx2KFYo3SULBFqJZCo4pEzLFT8VZqMeqQ2RPwfXcLnTdMukivGEAH3zQ2tejLH3ZZRuJCVtG51ujk6MS5qIWQ6K8ePFUrTgKZQHIZH1Jso8CJ2PzJHQBpNhttXbzR0lYjEeae9LY7kdpd4POVRGX8VsgsyRno5VNUfVUdg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990490; c=relaxed/simple; bh=VOUDrA/3pOEobvQHsjhY4Mw0X+i5TXp10gtl99DoZVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=DnRMy4XHqUPXUu/I0APPY6v+347v+fqt5k5/Y7B5Z5tCGZujmFGarz4f9sbVMFm2j0al52BQBE/G5/82kwxmIOsOkLNccGmwqkmrHcvnMnr1qq8l4+QOfp5AkTCm3/V1lo4EUe8R+LG5qMAJVq8uhhRzc054V0fu7PUwOX2Vzlk= 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=eC9zapJv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=OIwSSGNT; 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="eC9zapJv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="OIwSSGNT" 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 47U2fiFW001321; Fri, 30 Aug 2024 04:01:13 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=WZRaFvqKhmeZGOgIn0cNM+Fo1hKAtKZhH+jC5oCYViw=; b= eC9zapJvxyW3cugG2HVSrnuBJ6J5m68xK8kCdiDrbfV1hohw4vMmlLNkYaSMXCuG gyHj4ilkSr7fLDLKng16e27hCSSDBXw3c+fvxZJr+4y1hUqsu42TbvpXDP8Rx2qd KhSGCG3WqDzIpY/kui4fpFevlcMorojgPjBI0QlZWzM7ijl+yC5orvFmYHeMlnz5 3XiX+6cP+53cW8KHZS8oYjrL9wgI2N9PoepiXXMjrTMNMHELCX30AFLpqeEjVCGp ia177EqKs4/ckE92XMCHlcB4D9ivmqlUPraLQqu8l6S8MREkiJhTya6Vr4x4nrOl fP5UKA51w1U00s+l0VgGhA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b25qg882-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:13 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U0URNe032483; Fri, 30 Aug 2024 04:01:13 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2175.outbound.protection.outlook.com [104.47.56.175]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 418a0xj8a0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xFnQqHYNEiXLZ+XpXpRWAa4icArX9Y7CDlrIgiLC70cL8siW+JwQPzAvUslgxLtXHfW3/M/4LUvULEdB0uaqP5UI7kp8JLaPTKUj81PyObrMghmxMMG9UCxK4hFHsjlqUcZqHvuVAkhDCMD81S0zumfLfRpA3PgRHKpXPrSYw/vhFgNxvtS1b2HAmp4DSqhrxZp3jCGONlXzVraNln+s5Ci755pvAIi6raTUqTGBx+fYWuWxi8wdBT1pR21KPCrZ0SzYIgYF1dsabYGX4PCqOIqvAP3VunvFiZSknbIdXVe4vAQ/1JXyaEGhLHp2rWwtiqP+f/C61GULc9+QgVXGRg== 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=WZRaFvqKhmeZGOgIn0cNM+Fo1hKAtKZhH+jC5oCYViw=; b=O/2bRHgXXdT7Y747TvCV5GpUh2FYnZa0t2yl3lipRDdvlGd6Wkx/drC2XJpVpOGTg8RHoP0RmJz54qsPBIzNXhy7mCda9Gr3MEYbF6kSTr8joVOM973v5yCQ7/eH5eiXJALNEO6xZoaq6/lMTIqa1E9nGl+7U1ezQGng/ZDFiyadJ4KQqx4PunD62yvhyJiGXerxpjgTv9gMQAEqh5uC24Bpkjx9GLe/0T7ya1iT3ky9blJRoI/sytIHxeSB6lemwThIu0D6rUBzSPnCvf1rTXRXb54pCHcbYRMphJUp6ltnpOL1ESiyJjuK5WAO4Gu2KiFCv932vypWy4ghnyBR+Q== 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=WZRaFvqKhmeZGOgIn0cNM+Fo1hKAtKZhH+jC5oCYViw=; b=OIwSSGNTN8NtAmSI/XdH4HeUbYJe9By5V64xPS3Ixx3EXCOGucJ00QsIBnDmrFN9LE/P5FhAFsvn/3Q8nD/lpZQ73Vg+xodc9EynkWs0x3uP9u9oMh7rKPqzV4GYAXpRXd9PjwiLh66QuftRjAeNHd8qAw1C/Bepc3kPUsLL/X4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:10 +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.7918.019; Fri, 30 Aug 2024 04:01:10 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 02/21] mm/vma: Introduce abort_munmap_vmas() Date: Fri, 30 Aug 2024 00:00:42 -0400 Message-ID: <20240830040101.822209-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0057.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:111::13) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 5906c6d6-d9c7-490f-cad7-08dcc8a861a9 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?pSBls0z6fsGqUQzyVkFUnFpiFrIEgb+l1SmFKMP+vxuV7K679DBrlmcRBYbT?= =?us-ascii?Q?StnzlKm1MI3P+wxX3gcCapZIG7TBrlshAQIyvJz0EAkoyL8VUCo7zwU6EpbN?= =?us-ascii?Q?KSkdSTjSg8zgd+yK6Fqf/WK8BG4tDF0Hkp2dKWXyH5pZUTPYr5yPDPCHxamO?= =?us-ascii?Q?3NIHLA2XySuo0P8EH/F3laib3Miw5fVoFacOjE9BEnvkRJHQ+rea9dm7xKDJ?= =?us-ascii?Q?snDC75NurIEYNdu3IcsEsUIzk/S+AxYOPVWrS5UM24AKFnYO5dNRXSTI4qRO?= =?us-ascii?Q?zLPAujlxla7KD4e3cPRtVvvR8M2O+Zg3hDDHkFlC+RTu13IKbdcyd+u9HXOM?= =?us-ascii?Q?RTFn4AxaRzsP037VtJYbvzB0fQbdWKK04+KKSfiirL7kl4/VJhw1zXk90InD?= =?us-ascii?Q?H5jr74JgZr0jzwH8N1sCJ1wSZa/53kWBDgM67XqzQLGoKp0upff7fis1Hk5V?= =?us-ascii?Q?NzHUJAihqMDdU5HW8nAowuh+iIj4DxBppgWT5o/1Oq6AMwW25gP7cpUolkpd?= =?us-ascii?Q?qI1E+Sq2/yVeExiOxr06bzEokGU0FmEp8KXVZrSrHM3XtiJya2Pq0ysOe4Gx?= =?us-ascii?Q?Trxsgk6VIJIPTERqqiG9Q7Pm8gkNIQ3GI8FFMwi6R//auGhY50MwUGkGCN73?= =?us-ascii?Q?rhKctmVGkdSfW56Ah5fZ3SNd11TQNu9ubYLzetV1dYaFoMnzvYK6iNF1F92r?= =?us-ascii?Q?7I8KgRPcu4KPo4i9BIthV49lrsUXU5Ol9zkM4JUijjIbdlSYSUCCSA2KLTfC?= =?us-ascii?Q?dwqUAAExGvy/J5y8roTSXfuCHx38dNJ/3DPEcne5KKhlFJ5o2j08Gb7QOdeL?= =?us-ascii?Q?7pUK8B4niaz/9lCADaDoHuNc+K0YYrKr2Q9F025lM9UXawmaA4jTh9J1yuj6?= =?us-ascii?Q?LoQMzfw+XJ4aa+lFl1l5rK38KfPhN2Hg8FbzV4AfZCIklbpfSMLcEEHueAeI?= =?us-ascii?Q?EdLzIwXICFEq0dbRGzy6LVkCQQI1k6lDa79tfWz8dsCGRyxCX0v5yZTDOCH4?= =?us-ascii?Q?NdkL/DjbOSnPZ9MQWoVf9NR52xeCc8y35f5nMKxQSVdu+Tfbn5+M5YgxU3eN?= =?us-ascii?Q?mV77vJAr27jpKcCTK2AP60Fi2ZZU2xY2TVUBWZon1fYifHFZgmHjUNo5fOPm?= =?us-ascii?Q?MTTWFPRMZOYXlH5gH7B9XuD8Hgme4d/kMvUXtD8qXDwKWerZP+Y+Ggfjvxoe?= =?us-ascii?Q?NOY6VyCf9xBsiHsF6jh4rj/VwTqlYUulsEWDJ+UwTYBmXeyxbGHwlka1cZ3g?= =?us-ascii?Q?vsA20sbdrTMLu1NnEhuB6KJomJqZnGIz3MercGiZLgE4eL8zeiMkItNKVj45?= =?us-ascii?Q?Xw1MIt1Xo5ZylyjxlTkIRzQ78SSl9F55H4OVi8SMRDglnw=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?J0yCsSBYJfGuPp5iE2ASZdEsEfVSUvPo70gzw7JTvGiBuL2unqdHok7cSCuk?= =?us-ascii?Q?VKTQLYBDbWlmPJDwL/FZcMkeuL2GUvXAOrNkx+AeGSvvHX1JYqiyLapmYkpV?= =?us-ascii?Q?mFa/NbTFzABcI0EMzKkGyf6/Y7tcueieENhUfqsnHiV8/ZSWmqn1CnB66qsA?= =?us-ascii?Q?TD4mfjDUps9K07jbbIUvVqYgjQ/5ajGgEl8btQUmdwXVpclesoBBFWAUypDZ?= =?us-ascii?Q?juvGuRVdaIv9Rjxhs1sWT5sVw5AijEH9wbxj0oKMhTuKAkqe471m4zeQAvY+?= =?us-ascii?Q?9rfEiz/prJwlKtAzb9AlOJKXNK+t/Y+CD9/5esaGrHcUPCnVxB3V1xOBI4k4?= =?us-ascii?Q?5X/wNlGfdXV1EPHVW89upS3eWFp8p4DPPdNvJhYAXrrj5WetrpUU5N2M6vX9?= =?us-ascii?Q?liOBhi0acTqYtu7mSl24RgLmOiAYvyIfdk/7akDRzniUnQ7Mn3+43xgFXNun?= =?us-ascii?Q?3xTonet66AA6DYUYRslMeHsxHghFn6xH57nAYNvctuAeSu1cA098HcBU030T?= =?us-ascii?Q?RidVYvGxi+Ko+xaXxcBg5+3o5UKPuR/cpf+HTphSSYZi7m6h6gHwzrGuIKhX?= =?us-ascii?Q?yWfycYrYMAKBtUrUP6ZCTOXpB0rmh7r2d5BxohWGD11OGb1IHjgDb3IaFTdw?= =?us-ascii?Q?0LkLm5yXkheFIx9Clo8tNKVc80PAkXLTBo83aoyH8pkcipdKD4Jku3i0luaP?= =?us-ascii?Q?YniougzR8iRa5XmfzKRkPlUxPe03DAJ4BfSdWPAoHEKrYVZCknEFtXCxy/ah?= =?us-ascii?Q?jmAgpFYcBzbCG2Lo69JEakFWAuvs1bzhGHBKOMyjXAkZYm51HgMC5sdgLEUN?= =?us-ascii?Q?BM0/x8fCUCRo/NQoMckeJD+zgpm6Yf2FdJHDA69qJYDdf7gfOt+ytt6XCK5W?= =?us-ascii?Q?pgnfGfG3h5tiVPOvvw42uKkUpcH4RZxh71p3z1bgq0sKClZIQvxkkPEkRtcH?= =?us-ascii?Q?iYTNf9/C5OMerpHVqy51SDDl89hMEaDxumlNH0cBSZjS6HH6WiDZ8wvE6GfP?= =?us-ascii?Q?+AvurYDwpnPf17XHhw3IZlfopiz6VkW0te9bblQ7d5wEo91YAWBRudFq/rFP?= =?us-ascii?Q?uAdx6G5Zc1HkI0hE/fDkzH+YEn7hZKtFkvnA2pqG9ud2QSy1wNJq6OMN7d51?= =?us-ascii?Q?zwTGYxE8awgSc0UtgeURtsj9wfGCUH3rAQAX6bQQ2i73plmTwuk1pm6N3Tqr?= =?us-ascii?Q?3NBcEvq6iTRU+5dcHoaF2IK09mzXxx1FQTcTnjYA8QfOZho7cRb3FHfwM0Ve?= =?us-ascii?Q?KCz/AZhbXiqeZyRsbnWkD2eONeWhoXYnPMVBKmhiPAqikpKAcleQPSPxfKps?= =?us-ascii?Q?EumtoqfgImfxXjjoUXIuH1gbvSfqBtv6kxVDuAqYDQCX8GymRCexuGlYJSht?= =?us-ascii?Q?9W+8fHu1bqUVvOUU35fvlMmQ5JO5w/3TvdXvisb4CKDMfc6IZn0Q7Q7Nt5Ov?= =?us-ascii?Q?AduzANvMEGhB/Izhi09uRKjrSgen3ZqIafkf+EZhK4st25Jw5POfawDiOxZd?= =?us-ascii?Q?bYdxMly71E4szGzR8fGNh896RaxNHZmbm4kcjqibI/qYOz0zoEWAfYpch0Tq?= =?us-ascii?Q?n7L7Ax786wd9VjnYNe5mcvvEQC/9HhCDTRsZAyND?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ez4DOe9DlIf4igwCLTDkxB9OGUcTimFVqt0aoZ3AW8DhUpjZaqv7uFRUNpkmoDutUqYrl3G9dfMvxTbJNAw9s9RJiXyOKOqh9Lj32LK3ot0xx4bJh7YxE8aCsb/kpwZPKqDayPH8FdF2b7eXehg9mubi0RQA0DhJ1Wbwq0S8tFo1KSvrSOK/Yz2E2nqW+MtlbtpCJev+TsKpjVv12RXV4Y3ohfZu+vI+7Qmqe29clIHQMgWdoDKkliiwZaA/YIDVPoCpp+0a17rqHSWTrmDPi5gFClzo6Jgc0CR/mrAnyZ9ZiZ8l64Vvp2ZWALiJgQ2TRRxBhjaqf2c+6+EEPVt4e/B1WUBDKwE2uNsOSRmUeGT/icKZgltXbLqY5cI0MMv3uF2ZbOI9yZw2iMvXCbE4krN+qLjAnh3nAu4rgoNp2W3cojjEpg0AIwrivaghvPYL34E9oHCPNBj0+ZdWQUQ0FI5Ns2XPiNrm1ChCZsMp0znrZNdcHVHg5p7EO6c6lULt+ODyRpcU+UhES/VsWU1SfOuiwcHbODXfKv/vtjgDBT6Vzn+tWE3ZP4irhboI55W8uR4sr3urM8IYGWV+gqlZ7soQ+RBlID0A1LuLY/Xorvs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5906c6d6-d9c7-490f-cad7-08dcc8a861a9 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:09.9452 (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: KF2yrXvr+qwy8QC0lm/7KWQv58v43QT0K6MmHMERigokz3rLx2+ProXNKZdwh9j50iGLiLrG0T7sNQapS7mllw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 08MpBUmu_sHQCXsvpvdvRka9Xf9--INf X-Proofpoint-ORIG-GUID: 08MpBUmu_sHQCXsvpvdvRka9Xf9--INf Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 066de79b7b73..58ecd447670d 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -668,6 +668,22 @@ void vma_complete(struct vma_prepare *vp, validate_mm(mm); } =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 @@ -834,11 +850,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct v= m_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 Wed Dec 17 02:55:17 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 5D79B13777E for ; Fri, 30 Aug 2024 04:01:26 +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=1724990489; cv=fail; b=S0TkpMCGxF+SEyNdk0+TaHz5j7iw3fp+voY6XeCMfgqZNt5bEqBfqfT7LlRv0UBvC5Di+TdAF+Y1079FvyGe48iqlTL3k2YKRSzLBSxXNCAPesvp0W2h7YDsHyCpl7KK5DCfAtrtauqOCimh7zprxV7OVWkGllAo0BwjUetTLDc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990489; c=relaxed/simple; bh=4BoDbH+8BYl2x5PGXsKrkv0NY/DVKc5EY8nphVnMq0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=E7VfuCpGklKCR2WCDp9QzMU7I2blIm1psGPqn9upOQkY6cKZYobSy5dKcz+G99aAxDg1+76Ozjfe3RR7bmnl5GbxigfyEQ+9F6h14dNGkbbR/f0epQyekZ0pMhpSKqvOzu8VgrLq+pdKJE8hEEIG4BVnw3VM/POmHRUqdDyUF78= 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=AQjmBPQX; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=gfJWNYqg; 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="AQjmBPQX"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="gfJWNYqg" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47U2uL9G019681; Fri, 30 Aug 2024 04:01:16 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=INR2A1cBDUV4GAxtVOjXNUJPR3TPHjuX5sIyohpW8AI=; b= AQjmBPQXpnbQBV8qZSKKb0F5gMq3c3RqIDjJuUwJtY9Jc8zWSqzrzmgq60sFkqUv DQTiyZoKTdg0tFsxWKxKG1jeWB6PKxAqtLxyvJmn8JGrG83S84WHEKtug+ogL0e5 CiCck/4YSwP7LiSU7eTiSiSv85xTB4309rkWQnp+IOmvV7HFArKACEpPldO9biol SVoqpv/dEDdtirhJRKTBFhzpBqk2ixUz/hf2DiRL4pimvBa4T8JPU4QB7QUJuAjU /TnvdfRC220S9zFeFxR2P+99ID23aE+A/c7RCM3aTFDtkZqqAtRQJ6StC5bhjGBk VdoIfsx50c2Om0JRBt4pTA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 419pugwrf5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:16 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U1ZDJw031876; Fri, 30 Aug 2024 04:01:15 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2170.outbound.protection.outlook.com [104.47.56.170]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 418a0xj8bb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UIRIU8OIhCVS0o0GBPg60MfNCgmHafjhradbjClNoYTajyHVMTBz6vBgNtUzwroEDIuTPwrQ0jqvIdMlYwz2OifX4wbBhb8M0e05Isipm3cewdhhq7rU2q+5RIlpYS0bEKxx98FGrLWpJ+bawea1oVhKYNS+yxQYzgnHtPLRQafT/3A4StBR26Bjd6s7oI0wMMIcUPKP4DnIcd3bYT20AGZEqWIeqTP40LM+NIw+HGRx+m/NeBkyIpHGL4aju+CN00K8gClzfZ7/kG2hGRAQhRvmcACvm8Uc/34zz2VQvrrUh1vQh1wnpcgLmFABz8nA3KA7QJUSzs7OOomcnhXQqw== 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=INR2A1cBDUV4GAxtVOjXNUJPR3TPHjuX5sIyohpW8AI=; b=Kh+2W91I2zNTpdZeBi1cLszIzjGh9TEA83LWPtzDEbBlxWZBPb2vkDYNAOiF3cl6x3RUgr+fn58ZmZ2DeDkVa10loKQrEkKlkvhi3ok8gcqG/G9e6h2hzj4aKnaS9yJ7M8xnXc1xLWCcDedbu0FD9sAoJBhPRjCNVIRDv3oM3tfJnAZkur2+Q28Q8r5RGNfL2YnybC3TxgEdcmrJ3gqtluS0AYTk+kssz/6Q0C70vA85qLChbmYzbX2Zdx2zjyMrGo3SY5jTQntZ0WbvxXUVElKSAJc5Ez/cdox7cPu21junPPeF4NwgigM7xalqvMmMIpmGj8f2mjkPrnETK5CCaw== 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=INR2A1cBDUV4GAxtVOjXNUJPR3TPHjuX5sIyohpW8AI=; b=gfJWNYqgpZwI0YzjigOrS2fW1nelLWVbRxvSTeZKsQDpB1P+jelRsjswo1/WOeCEpUpR80ay50z/ClXrWcMLOkGu5S08BR9O0Z0yi/PXHe2t7AnyDQnozbGCGZ9KeM1q2OU3yC7y/JuqhXiM0oZeXyz/WYp2mQWr2slYfHmZemw= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:12 +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.7918.019; Fri, 30 Aug 2024 04:01:12 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 03/21] mm/vma: Introduce vmi_complete_munmap_vmas() Date: Fri, 30 Aug 2024 00:00:43 -0400 Message-ID: <20240830040101.822209-4-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0331.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10a::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: e0359c68-95c1-4b87-fd1a-08dcc8a86333 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?spA5QsMnlwpTykoQjiU/HcKXFsVOPTNJLbVJgYBBIRrhLO9aqi0Xl6h/Iwr1?= =?us-ascii?Q?E7TRbFDwxr+Wks7cMxTQz6oegCqS8Ejcvnsty8cBvgrEZLWZaMlviHrFrE6I?= =?us-ascii?Q?s+7bNsxeKBiNIxzTH/ndehBkHZok2K+6egWeSffkVaSi9PNzt5Kl498Dk98q?= =?us-ascii?Q?4Wr9TUlFotUrK5JqxwbuXPD9mi9N6GcFz/gp1SsnE+xusyEEL7703dLzvT+U?= =?us-ascii?Q?AayL879aUe8JhNf6hJO2SUizON3X1s4AQUu3ngnZew3eK1DOZLGhMQUf+KuU?= =?us-ascii?Q?T/Yi0dX1Mew9Z8HxYE6Mpg7mR26g5SCkSdbJ5zsueRn5pxtaNTjMAEwi8DDe?= =?us-ascii?Q?TTW/BtT2OxaVDCe00Sh3B73sp8rkH9EgJZSh+N5lyJ7Lets57XHGrrUalXRW?= =?us-ascii?Q?lVz05NBrs59m8o0D9ePvQh+mZbsdP5ZxBr0NqwA3u9lm7f+f406KGU43b6P2?= =?us-ascii?Q?A/aMkg2YFhRIJWpkJTG4CxkMTXI0yoEsnAIL/hZ1BNTWJP1FqZvJGQC7ORmO?= =?us-ascii?Q?ZUfOB9opsk9oZZbAbV9WNTSAVNjagvluI7JpEG7Ek+9JErnV/eelYWfOfvgU?= =?us-ascii?Q?1KqbSNHh106e4kXssUy7S9MSROe6epNChLqlC8nWnMMzsTlFlBblDk45Lkf6?= =?us-ascii?Q?X16ovOXjzBzepZOpRERs/z7VN2lFD/8Ls/tJPbyH4reumwfL1PsfQlxscH0h?= =?us-ascii?Q?zuDfvFMKjOys3OEc2qYzkEVGKBjjZNndF+E87HVHOPyTTrRjLZaMaf5bBPgV?= =?us-ascii?Q?SF+BNDQFy/zuzpYm1IRE2gjSYm24dYB2jdpU+/j2jucfbmAMNyWjem38ZWDP?= =?us-ascii?Q?0kAlMBy6OONS+J94KQow2kWS7pojG5ZoxiIqiMPj1g81jWzHlsk4SP1agFUm?= =?us-ascii?Q?6fBw1CJEfnimhTUEcXo3+bUw6xcXHLUrNz8Iy6GdVVNLqLKrsRKDVvtDakRf?= =?us-ascii?Q?wDiVJEZOyGOkSVDqUM+LRjN65o7nJBkOxA2fjpImdzBtKkQ6IC4ARtDon2FF?= =?us-ascii?Q?npnL/h2vG+qYUI/XAedFE4dpqZr2FwXDCso4xzB4Ebe4aVrS6tjkgK8ATKO6?= =?us-ascii?Q?m66uslnQ5nUN1FhZR2FbanV0yKEUrRQKlrFUPYN0MHsQWG5wqWLpYJt4oflq?= =?us-ascii?Q?nGyb9Z6CrdnGhntKbTbwemaVHGcIPBGuzHK7jGVOfe55WIYgS4EZRN2eHfxk?= =?us-ascii?Q?M4ck63bGEvlcBjkuT0rzddELxi1qfeBr5lBc4lwL+Vluc6OKgaD2xodXX5N0?= =?us-ascii?Q?II4IIId4ECJ/eNjnOjFRb8M00K0Ndt60luS1QU3d18lTZeN/96EAWLYVJwv8?= =?us-ascii?Q?sPYe3js/7KdgniAlW7dDRhBC9KjohWuiKtYAd6P/rrB0Lw=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?HIxW3ewT2VNYrK8RKE0IVO/cXRQd3H95VQ+jyhgNpsqUUkQFIwgfn7HEpE7q?= =?us-ascii?Q?UpR002GjBtyMjnWvAd3E4lPJEJb+/Epv81uSJ0XVDGiLqaAcrky+DbO8bwvs?= =?us-ascii?Q?yX3vtSVm+g6FzsT5OsUs803e0e5ibS57by4D2hpioKcE/phRbYlEDgEC7TNa?= =?us-ascii?Q?b6cFbUNfsgyjh2F1PjZl1hOIkN/XTebQQ+SQUL0Q6q8F3i7tdtWEmP0PUuDl?= =?us-ascii?Q?9jPAM6Gwwkc2q7E0uPFZjAIYXlggk8IsNxna5t+9dxsPvZu7Naqo0OVX0752?= =?us-ascii?Q?xntOK5bPBb7WPk1/Dem3ripl9+4Zokop6DMR+1RBF4atqoR5WSCfZ0f6x774?= =?us-ascii?Q?2f3m5KJZ2VqPp8vy3edTR0q+PD5/khPzxl2iDS5q0fu7o+mCUhunuP8TVmMz?= =?us-ascii?Q?+WmRfaLIq9c9ANCW4YR+keRj1ebyz8whYowTh4ysQLjccuNb2Xgl09UiXIv9?= =?us-ascii?Q?hRN4E+QKhmsM1AJiuRKNrnvqnPcbHwQVmhVrKO4PzicJ5q/dbuYQ2hW/W4KQ?= =?us-ascii?Q?SuiihdLRI6gYvAS4YF37AUqgPOODupdKfm7qWulVFSEnr6z/ZY4jnMeuGEJV?= =?us-ascii?Q?etcYtjeCBwwhRtAmRUabr2HvAlAskd4hNVMZ0F86GQ0pOEY91qgXMV/lXadZ?= =?us-ascii?Q?vCF1J3vHIA2wVVS58DLLrVF5g7TBpcHkqgeMYv7Pyl9mMHRnadDcLanLGLnW?= =?us-ascii?Q?7CU2XZpNaxtAFrRVZ9duw5YXzIFSgvBw/03k7fx2Y2fRDNaRtNfx5P8lp5pX?= =?us-ascii?Q?akNVeKwmG7hOk8K6VfBD0JotEKoEBzmUqwgDaxI73Fgg8g/U38y2lbYeaflB?= =?us-ascii?Q?hh6xREiJJQbqQ7P0b3+jlaGYRyR8Nhkwpntr7GzRcBRngf3kELpFHFVFKCnq?= =?us-ascii?Q?rBOs1NANL3os5M8F2RbP8kJJGY+thEoit66CpBxs2W2/0Oeex2LByyav8BVN?= =?us-ascii?Q?+XwsuzDIHb4+5UdJw51upA/NTn5OB9rJ+dFliSHo2mXkYlJ1yAIU0FZ4AY+A?= =?us-ascii?Q?jO7ryGhimpXgu3sVHkqHUtp2t6aQCZeRK5rRVyPojZJhg8A93Cc+HNAWdAQd?= =?us-ascii?Q?2DRDAZBFF6uO7gOrFdTJHQGluFEvZrpSxa4MsS60WQs8Rytrc/uU+S23okpc?= =?us-ascii?Q?lOF1xRNYUn1uiAI4cj5QVce4x/ffDFzC/tsPoTxEOAV1mxZABFoxaTF3BWCM?= =?us-ascii?Q?1iWkILMMwc5oCQX5ZJxHFXCxeZfD5qEH2PcrMxcc1PKVSj1GnNc0PNl/XQ1c?= =?us-ascii?Q?ETYazOr8Ab2gXWtR1lznSZHRV/s3hb+/bI0HVKlr1CKENsd644zxwL/vn10V?= =?us-ascii?Q?rNZZW+OIxmTYVqSThwKaO7anG2yF/qY7ckF504/TxGyCGtzOTaURoV+5Ojj2?= =?us-ascii?Q?TsFsZysCRGfpUfuyBY1acNJekUNy5GYw6utzSzdPZ7uBNpSmoWdaf+4MhVQa?= =?us-ascii?Q?807hG8sd3f7bvECrEYSR6HTsana7l5KkDdggRCa7WH6I7alilg1W7eQbXwaM?= =?us-ascii?Q?w+o2+nK5BPCod+qlHVRN5xoX9Gz7KtUzgJFD9nc03Sb4fZdFQQsjzFdx4aFp?= =?us-ascii?Q?Q5enBZVoy1T1d4CcX15lP4Vuqk6G8I9/S3kik+H6?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: a3LGdxkTbUhk1emIywXOVp1QlCdaBB8sL3iW4gAjS25VWF/5aybL9H1wFc0cMh1O/5Le6ZemXE5vR9IXWj7CwKwb1MO3OUz1+svD03IFUo2WSxlAbhx0tQrNFU1TTxP3tJ3m1iakvRI+xjDOSSAnlCtWOsSmaayHGqgLjgNr7u4HrokSbLFLkjFginVOkGfoIkm8rCqC98H2b0uC/cmcNbX3RBz/+lbWahxCpGHgRmyeRmV4kRgjCpgEVAygbNfLPlrc3TOZctwZyrOHeaMgOe1gGf663d8fFFPJtOtfKzhxlgjIvp2KZYhdcUgyrJW+xI0nS7QS/2uZ7Bvh4rfZSvgF+iyFf1L0S9JOKNv3FuPJ1dTXRku5q+VG9KnXtKZj8kCfsG+hwX5/daKIzx6HFwZvpzpvFB8/tOlUyD+n0RVjHUU7tukuzZp++hXxX0/c+h6E2DOdPZ9AvEWlS6tGFkPs0PF3IaNOgB98tfTPtSVxXQgO0mU0WY2iN3uFyaXDTLkE48nGcYG3WGCnwhFZOFpkep46sBFTiKw8m8aCBP5p0yasydX2UTSARBRzGx4vD+gr7E9n4aQELfiAkI18ZU/zwtVJbseO8fSYQgQ/Wo4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0359c68-95c1-4b87-fd1a-08dcc8a86333 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:12.5056 (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: vzZ3R1P9HMI3La9JRZCLl0AUhfJrDGwsDCVlLMiznT7yfdwGOsc7HJ5e09mhJSbru6/vCM9rTnb7QltLcL+bjw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 malwarescore=0 spamscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: DtnEtIF7t-cLM6Qf9quFrHcgnz4hQKEE X-Proofpoint-ORIG-GUID: DtnEtIF7t-cLM6Qf9quFrHcgnz4hQKEE Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 80 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 25 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 58ecd447670d..3a2098464b8f 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -684,6 +684,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 @@ -703,7 +755,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; @@ -818,31 +870,9 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct v= m_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); + vmi_complete_munmap_vmas(vmi, vma, mm, start, end, unlock, &mas_detach, + locked_vm); =20 - __mt_destroy(&mt_detach); return 0; =20 modify_vma_failed: --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 A6C8D14EC75 for ; Fri, 30 Aug 2024 04:01:35 +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=1724990497; cv=fail; b=YvawzCY1Ov2s3AR+YRB2IUXgnzI37UZo2BsS4IEZDms+2FZzbDi89vJctJKraqrCh0yvDNcpqrGEjrr1MWcecOf5kgPqTmczMTBvy9DSKPbQ/Xx74WiOnqs00f0oCYbVy/jAgC8bYaQUvPixBXHBReMSMtIf7ZBnR2ikBuhc8kQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990497; c=relaxed/simple; bh=usQ7NSFbfvA+zY0a8CjQiqRsWWuqljWiwoNeYEiqLyY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=fg0ncZZqOn7zwt3INEALJPqXpxRFkVu2V1QcxoajGBev/vWpgXCE5aLXdfHJAWgkiC5bHyS/IhL+r831E2uleat3hqaofxJ5HCsFz2Dc0XSU2HFHAP1O2OLzdMoHH9lxcpmfT0CaeZ2aPkqYmrcXjyAzdYwA0Eh1brZn8kJ2Yqo= 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=S/h4filP; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=y8uxUca9; 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="S/h4filP"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="y8uxUca9" 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 47U2fVGc001103; Fri, 30 Aug 2024 04:01:19 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=4QFME2tTREHjLVCMxQPlLoeuuJf1PRO7hekWo2btQRA=; b= S/h4filP/JPtHj4IDEBSnYXQfBJ+HzatKgpAJ8lsaAoKc61dezT2oyF0b2lzf9wM lSDfpi1Ocly3hKIfsFoEMOWlnzW4fZHScfq92Kbg48ryxqzAVPZ5KHbmY+1TBl/k SBM2rPABgZyUF3j6krkvG1ZQl3Q7mx8NPnLIrtfdKXjj92DTBHfoWO7HPYmmD0Av mKGIGSqhh+klV42Q4RO10T52Y9NfyxnxkLuFXGOMGg468RsLlUtDIBZzJQEbhpyX EEDxRB6LRJoYUoV/zv7/JBVoLg9Zu1Zd30InsLNpq39Uv/k7J/UeyQiGGar69fLr c/9BK8hSKYTOG0IIlCR6Wg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b25qg888-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:19 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3j9da034714; Fri, 30 Aug 2024 04:01:18 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4189swukkp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=U5hyAmlBoVlmTVrIGb1n0TcZiXP5aY6D8Sqhx/529d6UUHO8rs4aq/Z60TLE21gI/8wV2ELEQ9XnZH/ns3gcPxTIv4v6X2bfcuAK2xKR8QLv2elhyQjqiN+gBsibUNArnxXgSWrI1SAtcWOHsv3DRqrDXbrpUSf5OYc4P8IyC/+Ljvm9Ycs7JfjUWAmXlPFhRoou4LU24xKJz0efCZtGLr4XP4Sj890sLG5APKkOqa+5+N5z8fPqIVSvteyodlVMKU5b00mGTbr29CRCQenT6KCMn+3+ESLFzcEzZcocpjc23U7XMFY2BPSrM0NSfjw70BEY1UTExZHeZM4Nfxk02w== 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=4QFME2tTREHjLVCMxQPlLoeuuJf1PRO7hekWo2btQRA=; b=THeDQHs8CwcCIi0GJvZ0rvQqIrOOTNq33KGJNvrUW68QQ3BK+EQdADCageuc/WNqg6XiaC0G11cv+OO8YWkJ3YHdC4DCx4I8axgtlCmlbp1L34X1rmt81Gs68jOLlm5tdEC3fmLgQVe0RP5Casr7/GWSn8kgnC5pWZYQv2mIpQIPYT+yP8bcm1GFlu2XhXJiZ6wUWYM88p7GhqLpbwX0YHoeO2O2Lwyf/K1oWcEhL72Tk5F1wDozr5taoGOfXI9gVhRZZR5lE9AAkjiuommKv+h06nuwUpmLwdxVkAcrv4NBGGoMnrFxjZCQMupTckUFl4GB2Ky09Zli5/e6jzVH6Q== 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=4QFME2tTREHjLVCMxQPlLoeuuJf1PRO7hekWo2btQRA=; b=y8uxUca9zr+Us3L+CCO8b4zMuqVyRlS1JmFkXWX2UT6bGMuUBBVKy/GvSLGvGNuVimFENmBgSBFZ4aQDSWs6G8aaDzi5puSyyNSyNjGpLi+BXLuk/pYzGOsss941tXy+MiiVnNnAoTo2qmiz4cUS3ctvHZFtR9rcfT1zkIfIiQA= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:15 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 04/21] mm/vma: Extract the gathering of vmas from do_vmi_align_munmap() Date: Fri, 30 Aug 2024 00:00:44 -0400 Message-ID: <20240830040101.822209-5-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0098.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::15) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: f207ef78-dd44-4761-ca3f-08dcc8a864b4 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?J2iRrcermSVJo423j6bZpJNHQm0LBp1D9kxVerUaW0/P5reA4M0er//+3gIf?= =?us-ascii?Q?TnJmPFm9eWw6haZfKGZXsU2VvK1TIgN13lysTQySlwtwOV4QD/pTSOUDoQ2K?= =?us-ascii?Q?RkynQTY52FoRHCxtesZRNtOSeO9dD41d7qaMWoyRc7SzEmehXf2Vk8lMYto+?= =?us-ascii?Q?XYWCfhBmYv4FVPGub6ehKlB7bHsOCBOrg5thN7EvSBuD9Xcqg4KAx9xpyWKl?= =?us-ascii?Q?DtMkIvSOfeIYHZJEKybLNFa6dYTGILUUpojTY8J58ZZeUb6aODdbOeyeYs4u?= =?us-ascii?Q?aj/9F5n5/30w/5JLoExUs49CpmaP2acfDHL+c1ZcWJZaHFeWMhHGyoqcxNAt?= =?us-ascii?Q?mTQxD7iH4BQqRHSigBficbbNRuAgjVpitN8wdxfLzM5KraKAp84F2KJc6RyZ?= =?us-ascii?Q?pXQn5kwiNrUL3kcaULnvC8WB6SDiyNKrh3fI6A+lsnxzfXorYQ8V11HGY5O8?= =?us-ascii?Q?UP68xNU1GlkrIddXpIUlKd7skqmANwckmlOaRl3xIOo9LnpZ6oq4m+osQlp6?= =?us-ascii?Q?6jCC3VAtijmUqss/P7Iknq9NkAPyw5c1d0tzJSSncyJox+gpvCybnJ7uDGNN?= =?us-ascii?Q?/Ehy00tql23m0PNUNTsjl4O1nleIBjvvyvbPX8Y1n6GTKZ6mHRXJ+KvMIsA1?= =?us-ascii?Q?TrLr366VY1TFNYAwHI5e5C56IHIC4Mp+AbwzD/cxgyr0eNXEStOIpguthUUf?= =?us-ascii?Q?MqPcyejq0Sh95KSFFHOTEmB+if2r+FGVG0A2+xnFhp8xgo0mwa9wTqds+5fT?= =?us-ascii?Q?UoN79kv81IhlcQMinfU+QjoJppdAFD+y26vcZ8jVMaJRmohhC6j2eatLWlNn?= =?us-ascii?Q?rg3Pbkwzd6Vm1/Op0co/6SGslALOGpcEHD+ktyTEydkTRCJw0kypnJrnTrvY?= =?us-ascii?Q?pbIDrJ8dKL8gTnoms9s4iwA4AJ3cOI+fj6X1i1JHXQJnw3z/dHgHbIVqxixC?= =?us-ascii?Q?5UEvK4ARbOEijvC+0ckaNPYuKcOKq20WmDZDKmauHv+CGB1kPOiLZ8ToYAnr?= =?us-ascii?Q?SjEaC6hblB7zx39YEHZ8eUAzPRMKc+G1dGnu8s+BBfgrJXrSiRqKfazOXaMn?= =?us-ascii?Q?KzqMJMxYq0KrIlu+SOE8uiFA6qfb1K3Nosp2woaVo/6GVVARsBURzQI7L+Yp?= =?us-ascii?Q?ALD39OcqCo3W76vRaD1aakJRGV1+vLdifn2NYPj8aW/+gY86NxCCrnpjVAwr?= =?us-ascii?Q?QExHBU0z+wCez+GwAL2RKLD6a0Vif/Ve/JK1pyn+Fvrg7CgbHbEqhjTGvJ+f?= =?us-ascii?Q?vNbiOtneETL8uNaxkVsqxjtO3bGGvLdBC+MiyGRLX2oksOZGOhoGuEVaHj1W?= =?us-ascii?Q?DJn5DHgDcU2tfodst6TBf3uUDHYR5diqnKzH52A5khjS/Q=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?vzFAxiuXGPiPp8JfL3HvUzJM2JWWdVsjCcehpICa39MFVP0U+YdOoM6e+Yss?= =?us-ascii?Q?5+eIDHLghKZqxKqS9VTWZKj6sfX1ZpP947mzu9/nLdcijKPh1hqaxcGcFbZx?= =?us-ascii?Q?GmKkhn/yA9gYgUk+TnjO3D8XmDe5Xr0iH8fM0QE9/rvYeLF7txIB+1q7bNKZ?= =?us-ascii?Q?UUNHVIPbQbPr0gOjBHDqUI6Ve5PwxKhOORq/vNE5n/Rqwj5LdTYedFdO9Rwg?= =?us-ascii?Q?AWxEcmOPG/VS/ZL3qi1fI0iOA9bN5+NLJW4Uun1dMKBqJ1HkXwZ4vioZxvmL?= =?us-ascii?Q?aAGn0PUfctFX5EizYNr1yxIY+1NsCSioGkazCe6lH7Cs2fOAO6HltEtcUj2I?= =?us-ascii?Q?h2MUiPksQF73U5+7HS+5VV73csVsv82A7yDhYPHq3uNGf9ZOKz8X0TOUitzK?= =?us-ascii?Q?/MQfYt3iFEcBbVrkMIpuqsLIKBhAPuxXHDueRPBq8oiqF4U8BqQROZtDTal3?= =?us-ascii?Q?wdPl2boyuhYPWwHAjWtvb5ENtTkfRBeyWeX0z9S2+6cGHZG9BOVBzuBJTiw6?= =?us-ascii?Q?p1E3fEPqgh12eIFxf22INbRV/7pJE08oznYEi4Ta+F9hQL/bANXmLzeFRrQE?= =?us-ascii?Q?25hoChwfNzvpMH+XnTWkTwcyEQpRTcq0c6UQSEkJ3FL71bMIIhFxGvEXMYAw?= =?us-ascii?Q?KuJOUTtcWbVWHOxOsztCaDKqCeFuhJ6lwdvsu+8JkxafJ8jUd1SZG7wvHtGO?= =?us-ascii?Q?UZ/lAoRTe7DOujUWIB/9r9lEBDFDric0GFNBxHo0m91p9WkxQALz9ixLh4ve?= =?us-ascii?Q?p1sEnrC1e7gkfr2QdACVsXYpYWR6WeUCGsz1MD9SmjbDT8E62bedIJ/uLXPK?= =?us-ascii?Q?idWDvawBG7bttWzLHgpMCw4/K5Vz/3srepQ7txLf8EZSeV6zBVsdrTRXlmJH?= =?us-ascii?Q?ADQekklqszkkePbnR8AmsPTbSYGMdwBDl2X7wrlWDVg8Xxm7xSnq4gzXXp6w?= =?us-ascii?Q?A9DdET2/SVNk5Yb/OVYiSNs+rl/FghSD+Gu/Rb75FFLwRDEjaxFT/dfDB11u?= =?us-ascii?Q?y8M/67MBJL1Sa481ejR/Zz9QY8jtAV6LJiQpu4er2ADqAm6E5LawgM8nqz1j?= =?us-ascii?Q?a+iYiMsd+2yTRHJxmAZWN5Cj9pLO2ENqIhn0kYC9sKe8L/1JxXTds9YAT97i?= =?us-ascii?Q?r+vYudNZBNTKHI9oZtB9mFv8UhSIl2RmkxXbJf9k1/sKBKcZ5DJlw989J09Q?= =?us-ascii?Q?h9WCntOYRZSxTkELdjYNn9vmYNeDtZi9CWW68EhTbPoTwa2l+y/jFU8jPpzM?= =?us-ascii?Q?WQ+x7eO9XLcUjCXJtq5x8dv/YQTw7oWanQ3LZR/e2UNJ9YevRYdJRK73hxJ+?= =?us-ascii?Q?sJe9ouzMYTpGMFFH3zL1DAvPt6bXQomxNfs1rNbC/89dyvsKHkLUR43CwFXi?= =?us-ascii?Q?0d9wjESyLgUeOUlP3vGuM1aqsSCuv58uUwGtej6009af3y32PqqUEqnSPA/E?= =?us-ascii?Q?6qOKnrZ1bRjkXBjpMiDCCl0hvQ7VrUIsQ6BUKLLBN3kMcu2TJbcKn1QZo2Kj?= =?us-ascii?Q?JkOEUJKUgK6vh86uF3+5FaWtnAbB6iy2cHe1QMIvFTfiVZhN/hZG5uJ+0hof?= =?us-ascii?Q?nmDOvtOcU8pSLqeTdhe1nlWET7PM2MJHd7E9WVyj?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: fXkMXPzkZKOP+9foxrY0TqzvcJibYe642g+9MQamNsSEVfZeP9Pb9q9iZCu5XvZxHaNVcRW7mgUuaSLZ3wnkhhChibKY3z0af9BQD2huPVKQJLOdFoZTD1y7PSiOOtNbXlDPr1RLELasFw9VAAaHH6Y/iUOkSKXGSC84gMsRArR1YMj2ACa6G2QHsFR9L70N7WP2yjJ+ArG9gsKjYCs3evfFme/SpPRmLRQkYMHAWhfJ/ekRTMfCkgvlfwYWAxozwZ9a/DIMQ3GzuVps1oE4EyJRtQi30DGnANADLWI5FzQ+q8f8wCVlEnGgo3YDgfjps8NB19AE1jSyoLsUviEffq6XzXOFi+SHIcK/A+o5UwDG2EeK3a/fn8MwqPYArdCn+PEkqq2yimN1ddDSe7q8y5/XRXIoethTEvy0E4nHQo9NOyTGNI4oK4Lk1NdyCmTS5NK7lCRQdUFWLuwKu9MD9GT41LjVs0UyTV2CPBB/vdUzCeP251E70+tfCU0/vdiaHwCMZSZ8yKjHbENlUmfbMGnhohxyw4GqJkmTiEioRb5ZaJ9sDwaKFh4S9LdjA7FfuI9yvIsNrTR1U6zGvdumFlpknWPO0SGtCj6UMbXW0TY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f207ef78-dd44-4761-ca3f-08dcc8a864b4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:15.0302 (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: Z4qMCwGCKah7mLdp5PqYo/F45zNZjcA/3vz/4ap3wTI95rO3SqmD4jSnEPUkQEDKSS4D0auLrWC+Dtvc3Jn1UA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: l_bESagBN0mp42CK2JuMkFIdv2_bzF_4 X-Proofpoint-ORIG-GUID: l_bESagBN0mp42CK2JuMkFIdv2_bzF_4 Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 95 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 33 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 3a2098464b8f..f691c1db5b12 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -737,32 +737,30 @@ vmi_complete_munmap_vmas(struct vma_iterator *vmi, st= ruct 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, -EPERM on mseal vmas, -ENOMEM otherwise */ -int -do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, +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, 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. @@ -789,8 +787,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm= _area_struct *vma, goto start_split_failed; } =20 - error =3D __split_vma(vmi, vma, start, 1); - if (error) + if (__split_vma(vmi, vma, start, 1)) goto start_split_failed; } =20 @@ -807,20 +804,18 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, =20 /* Does it split the end? */ if (next->vm_end > end) { - error =3D __split_vma(vmi, next, end, 0); - if (error) + if (__split_vma(vmi, next, end, 0)) goto end_split_failed; } vma_start_write(next); - mas_set(&mas_detach, count); - error =3D mas_store_gfp(&mas_detach, next, GFP_KERNEL); - if (error) + mas_set(mas_detach, count++); + if (mas_store_gfp(mas_detach, next, GFP_KERNEL)) 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 @@ -831,9 +826,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct 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); - - if (error) + if (userfaultfd_unmap_prep(next, start, end, uf)) goto userfaultfd_error; } #ifdef CONFIG_DEBUG_VM_MAPLE_TREE @@ -845,7 +838,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 @@ -865,6 +858,48 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct v= m_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: +modify_vma_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. + */ +int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *v= ma, + 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; @@ -872,17 +907,11 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, /* Point of no return */ vmi_complete_munmap_vmas(vmi, vma, mm, start, end, unlock, &mas_detach, locked_vm); - return 0; =20 -modify_vma_failed: 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 Wed Dec 17 02:55:17 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 60E2C1509AE for ; Fri, 30 Aug 2024 04:01:45 +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=1724990507; cv=fail; b=ByoRou4BKMffZgQpgBmdkj16AXGLHTcaGT6eETSA7iCp+tix5ErVEJ+lQ5epL7yfq4wTUThMFIfY7YtV6oEGK3aVVErflStjpy0uO7KJpxCzPB9JueCMND9qUVYUFdH7hzbMNY+t6B3UdP1cWsuMsfQoULWQxn7ja4/VkmISiac= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990507; c=relaxed/simple; bh=GoiOTA7WVOopV+4y+OAv1a9H4neQ8gmMA1xSLweKQHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=VXZErYQrZMSYzkFnRvh2AlgPOvvlesNThEjN4O2glL16FlGT9Mob4mv+8v41sMQIKRUeSRxw9rEABNqNkrhFSG46WAvdHhIrPexSZob64uHUVjBBVFzCAW1itHgGVP6Y8YsEBOcqxAIi16ACLekUd3T1FHs2OcKTCZfcopngVds= 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=Ko/UW/6V; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=nSjg6gPb; 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="Ko/UW/6V"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="nSjg6gPb" 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 47U3LAZi021755; Fri, 30 Aug 2024 04:01: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=U2YvcKwGePCmxbcIx/fyjPP4qSdkHYCXwCKrh6Jw9fk=; b= Ko/UW/6VpgrfGTy0RBnPr2Cn16neC5oudnKBMmyFnK/YpnyY5csQ1atfkOso9LT5 efS0e5XSUfOfnMBt814l3Em8unjlqmI2C2uXdHpsWhffWomx1ShP5TU/WZ/RKBa6 aLTwrWxyTvVUdKBhU8DyycTsP5SIjIC5sJXP0CRngqi5r8cCQ4HkSncLgv6v8kea 5keEztCLgIGXICqG+KTNFr2cMV4DZhZkZqehDRnsY6TI13w864RhYPBBegQCYKmZ Ce8/UAIcrMoNvnN2hsuUfJ4E4aOFEv2dUfp3fKRjK7VXduxh9X3ttQXx9onQQVyz HJXUislrJYBHF+7of9y72Q== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr582-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:28 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3jJaL036502; Fri, 30 Aug 2024 04:01:26 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2swm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UbcP5asReJOpeZ032lgN084joZ6FpJSrQjwhhnIfQeF1Kd4szUaoLPsmeGBKHb9lEPAH04DFUvDwC48rOYoaDdjoPv6Vd3xrR25/TQBPrx147oJURMk70YQ80uS0hER9HKGgO2v5HU5yfZybX5kYx3UPXCNNUHVOiWTWBpEyi5v3Ujxydk2w1dlKD8arhUlH/nbXEoJi7yXdzmqhqqwHalp+dlaIORxa8rBRIYXoHnj2zBCqi8n527+2tHsNGDPx8GACiNW90lwxuybRWDnntua1+EaDV7C+rKPyDjkuRO02Q00ZP7jSSrltgvl5Si5WF/XjjKQbjSoJ/6TeVKzsUg== 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=U2YvcKwGePCmxbcIx/fyjPP4qSdkHYCXwCKrh6Jw9fk=; b=nTnix203VT9VVKwKxVySvDUoAoy/BPp8iyn0JHCURKdRkiiVG6wRjzusFK1gEWp/brXgvsYPXub9LAnJdqBY3HijI46ixlAMJ1lZtiz7/khtnfd4F9Y8B4UH0MMLaAKOx3qKcOnTvWrJOv9uhpIDEfm3cJMiAgSJ1jQgl/k7GEZ3QyIGhECNy48a9hfWdUi4QHIJAKnA0GYu6DwFzT2l5Cxv31xEVWHYetoNUvtA4u2jLv4dW7ueBHb2TjULr5RyV/UrVFufpEblGjc1XKQa76xICXMfb1svAxAVo2KtRIOusSid5Ic8pYDlwysydF9QWnYUbokvE9Eh0JjZop1wFA== 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=U2YvcKwGePCmxbcIx/fyjPP4qSdkHYCXwCKrh6Jw9fk=; b=nSjg6gPbll0zN4Xx5a1qUtxnVp32vZFeUZDsJG/gkdw+R2hAQPxLRFCwv9Aqr9ztWLqbNkdKWD4zBjFeYENweceDcJX5Vw8foDmG9ztbSXA1n6qKj598/PYJXGwKS8jgfk3LXtX2xIMnBr2qdOKJCpPgGzcuTqfoGoN7uC6Ol74= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:17 +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.7918.019; Fri, 30 Aug 2024 04:01:17 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 05/21] mm/vma: Introduce vma_munmap_struct for use in munmap operations Date: Fri, 30 Aug 2024 00:00:45 -0400 Message-ID: <20240830040101.822209-6-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0045.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fe::13) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: f251c220-45db-49a0-583e-08dcc8a86646 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?5L4g0gx/TkS1IxSXmI4czmvnewFasMREi+OmruuknktiaH8sc1rxyZ46mUuz?= =?us-ascii?Q?yvQ7513iXYuvZgxNBBwzIqkPLl8KPgZEzYUtfmzeOXHRx6KjdvXguJDl7SR9?= =?us-ascii?Q?kJwoha3CbdxCeIquGJUMbRP1vpRZtujeGW9D66rNrmDxdqCXjN2dHUUOORXG?= =?us-ascii?Q?5p8flkAR3RsRWuTNAgrn4W1tTS+PQ6ZL1JwPo/X4MhY0CLts0KUce6Q3ubG7?= =?us-ascii?Q?u4EbmxkHr7bx/zi0ToFJXFKb8DXxy/amvRlEgmlkOqClTYWRPo8oI6OZ0R28?= =?us-ascii?Q?1BiLVm4bGqX/oHBCMirbWLLUib9aaxOfDJ9mkJKebo4C9KFbYqf8Ap/T1NBQ?= =?us-ascii?Q?YIBCUZ/VN8nrqUXY0wl9uzHDJCu9Y0Ui0XYWUBKEFx6ubUzoen9vMlvri6sm?= =?us-ascii?Q?tDAAXsnyUeh9uaFz9MnjCM68myWreuivqnYTzV3ljMKC9dLn3CoqY+u7qv+r?= =?us-ascii?Q?0DaqfNHdwAy39RvHXlh//Z1oFXZnqYLMqnV2Gh0MP1FBbJDzePsDaNccBtCL?= =?us-ascii?Q?cBRe9bhPCvKFHGMAHOMF3hnX7VAr3lzhrkRygL7d0QPsJPlpNXAb1D1WhaeI?= =?us-ascii?Q?ux9QkYAYSA2Imj067Nkqw62We+EdrBi+icqSg9dau5aCYLiYzjkohhpBBkMo?= =?us-ascii?Q?g6Vnb+bouUToC3Qmo8bOpcLe7e7f4tcnkRYRa5fSD3uB/macVRB5IvXb0eis?= =?us-ascii?Q?IIbU3YdCUOW+IBi5E+R9m54Fv5oMR/JwwyKCiVE7FmOjpXIL5EQ/gCzd52fp?= =?us-ascii?Q?X34LtzpAASoRIX+6K3opobLT3lC0ODi+p1OuRgnC6QxGAzIYykbqe47PnM5k?= =?us-ascii?Q?5kCiD015dzW5pFjBRJo86tTS1f5vwMQr5pkei+C5ozXdrE+aK+uSmqeGL3ra?= =?us-ascii?Q?LRGXNSHnw/LJIJLZHc82oKYl4BXhIvlB28L+pV59wp+veBIWYZmDZbUssex3?= =?us-ascii?Q?UXkidc4kbq8m2WyVgrGdVWvVMKSatwrxdI4DEfL/XHGyROSwFd86lpKvcfzk?= =?us-ascii?Q?K3aGWo1cXvUJwLzfVFCUb8mi1T1S5dvFtQlDSnfRVpOUM2bOaUJoZyWiqc6q?= =?us-ascii?Q?6edc0+6R25TWvD46x7YH8eIbwPIt+CLappbzy3OmBkVh99tj4PlKSvL+1uzB?= =?us-ascii?Q?cI4zshHjcZbeLRiCsb461zg3ZEF7OghW8Sxa6WAmombZt/9Fz0dTMf0vcakU?= =?us-ascii?Q?E8b5PtZWEKyJ9vTO748LCNldslmpDQGQuU6bgTwbioJNePPGG6M7DgZAwGWN?= =?us-ascii?Q?Dy70E+srNYLI4vo9y15CaQCTFEvuCnIc3Rt5YnSMizx8fwDD1anzhXiVYhpn?= =?us-ascii?Q?yVZpBoZYVk8gyxnOLRmvdSTZDvUoY8UDpk+mZPEAD6nhQw=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?yqmThh2VpgfCMg2JmYgzuXahXt9HQLSDgY5OPy3+pRF6CruG+B/MzWr6psqm?= =?us-ascii?Q?cNvUCtVU3Be5rFYWfQ1Ay8xHipSjxT6R5sjS4jHFI1ucXxozy9UQ3F7SSgYj?= =?us-ascii?Q?Fd55cY+Q2OfNr1QgZDpHtZSB0uxnI40Ql6F/3MW8L5Z3Yy1SjVLB1T+yjbRC?= =?us-ascii?Q?QLVchrQlGuLGvsdxpqzqcHlEv9pLbiYziZY1kDNtOSDi1x/xIeIEGyviLryo?= =?us-ascii?Q?3UABK2yC2WhmGLyY64EaPWy1Xdpub+j1N4INZPDECPzP8+6oFGpyhW+vlhqF?= =?us-ascii?Q?IZ1eKF63zJOoV0QBtm2JoNvrww1zVwiTyw9m286CyIrqSCzLswKxqcrlFg3E?= =?us-ascii?Q?aGMtb9oJO69vXJ4oKsrHVNqioWkFt57m/AhmH8D4HTsB6gUSZo6YII88mA0u?= =?us-ascii?Q?D0iAvs9YkbQUg4xCvmjA1Bn3PPULQAzZ2PuRB/co+aM30CaxjQCkPLJ+2pEm?= =?us-ascii?Q?EdG3F0NGEiXKAhpDz67weQ6hhn4bSOplDJB9PmCvuFv8bWHScsJhs9iaEWTz?= =?us-ascii?Q?xM68fVk1utRhUK/CsiDCb32V9GMlzUSEFd073LnP/fY31YCAa2JlLIEdHpPO?= =?us-ascii?Q?hbunp1FU9E9K33VsZtuimFqD2XwgUl1hpWcT7uWFoU3WqYGekQM6GYS37wEn?= =?us-ascii?Q?rcxCICnvCerd0MSpQna4tG8tvg6n51yYJcbqEMrZC3J4p6Iz9e57exnvFT+5?= =?us-ascii?Q?Y9HdFLeJ41aD8amslxNT8FeDXNWjmcpOpOlIxCHpjsqVAyuGPnPz88118LGc?= =?us-ascii?Q?dNJvf0dTuk1gg8IhgfgOv8lzjh21/iis1q4/jOZJ9ogeipkUP1+LCMDt+BpQ?= =?us-ascii?Q?k4w3K2thNau9fIyR83m5xs74P8Yy2uwrW9j+/9khxBSU0fipoEA2sdK+D8mA?= =?us-ascii?Q?ZyQip/hoFoHgbP6UxU5mZvk/KfUPsq7FsOoBtQOX/WaNxDvrPgqMMicS7wSa?= =?us-ascii?Q?Lvfom+zSLhWtGdW93aqBMjfqr4pAN9GgNImOgNvUuKgz9jR4CrPZ7VfBlii9?= =?us-ascii?Q?86X95h5RiNRUcrqc+hwTaJZp7RBDCIdQhE0nIgsjyNoi1mfF+Os+maplaRL8?= =?us-ascii?Q?25sxagP/vMpzMtniuCmlicJWXdzeIf+P7Iqm5JWpsIovizgRSmSEjltPCKlO?= =?us-ascii?Q?ZKK4M7THEudzbQl+1iAoYp8932gXGEiXzklH7W88rOk4IaT7KSd+B9PTN8Jv?= =?us-ascii?Q?BoU/+BXr1eF+keSVZT9FFytvsAr+Kv7zapjkeqRlVh47Qao963AmiIhXWsSe?= =?us-ascii?Q?JWmcVwJ7veJPhMas/mO0z+5nJgY0e2Uuio5QY8viSIAhfOyTHLf86mk3MjPK?= =?us-ascii?Q?DIMIxpLQpCLS3+zfpM9ms3cPmxG5MVgxVDlrFBX0dJCIIv+wk7T4/YCXhiki?= =?us-ascii?Q?MyOrxo+fnf7AfHaEJAftj3Mm6nJGMusdDTphx+S6YxJPnvhTPksLs75Iyc4X?= =?us-ascii?Q?v2ZrDngafNJqaFZ6KNKXCfATgi/dnJTFGoxA7sJyhQoRbt4AAURcIGO5UMdh?= =?us-ascii?Q?DOO0RzgYZL+pTIenSXgjiZIlRqKH2VBD86rsoPEar3NACDXrerAFCjoJMFxa?= =?us-ascii?Q?GJ4LUWpM7DSBPNQRxLVyIbVd1mdAHbxIQwoTD47p?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hukItWkbqsXc6w1YiD6Eye5ag70SlU7YdkaC1+28yq2lwVwZ1qQSfwtGQZaGgYLzNnCUfOhirWmWVD9aEiHOqCtUBqqa8pym//HxCySJnriS8S0AhNW81g6KqOOhvWebUKYk2MMyT1kqrqj/dbqiTi6zWDVpkqx8kOC0BTRkAa2XG+yEmei6IC/MXIdQefGj+cSWUUfER0o3KnulBB9eH79nYfQBufcDhXvn/s3SUm5NqymN67WonGoLQ8hb/y4UqmJy8RQOqkCpCWP7uAa6EJJW72DCEot3UqjpzQ/OIF2u7BTH+mPKpdA1j7+dDRYz+DliUIHqb4e/wJX5Y5Ph01BnyQfMFbhYTMMoPn1h+eEs/i+emV4jHizpfzuvcXlBHhaiE2gDoelRRbMrTl98kWyi63lEAbG6EXKvVsIFfM+wkEF5uSnbaPpadPuw6aHFWLwZPfEmcm2hPx5MjxyVguKSlfC0gkU6z5CbC2q7OxS4xt1TWzXelHsFWPIhC8T36UoipiX45P2tLS+oczhvzSQTjU/zlGoAO11+8LeBrdRY1PzQwgtxO8iEkS9Yvvkxdsb5fRF0n+WRUumc6ZB3h/BPv1ZqTHUAaZTSDUmnxNQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f251c220-45db-49a0-583e-08dcc8a86646 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:17.7382 (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: jhBvNQLSm+4QFz4jpUAJVR8jl88NqNHL9rGYTbRnhQbCg9so3LIqucH2sP635Tz9ck14CuVjFUhvSDMdyMs9dA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 0Iy5k441AOmygkUK8-kHZhCA-bCtgAIJ X-Proofpoint-ORIG-GUID: 0Iy5k441AOmygkUK8-kHZhCA-bCtgAIJ Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 140 +++++++++++++++++++++++++++++-------------------------- mm/vma.h | 16 +++++++ 2 files changed, 90 insertions(+), 66 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index f691c1db5b12..f24b52a87458 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -80,6 +80,32 @@ static void init_multi_vma_prep(struct vma_prepare *vp, =20 } =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; +} + /* * Return true if we can merge this (vm_flags,anon_vma,file,vm_pgoff) * in front of (at a lower virtual address and file offset than) the vma. @@ -685,81 +711,62 @@ static inline void abort_munmap_vmas(struct ma_state = *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, -EPERM on mseal vmas, -ENOMEM otherwise */ -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 /* @@ -771,23 +778,24 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, stru= ct 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 /* Don't bother splitting the VMA if we can't unmap it anyway */ - if (!can_modify_vma(vma)) { + if (!can_modify_vma(vms->vma)) { error =3D -EPERM; goto start_split_failed; } =20 - if (__split_vma(vmi, vma, start, 1)) + if (__split_vma(vms->vmi, vms->vma, vms->start, 1)) goto start_split_failed; } =20 @@ -795,7 +803,7 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, struct= 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 { if (!can_modify_vma(next)) { error =3D -EPERM; @@ -803,20 +811,20 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, } =20 /* Does it split the end? */ - if (next->vm_end > end) { - if (__split_vma(vmi, next, end, 0)) + if (next->vm_end > vms->end) { + if (__split_vma(vms->vmi, next, vms->end, 0)) goto end_split_failed; } vma_start_write(next); - mas_set(mas_detach, count++); + mas_set(mas_detach, vms->vma_count++); if (mas_store_gfp(mas_detach, next, GFP_KERNEL)) 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 @@ -826,14 +834,15 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, * split, despite we could. This is unlikely enough * failure that it's not worth optimizing it for. */ - if (userfaultfd_unmap_prep(next, start, end, uf)) + if (userfaultfd_unmap_prep(next, vms->start, vms->end, + vms->uf)) 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. */ @@ -842,21 +851,21 @@ vmi_gather_munmap_vmas(struct vma_iterator *vmi, stru= ct 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 @@ -892,11 +901,11 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, str= uct 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 @@ -905,8 +914,7 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, struc= t 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: diff --git a/mm/vma.h b/mm/vma.h index da31d0f62157..cb67acf59012 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -26,6 +26,22 @@ struct unlink_vma_file_batch { struct vm_area_struct *vmas[8]; }; =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 */ +}; + #ifdef CONFIG_DEBUG_VM_MAPLE_TREE void validate_mm(struct mm_struct *mm); #else --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 CFEDD14A624 for ; Fri, 30 Aug 2024 04:01:43 +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=1724990505; cv=fail; b=HhgHFkEIOcDbon8J5xfccxXgx28rmvC/7uJaSVcnC1Dv9y2CowgADZPxcihO4dlVH+d4pcRs3b5Gl3+GMqaPMX1ZdMZrTIpG8Bm+Z3ae2WjC3eLtFPqS+DhCr2VoUx2QRG1E0qZZrLkHEViZc/0XsqbZNlC5ZPv48NN2Il4KGow= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990505; c=relaxed/simple; bh=3jNw5LRLVXz906MXLx8C/Y6dAwFMEEfCUHjLOn0D5bU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=b+H+rh6dWVeKGNrX4eGeWjx+knOrPLD5RbLbHWlKJtk9d7vHjk/pXTd8i29yx2EL7B80CH5oWgmJ0Vxzz4dUus4n9R9JI8LCg7P+cCuvXYtTkcTef4ySwGCFRnq4dRWTfDuD5KeGuInLjGYk3xVquKMNWStpABLJhv8BphSc+WI= 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=aJ48e43W; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=g/lJOcu0; 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="aJ48e43W"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="g/lJOcu0" 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 47U2fVNw022839; Fri, 30 Aug 2024 04:01:29 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=Lu6AtId3bBP2dooEzmFt7N2rgO4+X+ZJGjHwi2y0j+A=; b= aJ48e43WBfbdc9S7ChqawcjC1oOPRRsWYWI1suN4NpKPslbHNf9gK1HP735Ue2Wh 5xotbR/2UeAXXeTbugJaZPbuV8ND3+aM9bj4RTwuG72tmmyr9pMDuJ2UocdE/o7P Tq3f2eeGOWsB7tM+04kRxZfm7C94NJhwtGB1Pr1VkshFO+faudfx6h+KId99RzHD jb2dz0rwk2+jQocgo3VLUytlMYAk1DspfcQ9RjA6fQhvI7pC4Kvj1TEl0qLQjh4h VJ7zYuDZkE+dl7ay84J6FEJgKDVMZNo9+/nGVHEtvtsyf6IfuaAM7wgIbOeN1/Nv bcdpQtH+cGOufGxsw8pung== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b28508ne-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:28 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3jJaM036502; Fri, 30 Aug 2024 04:01:27 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2swm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ERTfAd5OD4ZjXTg/2oTC/Yedei2Law/mkdb/TTx3lAyVrhgQVNYlB+vENXiDyr+2KdatmNVY3zoyQ039lY4j6sP5pvJJfIHFyj0kCyQZgO7Lu0LNL5tvq298C8GzBwoGGncdHknJ3FEawfVHU5tN4bGMaPR0FgoM/FerKlZTq0k/4FFJ1xOuEznFARoeefbaPbbVSwg9Vva4yE6CP3mgFcbpuPQjaIuLqQyBLJDmZLPKubA5fc3aZluqGPwlSpLHSz5CKxF6hkiw4ALA+OfcQdpFo0EaHaf0gJzztqy3Ah3Nxju7eeZs/njCaFEOVQA1Z+9VsS4pR7og0DdxMvf4dw== 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=Lu6AtId3bBP2dooEzmFt7N2rgO4+X+ZJGjHwi2y0j+A=; b=nniIUiTEk4Ma2VQ+684FvVLsMHYvYRHxlcPtVLDJUXZ0NqBXPnt2byapqhqO5t02nneUnJtHcsOZaDJ2LchtB1dzRw4TJPVfXv72BUse4ArDNm5GVEiBV3WCNatdw5taATOWnpXUwY4yDN8ExHYlyUprAer7t5gLvSZcFuFKTkVWV29MGHIgYKHbsLpgYTZWSGFnYqv951+g9AvydqthEG6Dy50er+9o9JD8rHfwjb5xanm5nm2O+R0/KCUpyngVPQHnGBAjf8cp28RIAvc4f2Pzp8vkpysZzsZcpYOTbFF+Prn7TdNe+RNPqO4TKs2xNb7VEB0KbOSIfBzZ6bvKeg== 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=Lu6AtId3bBP2dooEzmFt7N2rgO4+X+ZJGjHwi2y0j+A=; b=g/lJOcu0edZeGzEzW9LmDW6Iu0cyTo9fvIhoU+n43/LixiEbqx8DMg+ZyTVscNa2OrVDAmtGtIO/GwutJhlGh1Nx2wgiHHcQV/Zt1ixZsXr8hqI8N6c4olgoETey38CCQHVYIBjOzzdl53NxsWh8cNJv2/XmfSPgg0Y69h7GMiM= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:20 +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.7918.019; Fri, 30 Aug 2024 04:01:20 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 06/21] mm/vma: Change munmap to use vma_munmap_struct() for accounting and surrounding vmas Date: Fri, 30 Aug 2024 00:00:46 -0400 Message-ID: <20240830040101.822209-7-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0046.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fe::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 575e3351-636a-4be0-b1ce-08dcc8a867cb 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?IpQjrzZWD/pgrLcHjNFdaP0J546FcdRDD/ETHYq2zpKsV+lGXNQt5oeduQzW?= =?us-ascii?Q?fN196xxxa38sjKGgB9KKMKwFStVKYbDg+ZuRINrL2nU8Io5fhJBL/q4481rs?= =?us-ascii?Q?ClLpkwIxuwk6YWERB3FdOf/l+3nAjSrz/wg72dWKTPwmp8fGu939SWJMPISC?= =?us-ascii?Q?0s6Uf6sUJcu5TfyOiDujHrIA0w/dyQ97iCborF4fxga2FctQCDJcfv6BYHgi?= =?us-ascii?Q?fXsLK6U+/JQyyWYLRdu2tsp3ZEViWxobVe4FlisOSEaySKZE8HJkdrSoVKaf?= =?us-ascii?Q?R73KCXW5PHXMLQFyodong4P0djpciXcUyUoan6DClJoFFGMos1BwnyUVVkSK?= =?us-ascii?Q?JpYiGBfYaNa2+vzojEuusA9cJkyFTUwGh40q9KXn3+g9DJYOKtBUKvQHAzDm?= =?us-ascii?Q?nB2x7yAA2mN9dieBswcFxSTUoI8KGRv6fCGTCtelxerImm7lnMxE8+2QyPl2?= =?us-ascii?Q?VS8gK38MQg/z7UMFbHxwbGxu9niZ9xEljpp6Nqicf5uowH9NHTntl6rN916N?= =?us-ascii?Q?KfvSPnIHG5xSXwMYOxl68EH1LiTIhRuh92OKJFI5OfC5/yB3rBA8vv+iF/KY?= =?us-ascii?Q?5TSd7irQrX2w0gaNYAqmJhd9tW4XY1bKdfJ1w5ERc3u0khWE3gAXEzmSP/ar?= =?us-ascii?Q?IWYEH5Fe8e3136qO8ET4FRrmTyTrZQuQzXX99287jHXNX8W6/ldfVSLOhcS7?= =?us-ascii?Q?/IhVSgRvUGMCoiKrvPieOT3QJnIRiCtEKifyBPTAgxU8kBE8dU7tE6CetGlo?= =?us-ascii?Q?VgDfAJcDtA+wjhUJtG5tZ4HMxB5nWP5gaSt1ckmVWujbAJmTunphNT98hvX7?= =?us-ascii?Q?SYMPyfF6H9vtOgrpeNWbOjNVzABvFNYDl/Lza6Z4WSCWwsirLtW4hNHgdlaE?= =?us-ascii?Q?uhLfLfJwGju4akvuYsA/C2/cYvmAAROiY+xcuQTKKnqbTV8mGiZhNEFzpKl2?= =?us-ascii?Q?VY8t/Om5+ROowEqO4WuHi2va920PzOg2ky0NszEM+kUKL8d5kv9HEo0cmd60?= =?us-ascii?Q?ptQVP5WzTtF6uT8Dh0BwheUNL/gIxIfBDzWakearjpHmNH2yD3tDp+eovQ+A?= =?us-ascii?Q?JXRNN8aw9OrXdlz6i/JjOInlvxK1bEBeOuvu0eiBKyyZWMQ3BOdVIM0IZ4Sp?= =?us-ascii?Q?ms0jFgdUI3cA6ZeLFg1tiZjXith8oef4YGmh8Y4iJOOeNHTKiOszxgvEat+3?= =?us-ascii?Q?8KI7XuW66CkMgeng2oYy3W2MVEexwDJp7cWc+UQjikPB2SiKHCMzJybMHIMX?= =?us-ascii?Q?cDaqhwhJmQr8Cr5Zg8sA9BHzipNkVbjya9orvBBi6FsnD76cp//01tUWxm7T?= =?us-ascii?Q?j5FMl3HBqUdqXMSW6CTCRA6INM6tu5FXlOg6aFlkZdrS6w=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?lIROTDVWHlJxRkEDAkcSFkqBBnQ4wJK11wBAAsdISKIqzuLlFHL/tC7vSio+?= =?us-ascii?Q?DcZbsnEoL/nc2MM9UdkDHzJ+gZuGMOG1jk5EhqNyshcbeE4YdIs5wA2Cr1ND?= =?us-ascii?Q?JXA7e+izulKUS52G0mFpa8X5t6JBFl7fKecy351Rv8ittvf0c7AkmGaf5ypx?= =?us-ascii?Q?NT6MLlQd5KBIvRnYXYs4SSFBnsmAEmP4uZfEPzLtYSfkM2sOoj6d+cvBIiuh?= =?us-ascii?Q?rSPw6AiGnhhliH/wojue56jsbJePwIoKYdAIPJQk71X2XqPYVBcSA8xxKCWd?= =?us-ascii?Q?XZQFHN/qv2Qc8FITjc0vreERDjtCY5i01/QZnBdHrrtRKmxY/y1wRV8koLMC?= =?us-ascii?Q?Rxyf9WgDVmSGqB1L0iRgkk0Qvyy1AFrCLc11T6ob3kR6HulIU0nR5c+w6fR2?= =?us-ascii?Q?NLtgo0uaxMCf2Q76EDYT/nA4enifrPEKnZ2O2ovwRL35mQ6Uj6rmMwKC4RBQ?= =?us-ascii?Q?tHyPVWMH6Lv50R1i742Ok2MXdeOTHmWkINVjGJTLenk9gFR1I1EiCJWhXVkY?= =?us-ascii?Q?VkchC1Ryeux554Q2vOs0YZlUxiauboFd6h54gLeh+k28aQmCGE/XIBeNhGoS?= =?us-ascii?Q?AxKu0HijgoHfGH2Mb6MdoJgwTxZ37b9uN1h6haPvvEClviwbFJZUq1aH8C8/?= =?us-ascii?Q?rRreqTSIvBE9s36w49uc0+6ehzO857wRL35WugaeouHBc8Y3K0ZmE3/vE6Xj?= =?us-ascii?Q?jRBH/4nkHcIdI+/MaXutPS3GVYgDluWUsPK4gbo3K+HSg9BG7zJYjsMzUW6w?= =?us-ascii?Q?exS7mmEIA4YJE6fKk2VnKyH+33xqhjae9s9HMljmY/LsAiGeemtUpoQGW3uJ?= =?us-ascii?Q?Vw4roe2hd+XYU2ylDR3IerOleAdPClu0m+V+iUZsrD/NSfGoixrXEvt2Vh8J?= =?us-ascii?Q?LOlnIemXeaxXePyfIc1xOY05wDtZ6ic2PsuAgzBPdTpy97tgKmw7Lbijjmp7?= =?us-ascii?Q?61ipfDsLNj9N6HBjJFHC5/VMxYzCu5U3XXsa5k0WKt+zs8kpO2gm2JffTIHX?= =?us-ascii?Q?XK4rnYweZ5xuB/xGt9jumDg1hkIKSwNQOgg0mH3o3PgmgDfBjaz8bmrvp7w+?= =?us-ascii?Q?xvT76gnhje6QzRQwEIHhTbT/v+4hIZGuATJSCHjEhB6ZWebNYspZOaGMZaNq?= =?us-ascii?Q?nO/M9XMCpq7EZdH0sZyLw/1Oq+oiFtqNQJWX8mz4ykaSyrCT1INQodpXkhk3?= =?us-ascii?Q?sPB43oJYue+4PGl75fMsGQEYMHsbDPOU4zZMyDTgHTRcXQw2OGGVsntSuo7N?= =?us-ascii?Q?Az+ygzmkpGVZf8GxnNvU1O7liw7pWV5kjch8dLNCriQk/v8bUFBuKuOQ/Cbu?= =?us-ascii?Q?nQe49hrXL3ndjwJ58nvuCnbXec3Mc7iES+3XMF0EXfPPYgB420vktCIZILtL?= =?us-ascii?Q?j5Dx2RtzX1tidnWu+wpN4/R49cyWlrJwvCwEAY4bjlLSHvJNSOEtVfL2bX1b?= =?us-ascii?Q?spCjs4WUm2ofy+CupYvjbfVj18lInY91NL65qteo8mGfC9Pw6GGVgflSLqOZ?= =?us-ascii?Q?YaFSXvMt6R99fiYkOGcL8m19WzEQqYuJc5zxuGE6wADA/uKmF/yRg9bnLfkt?= =?us-ascii?Q?/CglGUN69K0dUtS7ioqfU6XbSUU6IOVX/Gc4RpQG?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xcehb3/PNlst7lu6wYejJJlG6X8LOpZl+8VgvrjkFQs3vvJkQnPPf6PnDDrabuqwiNaxerr08nU51bkMTQCQzeAqNJxXFKHOJloL7Tyjg/FrBOxgefIZxhtYeF9VQRXqsEL/yqWc4vNlBCoqiqx/SnxRILJ5YkKQu0d3JdBxHzDYvOh8e6fCGYPm6KQ0dJlwmQknPYnHzHgSoR1vIZBzNtN6ZjIZfAaBg4mNE+qatd+Jb31bYoL60MuPM4kwJk6abWdXtXhaX3CSi631dij+7zJCWtmJsbvn0oU1hfKB8HuAAxsZFe39GNOyVsM5TkT8fW+W1Q4yI8tYOqpg9jzW701X55BIs5xsZ4tpTrD5BoJHyfWDsCC3tXnHD97iQKdmzNxzwciqzFgUSFrfNOEnP4LCY/ZsWZTJiWKb5kLOPhDV5d9re9YMwCm5cIHqDZS3RIR/K+2m/QT7zZx3TcnXcMSlUPqoCsWji7bBUyEzwE4JIWrpQczcR7M3dBWTgPwrvxzbZfEVzLfsbSb+yidNHcs1XcElhNBCQ8g+8vrkxfEtfcnbOTvccUuYC/isLXZ8ZL/2b8W+cdLFz+W8zs4iO5Ed/xvT4MvLb0K3ks5CguY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 575e3351-636a-4be0-b1ce-08dcc8a867cb X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:20.2381 (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: lSK2wP88qjL2baUazf1rBfe+V7YPObaUATZ48KooU7SQ3e3kLAoBBjo25z+k8sT2SKxMcAnGw6JL679cEP0kvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: s1TuJUxGpeLi_9DLnqI84Qp9tEc4UvrV X-Proofpoint-ORIG-GUID: s1TuJUxGpeLi_9DLnqI84Qp9tEc4UvrV Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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/vma.c | 83 +++++++++++++++++++++++++++++--------------------------- mm/vma.h | 6 ++++ 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index f24b52a87458..6d042cd46cdb 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -103,7 +103,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 /* @@ -299,30 +300,6 @@ static int split_vma(struct vma_iterator *vmi, struct = vm_area_struct *vma, return __split_vma(vmi, vma, addr, new_below); } =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); -} - /* * init_vma_prep() - Initializer wrapper for vma_prepare struct * @vp: The vma_prepare struct @@ -722,7 +699,7 @@ static inline void abort_munmap_vmas(struct ma_state *m= as_detach) 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; @@ -731,21 +708,31 @@ static void vms_complete_munmap_vmas(struct vma_munma= p_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); + /* Paranoid bookkeeping */ + VM_WARN_ON(vms->exec_vm > mm->exec_vm); + VM_WARN_ON(vms->stack_vm > mm->stack_vm); + VM_WARN_ON(vms->data_vm > mm->data_vm); + 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); @@ -798,18 +785,19 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, if (__split_vma(vms->vmi, vms->vma, vms->start, 1)) 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; + if (!can_modify_vma(next)) { error =3D -EPERM; goto modify_vma_failed; } - /* Does it split the end? */ if (next->vm_end > vms->end) { if (__split_vma(vms->vmi, next, vms->end, 0)) @@ -821,8 +809,21 @@ static int vms_gather_munmap_vmas(struct vma_munmap_st= ruct *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 vma_pages(next); + 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; =20 if (unlikely(vms->uf)) { /* @@ -842,7 +843,9 @@ static int vms_gather_munmap_vmas(struct vma_munmap_str= uct *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. */ diff --git a/mm/vma.h b/mm/vma.h index cb67acf59012..cbf55e0e0c4f 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -33,12 +33,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 --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 0693F1509A4 for ; Fri, 30 Aug 2024 04:01: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=1724990506; cv=fail; b=tf3Ae9pAgVBuuNmlQpTZ4IVIuq4AJsVx692lADvIrk5J32juWzjNVGjW+LteDwg1XxN4MEhCJZuafhuWz+GITWxQxAyD6C93XOsn2Nm87ISk975YhKWWWV1JY62mry818DMa1lZq5NumHaX5cvY0EQWou6UWC/BWKZgrQWvnapY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990506; c=relaxed/simple; bh=Lv5IqTv657WMoUM1LrRo1p2rMr9JlujI07haZKG2JE4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=N+ek9MIRdXcrq+Wh1S3kF2Ug3MZHftys1jicMuzun4Z3TfL2pHJYYOPtIIeN1UtU4vfs+QCixBP/NtUl+JmNqgNprB3YW1XOi3wOml9YPa3exirb7IUfdz6r8DhxmUKOeBqx/fH3ftUqb4abFs9kMsPIOOkVrTgQDKB1325CKSc= 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=eoBxXIZf; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=B2CnrSi7; 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="eoBxXIZf"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="B2CnrSi7" 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 47U2sFnH011046; Fri, 30 Aug 2024 04:01: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=qcbtKtfIxq4olm/b689TGnAJiG25veUzjpPHk8GV7Ec=; b= eoBxXIZfHcLuq7W3rWNDhOgTbnFGo4zguWfSQvMlKFSs0j+55041evrF4SOG3am0 l8qvOlPOq/v5e2QTPXCryMlr1PamROtbRfO6AOwciXai5QTgR0zsyQpG4TRWaub4 wP3hvGQMDWh+FJy1iMwkO/s8YaI2IBba66BDd87z6QaBezN3ITHHoxzr4C4KHiCB uaoCzljkFTvfiKks+5apaBozc6rNLlLZkjVQKohKx6hkhjsfVx5oh6aww7SoTlma EY/LDx5nYwb+3AX5jtEqJvyDWUJIRSGN7cPEvewK9WU5aBObyyH6a7AbJNR1reAn DpOa7ajyagMydKGKnaYdpg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q3r1v0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:29 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3jJaO036502; Fri, 30 Aug 2024 04:01:28 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2swm-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DIS22csqf24vqBmp0XwHNmP2GScSXJGudmDOWN0n8qlLzOAOo5wfq4aIr4vnerYwPBTkKqHqEH0WoNh/F6yBjIqKoRgGnCa28U37irbwRwWJF96BUX6LvuisENAF+TIvfVR3G43LPiJJpEzGa6X0lGfWz5azaOHUS06vvc9Vil74CsHkkIiJB4xHZTCa/Hblz9DE9vZ6tUr2SbdOKK4O2SsWJJWOyzKP7Rk7wXKcbDnMrkB9xdlGtqOGaxQvwJZ0PebVGVPI+B9RogHoZZer+BqlQoy0XgZAm3ymKFL+fpQ0rSjDrc6jICbrZoqrEXoLGZ1hs/yfdkZdQJU7sTIHMQ== 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=qcbtKtfIxq4olm/b689TGnAJiG25veUzjpPHk8GV7Ec=; b=VnejNvfIdChqt2PflrIXlm+3osTIrlqoeWG4GyUwaLqr8VwQ6snGf9S+Zda5hNJ+GSbSEXaJYqPuOesNwluC/XPEOx0rANvo7Kp77Rd2HaoVXEaEWq2Mikw/45QhRVcKDMeJNk5ouNnvpStfAVX6TMWTd06AG9A1nTycAfT9QpYzkjkb54rXI57vvD5KzqcqKPzBuyF2JgPDW5p96G5YKYpriYc+H40CSlPrjt0x3+lCLos3ksvRDU7duv4v+VvkyJUP+/H7dVOZNOHDL3ln8GwBVKwJDxj14md62aDhOfsugPZkKvVbViWt4umi0dkqSm9bhn9kztUKzdsbFN3/Gg== 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=qcbtKtfIxq4olm/b689TGnAJiG25veUzjpPHk8GV7Ec=; b=B2CnrSi70A9iRAQGEXQ9TxxBBZWuGkpKKzMoNqE5jD0YMiBpuXl3HbO4ZlqPdMLu1iIC4XdKbcJYwGSNnkGs+loT7wqRNP/gnLq1qa2ZlVpy2jIURj7mTl4siWFxSO1Pux8pDi7ITQ94jbXJTlwr7Np5m0ULugyKbU9EQcN7khc= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:22 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v8 07/21] mm/vma: Extract validate_mm() from vma_complete() Date: Fri, 30 Aug 2024 00:00:47 -0400 Message-ID: <20240830040101.822209-8-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0402.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:108::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: e5e05b30-d771-43b5-afa1-08dcc8a8692e 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?rQqyJZVIXPgM6TH+KynG6OgYB/M9gS+5JZXq9NYRIFmzzlVXsy8JNxR03g2k?= =?us-ascii?Q?bfefrfVSrtTQIdNsiZ7+pxyMf4KsaWuZOf4JsHYLBBGZtDyEOf96tfKF54Ah?= =?us-ascii?Q?xk1PXEP2fif1TyaeOVpdiDUbXv/wYNSLiR0qLOPCB8B6/uqo+VKh7G5Ya5Uo?= =?us-ascii?Q?CLmyDE0eCtdBsDyzQx1d9g0H9JrFeaByhFJKP4dyCtOc55KSYLX7Ca2Pltk/?= =?us-ascii?Q?yRzo9yFlr60L9SYDkhh+yiPaO46qYuL1o9HrUzKaQ50xjoCwwYISiRMgAplw?= =?us-ascii?Q?++g0jSE7zn76uShbLmQPcN+gSQRzhmKYDBQ8/j1QmXOLE6QAVW9PK2MzUlmf?= =?us-ascii?Q?PqiuYrdpvhPmmsC9IqlF5/0q6ejGjlH7dIvzknCL5ijE9uWTpGgPbQSwKbld?= =?us-ascii?Q?uZBUSTPKBykDPC/YP6Xy6RqePxm2BjTOjcdoCx8SWGxeJjS8zwwfaXHpoA6k?= =?us-ascii?Q?s8u4nRNj9ojbOhHmwqzExlzvC+RHY3JD8pMef53Dog4fMoGDSf9HM9MXMobg?= =?us-ascii?Q?pJxU1x1yVJl6rjPulrgpH8534/U9ctHmMTb4dupQWuUxgWewiH/EJ3wJmT6G?= =?us-ascii?Q?p6ZxNfkEP8t3IhJUkyuEd1KEj6mFLU2+T/D49oBd6zgJ/g2RWjZZnYEyVcdX?= =?us-ascii?Q?xVonSlmSB6tZZfrMZsa7o5yYk3G6vRCr/RE6cgveGdRwQCZ/B5uUgRllCpO5?= =?us-ascii?Q?77X+XABZkbXrT8hLanxPYxKXV2KTY2hn4uB9SHsjFAsHjP3nkXqyiRSSlMp8?= =?us-ascii?Q?ZFxPjcejCNpluXkKBy+gdABxh1H2f7PLC3U1q55+w6GfOkyR3Ct7cTeyW/LC?= =?us-ascii?Q?fZRKJ4gDOM7O1weDW2LilHZUtFCeA00aTLLCHDhy06+zQF17qShYadMVvOno?= =?us-ascii?Q?m8h3aO2EmqK+F9SVrjXpc5kUJxUIvBs0uxZ50D/nwVNKD8qXPE4MgPff+8qQ?= =?us-ascii?Q?EhbgBqHaAgYzM+o0UeUE3PPa4jy1OiDw6BYZXxFd2z2opdBFowkWiLNdJ90c?= =?us-ascii?Q?Vv+GAPUSAz4/3kE4Z3LuGelUuCbW+sAH3Z/n4yV7OsR5RJA9WybvFyvu+TMA?= =?us-ascii?Q?5aItU05cEwGP7qt2rmTZwGY9hXBkPH0JYuklyBKI39eAQi4bh0VeHzhSQlv0?= =?us-ascii?Q?ctKj1wzCipffCtVDBCMlX5/TVCfq//BKkivDUHhvdACimD3sGcHAxK+PFfZs?= =?us-ascii?Q?/2xAHYRZK2Um1829zr1/ZDclm1kvZiQgrFKf4ZeZEgjBjDhzygNhn0LOX61C?= =?us-ascii?Q?t4JVqQkRGGMNIDSCRWSgE01ogJkuF8DHGqx7A/Tm9rhoZ7Xyxvc2C1GL2ytQ?= =?us-ascii?Q?Yev67k+avgkspax4+wSRUmvso6JcKfE/lqd5XLigk5gvVg=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?HeDzGEHBtRS5CSGEOnjyA81AKQJTqe07S+iaINz32liLZYQlaUjyLQRlljhw?= =?us-ascii?Q?8To9H35+uZEd6cz26Ak4bHnqz0hHQXryDi62kUWwURgfjMZ7UHoUYW3WvIMF?= =?us-ascii?Q?iR/R9WS7sIwmBC9F35JgXrjbNsMJxjKjVEruuSi1VDszSoD9CCgx5BxWpcS4?= =?us-ascii?Q?ouWRm+EcIX9FVFrtnW/nrMjtFMmeTD6RC46gbIbz2j4SycWYtqjhIaiRhfFn?= =?us-ascii?Q?559CpMQHTW1sxSySV9cs1uLeJas1YJefGn2HmBU1Mt5BucLdxGcN+TKcgJS8?= =?us-ascii?Q?WgzIhBaEy1Z6RKbVSVw3pKIwBAQdV6UwexHgDLyDKGT/Zi4KLaoHDN/ZwGby?= =?us-ascii?Q?dMU4ov1vMkI0RfNbqU/MF6BZgMflrSbXqjsilKS3R8Xz/4rBLMTPSI4vtfb8?= =?us-ascii?Q?flUBu4rQZWOL8Pg9FSp4h8qI5YZFIruE0Ugz+FgyM1LhLPwXwETvMfRFoJdu?= =?us-ascii?Q?YN6whP6EkDDe392/sgn2hRlNY6/fElAzIXR6CjyoDifCYLCbktZSjaAsFD+x?= =?us-ascii?Q?tEwdrBK+WX+oNW8zbdDDp9W5B++smKZfPnLNaApMEbCR3Iv8ahV0D+tKxiDK?= =?us-ascii?Q?a+RT72jHO2I8HPAWEzyZq6d5qjGbYC8sB+5xvaASA4y9SYGZxauLZqtv2Cf/?= =?us-ascii?Q?+whaUHb3QF5hgc5U/3m4q5ITZsADUyO18vqtO5Fp41wv6m0Q3jL+UgjUU82K?= =?us-ascii?Q?DPnGVFa0AVWaPTAG9QbhxvF55fDIBv0mpY2DByrFsnex5swMfCntZHyZ23Er?= =?us-ascii?Q?zPzhIyOAENZhNcynp/eVMn3wjo2bdxM11kEWP3zqO4dXPpQbWUR8EBjgll/T?= =?us-ascii?Q?+lOxkPQuvtO/R8ULTm3ZjeQrbiXb91OKiWI+as+hl+YrIRCevTCYquz+xWrH?= =?us-ascii?Q?h6UvP3n5reV8KBqCZUFDrkO3PtYn65vvUKIaDVxaGsj6XAqP2b/oss5Fw4lp?= =?us-ascii?Q?Za7YjJfv8JOMyXJn1X+9ZCeQ2CqsW8Ib6lJCNL3JrpoO73YA2/MiN/Pn5k/o?= =?us-ascii?Q?1hoBOjRiwx5z4w+xnz+gyDU4yRPPJS55rGP/Qp5e4V7g+jiMF0J9+IKeKq9R?= =?us-ascii?Q?SsnM+v1Et2J5G0C3GjJ2suX2dQGSHH6+fR9R8LmsbZ979+/Db19xFNEydAuC?= =?us-ascii?Q?weDeHxkdoLqNhMNtFYA18+if4xlw7miHXyuNRE327F6oB7e+73AhE/1as5w4?= =?us-ascii?Q?TWRWEAUBa+fCMLAg0iNdheRLCptfpj2U7uBTgo2i0fA6DlaMqrb7g9LXmj70?= =?us-ascii?Q?LBbhEHNxJKfvimW5sROVdwi9KL4G1Wm3Abk7ls8y5qdKBVG2r5upOpvXWNOi?= =?us-ascii?Q?JsgZN5LqvqWtDA0f/OTO8axaCJLPIw32flxRK0z11EDfq8S+2vaLbFIepkbs?= =?us-ascii?Q?j/NvRXpZus7iaU6R82nlCh7hUA7oc95YZebFodaByk4cbv9vOjdy0LPsxT04?= =?us-ascii?Q?AOvwYIQZ7U7NU8bG80oM67qKXSWeLKS8laf+RKAAk545MA9YuGpVfXFk2ajT?= =?us-ascii?Q?t1w7DCNXRTdopip+8iCnP/rRdm4GPRKmVctDvBLEWK06//60HMfBiPxfDWtl?= =?us-ascii?Q?vxOAI/z4PPYzP5VekURdHgs38JlvdT6/o+JyzWBw89Np/5WxsjC4ozoG9P7X?= =?us-ascii?Q?6A=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Q1ow38rR//SOixmVX3pbBmvhugsRWBarg3Jks0zgyAVIQ8YOvo90Gy8mYHMUAkws/LGnoWb3amN6ZBi3Y9lBhzkoBW5dlk6PkLGAzLY4lEKwKLwqK0MU/8Dg6VWMb4EJ39tgTmzV8mJeymgmaBDUWpMhl0blZU7xjx9A4vKNUKwjGGXgWdZkFeUvlJGK8DfeGSTfA3U7/MCaxh7d+c3fRckgI0LVt3j9oKBVQ1E6THV/oemG17JFnefZZWAxlQTxY27PW4KLZTy/kFv2RV3Utig6Ial8yTstQw2QDlGDNdVpIQ8As8ty6xTxTWSy2euzwWmv6H6nJjKWZiMVvIzpaMoFlhysd0Fmuepw3ruEzjtQzEhZg2F5SSZ9gRP915b4wIK6sLsX0RUUazcDNwtXKgVbyBGlCMborQr/EbsyrEOImffAdZPftNf04wV5lwRom1iiloO+5XsE2PxlycdjGRRxdP81Sh2bZIHmtEeuL95GiCytckEh2doJi2Jp8ZZIyZtElx7c0e6w/1G5/L3rXxfag+X7OVolvQgXjDxJJsrFw50ZsOAJvtPvyRsj6k5HmosVWOyxVnpNuGL9vOraZtrCpp4GpXXCWAKmovvVxaU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5e05b30-d771-43b5-afa1-08dcc8a8692e X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:22.5751 (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: 20Yh91gk6me1Rd6JJmRz1mu8iqPQStn8jo69ykN/m5PoxtWYDl55Zj1BMi4SIaJrVPJodpEbmFBGg48SRO255w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: aVRmbWihzATOceYqtw-yMmMBmxgWFjMU X-Proofpoint-ORIG-GUID: aVRmbWihzATOceYqtw-yMmMBmxgWFjMU Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" 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 | 1 + mm/vma.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 548bc45a27bf..dce1cc74ecdb 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1796,6 +1796,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; } diff --git a/mm/vma.c b/mm/vma.c index 6d042cd46cdb..4e08c1654bdd 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -269,6 +269,7 @@ static int __split_vma(struct vma_iterator *vmi, struct= 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) @@ -548,6 +549,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: @@ -589,6 +591,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 @@ -668,7 +671,6 @@ void vma_complete(struct vma_prepare *vp, } if (vp->insert && vp->file) uprobe_mmap(vp->insert); - validate_mm(mm); } =20 /* @@ -1197,6 +1199,7 @@ static struct vm_area_struct } =20 vma_complete(&vp, vmi, mm); + validate_mm(mm); khugepaged_enter_vma(res, vm_flags); return res; =20 --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 39EFA14F9DC for ; Fri, 30 Aug 2024 04:01: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=1724990505; cv=fail; b=m0RwfkGecI9RVMIKDwe6rzhnbhuyZprMZG2iTB4g8P1prYZuR/0qZu5ZtOfbh0O0L4MW8sjTA6BrYiT1vcUerfJ7AL1txMZgjEbgQMR/laBQGPZYWm5ZVyue7ZQOip5pgz5m0RmoyEJEenz7eJXGGIglgELKBwcxA5gMMEs5PkM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990505; c=relaxed/simple; bh=kfLiFfuu76KuUS/5UmfiKhSzgFWii4GPrQQduHUxi6o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=b+QH12AgJC6CGAKzZBq4vFOoxEaxDC9Lu4U3F+XjtMtdyep/2e/fza/TKDBqgV+VXCZ6bX0+I86L+flgYqt0D5CIR9tqaZXrcyhJ79yg7FcxuQb7ISVVI433Hf8vj9p0uiSHHLxhWu1h0yHFKruWq8zEfHTYPfuEJS//qm1482M= 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=FPgBEyoK; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=eesjldRs; 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="FPgBEyoK"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="eesjldRs" 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 47U2srf9011858; Fri, 30 Aug 2024 04:01: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=G5x2B6KdF/l+leREmzG9b04kNGdPYnwroP/y6Yjz/QA=; b= FPgBEyoK266hI6RaIii69d24LM1Z5pC+vEw4uaRmDAd4TA+++A+mJBCr8wk5LQ3r MKOmnmGP93j/ZLrOI7xaymoYviUOT+5rNljovgD81K4wOOIsykCLK/fSO0cjFgX0 fqSa/LzlZ102I9QjarDHYuV+wuswADkfReyXEg4nIAXgF7/jKl3yXPrZQhl7dK69 dDPOGgCu8K+723dzjvHRantGMEVYEvG/70DuodYDJ8IKrU4393qOXMM+XLT2uwvz 7qAdQJETznetUOj6a7FY/ZdO88FuGFKc2RCoTvnjjWitAuZnI5DUSa3LjBG8z5zu ByxhLp1OQ3MCPnqSCQ1kMA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q3r1v1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:30 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3jJaP036502; Fri, 30 Aug 2024 04:01:28 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2swm-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=amDI/iHlCL4PmHybMRaSCOQw5tKfczKhM7k3IVp33CxI1f4X071oT+UpouewJnubUnnRDoRtGCPETXsgdrHjzgkVem0xlcDXNmZvBmmHRG+VH0SPjDx/mrN4fA3DswEscaQ0FynS8xw8UlkKBL04OFkkxwxIOvsqDcAu5r6emE+pjOT7SxR2LZgoNoiSW64/7vIGCOgBW8B4wjLkSfj2sblVq2Rl8XzysSPojUHWOsgQXXq/ZXXftUVWJlQfXGVQrvGSmLbLplfc5/8is6EsiVcqLpwxPv8zhu5xfgfOM88YugDmzdbtIH7Q1dZXbfN4CwmctQskrhx418w0yyvI/g== 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=G5x2B6KdF/l+leREmzG9b04kNGdPYnwroP/y6Yjz/QA=; b=R+xUvc4qEfHUGf6zmTqi6It1bbZtzJiixRHVOOmWRKY2J50JtKmVnvoyzEsc1HnFeV9qcxEao+msLnV+FxuhiZfjNALJfctSWkFbb8uOol+5ThWkb6MT0+htG6B9gSWju+c0n7C6VXlvESXcKV4n57hy0hiGf11fRYsTwKCC673xLIs1XDKyCRiG8XDJib4HexlnffVDQPEyTHjRMC9BPjgeFZ6FS/BxJwenBHHJH+Fgu3FqQCKsvAm7FwpFxGkCfrWpHEV/XB4bvEKqA4EhtJvtvW5V5COeYmPhstPajoaX5UD3M+Z906i8eBYXHYF+jsT4AzF2X6YR8h+ncrtOew== 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=G5x2B6KdF/l+leREmzG9b04kNGdPYnwroP/y6Yjz/QA=; b=eesjldRsMR9BDidWbZYoTk6CM+HJRFWjMB8CIJ/TrB3lfakvFsQP0GX++UqMu00hAqzwjoM5xzHNbUq2eZIFPuRB/+U9q7A50lgiv3n7695OLEdgSQ3vUQ+xzLEfG5Fd9wvH9h3ON7fW8O1E4o2wgcLLq2nPEsZi19fE+icRnBg= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:24 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 08/21] mm/vma: Inline munmap operation in mmap_region() Date: Fri, 30 Aug 2024 00:00:48 -0400 Message-ID: <20240830040101.822209-9-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1P288CA0031.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01::44) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 99322462-6b0a-49e9-0da4-08dcc8a86a59 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?zdi5fsZWBtshPrFg4lh1DRSdILh94vOoXBnrOrD+1P7Nt3GjxODvP6SmaKrD?= =?us-ascii?Q?cl1BD/reETz9cLgG9R89QM4py7rt4z8LS+JEP5xIz5zepwvnO1Dg6DqP+YHY?= =?us-ascii?Q?7gzjkD2pLfCQWdZjHLj4ajS/yLJSb6wj2N83YEqCIRO6xhaD2U0020Ztvuwq?= =?us-ascii?Q?o/vpHwxM4I8/tyUpSTi8AEWB6p3+cr8ylAo/SaFb+ZE+8KLXT6dCh+rCiFD5?= =?us-ascii?Q?K1Tt6IiIZ4CXZHpyEmZIAWSmrB4enLrDq2yOD2euLxiAy5FIxUeMW0q25Z/Q?= =?us-ascii?Q?248Ko9cQtVTYzhtbPIAafYghIFiYkV+Fdw7Sw15Euw9EJZp6UIRn8YTiaEDM?= =?us-ascii?Q?ae6Xl+l76dtCnsYHPTmlvujv4Cw4QfuP7dp2gasplEW/zVRpkSHPUaXx+UDu?= =?us-ascii?Q?quG3VHxAAJqdxYjAbTgk85sQg3Hvmo+Po0BaJ8ZXPnj7II2a8g05TT3tiRVQ?= =?us-ascii?Q?TnP1oUoe7G0eXv+0rv2PZktaXsT/GHpyUbmncFZZisyMSO7Ut60Mpt6IyR3u?= =?us-ascii?Q?+ecNvymY+nkCl0ke7LhctzaiNZxAwdKpNoKNFhKnemgsWML6ryxYdY/1H2Yi?= =?us-ascii?Q?0pUIX89MkRAzGzF+U5Xhak6XT8u5bD//PYbq8sPM5m4xJzZKZB8XqcSoZgif?= =?us-ascii?Q?1ozjPid3PFTvJCnHj2rvSlCjYdjlXOycPwH0xGjHZK68DHFVA60ZKGbfcGOm?= =?us-ascii?Q?jLrvCaMxcS0pLzjy2z/6fof7gVxR79CYE0b4W1JHsPCb0zeXZEURelOb99aq?= =?us-ascii?Q?rHgVBwaWeGynSHus/Oy71zYaGdl0ocQ4gKKnhqq/AuXRPjvSARRaoYgVuZS0?= =?us-ascii?Q?fWA5cit3eBFu9YEf9wBtiOZhTPvnMAH3EP98IqdFqxfvBHNLM4uQTVJBour2?= =?us-ascii?Q?fJ8TBwC8Gn7ElPUNLl/14emRh4Jo81URT03Is8C7Y9RynoJWW2+G7hTHpr9a?= =?us-ascii?Q?LyOTUKYv6n45RShjgX8EuS+eJkA8hDh+NsgEERcmgKxZnQczEtkomN8AUmto?= =?us-ascii?Q?Q4UMhxM8XPUtiofHq3/kD0kxF0GQiAaPk/b2MdSACfKtTETod9dHqJA2ecPb?= =?us-ascii?Q?GVcDKMA36GKgVUw3DJRgjW/VZEo8P9Jtr9UR1vmhr4ClfggyjSdvUKjeA+kW?= =?us-ascii?Q?jORcB+4T0Fsr6p2g/jmypFd6hPl1KmzI0KPCSlQn0dAMkFIHU3H81NLaRb6m?= =?us-ascii?Q?cM9Til401b65Imfft9nPD0pj4THXigq64Kt+wI01Kg2FXGsV+ksbFQsYBaJ7?= =?us-ascii?Q?OSbUlA7j+ePkfsWAHmmnxjpaGlVDBAcO2Ue9wJRPPwDcXLrRk78GJdruBThG?= =?us-ascii?Q?M+NkEaYSzPv2u/7I5rNLjQeAznaEHkrbtTvkTWO0/gc0ig=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?sn1m9z/CzIccL7qUR8FyR3R2fXBxZvdvPTgsjEwRdmU48T7E/jJbFGSGK+E8?= =?us-ascii?Q?9dcEZ40ROgyuEq0Z/mV0FlWxMeBm8pMjEIKCfKDthjZBOjja63evOnAkjr88?= =?us-ascii?Q?YjYVyRFjh1nLSxObOCJL9zmkSBOeeR+NYfgyDMYHaoqD6FHt/w2txrV9jndD?= =?us-ascii?Q?TmjvTQr6V/GJW/xeF1n0WT6hvmcUsgrF2AjrCNuGswE8pxw93gwEnKYUqaph?= =?us-ascii?Q?Eo66HiyluDKiEM90pXSigFSZFu8VoXYMVQFb3CnfmJiFK9lAWYnc0x037X7D?= =?us-ascii?Q?TBGRSZtnMdVm6qFcKNuDrXA3fNIjRnbCfhxslsGFnwihJSJx74kZZYDaek30?= =?us-ascii?Q?3d9EXuou2hk72TsRawEzofsiIPXoOvcicqDHU/5qNccpTawhmphP1w6debxl?= =?us-ascii?Q?N6kUnVlcP9tjRXlzI02TL3+602Z4jPIX7adr1bF8oh7Cs/l5/2KkGWvXVwNg?= =?us-ascii?Q?pDGKaCdnPmWD8OJ8hjecWW5DePHqm/pIqes9w5wPOCQr/9uRs8DQ/BpwHi2n?= =?us-ascii?Q?WGxtkIah5GF8fplK+WRi57Lb9TDoL6zrW+BIdCWhe9YqiUpXaKeZI9U+CA/F?= =?us-ascii?Q?IV+MPUc2/XCh4x7OhuQsPotoDtLW8oEWog7isBgERaFERz0e6qF0t+so50bs?= =?us-ascii?Q?YpXsaihNcJ8tdlABwtmxWw6fSE5XZpvda5EIdj5xHTMZJoTw/O+KS9Z5Uh8X?= =?us-ascii?Q?CCYoGQURGff07q3s2GcRCsbu3NPlkCwliykhd9Ztd5kVjrZaXNtf9Wag5ict?= =?us-ascii?Q?9hwYePhpDIGaXaH7tRcZPJxlIRTQ77ceoyCLi2ahP1TPCSRxOQm1uUx3Aluz?= =?us-ascii?Q?nU6SJwOJ4oMMAkQdC21AR0zRFyCilOQpdrbZQ98voWYeUkfB7/j4GuNfzy1e?= =?us-ascii?Q?c9kBzrfLocFee3zrUosuUOxHER03xkXWUU5G3lkVB+Z1xbFZzmQhZ5jDDHGg?= =?us-ascii?Q?Rx+NgCX5SAAWlg6hh+Alz8TT+IY5EjYD5byBxp1SGrl5xDtDRGCxdgP9s3TD?= =?us-ascii?Q?q7cPAelLWXQQflTiSGCPzU+Jjb4Yq/SieD/O3TPiNuFvv3ZkLlQ5YbyHELAL?= =?us-ascii?Q?59pQw/qPzJAW032a6ACJNHGlFkW8vZudgnIIuiQ+RAzZujuHusdk8FwYCMhd?= =?us-ascii?Q?mP8NRDSR6kzgCSlMUioKkshbaU9l2Tez2SHE2pMta2MfS9REGgelXfUjPAkf?= =?us-ascii?Q?+/L/0Vxw8mwbLRY870OqSWJEx2mrUcvKaqO8IXOwVnZf+DBzDCU2TEmxEkLx?= =?us-ascii?Q?Jx6ttzs1lthYRH1pDLHjkloYP5wq/XOnt/sO3++5sV5oLYRutNLwBnNQ1c+U?= =?us-ascii?Q?+VFeFmBiSKnzEj/PMKcEtcp4vz8jro+h2o1ht6gadr2P+GBuKf/QfjZH69AA?= =?us-ascii?Q?4BVpsfdErEscnImYcLG3vrGBP9cYpexnJg1L4S6yELmrpVrtS1BBToddLGFM?= =?us-ascii?Q?uhcflEwamM7hoggHgIUP9ZMapxLs6sgo1VhxaetDAN+/Q01c/GvoVR3D9ULU?= =?us-ascii?Q?D8/Mv71BPlt67WhNgR0zvW4vf9JdI7TeO8tlIbgI1VAwWBhpKEBVFPWGQlau?= =?us-ascii?Q?k1KkLm2bd1ciwRzCaJfNB4Rc3Q6tj9thBdS/meQgtF9V0OqTYYHcQu2Vft3f?= =?us-ascii?Q?8g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: jNXPpxlAlbsPhqnmL0iLBPk+QOyBzGM/a5O7BqUxvneU6AgFJ4YsvdMpM1RtZTYIcU95A+KFgWxoY1G7980Y/sgtPXcV9425dwb/Wcpx2WKVCFEKI5gWPNq7WzInb6yImn6/sZUCdz55cxE5MCGoZUsthaUYXuuLYQvInhiSBgptjHAnLqD7cCNzT0dsitaNLFJfmlBDv8h9zIZgbAJFkxynt8BPLf+ofdn6DxptHmtAetpbJWOQt0Wh7wYbknoe8t0olZjQNz/bouir4r/f+H5erww08ikQamSyBit3DROGFtpSbaSNn9WhvO/rz36z9SY7BZZkSHFsc4P4UIl5RBQ0DSZOzD4oStQhJ+IwFHN57fInog4DW8OgY/+MhE6Jv3HdL2sM3zrl/GpOaC4P9MTaucE+Ym66xlQwoKdnivfKhlz/FSlCLript2i7ZSlcwBURWgUu3aPjJHLpFHZsJ58Q9hnlQJ+lso0Nq18y2hoAjy8avRk7PLqJbcyoEIaFFxTHAIDoJ7s50Kt4H5dxvHMpDN+H+tb4pXawAlE9tztEs2Xr4rY/NWXG6seMmVh51LtgrhSoGHf7AW3oG6GRJp4zuj4FKMOCb0gWixuBsc8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99322462-6b0a-49e9-0da4-08dcc8a86a59 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:24.5268 (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: p7P+praqS4KVKW8aL4HF3Mll3nI13SaMXtm483nlhD4BoI6XSd9R1B/JFtJAYlT82O2w9azispgaXs2DuZ3Wxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: qWbMrd-yMzxYTgqHDsZnajb4gbBE2Axp X-Proofpoint-ORIG-GUID: qWbMrd-yMzxYTgqHDsZnajb4gbBE2Axp 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 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index dce1cc74ecdb..ec72f05b05f2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1388,12 +1388,15 @@ 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; + /* Find the first overlapping VMA */ + vma =3D vma_find(&vmi, end); + if (vma) { + /* Unmap any existing mapping in the area */ + error =3D do_vmi_align_munmap(&vmi, vma, mm, addr, end, uf, false); + if (error) + return error; + vma =3D NULL; + } =20 /* * Private writable mapping: check memory availability --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 127E114A612 for ; Fri, 30 Aug 2024 04:01: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=1724990503; cv=fail; b=omF4DZScuimfAD4Qfzn5XggvjOF9eeRcHjQRGtIlECpzrDDhN/eKl+m7a5G6oD1ADvc71PFCVV3e6irCHAqQ3lk9jFTryi5aSXcgbuloII5rLACPmQ2DI+PghOxLOXxyJYJfu8pC6GqbNHvwZ15VWIYTxthsXApryDBufA32ru0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990503; c=relaxed/simple; bh=QKx4HhIBl4QlOsXqRFDAYg/u+9WJfayKcgl7JZOCQQI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Yy3zlvYsPAytHiTI15tlRYPXV84SGHSnos4959pDg2xYv2ODjlzmo6D43J1CZcVbsLilqTHA9jBMvcQbe4UsA4jqP4aBEZsUDhdAWUhT6gflHXlF4bn6RIUtyrjlpECYMDPZ+fgDBxzZFL3qLswnNO5YapDKZGAM9wV963HAJIQ= 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=U2Y7mpKM; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=nfuXuNF8; 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="U2Y7mpKM"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="nfuXuNF8" 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 47U3LAZj021755; Fri, 30 Aug 2024 04:01:31 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=vsjQKbisoOW0P4k2LKeId1n/RkQG3vYsFDDL6+Q3PXw=; b= U2Y7mpKMd537xJb9oT6mnpzgibrsfN4SYIGwqnGWcAnQJ7BORVptDcKFRObgWV64 UZxPTtdJu5+JBZAcBN8Cue3SLffhieTyfOWggJbP+Xz+LViw4J75vrdEtPfxF4iI e3yQInMRNHY1pcUl0+ww7zIxs0IFgFKpaxBpPwxe1gf8mHpIvDfej3gKM3Tsve1N Oyp55CG0TNoSRBLqFBvUGCd87w0Xw0cUp74VzFSfNa/IR/xQaaGrWG9RNyxkF+fb YgXRZ2tKABze6C+0S7qPhiFoOM2QAfzbjrpi8qbV6B8LKIKuo5uXUG8iWCGN/rUe 2DPpFb/K9jenLqHCexgP4w== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr584-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:30 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3jJaQ036502; Fri, 30 Aug 2024 04:01:29 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2swm-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bs93jPt3EZL1CZpMLgt8GmqUt/XFNfiMBj7F1LPWMDXgwicuxVaBOaZ5y4RIRwaY3NE99MTnVwuVzjCMKlg2axV+Z37/STJVt7wUF5nXIFzcZUQyjhFZ+F4xzLtT0C6FIr38ZP1R8wnRgfYiU41vGEa86Qg8fl1pnf9S5UNF+hVjk9lIo0ERh36bjpJvJuXcMbhjnoYLjc7vRHlawxGPNkH1a2uh0M+oaDgPxthsoYwCYmgrDADNNJkdIxXl+k5bYgxwE2wD+FF7jXC1rnyfveYwMCo9n0lqO68YNafGGQeb8Xs8jO1ea9M23dmj5if0Ji1hH6nqB53IXiXmckdL6Q== 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=vsjQKbisoOW0P4k2LKeId1n/RkQG3vYsFDDL6+Q3PXw=; b=KLsc26ZihzOrqt64jEpgVCa0/eXJdArnDrjjKaf5cwnuPTmoRfMWmI0SPsX2YcCLRvsZPGzstWys3m9W5GZSD8elYhfadRKTtPQcWOfAFAgO5VltC7K9jq0JeZ+74Iuvz0ob0QiPZrOrw7SSa+BmgqB9pMqWS0dFZBDFL1HkzVxGG8ldBAFY5vvVjkTMiLoXbc7yQOXGMK++fXSfebEGrZcOnzOnCZybs1Z66sZN5VRu/hbmcVU06CscHPa4p9z2YcEA5+xQchFT5wI7Sl30MwxEAEWxpHt2ivokMNzHvO+1rhMTHyrlWWQcJyV6buK+JJL3mWOZegfpr5z4Gd2Hhg== 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=vsjQKbisoOW0P4k2LKeId1n/RkQG3vYsFDDL6+Q3PXw=; b=nfuXuNF8m4LvfR0CEQ0R7tMugQVcoD4vHtlH/YypTmWMqXX7Z2rjJWr65IcWzmWff6f0rnBniOBJn8ZJQoeNlZMttWVS8AbjOighTiHVXaW2n2Dgf1l8WEtAglvLiC1FoY4mSSbzJ8WnlyMKweiUtHgPeMTF1nPywGU+OiQG6Rw= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:26 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 09/21] mm/vma: Expand mmap_region() munmap call Date: Fri, 30 Aug 2024 00:00:49 -0400 Message-ID: <20240830040101.822209-10-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0031.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:fe::15) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 673e0af9-989c-4eca-3669-08dcc8a86b8f 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?seQX4AvNOFIrr74URqOcTZ+ted0+W+rWotzL4qGFY56XSp+9tATcyl3vb+8n?= =?us-ascii?Q?dkNQXq9bzceHSx7arfjMSwnOC2rFWC0NJEBkzC3qlZTa8f3Inpz/MB7hG3sf?= =?us-ascii?Q?YHrjVMmoXC45Sc8am3RJw29h9mcRe1SNr/+5CY5OEcdjJGwZ+FAQcIhZBMRg?= =?us-ascii?Q?n0a35Npg7YDUUcFhkRNhD2x07wN7a7UWlxJzk5rIz2bCMNTFsSEj9dL5vHqY?= =?us-ascii?Q?FW9ysXHhaQ3Lvn4QlD1uZG+2u7HtlKMizbPcQRGhwHXe6XHaQCwOlS5oH5rG?= =?us-ascii?Q?SvR/cGO2CYJFzvJhvkBDed4VekaycfanS83Q1t1Q8JnzBPmo7M7YuVr3/5ZJ?= =?us-ascii?Q?VeIvkd1wVESlT827YCPxZiu97ij7e+kksQwKOy4EtTnE2ByeAg8y+so5gVl9?= =?us-ascii?Q?xGBQbNtorfqgrzGSCL/HTD9T3Y5lWCq4ZGtUA0FvHll/jO3St1KC4ZTdnnnw?= =?us-ascii?Q?1yb2WGgyVJhQ6uKnP/axMUMNWwelPp+CzpSMiWUumkXCI4TDJfSF3WMrfMrR?= =?us-ascii?Q?Iuit1kz21UWSNVru4bjENxiRsNmejC5/7TCSFzQa6XtgN+TM2gvfXWwQR4dg?= =?us-ascii?Q?c+zxVL/i3s6OVMmZ4dt0NwGYT0cGinYxsOJDrj2Y0s3cGeaeLwsFTNANE+xX?= =?us-ascii?Q?KDiqI2M6QwqN0BXPzRlqpAeIE2OHovHU65kwrfgIKM9lPTw1QyvZUcG6uhuG?= =?us-ascii?Q?9c1Q16tMuZ3PUpr/ZgDClQLkeq6Ki9dVLS6hv1d0x7Mjwsc5YP5QYbA+lIvv?= =?us-ascii?Q?exkqdUdDthIH7iBfj17sbHDsbGUXBExtwixUzNHNQAsBJUNqyJ5RbLfqEdjG?= =?us-ascii?Q?O5hZpPzahhvjmWCbZzb7Xe4u97lMBomFp2w+NVEGMx02EeoAHNFKqaGUpym3?= =?us-ascii?Q?64/TYbjib3V+LVm6x92Is4DN/xTqkTYPeH6f+DotU6bYn1HobtmZfPDqag6S?= =?us-ascii?Q?huIFFSh5oXd+OSsGqEL9oCaBM319Qx69B8xpQ+HGoni5FsihYQhnHgmfUcp5?= =?us-ascii?Q?TlI1mJXokDMwgerj1ctwZ6MP3ITHYsUTszPQkASv8f6FI01q8BXW0LYcPwk0?= =?us-ascii?Q?Xdo22jfQzyC5WXlfHp8SPadYqMyxSA0wSyNAlu25GSMi0x68pIdRXKvXsXiP?= =?us-ascii?Q?2S+xPISgPPACMQW57N33iAL5EfpaXMidnAk0A6yfxnmRCq/NhfyGujOpWR7Z?= =?us-ascii?Q?spGq7e6bUAf+nXBDEHXRB8vkpjLDU2hnEgOOjUDt2iCFmjCwu7cDcOmqECVQ?= =?us-ascii?Q?eu+zxhLz8e16wYBgAYNAWK/dhIPL+JHrrDnV6rlwmhWWgVSMCt15Lvy/xo0a?= =?us-ascii?Q?eIeCUoJMJlaF1Rvmc21gKksQZEO12Qu7cJKXrFbLxqAq3g=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?9X4fQ5KqYVIBWrf6k8sH9KLkHnf1eqE1QmjvsqPSzFylmACa2rSE+KEPGW1/?= =?us-ascii?Q?4KM99LCU1DgrJaFdj//phkFHeK0rGRJoUpECS5B5ryPe8601KlpKOnegozcx?= =?us-ascii?Q?4uZN5NQmfnzZRBu18RKXWfqFR8KCQDofxbqFoma2S2sJvvgJXwE9D682Twti?= =?us-ascii?Q?b9DGyFLIwx0BcqnRvYFhAgP/iSMaMfSbBOBRb0t8HmyGzUvMTsGyKeXtytSm?= =?us-ascii?Q?sQzD5dkxN3Xe/UxDO0Ah5bj0Q78Pcq/D7tsKI7EQXMLai0ApkqnG2od/KrSm?= =?us-ascii?Q?MwkuR1dM+vxQCa668WJyck7ZulZy3W3bIyzuEL5BJxE6lb7YLwgdEZUA4wHm?= =?us-ascii?Q?Ss186UMCko9jzScYxKpObyyjdq4W3TNr/LBeED8+sOiiZw6VQ1xFL0VI+Hge?= =?us-ascii?Q?9CH0HrdhRjEIgyiiQ92Y70n6eNOYjLvaYI2LXBstKVe+WqHqwXq1ZAL9/rsm?= =?us-ascii?Q?BVWnWe9Xb95Cks5bzyKcfmPDRFAg/QAUfUcRo3YsIK0KbhDsFIAWuN1LiKzB?= =?us-ascii?Q?fpEgeBT+9zIi8TMk9cNMF3LhOG+/vQTNg/TithtTzIzLXnVQVhsUQIB3B/ID?= =?us-ascii?Q?Pg92AXSfLMgzZ3x8antznFcU5KrdFVPja1CRIx8l4Y7UxVqN4Tesnr3D819V?= =?us-ascii?Q?TBkEG9crlcWpPlOnxh/lb2dOeicwbT4y5YgiCxulWOY3yR9sklYHNxcPbnRZ?= =?us-ascii?Q?nyx3Eh+SUDUApRisNOs/5fWy90mCmCmAmUKCAaI+fwremM3vjsOLfj4zqBqQ?= =?us-ascii?Q?sl07vQoSaDIkPhJ1VcORNFJO415nwO+cadYKc30SPT1G6aZ4zBAjdWUvKK5f?= =?us-ascii?Q?qZ8OEO4z7Zft7s0Vyeng1rlnA3s09qkzaiOWYFiLvZROdN7XB4vqm2rC90I/?= =?us-ascii?Q?l/FPn7TYuWyQoL+mo4qp9iNy9djnRp12WbQeTfmG6vhpiqj46aVxEUkqhTSL?= =?us-ascii?Q?i1PwVRknyx8FoFpXZUTTFFwfrHNcueLkn+7pZRGYHtk1T4Fbd6lG2w/gANpI?= =?us-ascii?Q?SClQkC9EzMWUb/HkCFvitVMxm6I1WrlF5v9izQv0WJJdQ8Oz4rD5pKIl4zLi?= =?us-ascii?Q?n3ZW/AoHyVRaIyiqw7lnDkokAYa17P06ET9ZwTGNT+Dmtq1yGf9J4rl/Eq1s?= =?us-ascii?Q?vunOZcqe/epT+YQVlekC7TyXXdGETif0t80cnBPY0O+QNmXIG4PXJf68cylP?= =?us-ascii?Q?QBG6MwdHFtN9Kqu/1FuDgZTikdsWRXU3KcrVdpqro/0uFuOKiI1lcwg4jGmd?= =?us-ascii?Q?mC25AnI7stZ5iqzndCJW/qzhBg5ReeZaY+tRwiQn0uW4CofNcM+h9uQCHu6C?= =?us-ascii?Q?5KiyAF7tLikNqOpik3mbY8nULr7CJ6q3DkIAGV0JC+JEz07sMUZI9ABk79xf?= =?us-ascii?Q?iGYooo/8mMDQIGp7Q3Wl8eiyR0ZgjVAMzbJCzVUn6pkZdtRTGKVyPhYl4j2r?= =?us-ascii?Q?cDAcjcYVr4wYQFOdzpsSCrR3zYLBIAskbqMhwX5PAhLEdUWIPuPMDi1aN9Dp?= =?us-ascii?Q?JmPDZYSc0Mynp8XZqnss+DnZEsat1P29+t8lf5WQP8bIl0Fs61hqx1h6rGO8?= =?us-ascii?Q?QjzzupP7H4Z5hqkI0UWAce6gVXJBDi2ML59+/NHSJF9sU8I949OAUwzeCv9w?= =?us-ascii?Q?+w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: hoqyxFaG2G3gppmSwnVc36FkQI8xdP2fJ4cKnz2ZtxV1Q92WzlMMk08EByea9kTw/pDiJBFLgibAxYJLa1+6tNYXw4O2u9FjRb4NTpXqNHe8c/LK5jCBQ5uJtSAIyYlo43yuQI4k9MKl2el8IFSnKL1pPdOEoRqYLFfHTbYuCeau2HG0+Sj1WJJOhVR9RzfkCNNdktpNgQ6Kz1OZrwxwJ6OikN490yj4X0K4SyOyoc1ql5zjaDL7cfCcA8S5i3Xkqn+CopRIXlDAF4rZ7/C296YJKSiJBQSOVcN5uEqJnVkzr+D0tz0DKWv5Q5DdtSAk8SuXXowKvc7pN5FlXky4ogWu/1h9bmmhSKP9VB9yR5RdynWN4KJjhcjI2sdRpB7kMIBJ527joClIqv9HH2uueSU7O/gayZ/hd5mBpPxzMaRo737lQ97Eo5Kld9lUjfIWv6AjPZGhlA17hth+q2wzaC8mGdPIbtygzrd3iTc4RONq+YwJx0wVmbA4LLaVaAAUriI0Kebn/AzMzBiCKJXMCy3Jyu6Oc31Iq9QBxh12v1TDb354sz+fuyEuk9mG9ltpZEBvP4QouZ5vDJUhgC757dCMUZm15j/G+aw5w5ixz6E= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 673e0af9-989c-4eca-3669-08dcc8a86b8f X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:26.5250 (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: WLBJIVcadzCbSxwWtXhY0ss82KDWT9nBj8KhNfI6dnF1aowHLo1+LV4fUrRYEAlzfA8XZ5Qxg+Mz2qQaMeqOpA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: SYqKMsUtNBMT5GYaueVV1M8pjl14X6g3 X-Proofpoint-ORIG-GUID: SYqKMsUtNBMT5GYaueVV1M8pjl14X6g3 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. This requires exposing a few more vma operations. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 26 ++++++++++++++++++++++---- mm/vma.c | 31 ++----------------------------- mm/vma.h | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 33 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index ec72f05b05f2..84cb4b1df4a2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1366,6 +1366,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; @@ -1391,11 +1394,28 @@ 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 */ - error =3D 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 */ + error =3D vms_gather_munmap_vmas(&vms, &mas_detach); if (error) return error; + + /* 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 /* @@ -1408,8 +1428,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); diff --git a/mm/vma.c b/mm/vma.c index 4e08c1654bdd..fc425eb34bf7 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -80,33 +80,6 @@ static void init_multi_vma_prep(struct vma_prepare *vp, =20 } =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 vms->nr_accounted =3D 0; - vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; -} - /* * Return true if we can merge this (vm_flags,anon_vma,file,vm_pgoff) * in front of (at a lower virtual address and file offset than) the vma. @@ -698,7 +671,7 @@ static inline void abort_munmap_vmas(struct ma_state *m= as_detach) * 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, +void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach) { struct vm_area_struct *vma; @@ -752,7 +725,7 @@ static void vms_complete_munmap_vmas(struct vma_munmap_= struct *vms, * * Return: 0 on success, -EPERM on mseal vmas, -ENOMEM otherwise */ -static int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, +int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach) { struct vm_area_struct *next =3D NULL; diff --git a/mm/vma.h b/mm/vma.h index cbf55e0e0c4f..e78b24d1cf83 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -78,6 +78,39 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_= struct *vma, int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff); =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 vms->nr_accounted =3D 0; + vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; +} + +int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, + struct ma_state *mas_detach); + +void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, + struct ma_state *mas_detach); + int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, struct mm_struct *mm, unsigned long start, --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 479E414F9C7 for ; Fri, 30 Aug 2024 04:01:42 +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=1724990503; cv=fail; b=hd+LGr2LhUR/13eI4sydCqUCs46ZcM1xLXO/D5G7DvUiWhhTXuJxkvqu+QpOOPJqigCqXQChKtwYMBItGSOKSzDeU5FdwRvPpbkMMiAApbEQKmEysg0wY09EQP6qPEB3YgKmEHvqH2JNbne07U23qTJ1nscZ5K4vACRo1br9Su4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990503; c=relaxed/simple; bh=u6bz/mYSytjSKhdbSNV8alE84POEkhq3QkbG9CxJaoU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=LG57kzOuaV239F0F3bi3vidRRRZjSIG7YzIHxuIJ7w685sgm045zvCDjXz6QoUadmz8Qf7HioTgrS1m8+Fy0K8CQirzNf5OZDfldT3iB+tZxo8m5f4NZHxy9GvSVqGbf/47uQSbuRpma6IDMvxvOdHKob5QH4E2IinFovUYCwwk= 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=ic8hQ9pP; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=SVdHwDT/; 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="ic8hQ9pP"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="SVdHwDT/" 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 47U3MisE024297; Fri, 30 Aug 2024 04:01: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=X3TVDEXy+8mIis7fJmNHmIG5dYhcUaHLYXCY/rRjgL4=; b= ic8hQ9pPkBNxwDq4NPuxoJOSFC5XWqvCWHHSx4TZC9qPEM689PbNRFayqne90gBm 9z224mp4mt8tbAfXS0wdQmepwa0Hld2f0rWCsBnDffcJsLeT6lvCiFswvxn2GSsl 9DSfPQhpdDMND244jFKqVEkKKA5pRqX5CEYmRUC4E2LObUGFmr1mJ4K2XFZ30swq sBcCGoO4sLpA5h4nxMZv/NFUGwjE7hGnavJYLEqnoJbamMbysx6UgxmuRvLJqjwh vhK6UBmI78vOJj006QfDMyoowaSpAIYFUrQuGp0Uz02hBGxN205TQqIg2qawZ/Bk l9qkXqMK2Enn5ozd0ydRLA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr588-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:32 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3j9dj034714; Fri, 30 Aug 2024 04:01:32 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 4189swukv3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tUqFvfKmM/gnDTJAuhlDbJjNArRQnpLh3AOHUNVEysFDuywIVKqMLlKKc27/YPF/97f3Veg/hke1mj4EQU1djNNIwCCK8GOXDZpt1k30FQVfr110Rh9NcpYDo2ba9ov9Ce3ltkHFW3XuSzaE00JPsqa3Dtki4aMNBOcgsDavPojABpdWrGAdcp/Q1aeQ9KYEin57PS+ADA5qS3PVJTpLNsnUuoFFOlmZ7meNWJWKsQ1Du8w/xXHDpT+2kOeLE80BmWbd1WA5OUgFDjwaVSlLNm01tLygmb6tuZsR0l5+LHllWPyleegyDAMAoDN/BYIdUgkeYCGDVVFa8aq6I4AUxQ== 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=X3TVDEXy+8mIis7fJmNHmIG5dYhcUaHLYXCY/rRjgL4=; b=n3wIfYTx9X6pHM9wc3JPj064Rjd8K5ISNCmrtSI86NIlcOH8UuB8a/gDovlP5i5o70kSl7yQ+lbVBZd+IYt+TP0198cPJs+v4nsJgSkDXqN0cuFCsm6X9uGsNgTC0UMs9YCPaxZVKlD3ea5L4NOu5+FCcYvA5y5ywUUUINixrZSfPAm8iXMog1gdKlbBAw/WS7Cg9gPp5ZS4UIiag76jzwg4isnmNn6VWPvdECBD7UNn8oNZVXwjWtw1h8d2FYBfL4fBoCqGyun3NNQfpKf7wQLHr58x72+eRfw4aOgU2nbedG3rQLeWmE+j6kRBxgH3R0u5k7JNbr7bhLlklcsDsw== 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=X3TVDEXy+8mIis7fJmNHmIG5dYhcUaHLYXCY/rRjgL4=; b=SVdHwDT/3xNFUPu1eVmKU68O7YQdsp5ov7kj+dvtsFirIj+SjGdPtxjMbo+PNPAyBNG1oTABKHBMTTJ+DAuLcdokPWXl+fWz8tY07egBoWL9j5MdNkHnLHP1q2foGqVzYb3gGI4KHD2byY1lh+VyvsBJ3w+X6D3Z5kz+DyymkP4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:29 +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.7918.019; Fri, 30 Aug 2024 04:01:29 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 10/21] mm/vma: Support vma == NULL in init_vma_munmap() Date: Fri, 30 Aug 2024 00:00:50 -0400 Message-ID: <20240830040101.822209-11-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0014.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d4::17) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 16142e4b-0027-430c-eb64-08dcc8a86d22 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?XjkQNhXW4d9SsIpeSndOAewtTj6N/ncaKr5X4R5PHNxc7Re0EX8A7pL123HB?= =?us-ascii?Q?B2M3hEQMvNCv7Gy+E52HBOuXNf8O+ItgTKxGHr6jhta7e2xE1VD7FwI5yjvE?= =?us-ascii?Q?cwaYuUxlyzlmcKTDI2vEg95+NpqyQZu0X2JeHXVVj49ecL/ee3XXOVgQytI9?= =?us-ascii?Q?Y/OT6ZsvqdFFYhiWlO1cj4D+CxeyKQpTq7Jsb1EW5wBKF+ZQHpNEMwyMFuRe?= =?us-ascii?Q?QEUlqne5LQq8RPv3Mz2MbpG2eGKicC5qycnonKIsf8YEnnuPsJtZvdo8XCUs?= =?us-ascii?Q?wNCeSBYCrdUvGtzVM2dV5YrUgo4j/LtDbOBsqBdS5wc31sMsOxeIK84aGBnL?= =?us-ascii?Q?ngEOZti08AupKaLHPd9hjNoHl2ZCKb7SuPnUkFk/bgtr+stC3YCFfzPN7E4M?= =?us-ascii?Q?HsW0iaRG365B5C1HnjG3wAo5CjSjq8Xj2PQ7Pjs1lJpwBhXy0TWEytH45DRi?= =?us-ascii?Q?cvkzs0wNWT+Hjb2omBZAITz9K6nkFTlvKDDrTCxlj5N4L+PMw+X3X08NIKwR?= =?us-ascii?Q?q9ivl/9lslsKyTdPbMe+7dcbYf5HbsxdE6s9hTZvFYMMnau00cJuKfmZodqu?= =?us-ascii?Q?j26nQHN+lBzTFH3wxmj5mQoDbpZdnFwQbvbj/47krJU6UtgeoGMWMYtutT3Q?= =?us-ascii?Q?cMiA/Kj5l4BkjcP6qo424cqPwn6Zr7DZh9vZtMvYHsc3yAfn0CLWmSCzndhx?= =?us-ascii?Q?Iw0ndexhmLUufiKqfw+cKoX4Ta8/XBBUuTaLz3MpQMPC7jNCuBSTS8o7X50f?= =?us-ascii?Q?WUIQGjIXhwEC17gJlrd2o/0kghF7RJKrwHteLAfJgw4jBoYWGIgl4GgBVtdg?= =?us-ascii?Q?eD3igYqPZpDcRZti1J5gKMqH8rcrCU6ledZcOWhvxAsd2PsZGbbWJrv+N0Gq?= =?us-ascii?Q?FWCFSV+lVNawlO+wol1bb0pYqLWy3CiXnae2MRihqSE2tVkTnIfT29mU8ebE?= =?us-ascii?Q?ImXjrCKOIHKOocjQ7XXX00BATajdHZMQun4AZNtXUzMY94doSwxRWSCxRLQX?= =?us-ascii?Q?nUUAghxRF+UvJS11iqjAi5sPfn++LM6PV9fiYcs6nMm65whFu1/eceMnuS3x?= =?us-ascii?Q?nObiSO8xLzrrNptA144kjBzhFtjF3dHMAGy+TxSdX0W69h2o0XT2p1hFUcLy?= =?us-ascii?Q?SRtNZjbqcedxG2u8dJIsi62oBsNP69i1hOLxroI6ETY8wanlvSEa893ZBsdl?= =?us-ascii?Q?6tgk5RTy6++oYzXt1uY76qJ/QTgD/o8PzCKrzITfXqDPTmE+Rbo660hg/K7g?= =?us-ascii?Q?66mrWD6FFjlb3zqPQmWHLUxFgm99uzt6u+ef3xmKSbWop2TlnWpr1J1ecd6r?= =?us-ascii?Q?m9dUSDyc7fd4YKDFOLpMIM98g/qMFhsFhjSmV9pfQhHZnA=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?YQ4aTX8cEv+kiBxqQUwXVmvhQAXbTBcpnXh+UnZH1IFOLDQQmewCuqOE888I?= =?us-ascii?Q?+DaLP8JLaYNbX/hebj3OhdDbsLYg0Fpxvjrt58YUt18r4g6jzf9pRuwSxvC9?= =?us-ascii?Q?kKwDrBBJOc1PG2KTam0MK0KIGVyfMZK5rwVrwBZuOpszmPAeO2uIIuTT9odN?= =?us-ascii?Q?3D262+o94aPxYsufz5JusDCriptc5i9/rWgteGTLQffSJ76W03ykmj6dPJ9g?= =?us-ascii?Q?s89X0lRnS28IXunTWjjLa/rg92Qf+uf2OUezuJ0cO7uQeHaMbyTrXn5XtW7R?= =?us-ascii?Q?dXKdgRVft73SiRm9PeP9hdMsbop7lvh1Yw93p4Gs6lCemTZ/osIdeXIxf6is?= =?us-ascii?Q?diP3vCvHj+dgVKH6aKtWkDLsn7ob/EuV5wS5Vj7LLwLwHcbtXsew3fliNdX2?= =?us-ascii?Q?caMco4ULqr88RDHf6Ip+e/ELvrjrHRcDDhziZghl8o459YyzbF5amDSC3zSb?= =?us-ascii?Q?6GC3ijvS0z+MHCk/Gai2BZ3G3CFVvXiK7RlDzY0MxWNIzSsv5UizS/CFi7oB?= =?us-ascii?Q?Umd8l5OZKPt147caZqiQ8Ud4gh8Ty4QzVWTd278AbxjU65H5RuNZCWs9AL+y?= =?us-ascii?Q?HATPlSi9tSmtNb2QgEfHPs2B3uzEY9lHCjr0td8pOy0xm7DdmG7yVaNaYM0+?= =?us-ascii?Q?4dQ4O2MU/FE63rWGBgFCEaCsSJj8adKvS1fppYB7x45An4o2zVigCZTP4B28?= =?us-ascii?Q?K+bitUALzFNG8e++rKJNuFw1qJQ9Y8YlwpLJUjvxU4HysiwqRCBX1/C00NEw?= =?us-ascii?Q?+UTCBNcCn9eO8pMeQSDIknZVWgR16SQT5igw/dtGgP12uhPlUSbJjHzHIPjD?= =?us-ascii?Q?D45ZWxfuVVTiSjlEqgeIMDm3HZDmMslSrqrJB8OpW/j12apV5toUScB6+zQs?= =?us-ascii?Q?kI3++cGXmnr2bCIBDxvZ8GQ92r+l/M4LYSwS0QNu2gpD22YpuXzTuQ8lChKm?= =?us-ascii?Q?m2cVFy45Sf8Y0OtQnR3A+37TaAOZdbz2slpRqKAmZevMFtAKku20rSqGin98?= =?us-ascii?Q?tJhRq4HRserLl5U5n8/m3bG8xac1tdXT0VfsArV/mmrkMJ768bmxBflcJS/F?= =?us-ascii?Q?iRMqcFolexA6Q8gUD8D8Godd+S2dU3oFLBQFdEDz7y7Fmm37DSPtRK02m54D?= =?us-ascii?Q?WvHoHFF7MLHDHJgcof/MxMjx0BCi5FmnfjD5jyMAU5kjXPr9dLvTDMWtCc6s?= =?us-ascii?Q?q2vZJ0ybCNnhOknMyA3DmSGdUaONVLc+a/uOcCoR+hpmnGPTBO8JF0yrxgka?= =?us-ascii?Q?aDGOR9ybksfDnTuDvmRngBfNhp9Qpi8YvePCeSALcEjZKIfduhdSGFFWkveg?= =?us-ascii?Q?pU0HgYfjkYwjfEaG0UEpeVVXy9zS+uljDue4L4sSIZnCJaAhitl7o/av8DXg?= =?us-ascii?Q?3n506tdBXtkqdznl9TYZPMyO0BIS88FeM+9YIBiFw/Q1AyTTR4VLIkFKDQnM?= =?us-ascii?Q?fuqQfeV1+2GSjkqtew/j2viYR+G1A9Vv+lgFaqoOGST+RdzW1JXhYlq7p4hv?= =?us-ascii?Q?UQorOOdgQibEjqSdOwWlouiWvTcWm48buV1ClfFLMpVvp8O8+4B/y0FfyEoS?= =?us-ascii?Q?Jw3KMUVHUBVXkdP41f4xl4cjH1X4Pm8Kfljq+yC0smOvZH5lYNcgOvuZwbMQ?= =?us-ascii?Q?MQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3zscJbNDGyELvyMSql93u8Fdkm7aRJTvxnZx/C+qAw3MJPRZfa36Jh82g/g6ylawgU4QXasNc94Y7/BICyx++R07K+cnPZyCgHHvdS0132We1ZuX89G0ezLSLegmpbrG9tYiLRhvTP9byjT3erqnuQLZ2tqYYGuWBaG0gZVpRTFHqW7vq7gBCMQURbv/3yLXhSicOp5Zn3F8YA0B/TRNqbxQMofeiMnwBgqVI4IYvVjZtTh5vrNnhzMTEZN4b9n1DhcRZ9JoLGiWmsRzLvalXpFgNa7yE6d+yWjJzcU36u96C3q4+5jZ7lfBJMhcmg0OMOZVCK6SKdcpuikUnQusgOmkLoJX54LeQPmF4Ttf+JpV1Zc6oSdF/B6A/bO4Mam7lFvUsykqm9+IucV8czrXT982QHuOZRP5LzT+FSkpx/VvXkkVqguKlHkltb5t1mr53P0MWBuEk+cN1hX8S328vI3GyTDF+s8r0O2uxqX/EAB1C6wqBXtPA22nAc9FuQkxbQekjcQcA7wfAjAelgOvjI3vGTsxV8c8TGMgOagtgK9ExLxwyAkQ88Ndfhs6qL98L60eziepezTxjK4+W1SaEK5HKCd4h8hzGcKg02BjmUM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16142e4b-0027-430c-eb64-08dcc8a86d22 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:29.1861 (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: iVwcVMbY2p0ouECm7pX3hxAZJ0CqWee4qHSJY9Ljs2tn0wL6M0KEuH/8Lr/MWVVKYEf2b7owbWf+jorLuIt3MA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 bulkscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: eOhw1X3WPtRStrFG46zQ7AKI6eVAj2tH X-Proofpoint-ORIG-GUID: eOhw1X3WPtRStrFG46zQ7AKI6eVAj2tH 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 | 2 +- mm/vma.h | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 84cb4b1df4a2..ac348ae933ba 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1393,11 +1393,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 */ error =3D vms_gather_munmap_vmas(&vms, &mas_detach); if (error) diff --git a/mm/vma.h b/mm/vma.h index e78b24d1cf83..0e214bbf443e 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -95,9 +95,14 @@ static inline void init_vma_munmap(struct vma_munmap_str= uct *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; --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 3DB061531C2 for ; Fri, 30 Aug 2024 04:01:45 +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=1724990508; cv=fail; b=iW9KWbPR1PQ50Jth5GOJ7IfmGT0AVSjWLZ6I4nvXJzTM6jjdDK0QLWjcwWtdt2EppFwV9iC8tkoyCARIsjOCPdqt69xO5H9VVdKb7KSMHRWSYHFzKxp2CbEqfGw+UcsdE+pXUJkAfCoQ4Rv0C68NW3hO/Hgj9Lko/38Ko3ClhXw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990508; c=relaxed/simple; bh=OeSb3lFz41JVDt69DIlFWHGQR06sBYFOopqEYSF+X6A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=npr57dIy/ySkmA1XyZodt61yaKT+22agsNtTtkIK31dTnZNH1Ln6CzYnglIOnxmOc+jjabo/FRnYR48hZZCnR0UEI8EykZkmouCjfT+HYZ/HcaZdC49kIlFIUBWH50Kyg79SbV3irMgEEL7pwOgq4F3FrZz5YdjBPHLbS+bj0VU= 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=LnYWZXTn; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=MB7Dy91m; 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="LnYWZXTn"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="MB7Dy91m" 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 47U3MisF024297; Fri, 30 Aug 2024 04:01: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=Z5cwf34TT/HBeM8I6zt4TT5YDhHE6v+wv7dphrKLbdk=; b= LnYWZXTnT1mSa/Za0iAOixcVHN09eRWG/VYWOLAdyQQXQEIo6fhjXsMZ/8mIfDiL IVv40CjhClZOFP0/njFXLHuMrJR17YDYUk7Xy/RCZeV69JOmKvEgcz1ZqJ8HgiMt 0zWh8nPuODeVIVwwik5/efN6w4C5WNN8gxmDXRddUHt4YmZUBVKykqFhArq9cHKr qKSv7YePP5mmgeZdjkpmbl+ohXIUtt66oOnKuQaJqk5E5N7Ymz+aAyCtSoql6EaX gjm4F4mNLav2MGxKelkY+54ClnTiV2Wed6lduuxdr0UOSxWQifsvRxbOSBekW0ki z2+yWBOaCeRHTYrsefk2SQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr58a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:35 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U214vn036782; Fri, 30 Aug 2024 04:01:34 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2171.outbound.protection.outlook.com [104.47.58.171]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2t5u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tr/dZB/PefCM2I8bfpUDkZ3FZHEzab1L4ic2HahQj1jCxYLwI8ebhTpH0284Rqx3UDYKgo5ws2XFg9R/DVIS4UNRN96qBhDgllndRGoSxGOgnPzSuZesSBZZWAmzc5RCaT6ow+ZCSoUTAPuvKkTGWXFD/HQLPsu48/8/eamBzieGXDcAAlXudK5GZfanmvZiauvOyT/iU37bTefpHiUKNPcPYMf5T/4aDO3lubohEwC+gncuo9/gzq+gXvUbMIF3GChb35B6D6jSGFbhTSBVI3w75USq8PKrH9luFALEFGAgIWOqvr/AZ3zOLctJ1lm1ANZsFBIS0unCpqnYiTUYNg== 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=Z5cwf34TT/HBeM8I6zt4TT5YDhHE6v+wv7dphrKLbdk=; b=c8wNhFI66pYn5IEh7gy6hJw8SJtfiFjwqci2q2CNijMtroXmlNsRsD6RCLSJLkN9WBOSYQL0r4t0jWvIJlneHD87UL/SXQW2V43kSjlkOx5cFjkGnIT1kDAOgJNH1b8DLDpa6wSIQLcoUJEU6EXymhYODPxHW2vCbpEYvhjgFr8jnhcOty+ddQAtWqe0SAW7CTKQHc5VOLH9IQIFNiPTWV1HGciO36hJmjhuEIYA5EDjlNZs87g1bxNtYJnIev5oHW4lZif+vY5joPhtUTVm4ielLzODxHihqn2kMvgyf5R9TpcUMuHzvqezZA9PkGkmzbb5N7OMM8ycFjXo5l/WRw== 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=Z5cwf34TT/HBeM8I6zt4TT5YDhHE6v+wv7dphrKLbdk=; b=MB7Dy91mgCFvQnq0Hfk2AU0+on+wPiCv2VJJO25lnu/P2S9wGOaCD+fnFJQgMsXt52KTbrXCt3Ko17jQwChzEqxYUcRfxrpAuVac4SzC3dr+dq1LU6tCV6J2PQJnCuE3wQcKkIhnVRgL9CDqMoBznwNVlZEJCB7yqPP+hLhveGY= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:32 +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.7918.019; Fri, 30 Aug 2024 04:01:32 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 11/21] mm/mmap: Reposition vma iterator in mmap_region() Date: Fri, 30 Aug 2024 00:00:51 -0400 Message-ID: <20240830040101.822209-12-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0043.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a94a7cf-43ea-492c-90bc-08dcc8a86eee 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?aQrSZO4bo+Z0caHDATn3gCUeWndpZtqv+bu40fbEQv2y0lacN9sXsjOx7syO?= =?us-ascii?Q?7QRKknEZrTDlsk07fC3uc2TjX6mZTjwQ5ITyKhnS3JzPmhKxToqtv+wS/We1?= =?us-ascii?Q?+34+eBIkezkUYoHFgvRFwkBHzVAqHLpdDcG+zPys4w4EU1X/V4X27TDao1Aq?= =?us-ascii?Q?ttgUMbEbK2UZvKOEKagC8vV/mLnFX4sbW4fPS8yJqoH/b7aDJ3IIRZILJVwS?= =?us-ascii?Q?JmKMFkiNWc6D3wZpAjQ/FmALLj77StuODhn86SbplyWtRz/KGqvGTNfwPiy7?= =?us-ascii?Q?BsFRlc2GTFA4ZJnbgLMUYLTTwT3pZVojgx7+giDYIHWJfzmFg0cDU5LoJL7q?= =?us-ascii?Q?tN1jDt6BERyOaL7C4XtvuxNvkoL854sSrdoOmBfNq32OcYFaB49ltTSQdraC?= =?us-ascii?Q?J7VFKmz0ABmnEhBjit0yYDLputZiCuBH1eBc+EcaYprFRiYT077DR1cyfzl7?= =?us-ascii?Q?k1hudcwYdWNCt6ZKzCQIDAs+PtgQlBofgw4cQ+ttaYgvKIlefft8p2el589d?= =?us-ascii?Q?MCZmAuUjGkQtAwq/Sk9MkUVgpJBU23gVl07XbTHbyuWQ7FnnVZ/DHp3o3PpK?= =?us-ascii?Q?KiPOAczMsznrsD0JMO49OXInJRni1abNuOHl8dmGByVZYTNjWRWEVqRoStQK?= =?us-ascii?Q?dguYBxUNWevA6/fRR+DdxCZRldbQDtVjHugm2lYz8lMFQ/H1p13a7g2ZKYU5?= =?us-ascii?Q?2ViCHh4bVtOaai5a38pG5rk2Esc8XhEmN8Ggr9z+zYOmYzf9hJaAufkQGsml?= =?us-ascii?Q?rviVowwZSNPRuV6SYzHAvBV7RdQh2iIAwpS0yKQYhU4xYeL2YjqE4WHM+c6a?= =?us-ascii?Q?VLsGR+o05AvW58tAjYjLSCGBPr0g9z4z//ZGL13nR8JAbjfeJty+pNbAGbQw?= =?us-ascii?Q?2swilOCRyHNkyhzUom4o2De8JaoHE6GadMcE5pCJhjkqxw/LQu+VGZpdf2FH?= =?us-ascii?Q?kNJJ6xkAgBTIogLQLEOKovW5whPm1SktzIFhW4o/S0CX58oegCBTQmR/fyGO?= =?us-ascii?Q?gRq04mKQ+nY6swuY8a2okmQqn3xYt505T/oybuDovy90FuLjQ2uYqV2M08uE?= =?us-ascii?Q?B6FxWU96h6rHle+lEO9TDFLKlyqYQC/wbA+uBBw/eLktS9TPi3Sq6C9dTuFm?= =?us-ascii?Q?P2hVS6I8ojSDjw9fY2E7POmp0ZBafFxfQhs4xTiF5iiuOMz9xEm6JyIXJ+Rq?= =?us-ascii?Q?ATek3mX4dj5HE0wIJNF8M2NFZw/kJ0+uKnaOxKMxrwot2HFtSl2RQ4/GLR9x?= =?us-ascii?Q?uLAiovu6ZoI+t198x4+T56hhr9JQ/JPmYtAvNxGPqY3CRWAE+XZRMKVKuFlg?= =?us-ascii?Q?3TNX+YKjVzdqIQdBqFD8KR3Pg1BxmWskvFdpyLjQOSkehg=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?9yGohlGTaQ224JXYldn/QNgnOrd+gAwcZApYetqM7BPlvMT79a5jrPErBh69?= =?us-ascii?Q?2DNv3UuYqAuMzGqo/RFLOzMHAxzW3HqakNyfMabYm777FXEdKRuPyjQvNQ61?= =?us-ascii?Q?Zzn+luIzYvIJuNDJ97lSreTA7++Sv2iX/sya3pY+jEeEqBBLQYY6SYrKRfiZ?= =?us-ascii?Q?uQe/koa54ZkgmwNuecDJOrC+wjzVL8X2hFBRomSrLPoRO88po+6HnUMrdsAY?= =?us-ascii?Q?h+lTUbV3vHRrZP4LOMG6InfsvZxE3k9bkmWIHarfTcZYBEJK3xC5a2e1ivbx?= =?us-ascii?Q?3QNiAVcUav5QKe1XFKtbQY6pzBaF8A/Djfr26JRqMHldHWeK3SUj4ZWqDIfy?= =?us-ascii?Q?kGUEk0v/3nWRlzF6zaaDfq2q1Ybj7wHz1xMrfx5KPDv+YhIJ0ZsidpTTypeB?= =?us-ascii?Q?EYrPZt9J1U2v1d1uP7mVwCvHwkRgdgOvVVhpbo0oMRMv8x9R21UQDsjvlyuG?= =?us-ascii?Q?nT73biz7GfoMAqwyRdy8c9qUR0RLPWIyRo2p6sn7hvV/Jj1Yr1Ku84I0X+qb?= =?us-ascii?Q?VFRHAcsKDsEqC/N0G8jhFS0GDYOrJEbWlag4LnisGIGT9w102m32EPVyMr+m?= =?us-ascii?Q?AosRwUKzTfqjC/ZFZAa/yuvwaW1342nrPpCFRUiMpZVN9P80MJ5w2Y8ftz0r?= =?us-ascii?Q?3pO/wxq8jkmbImHzH+NwgFJuwWMNQ1XxLZa+oci6aDr+s+bn35WKnIGOfG1e?= =?us-ascii?Q?fZE7yvlP1KCugp1dsu10uwGkGT3ND53lPYq42YwqyEkNlujiHR6UPyo2l1xl?= =?us-ascii?Q?UK0npxDitZWKujF7AgF5gofHcIU0qcUMSkCS4m5uBNrWZHfN3XTfUuSTXcXv?= =?us-ascii?Q?dXI5F1ZSpk0hkDIzMBcocB93uaoGz0pB0HIHeKbot/AvGmOY9XOh+eCUYNDE?= =?us-ascii?Q?TvIBrv0QoZH6EkUbZ8GfaFof5nxdBwSpWq5hSGn8HNBQvMOwomfYXAmConq8?= =?us-ascii?Q?4IWop0lr6IhDR+43D9EYQuWrp+pR3IcFnsxM5v9ZQH8nrYYQXTBP9oS/4bwF?= =?us-ascii?Q?xoI4frbTog5itFWasL0pBawauEHAIY9ZoPvR0d/d8ie9sYDeMWcTLrUPLcHM?= =?us-ascii?Q?9zB204w1+aLhxit5WZWyewvoC5aCFBnfteTzlK+Zo87wothiUa4YQ/K4LR4U?= =?us-ascii?Q?+GNuwM9Z+9Ojc6znhg3OfKr7ge3cMX7A1/XkZumOqP4oyTov00Jy+Z0qARuT?= =?us-ascii?Q?rR1Jxlrj0L8P2HBKNYFyBe5GwDcrkTvbGHsAOxIth4TRjEqyd7/OYvYEAguR?= =?us-ascii?Q?WWu5N/aPUvMmFc2Kyxv+Lof9pme8Kzjkh3wguoamaR3GxlW37CghMyTwRgo6?= =?us-ascii?Q?vcE125/xhx1i169z5cogmJUju8CrPnK745oO9MeNYdNl0VeT4otpXEBk86Dr?= =?us-ascii?Q?NqrVlBv82WI0591kO1kCgEQ+YSrhbqMrXhFXATzQ7YuyHsyv7mwHd4ZPZ1b8?= =?us-ascii?Q?/ZltZME0OrKUHRujlaRzP7bhN7Loq6wVk9SFrYRFoeTg9Kh6k1LZ2ICxUJCk?= =?us-ascii?Q?5988VfkhLqbiT64NnCGAP4Y/fMyOkToWE2eIqtORNWm0SNPYcZt5Nye0oQwU?= =?us-ascii?Q?fj7Pwib8NxLgYXTKWoMmL898g3JuNKDgImDCtvJdTll8MLIoubLXe0DfVmA2?= =?us-ascii?Q?aQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6/pTG9Ih3/6rPluHLI0EdVWbPUEGSXYm7HnAm3AFGOOv7DnJbmhiUL1hL4flPU43zcGK47H8HxSu8iipO13OpZ+TXCErSSxWhWf8zHaevIpNhIlGAojXULXee38iS/AwXG027trJ6RqN4XRGqCjrR9d8dn5+5K2Z+EHuYqpSkhRaSqPwTc1JBSXqylZBqQqE2pbMgY6c5krPuy969hyhTv+2TMbruSXNP3otaNvfScp4e0n/pCj/dYTcOKQQa22lS01Ss9GJXvx4oVybmiVYOQISNZ9gpq43PIemeHXP9EuxdQ0SNBfcFR+IvMaBvH/wRiGieU6G/9weKlWHebixotRacajAq0kMnVJ3h3IWeMcK7QKjaZAywMemFdAUZrYv7975223VDTE42BP4vBDhQczGksu6k04SxgIVPjdvkJ1OHAs92yLmvPv25yK3lefzKH3F+hwj815LDh8UdqgbP/RI7aXCWWcJsjmyy79TDSHFyn9WzDpC2SsT6Oy/0KNqSxFkVLmD/eZk7NHwZ8Lr22MNd6rfzw5KLOkdwJodmueMVkiXD0JF42s5RWdoVKheqES7lOjFmNxpG7ExkCYJSMF9qjR+KSl85IKJc4O5Jug= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a94a7cf-43ea-492c-90bc-08dcc8a86eee X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:32.1919 (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: 51VkXatDBUx0xj2L+ZHWhw1HmiHJIiijKsV8IWFBj+2SU3odNm+HgYi6e7jt8/dt+RH1BO9ngcgjcEHEFkQXjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 1yByl6WiA1mCMZ-3n6MHi3MfmF4MCiq2 X-Proofpoint-ORIG-GUID: 1yByl6WiA1mCMZ-3n6MHi3MfmF4MCiq2 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. This change needs to export abort_munmap_vmas() from mm/vma. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 40 +++++++++++++++++++++++----------------- mm/vma.c | 16 ---------------- mm/vma.h | 16 ++++++++++++++++ 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index ac348ae933ba..08cf9199f314 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1401,21 +1401,23 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, /* Prepare to unmap any existing mapping in the area */ error =3D vms_gather_munmap_vmas(&vms, &mas_detach); if (error) - return error; + goto gather_failed; =20 /* Remove any existing mappings from the vma tree */ - if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) - return -ENOMEM; + error =3D vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL); + if (error) + 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 /* @@ -1428,11 +1430,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 */ @@ -1453,19 +1452,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 /* @@ -1624,6 +1625,11 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, unacct_error: if (charged) vm_unacct_memory(charged); + +clear_tree_failed: + if (vms.vma_count) + abort_munmap_vmas(&mas_detach); +gather_failed: validate_mm(mm); return error; } diff --git a/mm/vma.c b/mm/vma.c index fc425eb34bf7..5e0ed5d63877 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -646,22 +646,6 @@ void vma_complete(struct vma_prepare *vp, uprobe_mmap(vp->insert); } =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); -} - /* * vms_complete_munmap_vmas() - Finish the munmap() operation * @vms: The vma munmap struct diff --git a/mm/vma.h b/mm/vma.h index 0e214bbf443e..c85fc7c888a8 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -116,6 +116,22 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *v= ms, void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach); =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); +} + int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, struct mm_struct *mm, unsigned long start, --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 8E42815855F for ; Fri, 30 Aug 2024 04:01:51 +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=1724990513; cv=fail; b=sICqHIo/aD0Zo6eEwYnr8B2Ew28Nl5skY+jFXOWI6341ykOxSyikWGSu4GBgOI9y4q7WHg2SXDZr5VcOU3TCPcX+H9/DXGjo0pl+wKIWUNmreBgrUv9QpMjC2yFdc07qtMdxdsWN9rEUS6tFjWlRqiU/QJUShYTtcB/TFnyxD3A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990513; c=relaxed/simple; bh=xnMkA6bC1RzKgJhOaXWzTxskMoA1/9x8jk+ccsJ5cIQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=EK5VcMSYCJEmvGhfcTQTZxpF35nsLdfXDruEDlgHnvk4FBl95c9TDlJSGZXw5EI8Re5lA95lvyA1XL1mk2L/u/PdOl9+NNUsSYtd6l91Otfivti8p8DV7TEUfrG7Dvm1CmuTmZG7sfSXdgxDxmWWiWDn/zkbDNqG2OldTEQSHMs= 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=n7UQWtP0; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=O2iwDVOW; 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="n7UQWtP0"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="O2iwDVOW" 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 47U3MisG024297; Fri, 30 Aug 2024 04:01:38 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=1UDjaqCUY5CJt3NaoL1p2VlJ7dG2+K7tNGwtmFfkaek=; b= n7UQWtP0I71xATwhhSCJkDUKitw1JWUt8jsC1h2P+z5xi0KL5vIdBkov210zmi4V Ix+vIRU9ETRlvuYcGauZn8jSIZ5tx3LtD4OAEmKthK60x+s0FNKRkKGFRVL7sr1I jxAzOIy/LpjiWWXjX6GrlRzlXVNSGR3Hg/lhxLq32lR7Eiz0nmjKU4QBt+UdkfhQ Qb1scn9ZAr6tmoj0JA97V9Tww2M8STAv2mdZJh1pIStNSVzFP/HDuITYyFdVpaky W5eQ7oIIcRx1DNrnRSwgqVZwnKvQcivMZ4h/+pec2mFs893zobY39RDmVvlI6BVd 1rw9yBI7phQpuziYj26KlQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr58d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:37 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U1G4jc036539; Fri, 30 Aug 2024 04:01:36 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2172.outbound.protection.outlook.com [104.47.58.172]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2t6w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=umB38vR58aHAHJAg/qM/CB9odk3xpE278u8qHB+8qrp74BibzOcwYMmk6MtAnv2UfClu7yW+7ssT9nkaX2g7HLzC7LHCd9iSahB2REP3yfeaBRVaGESuqd+VtMHCkTZyGuPCUmAX0PPhlrYnDgRVkBhcWNgjKR+LvYGlxLGUZxZ/OhdNPThy/8NdODCKqjt9VOmnv2utVwFXonJORybgQheTiC9bblbuhvvb87Q9CcdF74mGohaYlStsa3dSIhReuvsR+qwJi5qmbLLuRbSyT4yg+si2s2LPC+S/hmEfmhadNEnDQc/h/l5MWEuykTl5+WII/EhTEwvETbE8J2vbIQ== 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=1UDjaqCUY5CJt3NaoL1p2VlJ7dG2+K7tNGwtmFfkaek=; b=MyfB7Ajvq4+dpY+RSBGnujVoldLr9tgQpjZVJI+ok5FnTIv4wmEnaOmVW1yMwru9TfhlyiSzEimv+C8gOvrMrYfj71XM+qVVc8KtUEZ90tdP16uzjR5o9zB56DnZX0NfqkZGaIrBZdQZ/eMM9voLZe9q1JuzwccR6vBuwUAQYMddhi+kP+szceaEdlGoZafXABa7/YGtmRlmqwSH2hbieaBfyV5qaPdHjgBxtnEfy5Ht4KAkEEUy7q8hnFFxTi4jffsovftZ8eYCaWQOkg1xHBurpNeGc3CXJ1aFHlHNxLJgnDIsW2XZ4MD+FSZe1YNpdH7l/8wBIxJWksu9KBhjzA== 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=1UDjaqCUY5CJt3NaoL1p2VlJ7dG2+K7tNGwtmFfkaek=; b=O2iwDVOWWhC+7UlxKT8GmhbduF7fDfAcYCgLZl3SEUDDuZdl/vU/I9xapNN+6YKQZOdMdeyjXju18QhktbqZxCWvtvoK78B23mXOHm91BjnCm5/XfeMT1Mc8sp93AaI37FUrAZCRJJ45q1sigvEe98I9L10DiVn54IASzxtWJz8= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:34 +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.7918.019; Fri, 30 Aug 2024 04:01:34 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 12/21] mm/vma: Track start and end for munmap in vma_munmap_struct Date: Fri, 30 Aug 2024 00:00:52 -0400 Message-ID: <20240830040101.822209-13-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0031.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::15) 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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: eeaa53b6-d7a6-4426-03c7-08dcc8a87022 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?s5+CusT+Ug+CqIQLM9+Nl9iO0TKO6TP3iMpLroUwfX/lemZMQeG4l+oNLxyP?= =?us-ascii?Q?jgokWXgQbfwBEi4zLE7/iPPEIGoPkNwksrDgCqDQ4bFMj7BkwSkF3oQaZW5F?= =?us-ascii?Q?dTrp+7JDruQ4Rbfqb//OwIXFOssbhCvgGEt6mpxgcop+EsWv7gslozL2r8Qh?= =?us-ascii?Q?vi0R3S15ItfvhMNivijmOHclzVr9CbOW4KE9dUnvosZZDAThC9tMMHjzVIub?= =?us-ascii?Q?8ttWcQzq31I1wJMnu0E9fV6FFXDmU6yw9U1wror/9SA1CAasTEuHJkb/BvaE?= =?us-ascii?Q?CjAuVK+2OW/f9O9WPWbe2ee2cmmg1pXqGBF4ebf4XJ3k9WFfd9MQ3pwB0Qqp?= =?us-ascii?Q?Kmj3rRFm/Y4rEJxrBYGJy8et7an7IsrXJGQOMJxk2Y+d1IWRBzBGcf6WQndj?= =?us-ascii?Q?7kOFKm7HRbtVGm7CVpbc1q7xIs3laAt5KtW/a2DYQx9LbixvEZ/1u7jjfWbB?= =?us-ascii?Q?sk3Skc/cUmHqZYxfxL6vj25fX2TLur9kaJ/A5BFrRFuHVjpFI3ZjEJyke55t?= =?us-ascii?Q?mWdVyfULsjIk9rixPFylKiq7+hrJupwOXXcZ+twALkmGEFBJ7/CVSizvnFcm?= =?us-ascii?Q?YnfwF9PDM34Bs9rYymAQC2WmYQskos/WAgqdbh+tB47FVYwFBNw+wJ2Kb3WP?= =?us-ascii?Q?GqtWG2THxdpKGoHpIjuQZ1SHBslYDpt3bS44uI5RKTq5/S5EAi41p78N6Xcv?= =?us-ascii?Q?HNEtdv2XmS4S5pDt9NRTOnrndzRHmJPBJPO8K3bujuA1Xp0NzNJsdeKzNS5D?= =?us-ascii?Q?3dHNX2P7ep1xiMMTIVgHwhViHY4LdTcMPSxuzMUPg05e18ZsRXQBNM459fJQ?= =?us-ascii?Q?KiLv+KtkV+EkvsFCjcbuVX/rZHHvGpzELESmFdD9jOqYXWARB/tTtgxgSpbj?= =?us-ascii?Q?IP7ni8szPgLcSm0cCnflNMA3/FUJXzS5VHUnNq2xPTuIfTLzVSKNixCKkWlR?= =?us-ascii?Q?JxuP0BkTCvVsDyCmBuVuPHwxdpqkpkpfqxW0KgOU3TIMY4OR7L1mIEa/TXGO?= =?us-ascii?Q?5FKs8CeH0peaZGGGdiYhVSHSttvA2k4jRuhX9wNS3iNOWxMZ0VAC1YY8myWv?= =?us-ascii?Q?/BzpwgiHUvtTxo7sfHO5RJLHyUrtGlzbYPdtfzfeeu6ysxj5RkfhpPdQH3O9?= =?us-ascii?Q?p669953H4OpAmcJIfVjHW5CshxpkIxDIvCzaltDnWQEs/0swJkEe4CLtG5M8?= =?us-ascii?Q?ehF/CTQScX7tVOPw11aSCeZLgiHrEMG6+YjcD5fFoZhf5BXi93WRHIvug/rC?= =?us-ascii?Q?QETdTn7EfnX8AEG3ZzpE0/gAp56gQRluwTye1ACwA/Ef0xNca+Z3zkOtt52H?= =?us-ascii?Q?7VDjL8akZVeWPfdrwsj3nUUn3fLefhRsUSGyqH5Htm7r3w=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?S3Q56uW159YVy3z4I2ZNeBZkitq9m3gsCsk2cyy6qtNxmllIyREhueQT2/Rq?= =?us-ascii?Q?vO5QygLtbNbI79YowGm/1cRd7OQY4xv6zROTjV04DXxxw9UmvzHz5Ehrc8DF?= =?us-ascii?Q?/WZUceOYXaTpZtlYrlllg11jEFYEtCrx9UxFQ9h8+3MQXfSHPhDk5uTtcEbc?= =?us-ascii?Q?L+QcKbCuPkDu4ot9oitJJRbToP7sY5vAOJVhk5G35OztJyH4OFR6BiHmcOFZ?= =?us-ascii?Q?sSqdz8zWMxDZCjpvh+Mdp8I4j2GtJ+f1zkWN4nf55UJwnxWrfFPnMfaCjGmv?= =?us-ascii?Q?rxzjzJfDKQ2HhEkIQulBs5pVzPQwJ4/jQsCo76/cWB995C73JyMVsUuE7CTh?= =?us-ascii?Q?ZT7qc5UyuPmkNUOCdn0CWhYyzI4ku1aHZKEbeSnBiNlN5olhQhdq3cBlZT2A?= =?us-ascii?Q?neiuL5O24t91eyesl/KYo5psFFqJ2tVzLY3vGwKXWms+L+aLbtBg9AfgdqMH?= =?us-ascii?Q?qOVr1pZA2HbBmnrTXpaRpPqGaf0VSpg3cGso7slVDXW8ftqSxUNODCnqlUTF?= =?us-ascii?Q?/DUBcwaF+JnuMPrQSLYmb/HiLgwNy5dNSvhizLROZA+hDTJjuxhZUZCovhSk?= =?us-ascii?Q?qaodNXjn3BmX5WhfbYM3saz6N5HlCRaTKmedeMDFAe41a7x3kGXInZ3L/YS0?= =?us-ascii?Q?cbxtffG/fz5fgIj/S1/PVyyBzrCo/LxK9Z+t+h5nG/kK6WjjdfGzZmZs+LST?= =?us-ascii?Q?eSCaXibqAWZVPD8q4qQuLjqHNtbv/BUoYZ8mKRGQP9mCnNAK7KkWeB9KfG2E?= =?us-ascii?Q?VyY4DSJYuwP0UZkfnLXkExodS1MIZJzQV0sqQQZnHFKOzVW+9AiM7ahjMJGw?= =?us-ascii?Q?EgVhtB0YKFgUi+wyGoMBWXZTNVnVXiTuuQGbUSdI+Ho3KJC3d0grToVIXBa3?= =?us-ascii?Q?UhP30Cei3d0RUOKrjirApmpnMHeXvwmAkOJ/qBGw5B4+UwhpCHZHcLCdQAar?= =?us-ascii?Q?UTYihNEnh9y14FUuSD6Pr/yUbRhJZ1hmW3bK7RA/xiw4duSBEqrdiM0ekoJR?= =?us-ascii?Q?yyUcMHC+CcCttUzsbYjK1+TFlTU8n6Ng2OFUCZDFrIII3vezz4acyELcgpbJ?= =?us-ascii?Q?l2EK+hn1axWnfbP/ono+kB3q5RuxFnxFBTfXXDtHl1nMRV+faZoWeEe2oIvg?= =?us-ascii?Q?WeaF/l7SUGxqpng07Qmx5IYzrdkdNLdmTNicB+lqvC1YT5kKzLoXLhe/+UZ4?= =?us-ascii?Q?+L9SWglIemCVYq0hykrRDAlS/qyQl7LebxyR3p8qmIqyvIgiw4lHewSpy4iT?= =?us-ascii?Q?nrDNxl1o107KwJdhMjzB7ezpX2hCXsFk3rjyy2QW+82270lDBAjCZOo/z8QU?= =?us-ascii?Q?tyGTa2v88t9zTK7qxkV21VWdaQ+qeor6tjYEsRpOXVl9S+rpVCSKG7xrxZS/?= =?us-ascii?Q?3F6OXsXLluWGYre/7LQzCtnA/j0ZxczlqiZIcg5DNQ1GRv9MsjrUJjMWfGz+?= =?us-ascii?Q?Oyp5DKJ2i1p2pfO4RuN1Fmp4oTLU2j4ITfbQV8koH1Ar7KWtF/bU8mZzU0eN?= =?us-ascii?Q?UDnEZet1jAk/ZIfER95jNbxYdjARRBXd49dIaSn8bHhsCwOuWyhHic1Dao8U?= =?us-ascii?Q?V3bQThFZ4RUHT+NNdM2+ox2E7VPndczj5a9v5QPktm72rVf0x3pSJwffTwL5?= =?us-ascii?Q?uw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DrZGeCunhnhojLLZ6c6CPv1dqEWAY1L5lFZBCkLDQQpiN3AqVbETa+lVb5VIZ4fwLwD35GCEc20VETk0zqaWDjEQP5jfCKrJye8NBaCj9PSL4l5fUi/mECOayO06Ghc+E89xMdKlaMBtFLWHJrlnFp8t35+po5L+3vRCDHfmgsYnUkVfBfmRX1uJluqDx7pJcVIcujgzFcUROCUMzqhyMUd+83EJRYXFpJgdItmd8vtMQdYuOpShBPRzyrjdCnZ4/nLtwPBO3nRB7/YVy2qaHbylVovhI+aszBMVgnyx0+mIZ1pZyXQm218YLpHKUq3xvNPyAO6EmYcztDLKg84nWqnHyBglDZ9UL9foIJ8hpp8UwUi2r/O0EIaDZEuyeU6cF0qqDPz/pzuoJJqsScb/a1CHtFhlt0byS+Irb5wpMpNmaqv3aNs28NG39GYQa/GhjGH1FrstivmAwHxoJ/FcxKRNHuyruFxCbzNZ9ti/V2F7/tgnQzU0DfUrMfPH9++dG3kuig1ecpVYdagqcFE9AIiyWs45DK4vK0fVygTpI6WxzLUfGwXgW4ka6RLyOq+Zn6sGwD8uG3bbzgwF34WAxbF83pIAbyNosceMLWeRWtE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeaa53b6-d7a6-4426-03c7-08dcc8a87022 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:34.2166 (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: eM6+xp4JHq0pjzF+7V2O4My71/JPIH/sSrIfEGV8XnhreOQrYIkbLxGPScLUbUYmzSZSuIx768B9IUIHT+9rzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: gPE7UbEfr89SN2-XGAYnktLd8lFfNf_I X-Proofpoint-ORIG-GUID: gPE7UbEfr89SN2-XGAYnktLd8lFfNf_I 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/vma.c | 32 +++++++++++++++++++++++++------- mm/vma.h | 6 ++++++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 5e0ed5d63877..c71dda026191 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -646,6 +646,26 @@ void vma_complete(struct vma_prepare *vp, uprobe_mmap(vp->insert); } =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_cou= nt, 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_en= d, mm_wr_locked); + tlb_finish_mmu(&tlb); +} + /* * vms_complete_munmap_vmas() - Finish the munmap() operation * @vms: The vma munmap struct @@ -667,13 +687,7 @@ void vms_complete_munmap_vmas(struct vma_munmap_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 */ @@ -745,6 +759,8 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vm= s, 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 @@ -805,6 +821,8 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vm= s, } =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. */ diff --git a/mm/vma.h b/mm/vma.h index c85fc7c888a8..8afaa661224d 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -38,6 +38,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 */ @@ -78,6 +80,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_s= truct *vma, int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff); =20 +#ifdef CONFIG_MMU /* * init_vma_munmap() - Initializer wrapper for vma_munmap_struct * @vms: The vma munmap struct @@ -108,7 +111,10 @@ static inline void init_vma_munmap(struct vma_munmap_s= truct *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; } +#endif =20 int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach); --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 EFAFF14C59B for ; Fri, 30 Aug 2024 04:01:53 +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=1724990515; cv=fail; b=Wie3KNZ7DSDsuB2qFZhXZNlbSKXpopBD0JJBrPSZaahBjjlOw7iwFTADAqzLj+kVXOpp9cQMOlJ78jpEWiyysa3rxe3OSxH670oBlzM4IM60vNyaDj5DbV+j11EEB9fY3cABmOasaUnTZT8EBG4oiitWl5gVC9TZ98lPllZWmQ0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990515; c=relaxed/simple; bh=vu22OMbGp7avSkj97Tt16jI+J/mjSJ8DQEcWhmLxKNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rt1aa7B8MzPp4Jys0W2UbSCkHApe3cVKpptagyu+yNxaAAqhQh1pPeoSB2FjRb6J+xi9WVnSbbAobmv9f6Jl1b7vtZDIwMc3dK7ywu2TX+hTqE1f5uAr4l+Ih8gbjN8fF6OQGOEvrGIedwO8Tzb3qfw9Epctx9Ysc1jfokAt3Zk= 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=g1nuX0OQ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WOGOJekv; 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="g1nuX0OQ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WOGOJekv" 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 47U2fV0h022842; Fri, 30 Aug 2024 04:01: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=76Q2ukEjjb0hEfT086y7aNLQ+jQfS3rZu8flZm0AWsM=; b= g1nuX0OQWE4Gh2cbdG7TS4duqWOKl9E+eRv1X6cHJ85+LCYxu6/+Uc+oDKtDRxP+ y2LS7Od4xquAeocczc2inybnYt9l/GFkSizHW89HaXHZygT2iw9XFuGKrzKZEdML F4Vgyh+UkGdXNPwYKqDOPudwpZQPvrh0QPV/XldnDpJRANvdeUD5icGtKPXt11xF I0miOZX3CXOrgnC5RPtSpZlaXf+jarkP2j1lm8dotsHPkDyC3GRZIyvica+IexUy Qpgy8/fb0b+E6wwfXnAEAS1DCI/1qdbiAmjbx4TuVpYYfNclmI837FLMjDbC09N0 FakENgSS2OpS2wLSPKQcNg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b28508nv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:39 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U3hBLY016852; Fri, 30 Aug 2024 04:01:39 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2171.outbound.protection.outlook.com [104.47.58.171]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 418a5vy50m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G//IAJ2oms38khheTgJTqN9wmmcF98bsWcz58NRX/O0lwl6qh+gV6Xu0yLiQxMnCLz/7MH1uoEpzO2Qw4EemAN72bc0hYigRDZZIVbADQR6oG8ICnwjj/h7Y1xqrnfcsq1NL8eRGJFI4zzlHtpaG7aUAFv/gvFfOyiPtDvCyrHyZpYBvYeai7PIY5mb9ygc6iGmrmamLlg5QDXiqeMqHvNnM86E0+oz/mTukU6VBum+n0BDbgQVjE089QGCioh4KdnF45oY/gag3YEWiaSY4WojFGSYqP6rvETNOCKQa+RPHb3JmH4+7+YfIijP9UWCdHz2SK+NMFhOtgQ3pcoSneA== 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=76Q2ukEjjb0hEfT086y7aNLQ+jQfS3rZu8flZm0AWsM=; b=phSg8iBiLVFqdHO7wcTrJbSbbFgcWYWB+U62xLFz27FWRqZRDjMUrKlZNBfq9lKAy1mFE+/K5Nz5oRGHqbP3514decOoSljwEdUxwVVavnKLWP8xNTaPgFOmrfUxAVIjl56SmB90g5uqHNKzaFeaaAnWbjvACn+o6VmQHoNDXiz1UohsL1TrmpFtuvh0g/lk5FfSOutIjn9W2g3gHsxGpN2FXYrGC8eRPQA/IClN+PCNddoYwwRevnnSHNy0MZzMT77HCxkn8c3Nfe4XSnfoYFu46fOEA5eGPmbSURMPqMvHhlRgxYO5lEVaWg9eXg7l/G74TE3AgSUISnAOU1cVrA== 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=76Q2ukEjjb0hEfT086y7aNLQ+jQfS3rZu8flZm0AWsM=; b=WOGOJekvxvwcTinf4vrlEtwzWfNltT6Vm6p9SlkXUvPHKWWe/4zM2atNoeKeDcqd1ns1u/sCPtxGV0l76YoULwSeD5aPgzsKgGUr8bNXUbdIzVMe/eXNHLQUgc1OCsidDU4uBWF5lK8edljjB3wnXyHQ0/NYdQYJNoz3lUi0YZk= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:36 +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.7918.019; Fri, 30 Aug 2024 04:01:36 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 13/21] mm: Clean up unmap_region() argument list Date: Fri, 30 Aug 2024 00:00:53 -0400 Message-ID: <20240830040101.822209-14-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0170.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:110::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 9142e4e6-45a5-4951-e3c9-08dcc8a87145 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?T/iJNEne6aF2T/rLX8iiU0BEdC88FDq0ny5mYE/fjUVBk0F5aUFQJ0Ih97Zj?= =?us-ascii?Q?m2WUIx8e7EgnC021M8XYgTnWefl9Pwmg5t170FpGmMiaK5kMRqI/OKPcRFy3?= =?us-ascii?Q?iSDbQClDq7zUDI3too663vKd3bRLe30f4MewYBJhX7Sxam7nKEVPhMm5DIz/?= =?us-ascii?Q?B5FF3H4X2buG/PoCmt8pOhAIVdy11M0LPzzB9+11ca3jUPCzr2NBx/S5yDAk?= =?us-ascii?Q?dqVZr5l/3RrPcDJCFAm1BQPIdIueZ1MLDCVc4nvEJMEO9OSDdDyZyjQ2BciI?= =?us-ascii?Q?1ag4nRtSiCegDOAnmTuROg6IwmaPh3ustbw2kicQ3qDjO83kjQ6YEmHAWXux?= =?us-ascii?Q?dK2cMu6ZGHkMzWV7WYvTQvfrlaMwr41XL17JGF0mrYiQ4VaR6zTLO90gQREi?= =?us-ascii?Q?fKUu4fH+Kbz41AHIp3PEhDj1mFbtdyTKKUKc2GZCx5dcP6R21+dT42tBvce6?= =?us-ascii?Q?o3bAnBFxDJseBhKPTAnqELrklXj12/r31YQt/UOOTjeAQux1Nqj4qilAyFmV?= =?us-ascii?Q?3R8ZnP1SWRUFLiwiMwvdyCkBoiYbT/BOPFHoXWfIMoMKu5s+fyYS5zEE2SSO?= =?us-ascii?Q?c18j8t9zIH8nykd+vffO8hm+Dm/aLAGxhDOTUO/MJ2T4fvANKc/tG6e9XbBi?= =?us-ascii?Q?H6ERPRz3gVBnEj5IEp8Hz/O2cVRBSbeHW1KSDfCXUaic3udloQ2NRz8l4Mem?= =?us-ascii?Q?4jaGnlEl2U4j2UbI6cYl+8T7/D/7kvJTNA0ztLSba/iCzjHizHTfsgKT3Far?= =?us-ascii?Q?HTmiQsWv47c++trXtqlRGM3fumq/sqyY8cFFw8Ru3pqhKK1g1D0zVMlzxPIa?= =?us-ascii?Q?kAESV+16GZWAVr5iCes/sKr0HuKq4YX0PD7k3IjQP+KAwjWAGBp2YZCooHOR?= =?us-ascii?Q?Fbp2eeWmi8sGsFGnJc/wPTJpKO2acAyw6FbMStz4gKhH38Am97rOh6It8pP6?= =?us-ascii?Q?qZ2ESzc6/8ok8aXbXUU7C2fDC0ARAXTHRdRY+ihGSfbumtcWLzkPf8wq/UrV?= =?us-ascii?Q?RnAbNgezDhjO2pThldaxVHqbGsdpegx2YUjuT8Jpq6L3qVox+4eULgoVajC8?= =?us-ascii?Q?p8hrusDkPRzc3EdPOJtJvZRXXTM0hj4PMpppzeMTieK3YdleMYsa+8alnFFg?= =?us-ascii?Q?nHqHdSjF1ZmrwcdfmOxGOyg0VXXp7AXcwvxq1QW3++ojpG9PlmVeIYNA7zSv?= =?us-ascii?Q?tQQNTwHAeT/1YPlJwpgfeHkdkZkjzCKY8KHagCNzsnBhmYLAXuvRyJ3mqhKA?= =?us-ascii?Q?PXHImSCcox2lVD2SrxhitsZ7khfvaNdPmtf4p/lRshXEmD1+usbJ6QL0nut8?= =?us-ascii?Q?Hyjp6S0e8dw79iRLlc0fdy/9FxYuBFYkxsQUAodpDGFngw=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?aMuinCNqFcj+tNUxoSNpomxwc/N5uMVEDXmF+Kz/HiO+yz5cPhMNEJsa9zHp?= =?us-ascii?Q?DsB4/8I18e4jJdc01wUWCDq/WSxrxFysXq+1EgXRLqvgZdY0R/xt0UwGKKCQ?= =?us-ascii?Q?C0+M541IIvz3Mv9tX9Z4HxZ+I+s0ogEWtjssmf0RYMtUWkjgVGBIl5E3X1mo?= =?us-ascii?Q?eOwnST7qEKnddAuNuUOixSFb76Rr7a7RKYGXR7P88QVRdoSp01/aXigiLDIz?= =?us-ascii?Q?4IwfltvmA/M+xAVlzODjxt08rpK2xuX502O/KH4Ng7bWyclJHpDI6U5/mEIJ?= =?us-ascii?Q?FkAhJzbbA97kBEhs+Z8FvcCIN88yAzbtv8qj7dhuwzcz1Q9ahz0oyYKG5w5k?= =?us-ascii?Q?uOp+593cNwnNOaE2/lUEmR7sR/P3v7lh0qyFXt6iGKRF7IKLtLnAnA2FuiOR?= =?us-ascii?Q?e6cPP7YH71HJVqXJHfUxi8DXq9TVuCqqRaTuUnl55+BxnvKiKVbAOs3lJXHc?= =?us-ascii?Q?5O0s1kmjG3kV4Lxagf/FXqvpOx81/WHpk4G3gD5mpBJMS/d3gMT+//846HkS?= =?us-ascii?Q?+o8xUx0TWHPapzWGzRin3HZcqDNldKWba+NvROEVBBivJq+p92q4HHk7X9I7?= =?us-ascii?Q?0eV/+/lapoheyofy33crdnX6o5/BG6QZfQfuq12+BymR0qVaInVgANbTKkYg?= =?us-ascii?Q?nRJiHcJ4cL6MWYMhIlM2ZCtHZ96Bh57fYKsh8fUxokTKz2cVNfiGqJztZnMl?= =?us-ascii?Q?FTbW37ESF+ib468BRi/VHl5UfSTgpfr/n3I06gtwQHT4dD/ipnr/szjxEpww?= =?us-ascii?Q?EvQ4P8aZ0u6I2uLe8FKuqt4Ql3sjCckR1b9UyvOAkcn2pNcDq2TnovzqUAgE?= =?us-ascii?Q?jt+VUvMzAg8sW7N27RAcx7bf6mkS4saV0nTgmZ1aWr42acJnorZmkU5oRCkF?= =?us-ascii?Q?cmJuWmTrViQH1Gh6Pmb97cpbnrSYCdSFnDhQYzgr70+RdhkNz5qryRZ2wM3q?= =?us-ascii?Q?tHmezYva397B1yqi7qMLhmaRS2BJ0jV+BcYU1+twcXIw2HwHVvKFdbjGvSJT?= =?us-ascii?Q?t4jEax0VcNG4EJAh53D4huCtN4Yc8/vLc31f2O/VMc0yj0yUmnZclEGDHMLD?= =?us-ascii?Q?DfMSu2zMNz1VdEXxMxIQYLBbtxH2rT7dDOh9Z6g5pcQWVevH5IeC9Ru+yemv?= =?us-ascii?Q?NbHGrJkW/FTDIO3XgwkMg5Sal4Rt9jVwM5z+4MEsA2JKf/ty+QqptZV9EyRi?= =?us-ascii?Q?g4X5xobo28GhAAGC+DVAE2ILv9jjOdzFsAwD6TkqP4WqbpubkiAYT0/VMiqe?= =?us-ascii?Q?qP2NI9ELL53fC10YL1qzneEoI5EFnG2hcnRCJrBsSlKbIDmMzKi//rTmmCzr?= =?us-ascii?Q?KZ6ovV2ScEMatGk7PAcXHRpoAOMoCkC1BjEZPt88Xfa7Dg4XHiQ5KzsKoR1a?= =?us-ascii?Q?4TGy0wE1vKv8sFoFvg1KwUG76w/gQXEZs2rKhtyyb8u59XCjxvKz5X4H6YWQ?= =?us-ascii?Q?pSxNFt0pl1l75a84sySWWkrudve6fbCXOFqVvVD0V/JuxjAOK/hbnWAzCAqQ?= =?us-ascii?Q?GlnQ6i2UFbB0Lq5/Tjp9D1FpbnvJn/wy2QzEmlpvH9wd95oxbAVOrTQrBlPZ?= =?us-ascii?Q?hv5lO4148mfrhsQGDUwzKuf0VsNogOq2kclv5op+/XMJvAI9KOPHUlC/JTb6?= =?us-ascii?Q?7Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rvDxd9h0IHDwew7o6QYUieGSLHqNNYcTiT4eezPGMdpAag1jxkcji1Y0hKImSQ1sy4hUbGyAn5n1pmeULxDGG+VuDAxOu/suF/HechFFfPqB44psIS/0ByBpMJdwDXotw8dIoVC1Y2LOGdisRX7IJh4QeOuCVqX+R+9T/AEiiNBWru0BO59tdGAsX5mPn0z7JMOVuths9njcjllg/bR2rEs5nP07MkdYRi+VIoIVTD3bVJo8LQZI2GbG26S4IERbTN/c4gOPKgnvwa/WWU0MzwG/lOtwmQIb1qSmCbo7rPp85CrQONyyF6LnOUpWOqa3ASMIKE+BIlTIQcyMSp5E+fsg5viUUPU8rHI1fBh+qgMMDj+viHH9vjjE2Cgnm44tU++VNXpX/lHJKX8KgSiGWLWiVNG4beZsnPRqEiziA0bgxARNDt5Q63jd1aOX82qGWlzInrK5+zDD+KOnwZxc4xoPFNeClPaD+wJRVBBN3s9XAe3y88c3mBB5u7FXKwX8iAf2MmrDK4UNjGlHc+Gd0tPPwY36Vpnf0QbCD6HcR+7XXmQR4DQil91vvdClmzaZGDWFZETllQNeEkfLsLDAZHFac7FYT4LM7zUALLVsgkE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9142e4e6-45a5-4951-e3c9-08dcc8a87145 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:36.1205 (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: riKuEO0cB54gEVl/A8cnAnNMpSeXf1dREqKhFr283FCMINMKSi1aeHtgxPmrxOYqyA2/IV3FAOMWj6EvuKhrNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 6g6YUpPvGEfzmkLgHF3vEdC8_ZUWdpVO X-Proofpoint-ORIG-GUID: 6g6YUpPvGEfzmkLgHF3vEdC8_ZUWdpVO 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. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 3 +-- mm/vma.c | 17 ++++++++--------- mm/vma.h | 6 ++---- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 08cf9199f314..304dc085533a 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1615,8 +1615,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); diff --git a/mm/vma.c b/mm/vma.c index c71dda026191..83c5c46c67b9 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -155,22 +155,21 @@ void remove_vma(struct vm_area_struct *vma, bool unre= achable) * * Called with the mm semaphore held. */ -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) +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 diff --git a/mm/vma.h b/mm/vma.h index 8afaa661224d..82ba48174341 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -149,10 +149,8 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_= struct *mm, =20 void remove_vma(struct vm_area_struct *vma, bool unreachable); =20 -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); +void unmap_region(struct ma_state *mas, struct vm_area_struct *vma, + struct vm_area_struct *prev, struct vm_area_struct *next); =20 /* Required by mmap_region(). */ bool --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 B6334165F04 for ; Fri, 30 Aug 2024 04:01: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=1724990519; cv=fail; b=pDnqfViJ4GtOFjOiShxywcy7SU5CxDFI9xnSsHShqgH8oVX9D7rbEuBw/A8/GFdHXVWTO/7viGrzdmXHo2H2AsnLExBvIAD7YkIs1hFuZla2IckiUE1ueiGjn/Z9uf78LxyFcsiuO3kNbEW6r+WlBt1YBnl9CmZSt0vf5O+9WTk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990519; c=relaxed/simple; bh=Dlc236RtHwL1U+OlBHMZjJ9HLCzndA0bDgSwSDqZsnk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=kcVO4AMnPtS1sEOvBPPSJCWdTm2zHvV37vqZ9IAhlkMlkE+QF20MUlhLpwJDZ6POSo104M/TGc2fNGwZ6n0U8GbAR367LyoQgI2OImusor0wyhqCARERa2RXa8pAndE2GZAUp0jLCNHlZ0BUsl/pp/tMRHqIwG2zWPENUSOER5Y= 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=SkHi8+99; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WC+uYKDd; 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="SkHi8+99"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WC+uYKDd" 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 47U2fU8g022832; Fri, 30 Aug 2024 04:01: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=nJx3QG3RDEW0OZLwG20OZtsi05/1/vVoSWZWUJoiJXI=; b= SkHi8+999tdsu/By25e5Jm4/591FBdSLscaHFL3VSNUl6pWdA7P7nvGlQUFT3x3U 80RFMUIyqgBayQ/ReJc2CTD+00mjo/UsJSInmy145bXhQj25W48hFAQ4FDEUD9KF dXhx7eTwMaN2hH+9Oekkw7y7empihxvqQiud1MgVBPDRsjPUPiQ2RHppqgXLUQgQ hC4xGqxKiKnyRT14uHf8k+zzNE7W5Ygh3BLOsOkTq91qnl8h83Ndc+jy+P5rL5YS X3N/9BwUrDDQx/lmyx/8ISwoQeidAZjIiD9oxEK4oiUAeS73BvjzdHuTsIiyH6PG cF6OWFA0uxoTd8slK0mR0g== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b28508nx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:42 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U2YOTC036524; Fri, 30 Aug 2024 04:01:41 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2176.outbound.protection.outlook.com [104.47.58.176]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2ta2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aTaCBfES3nwf2CEQF8r2iO4dYwqgbmrZPXqZYJgHajDVdb/vtyag1JiytmGZX8G69SxoSSVecKx1pnWW7Cw58cBi0vmlDGwCt17LsVHndyZIUgQfg7rCb7KkpFbk5bj7h20n3ZJtdpiJYP4BFJQOGq7lioq1mp+gw4OFxmrwodQApbZxw0yiw19f/5h5LdEtQ9M4drHIpyBQD0HcFefYEi0kMgkYb2Pd62WUpBx5WINOXxjG53egOtmQ5JCZg7kjXDXP1QvOc+mzefjKI4Iy1lhqs+pQBNf9UKHMzHWAb4rhcxDutckRp7K0Sa7H0h2SfEdhULytQRFzvHw5O/Y5QA== 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=nJx3QG3RDEW0OZLwG20OZtsi05/1/vVoSWZWUJoiJXI=; b=rxOcuShv5k+4syitjXaLzwH9/J5vHYDcvMB3VyinfNgS4llPqvwj62C7M9I8NG0JZ8tlPTP2AOOs2JQBL1C4WQ7wnv5o+LNotDKzw9JfTKWxDglmsds4QRKy40FV1rbYRt6vYM4OhVu/FmgJB8A9fL669OTL9O4UbcrZh7WIFiL19Dnq2drwqfM3wMEns0zJyX90KlAsOHvJykPNULk6wFSwaeg+7uuHeG9h/xEAtSSxEDb5FzF5MSnYu44YwBhhsdCzc53ImrLFQI2PaUgOMKQIWhDwwMa2jU+23znghd/ieEY/cMzvGEkFC0HkND1/GCFl/vTrJ8BrTd5TRoWzUw== 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=nJx3QG3RDEW0OZLwG20OZtsi05/1/vVoSWZWUJoiJXI=; b=WC+uYKDdztlEaRWJQVf7+/HzKQLm3iET649adsWwC0nmxHUlUgKUkdRRE3f6tgg9k5iCH2umDVu0zWgcF94gpN17jj8emB3mku7tCcwhQ9tfNL76Lcd7tBM7oWKdkzvF01qR0oh8+8S3XL8i14oJ8RkGuvfju+xr6X4dxPKlBTM= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01:38 +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.7918.019; Fri, 30 Aug 2024 04:01:38 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 14/21] mm/mmap: Avoid zeroing vma tree in mmap_region() Date: Fri, 30 Aug 2024 00:00:54 -0400 Message-ID: <20240830040101.822209-15-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0175.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:110::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 6292d4ee-5e68-40be-b81e-08dcc8a872a2 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?wHr6D+ERTM+jHG1UqSXm2UvaOzKSX3xSPr5qXu9Y+NN3KBvj4F/n0BWfdyOf?= =?us-ascii?Q?sEKXWz+nx1FTS4btQQgsLenDi9as2twnM/5iStZLDpbbm2Is198JSu2nJBXL?= =?us-ascii?Q?LfD1Yxl4keT8GnAmdiuOL+qkmC2V81ku3xS8xXZidmPGxuk+VlYIHrbDf6sG?= =?us-ascii?Q?V7JHPWV6BWg4viIGBNLPlteVa00++QBdqhVa6LYpZ6QylAdjHN9vfwH0hXFF?= =?us-ascii?Q?uIGRQKAGdCHVzR3bVT49IsTZRrSFFqOSB4m/UcUNaf8LhQY51yAPBmLr7y3y?= =?us-ascii?Q?7qcDhv5Gg853DxyQXjsXKlWJBVZorIURzxEDjYZ4RoE/sNzwYX2BEydN8VC2?= =?us-ascii?Q?l3MpRLPYq/YKSgodk2JNMk9s30iiBwULZcIt90WB01AGGVdeXNdcsZctaGWS?= =?us-ascii?Q?enfg5sO0BfqA5A5mfx9mTO9I8+2x4RRbEfdT7k2t2qzPekOcpKNY5gk0HchC?= =?us-ascii?Q?/syObVLQMSGJwhzhtT4YOyjbT/IbqiDkVcQ5+WpXkR5WeR7BI0bdJJ250sum?= =?us-ascii?Q?U/r9UyoKK2TsmXS3mRQsTB1Igezr1S4tJkL1+FOQwVJWgICyuuO78x2rEFza?= =?us-ascii?Q?OdsLOnvs+JyLAmSjq+FHpLwAMybIdxocqkSrTaRTnKkd+0vX1I2NcSj/gG0e?= =?us-ascii?Q?tbUVbb9TY7tgudU7qrquWUzn3X3K3GQRh9yAa5BBP3DA49HpAhlwi56FFdX3?= =?us-ascii?Q?w7AJNDXUyK3vE8KFXlyoS0zCV60WUb5vDfJ5Wm3PLGNobVQJbInCNuuP5dyX?= =?us-ascii?Q?yF2HWO459wZNq20ZIMoMqLuNh9340mlEB7tbQdAVO0mrgWKo3Uo7MkWTOj//?= =?us-ascii?Q?frZrBVe+Cp18ycFtMB/rIxOJvpchLF3+kz4uhGFsuXeqvOlItHgP2hHOXYsA?= =?us-ascii?Q?OXfzHLQxxsJ+TOrNkL+/B1cBn0GJhYAocQWXoiDYwP2xj2u7BkL+JlRBcECw?= =?us-ascii?Q?sr3dusQlpp8SXnsBhs4N1uCtdGHLxA2KhuewmQPZDSGG0dinDm5/h47Cl8YK?= =?us-ascii?Q?9N/7h4S8Pj9LR4ZgW26atOto3mMnsaWhYnOpwexaW9Go+imbZIVN1JpUbObI?= =?us-ascii?Q?YcoO5yTfS0YzaiVTDqRMAB/LcIF1mpUXEh6rJVuM2T6b8VwA3XMqWNal/h2n?= =?us-ascii?Q?mXvsfumUuh+2G8fAxn2svVJVJrs3bYGil+oxEnKrDaUUBhflX4gv+0Yd7ZL3?= =?us-ascii?Q?ud/8CfqjLoPi4JN/y9bFUmz0kXoE49tlclH8lIkwAKER4P7tQCm/725AEyzA?= =?us-ascii?Q?CA3yUE2QTmh4BIEPa8JFoIeA4z64316KBqkUTuzhGvV3+caFjAMi43MBYHbp?= =?us-ascii?Q?q9sb57Zq+9XWRMgqcrLe/KHAd0QgNd9aZhXIP7/H6rh1jw=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?BPjVHYMzICQEphINLBXAwiSQAhYw/hl6rdxl66gWBlO6deIckNSyCb6HM7lD?= =?us-ascii?Q?OD9myGqatIV9QooRLGH8QV3elkUXv6e/NQiUToXm3Zp9l+ugjBgU2t+On22E?= =?us-ascii?Q?JF3tbjf1fXH18ENAapZqSj02Gh+JuyJERszXx6QNmRxz8lSxF0evPn9n7/xK?= =?us-ascii?Q?OZvDYhUgbKmkOwbvnV/2EHiUHcdS2pePboREdL2XuI2Vf6rWs/dKxrMV8hVT?= =?us-ascii?Q?qjC5eqYz02/rhD9M69fqlCGj//eb7taIdhYcOimk3py44JypJMQz0Pnh/wVG?= =?us-ascii?Q?GT8sf0+i3xkXPSQLOg1lGRLaEwMUxoKQafHn3Eam3DOafMDNEU4Dpo48iQ/7?= =?us-ascii?Q?tp1Kb+9JpObRQVU7bHDu4U5EOcvsIxmZbfy96bHdFbOLRYzIQofyHZOVoIq8?= =?us-ascii?Q?31JzEFphd5TIcesP1wDhAwcQ2Nx5PnMUarFI2zTl1x/KZd2Y2huLh9qVKpIg?= =?us-ascii?Q?hKbsEk+9jK7GakETWTtm1xHDgG5DcVRWBLbDxDUiPYwGlC1+RukZScMGyPZN?= =?us-ascii?Q?ecCmmgeU2/uH4nD3e6SNMKvGp/0A3VS+5as/u77pETk2D0CJiGrekpxhhZZm?= =?us-ascii?Q?6OgSP0iY+V+vijeWo92ND605yQ1c4hX+TNb8RYjil0/Qv15RhVDBwk/yK210?= =?us-ascii?Q?jfB7swrAVLEGhbWudbA9alc+Gt3x4VlSUpBraZBUOy0ckpnr/rS5JN6Chv0I?= =?us-ascii?Q?Z+03UOKXN2GRw0uD0K8ggRZfKk1F4g2wVGRPku1QOzpEwYWvPfS+OBGtJIfx?= =?us-ascii?Q?UGkzrIBj5TJWgR5ZHDnRhPKKxpZ6EusXi8yC7We2PTRT5TZKtwUPkPFa2p3Q?= =?us-ascii?Q?X9NynHtmAIjGl4llXkQIXF3g37eaAJmz8JDZ+qR9/SRbPmbDzJHxeO2O/Eik?= =?us-ascii?Q?c/4MUIkFWMBJHDf6Oja0X+P3SQBly633dH+1fz4y6qjwTxH04G71Ua10zRTp?= =?us-ascii?Q?EHL4bGR9gsDpOJ65whQ6M40t2bRtq/TmmXN29jFOxpRSNnXJ8kCScouH/nga?= =?us-ascii?Q?XrDHlN3aIPU6TjCww6UTHZYAEjL1y/QKcWrl4xhpUavlpaYc9sUVPXg+cnae?= =?us-ascii?Q?o+CaOx3fwRns8W7YYlUGkpFfK3GOuIXHyTBW2+nxKxu7DCGK4plz3nTKvrQg?= =?us-ascii?Q?qZwDA2pPzV0Pb0gqDBq1fIAZ4RwsHp/a7B6XWQOozPVJSx2fpYVUkfzf8VDi?= =?us-ascii?Q?BKDZ/5qe+vqKZ2NlTpdWbPI1G6+MZ7tJFfTNpWS44I28+gguj0YLYaiswwR1?= =?us-ascii?Q?pmRFB8sRDaEm+30DcIYibhY/RZTfz1p0mplM2ocA1oD3HBHGKLh/YTKHVE1c?= =?us-ascii?Q?FMlEUVt2MVzx7Mzc0JN295jRSVx43LvEcW/Sk0jf4V4mHZBIh5fl/YaHSmrn?= =?us-ascii?Q?6uFOXAsY3XmHQzcPjZO2V9jA/EpgsOpn7GanLEUU30bGVaCjiSJi15O+bTBs?= =?us-ascii?Q?2pfShDaRtBM5PMK9jWQJevLhBGZFLAwBnBhrtMqCSYv97YXz3hPRFlyiceJP?= =?us-ascii?Q?C7ZpvkeaRSAUYu6BM6z0srwpkkjYm/EX4v2rjGHPn9wf2NIGQOq5nKplLiin?= =?us-ascii?Q?LtrHk1YGRigvBLl80UABmKuQGSGGpZ1L37r6RJnsKIbqumVe7EvPoTZFkp+Q?= =?us-ascii?Q?Dw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: fwkX/2gh/9vVJjmrE8UCbLppm7WCU+k7SiP/KLk/KB5J1TZEjj9lc14pBYdGyQqeCkDsVlbvrlKErnaPJWcsDpTOf5V+PkY8KzA8NvWN7+tZu+n6NM5CHqB8Znf8nKUE4gnfjAdJ05YEk7HUM/9LHMdU1t7Sou9FcQYA1CAhgPI+YeUKJgt+FpvMl3Eyw1+Ki8Ah7V9/gZFRQjSuIJklfSUl1jHTYZgDYJUZ9NN+TPyv7Svh0DOjihYWT4gBgBMCQkV96w84F8TN6XgC9QZpeCi78pd4wj4leIxfHpAESr8Cq3/sWfUemaE0ekYRv6SHi5StyfpsAtIgBi948yS93thlExSI9hxgRoeoOqhWJ5XbeI4zWPQoV9YlT1Baoa8Rf3PbPU/bnkZ/Y+AMKTSa/cwVBBn2+DF40CWFlnQw8DN/Jg58wwqO6WJ6dOuuEf2+HuZowWSYxgelIsK9Hzb1/Owy+OL5JMpUysFuOvmPKFFIO3oAqQHQG7qCsu2wr7ZdVz+wIfUKTAlpweQGNH6pNuTW3mh/6VF5u3m8q5XOU8b/LO/a6VbY+SvKR/Vs9aAxY+MS90unoz1SBsvEsTXrFWBGRanD5pAj1r1C4Ml6fjY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6292d4ee-5e68-40be-b81e-08dcc8a872a2 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:38.4006 (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: JSl3n9qNTldgPnkDsqEB+3OofRDEUUNgefVvvnPpx+/52e6dMDWf1u6PM94uDhvamCHQ7/j2u3g+sAV4iDQTsA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: TfGlakqAfAFPkZf5yC4KLqBVn5ZsHpXg X-Proofpoint-ORIG-GUID: TfGlakqAfAFPkZf5yC4KLqBVn5ZsHpXg 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(). To ensure locking is downgraded correctly, the mm is set regardless of MAP_FIXED or not (NULL vma). If a driver is mapping over an existing vma, then clear the ptes before the call_mmap() invocation. This is done using the vms_clean_up_area() helper. If there is a close vm_ops, that must also be called to ensure any cleanup is done before mapping over the area. This also means that calling open has been added to the abort of an unmap operation, for now. Since vm_ops->open() and vm_ops->close() are not always undo each other (state cleanup may exist in ->close() that is lost forever), the code cannot be left in this way, but that change has been isolated to another commit to make this point very obvious for traceability. Temporarily keep track of the number of pages that will be removed and reduce the charged amount. This also 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. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 57 ++++++++++++++++++++++++++----------------------------- mm/vma.c | 54 ++++++++++++++++++++++++++++++++++++++++------------ mm/vma.h | 22 +++++++++++++++------ 3 files changed, 85 insertions(+), 48 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 304dc085533a..405e0432c78e 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1373,23 +1373,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; + nr_pages =3D count_vma_pages_range(mm, addr, end, &nr_accounted); =20 - /* - * 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; - } + /* + * 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 /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); @@ -1403,13 +1399,6 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, if (error) goto gather_failed; =20 - /* Remove any existing mappings from the vma tree */ - error =3D vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL); - if (error) - goto clear_tree_failed; - - /* 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; @@ -1425,8 +1414,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 @@ -1475,10 +1466,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); @@ -1487,6 +1476,11 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, =20 if (file) { vma->vm_file =3D get_file(file); + /* + * call_mmap() may map PTE, so ensure there are no existing PTEs + * call the vm_ops close function if one exists. + */ + vms_clean_up_area(&vms, &mas_detach, true); error =3D call_mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -1577,6 +1571,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, expanded: perf_event_mmap(vma); =20 + /* Unmap any existing mapping in the area */ + 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) || @@ -1605,7 +1602,7 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, return addr; =20 close_and_free_vma: - if (file && vma->vm_ops && vma->vm_ops->close) + if (file && !vms.closed_vm_ops && vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); =20 if (file || vma->vm_file) { @@ -1625,9 +1622,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, if (charged) vm_unacct_memory(charged); =20 -clear_tree_failed: - if (vms.vma_count) - abort_munmap_vmas(&mas_detach); +abort_munmap: + if (vms.nr_pages) + abort_munmap_vmas(&mas_detach, vms.closed_vm_ops); gather_failed: validate_mm(mm); return error; @@ -1960,7 +1957,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); diff --git a/mm/vma.c b/mm/vma.c index 83c5c46c67b9..648c58da8ad4 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -136,10 +136,10 @@ can_vma_merge_after(struct vm_area_struct *vma, unsig= ned long vm_flags, /* * Close a vm structure and free it. */ -void remove_vma(struct vm_area_struct *vma, bool unreachable) +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); @@ -521,7 +521,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: @@ -645,11 +644,14 @@ void vma_complete(struct vma_prepare *vp, uprobe_mmap(vp->insert); } =20 -static void vms_complete_pte_clear(struct vma_munmap_struct *vms, - struct ma_state *mas_detach, bool mm_wr_locked) +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) /* Nothing to do */ + return; + /* * We can free page tables without write-locking mmap_lock because VMAs * were isolated before we downgraded mmap_lock. @@ -658,11 +660,31 @@ static void vms_complete_pte_clear(struct vma_munmap_= struct *vms, 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_cou= nt, mm_wr_locked); + 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_en= d, mm_wr_locked); + 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; +} + +void vms_clean_up_area(struct vma_munmap_struct *vms, + struct ma_state *mas_detach, bool mm_wr_locked) +{ + struct vm_area_struct *vma; + + if (!vms->nr_pages) + return; + + vms_clear_ptes(vms, mas_detach, mm_wr_locked); + 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_vm_ops =3D true; } =20 /* @@ -686,7 +708,10 @@ void vms_complete_munmap_vmas(struct vma_munmap_struct= *vms, if (vms->unlock) mmap_write_downgrade(mm); =20 - vms_complete_pte_clear(vms, mas_detach, !vms->unlock); + if (!vms->nr_pages) + return; + + vms_clear_ptes(vms, mas_detach, !vms->unlock); /* Update high watermark before we lower total_vm */ update_hiwater_vm(mm); /* Stat accounting */ @@ -702,7 +727,7 @@ void vms_complete_munmap_vmas(struct vma_munmap_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, /* =3D */ false, vms->closed_vm_ops); =20 vm_unacct_memory(vms->nr_accounted); validate_mm(mm); @@ -846,13 +871,14 @@ 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 + vms->clear_ptes =3D true; return 0; =20 userfaultfd_error: munmap_gather_failed: end_split_failed: modify_vma_failed: - abort_munmap_vmas(mas_detach); + abort_munmap_vmas(mas_detach, /* closed =3D */ false); start_split_failed: map_count_exceeded: return error; @@ -897,7 +923,7 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, struc= t vm_area_struct *vma, return 0; =20 clear_tree_failed: - abort_munmap_vmas(&mas_detach); + abort_munmap_vmas(&mas_detach, /* closed =3D */ false); gather_failed: validate_mm(mm); return error; @@ -1615,17 +1641,21 @@ bool vma_wants_writenotify(struct vm_area_struct *v= ma, pgprot_t vm_page_prot) } =20 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; diff --git a/mm/vma.h b/mm/vma.h index 82ba48174341..64b44f5a0a11 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -48,6 +48,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 cle= ared */ + bool closed_vm_ops; /* call_mmap() was encountered, so vmas may be close= d */ }; =20 #ifdef CONFIG_DEBUG_VM_MAPLE_TREE @@ -96,14 +98,13 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, unsigned long start, unsigned long end, struct list_head *uf, bool unlock) { + vms->mm =3D current->mm; vms->vmi =3D vmi; vms->vma =3D vma; 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; @@ -113,6 +114,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; + vms->closed_vm_ops =3D false; } #endif =20 @@ -122,18 +125,24 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *= vms, void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, struct ma_state *mas_detach); =20 +void vms_clean_up_area(struct vma_munmap_struct *vms, + struct ma_state *mas_detach, bool mm_wr_locked); + /* * 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) +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) { vma_mark_detached(vma, false); + if (closed && vma->vm_ops && vma->vm_ops->open) + vma->vm_ops->open(vma); + } =20 __mt_destroy(mas_detach->tree); } @@ -147,7 +156,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_s= truct *mm, unsigned long start, size_t len, struct list_head *uf, bool unlock); =20 -void remove_vma(struct vm_area_struct *vma, bool unreachable); +void remove_vma(struct vm_area_struct *vma, bool unreachable, bool closed); =20 void unmap_region(struct ma_state *mas, struct vm_area_struct *vma, struct vm_area_struct *prev, struct vm_area_struct *next); @@ -261,7 +270,8 @@ bool vma_wants_writenotify(struct vm_area_struct *vma, = pgprot_t vm_page_prot); int mm_take_all_locks(struct mm_struct *mm); void mm_drop_all_locks(struct mm_struct *mm); 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); =20 static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struc= t *vma) { --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 18A641667CD for ; Fri, 30 Aug 2024 04:01:59 +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=1724990521; cv=fail; b=aaaslBJoPqmZLcGuQanqCs31CeGdo0lxjk585EzbhDyGSyu05C+NPPfAAZv3lfpurC3+nhubMD8WdMkJ0smOnJmudo65SUvAasGAcF5wkTiN7vfOWVCvpUYwsxWxZ2PnBCqvcQh0zSgy1sdt+inQ5z/KjLJRz+Z+FmNsijrMYtM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990521; c=relaxed/simple; bh=5I7YJOuFf02Mbz3htWgZsOANqsKUiEeGVt4vtwKZzEw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rdxCWA4agOnldXbpYkxMWCif3WJksFMd45fm7J+HOdn+IE2/0nezHwPml5maahfQwofcHCjh+afCn0Iqn/voPksN9Pu90BQNM+qFTD1kWKklpwttcMoU1ktLUEBPgbzCyVy/jZOXSfVFOycUTgwn5empOkeAgd+NYByOzAsCOwY= 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=oIVLn1Qt; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=hKYivDEE; 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="oIVLn1Qt"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="hKYivDEE" 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 47U3MisH024297; Fri, 30 Aug 2024 04:01: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=QPEwLzEB0vrYF3G7jIZC0g0ABlZtn3Z7lT23QgU8XIg=; b= oIVLn1QtYiqpTfBN9QkQCULLw6LoaMfyVl/NiPKdYy5Tam+wTuUWRqrpXvejojs1 b3mTEH/51FWcN7edjcBvwX63rv+ZcSnshpa0cWiHBA+BTnYHy0HR+yCYuVOj39JU tVYT7jrc/D10+rUBigkPpb5lS51CRhv/OtUhtqcWmnIz/DbGdkOnNaxIGX6QSaia IXKX6GHLOZkBlQSDR1Umb+e+zd7Vxs6Fqv+YgnBjZO5NvyMww0AvY75Gf3Qtk1Lk YpRtXRhyjdfelVLleSA7hpHFmo1QbvRdXBoPsnA5YR2ABFTDM2L1sTvAZe6ZLoau eEhIDUsOXtsJMXo8gr213A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b3myr58m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:44 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U23Wd3020188; Fri, 30 Aug 2024 04:01:43 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 418j8ra3cr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y5USXT9gwngBKjkv0pwdNA5LVW2fhu8/z3yXafo414KnLurda5t0Vq7dH2ncn258TfSSqe3QRcvprxuT7gMzTP5ZKULiheZn+LrIjd2RoOJq8eTU9pgqvv7FGgGIE810JLYYUgYKJ455nC7/Q0rB86gX3b9wiK/+flITQAtBasiDyVMkKZumvXWMHrjT6nlczzVJdRfVqDJIJ8ts+LOMeTwMiDNHDZB06tEiEKRLl7hI1z9drMrEp5Ict4JYRTTvynQiC/dQC5tCpHPgv+gl9u2yHnwkXih46sX72aL660lUVr6goE6jDKqhlDI3sl2LBCUU5/4lJDRbwH0aMs8/xQ== 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=QPEwLzEB0vrYF3G7jIZC0g0ABlZtn3Z7lT23QgU8XIg=; b=xrjqbp8m2DdJE9eES/UX+7LOfJNr4setcy+6KakuAeIXVtJngK7JxOH0ImEcrwer9ljH8tPNMCd3FJrwbcakHKeC+NfBuqVMaY+3eBdVGfEC8lyI9KoqpHKxkbh5+lxEdiRslZHzyG2iKEtIcb7Qed475cLw/GwSYgreOWjRQHbuq4sXYrR0FdqET7vKne3CxhrJIRz1NG3yTXZDfevtRczrVbjTUeY5ol+30AEXQ/0M/eE0oCg82nrielnmh42gd4+pcZWyT9CK7+/KgIDopvacE26X25nj8ab57CS/5zOFBlvRixxZTiyFikOWkz8ZUNwghzSMSdx0C2Fuv5a3Mw== 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=QPEwLzEB0vrYF3G7jIZC0g0ABlZtn3Z7lT23QgU8XIg=; b=hKYivDEEwLko5+7bZMtk66vCWIlVy+5XAl3sHNENy/sjZ+0hQbA7AlY+7z24m2y2nRSDrYHqYqcD+eNIaK5wpa+d5y3hmSvL4VC1REWkv7nA2SqRg3uxG6PIGKP0x6Ipv4jF8Ti7xGFjlJXsmBDpGwEMWpzszg62l5/o4AUvzpY= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CYXPR10MB7949.namprd10.prod.outlook.com (2603:10b6:930:e3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.20; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:41 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 15/21] mm: Change failure of MAP_FIXED to restoring the gap on failure Date: Fri, 30 Aug 2024 00:00:55 -0400 Message-ID: <20240830040101.822209-16-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0131.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:83::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_|CYXPR10MB7949:EE_ X-MS-Office365-Filtering-Correlation-Id: 9be7a624-6951-4625-c0c4-08dcc8a87439 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?BlgNi9KzZlcfM22/qdU5AjWVTIqsES8rJFUokx6Lh3FPRcpU9VZ/QZCjFEh9?= =?us-ascii?Q?9f8GsFutHHzhNRZMD0tj7MX1zxtiyV/Z9myJ0OBjg7/fEUkH1iNop2Y/VqBF?= =?us-ascii?Q?NsXDE0OZcNAur/8dc5XwAXbBCJM5Y3I3s0VCTrbwCZmj2Scvxundq+8Ibp/C?= =?us-ascii?Q?uWT+iKZCJuOpxx30CARFnFG6OAWJyasyJT6Bdbd5H3pi4c3rsLiibreeVjYQ?= =?us-ascii?Q?kjUIpenQwP63GbJuc0X+5pyoSpdRLJfKkAdgjWS/gYAILvTpYu8v0gm33Qwm?= =?us-ascii?Q?ojqzHYFCV/cR7WpoNpQ/MEm6aziQjBxVJKeLjzesMKecGUJImM2z1cbuje5X?= =?us-ascii?Q?RSP7afO0J2peNfSudlufHE6Fz1jAw2N4IFHjj8fZ6XSIxwHS6zkP8DeGxMr/?= =?us-ascii?Q?tPQT1fanLOK0RykcBKWZctC1n7//y0NU51kj7wUjP72OyENxuYGyqmCpe1BZ?= =?us-ascii?Q?9qzg3boWD82mPsxsS6L5GkgM1BpuSTaqjHjwAo66lTCj7xYvUaiaNxgmB275?= =?us-ascii?Q?+w1jKiL/gg9ozn6HQ1tU2LA4PEeHp7iwY3OxaCFhj+3L3/yMsCZ1M/sbVMT1?= =?us-ascii?Q?3NIolUYbV3HdtMHbaL3Pn73HZnkCmvah4Jj5ILluREJ17LEIlGXTjx5tqG8E?= =?us-ascii?Q?1KEG21wvE6DWe6nuz2hGd/Zo/kNfGyUvJkgmHiH9ehb2Ywofv4w8wAWMAQ2c?= =?us-ascii?Q?aPetjKlXHR/998updPrHwkXTOMYPmshYMkH4c/n4mhd0c40+M+zutD36S8nM?= =?us-ascii?Q?IsHzcYyY6Od1rjU8mCBfXeMHzZX//XdxHyoxBua2mSz+U8aRWb/VJQHWXmnr?= =?us-ascii?Q?rrZPOuDSxRwgwOtxTmckAq62HZmyQYr/9nLrF5x1shID3bJ4bRDNeRc1247A?= =?us-ascii?Q?KLJV2rHiiU6evafh/m5zJCsGGTXPbKFBqpICRGB04QXGUuTLx2qMMjt0I3so?= =?us-ascii?Q?no3X05Krvq21q1bofLR3E/uBjDNpL/kJo+ulM/htWdM7jRJeUqfVbBRo+rT0?= =?us-ascii?Q?uXmQeynVW9hlmioNdozGDk6bxae7oeceD/eiNJp75Nb1M9WCKVpcP5fs81lZ?= =?us-ascii?Q?jZjPTNUrPXzxnU1bTkSQdGP87t5Jali8xa3OORH5ZYcBXNw66rRNLlJBnObL?= =?us-ascii?Q?rldx5qp3GCXI+FNQNkS+PP2EUz8g1cGGZM3/C0nPmRAJONTcB3SIh/pUKaQP?= =?us-ascii?Q?duSCb6qR0OorHCiZp+HRto7Z+9eX2kwHxYJM2fVI4/kkFms9q/ceIRyuINRU?= =?us-ascii?Q?yCLZj3Tihi3VW4/Sk17sMQt5b/7Y/KE17PlJRQURiU5/yqNLN+hHCueG+zEn?= =?us-ascii?Q?SFL/JE3JAAGhSuJu80rV0BBah/Lw6cFMD7OYDWas7Tw6uA=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?dBPoZ/xrFP1QpT8FaUC9wUgjALRTUgWfufcIY2r2oDnjXUMuFqkCW8JBWJ0Y?= =?us-ascii?Q?DtF4MCEo6lW5jSuQf5M3fRvVhk/ZdYnGqrnmgzFqmEoy9uV2VHV6sDtdMo77?= =?us-ascii?Q?hyqezwau02+5E9n6T62OBkcOfxvJ1pVl71fIkOcMgt8szE2+6oGL8i67qO1u?= =?us-ascii?Q?uv5oZ21eyNfIuKRAwtJMrsQMUcPXKLulZKcfVwdx1hn88gOrf2lTJOR8hBfQ?= =?us-ascii?Q?JfDDigSEyKcuZch99mQzWyCFbQYHigCjvktLQBcwSE6eOAmJ4ogHy1M4nBaw?= =?us-ascii?Q?oBBg2U2Qhh6GUGvcW6VRMz+434l/8rc2EAG9xnDPmRboOx+3l1N7f5iorjlt?= =?us-ascii?Q?dZIkMzy8iUbMjuhbkVkKJk+eSdanbgS81L6ov7HhXui7nkmeAL8M9YpLTdsw?= =?us-ascii?Q?YmleYXsNyljntDl0d+rmAKxtOPU3zYb6uHNSMLnSK0sgachf3TPUi/LrTy4b?= =?us-ascii?Q?um07MMiv7/PBSSqRZfTOWiQtdSIv4i2yIG+qO6rN6GMPJ95YSRVPlzNElidV?= =?us-ascii?Q?TF1g7udPF3t6FijW51w5Io06nk68OkJqdRztZd2ba2VfCyxpn9l62VOYvqkU?= =?us-ascii?Q?4F0NPu/lKl+h2/1kU+I7Sbzj1VZN/qX0chPczTYGgnz8wGBPaHl5vbKQ45Qc?= =?us-ascii?Q?wHz5jvUtzXgJ5a5jR2kpKU4TbO62/V4TIfwYRu986oaU/bLjLQ4arYh3vIUS?= =?us-ascii?Q?ygh+/z2erQ3HxeNNIpkThA85BYwDfRKBUztR+f3DEAeEuo4EnUZa21ckRl8B?= =?us-ascii?Q?p8l9ohWbCIuMa2/Puf0pCgNuD1P0AT/LBOOud8vKYJEK2zdFwR6HuAx1t4Rv?= =?us-ascii?Q?kbkkeEf7yQnDcio2OmWIzSTfXz4DOB98lRjdHp3QZFLS1kC2qnJvASNT9quZ?= =?us-ascii?Q?Pi+xvyfvwqP3LmtDzgY2YiwhUbdVAZSswoKceYEccsYZ4QZUr8EFxTOyZopv?= =?us-ascii?Q?FSWj0Yp6coxWrq1kPXiswakBv/wP+bWO1Ryhr+4DTpSf9rMFKy+NqoxydLtv?= =?us-ascii?Q?PJ7GixiLGHRW99cUO7lQFmMc0qM7TB8JqL9qmWNLlHZezQFl+99vxBdHVh7j?= =?us-ascii?Q?C+IxXx4ydH0e67fG6vjavFJvvxOA9SwGeuqt7aNLYI05lBCx8c8LDLjOjVmy?= =?us-ascii?Q?BIyDDOugtf9mPKnLMLYL9IDplWdf14TEMaVNkJB5CitmQpGpUuD6EmZ2+JUM?= =?us-ascii?Q?bU5nAs66SA2vc6YTkbekL00udgHigEHXq6PfodvrCQoFxzGL0QnwIrPW2C4R?= =?us-ascii?Q?oJ157aIRETR0hvOwC07FAwNxYXXxvzUNWth5somskKW9iYezyud0RsF11YMz?= =?us-ascii?Q?6nFzFCvPVmGdmKHzhm8sbzc53rKRmV15kD5Wv9OswNM0+k1s6g+9BWI/cuBR?= =?us-ascii?Q?yhGKPbNG/65O0ymLzJSYEtkhGCfWvHIUMPWhD7/vjLn+Jzxm+awkoKtwXwO3?= =?us-ascii?Q?B+9R/CSEfZdgf6tXy5EfPP1ZCgaatqVoIceJ0DUxe6xHKaL5/gPs/SDCuJoj?= =?us-ascii?Q?XDYf2LvMamntb/xA83l28YYwAPdQtnZswc93REHmAHiF/a6DOY54gM2SJGh6?= =?us-ascii?Q?POwt5s0jQ0QXs8tQ+3g3Cui6annAEfGYsFV9KTZX7f3EmonbEShwTEyho6Gf?= =?us-ascii?Q?WA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RDkc3CbdVh+wlNSGqZANCw4pEcUxwHPGjBCiPAFjgd7dx1CzIHbB/61wu9qa4qL+8e1W1o4C+afzYt2cHxcCi53VWwlfACyeu1kFYmZfueWsYdcKJZ1+Ek4xMFjab55PR0W/AizjnWB78/CT20aoE+G8YSkQbstw2xdfVprnf03AvNCFv3gNUnZOe6QvXPYLuDWj8UUmJaEVdpb0dDIx+/NOhnJZszO/Sxk0SDuMcELx/FXlA39vNz/8yRq0XpnYQX1GXnxtTCiWqgNZBjeZx+BdhWq6napyekXS7EdllzKyiPtMADwejhJVKUWwaPSHIXjJlR4sqWSF2kCwLtq/iKV/7FfoBHKEqu46agy/Fm28pDEErHgRGPoL0PkbmQ6bTfdU/DGLC9g6bPNi0EDn1G+fqDWgP26u/ZFOR4AjdkSh23ajtrNKE6ZzKip9/h3HWX8o56gMoWEA7Lf/od6q6V+fb4DQV+rY9t7NXJ0Ne7rYPGT0lm9NCpdQHxvSYO7qG18KXA7quQm8yu13yN8bwHSdm5zFSyKEf3fhW7P9ojrDIo2e4qB3zJTZZzRN3ZBEl49YuPUqT84OiGwcEKITsG7G3kwiMmTvTThhXTeXuAQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9be7a624-6951-4625-c0c4-08dcc8a87439 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:41.0802 (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: tNRQp0Obemw0EyLJlP7yF5jNTf+wkh5vFd6wQzuLDS5I3xJk70LlptuTHk6TuG19owUyp4v5lgpD2jq13086XQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR10MB7949 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 malwarescore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: Pg36GqwKrh4Su6Vegp2Qn8TUrdhJyRF8 X-Proofpoint-ORIG-GUID: Pg36GqwKrh4Su6Vegp2Qn8TUrdhJyRF8 Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" Prior to call_mmap(), the vmas that will be replaced need to clear the way for what may happen in the call_mmap(). This clean up work includes clearing the ptes and calling the close() vm_ops. Some users do more setup than can be restored by calling the vm_ops open() function. It is safer to store the gap in the vma tree in these cases. That is to say that the failure scenario that existed before the MAP_FIXED gap exposure is restored as it is safer than trying to undo a partial mapping. Since abort_munmap_vmas() is only reattaching vmas with this change, the function is renamed to reattach_vmas(). There is also a secondary failure that may occur if there is not enough memory to store the gap. In this case, the vmas are reattached and resources freed. If the system cannot complete the call_mmap() and fails to allocate with GFP_KERNEL, then the system will print a warning about the failure. Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/mmap.c | 3 +-- mm/vma.c | 4 +-- mm/vma.h | 80 ++++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 405e0432c78e..e1e5c78b6c3c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1623,8 +1623,7 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, vm_unacct_memory(charged); =20 abort_munmap: - if (vms.nr_pages) - abort_munmap_vmas(&mas_detach, vms.closed_vm_ops); + vms_abort_munmap_vmas(&vms, &mas_detach); gather_failed: validate_mm(mm); return error; diff --git a/mm/vma.c b/mm/vma.c index 648c58da8ad4..d2d71d659d1e 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -878,7 +878,7 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vm= s, munmap_gather_failed: end_split_failed: modify_vma_failed: - abort_munmap_vmas(mas_detach, /* closed =3D */ false); + reattach_vmas(mas_detach); start_split_failed: map_count_exceeded: return error; @@ -923,7 +923,7 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, struc= t vm_area_struct *vma, return 0; =20 clear_tree_failed: - abort_munmap_vmas(&mas_detach, /* closed =3D */ false); + reattach_vmas(&mas_detach); gather_failed: validate_mm(mm); return error; diff --git a/mm/vma.h b/mm/vma.h index 64b44f5a0a11..b2306d13d456 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -82,6 +82,22 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_= struct *vma, int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff); =20 +static inline int vma_iter_store_gfp(struct vma_iterator *vmi, + struct vm_area_struct *vma, gfp_t gfp) + +{ + if (vmi->mas.status !=3D ma_start && + ((vmi->mas.index > vma->vm_start) || (vmi->mas.last < vma->vm_start))) + vma_iter_invalidate(vmi); + + __mas_set_range(&vmi->mas, vma->vm_start, vma->vm_end - 1); + mas_store_gfp(&vmi->mas, vma, gfp); + if (unlikely(mas_is_err(&vmi->mas))) + return -ENOMEM; + + return 0; +} + #ifdef CONFIG_MMU /* * init_vma_munmap() - Initializer wrapper for vma_munmap_struct @@ -129,24 +145,60 @@ void vms_clean_up_area(struct vma_munmap_struct *vms, struct ma_state *mas_detach, bool mm_wr_locked); =20 /* - * abort_munmap_vmas - Undo any munmap work and free resources + * reattach_vmas() - Undo any munmap work and free resources + * @mas_detach: The maple state with the detached maple tree * * 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, bool clo= sed) +static inline void reattach_vmas(struct ma_state *mas_detach) { 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) vma_mark_detached(vma, false); - if (closed && vma->vm_ops && vma->vm_ops->open) - vma->vm_ops->open(vma); - } =20 __mt_destroy(mas_detach->tree); } =20 +/* + * vms_abort_munmap_vmas() - Undo as much as possible from an aborted munm= ap() + * operation. + * @vms: The vma unmap structure + * @mas_detach: The maple state with the detached maple tree + * + * Reattach any detached vmas, free up the maple tree used to track the vm= as. + * If that's not possible because the ptes are cleared (and vm_ops->closed= () may + * have been called), then a NULL is written over the vmas and the vmas are + * removed (munmap() completed). + */ +static inline void vms_abort_munmap_vmas(struct vma_munmap_struct *vms, + struct ma_state *mas_detach) +{ + struct ma_state *mas =3D &vms->vmi->mas; + if (!vms->nr_pages) + return; + + if (vms->clear_ptes) + return reattach_vmas(mas_detach); + + /* + * Aborting cannot just call the vm_ops open() because they are often + * not symmetrical and state data has been lost. Resort to the old + * failure method of leaving a gap where the MAP_FIXED mapping failed. + */ + mas_set_range(mas, vms->start, vms->end); + if (unlikely(mas_store_gfp(mas, NULL, GFP_KERNEL))) { + pr_warn_once("%s: (%d) Unable to abort munmap() operation\n", + current->comm, current->pid); + /* Leaving vmas detached and in-tree may hamper recovery */ + reattach_vmas(mas_detach); + } else { + /* Clean up the insertion of the unfortunate gap */ + vms_complete_munmap_vmas(vms, mas_detach); + } +} + int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, struct mm_struct *mm, unsigned long start, @@ -299,22 +351,6 @@ static inline struct vm_area_struct *vma_prev_limit(st= ruct vma_iterator *vmi, return mas_prev(&vmi->mas, min); } =20 -static inline int vma_iter_store_gfp(struct vma_iterator *vmi, - struct vm_area_struct *vma, gfp_t gfp) -{ - if (vmi->mas.status !=3D ma_start && - ((vmi->mas.index > vma->vm_start) || (vmi->mas.last < vma->vm_start))) - vma_iter_invalidate(vmi); - - __mas_set_range(&vmi->mas, vma->vm_start, vma->vm_end - 1); - mas_store_gfp(&vmi->mas, vma, gfp); - if (unlikely(mas_is_err(&vmi->mas))) - return -ENOMEM; - - return 0; -} - - /* * These three helpers classifies VMAs for virtual memory accounting. */ --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 8901514C59B for ; Fri, 30 Aug 2024 04:02:01 +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=1724990523; cv=fail; b=qJOQvjnQRiMTXG9Oym+Y1iiH3zoFaYh6913MaPUSxJuqeFjK6mM1I2Sa2v5TCT7HVlk9XG60SrWcBVa9QZvi7z8GJ/ANpDpq5JT4bg6LAFJeRvWcZU2Avh1OdZaGAEfWFdQ75PueoImVmkwbqbWnq1S3egyH7EuKpexvus2WDfk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990523; c=relaxed/simple; bh=unPHXTiAaBPgJQgDSYBtiqoEAMNFbYTgEExwsR2UVi8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=heEhNSf2vvYlCsXNP3HSmE/kMeoTjRlvTyFu36O+VHW8Qty5H3f8Jhk+w7lbjY2Zz0mKS7u66Tc4Y0UFHojVjPXq1kC2g4QxAMOLgMMaaMJVNc1gkBRZDejg6HHOKYB+ssiAa94qu+4hfntv9WS15RDlsNVTDxy+RGUNxHS5aq4= 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=QLqZ8Jht; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=g1qbXRjR; 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="QLqZ8Jht"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="g1qbXRjR" 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 47U3RDZi029580; Fri, 30 Aug 2024 04:01:47 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=wu2pkeT2CbgfgdpPn2Zuz7ayl+XthYdcArrCgG1Zpro=; b= QLqZ8JhtHL5vt89eNHFLnj0Ro7JveAhbmFiY4HfdgywuhjP2zzwgX+ZcuaZiM86o r4B+92enhp6FuSx+dYwU58pM3HKEq1wOZ7VbSEG6A5QZCThG5QfvjwmO5Zd5o2Ye 21xW66Bn0CaECDaVyGQETGyNaoXLSM0b2lQXNVh0mckBOW1ytp+QdV5aO6supKoK 16l3r1PL2kQBsgANCMXv4AU976IxpBEnLLSTOPeFmPCmGpwLOxKmrjlVSHiwDP6s kBbQMSNs7DgTHZcBsx4jT4PQrXhSxCG+K6iPEKxnmLncCPta6Tl+xzaPgdqoJSoR XsXKIlOsPMGH5zPZ0Mpk4w== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q381hp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:47 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U30EUJ016784; Fri, 30 Aug 2024 04:01:46 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2173.outbound.protection.outlook.com [104.47.58.173]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 418a5vy55m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=J4LnhBMB+vckaocx9WVUVYLt4dJtSLHxALD3gzKqybTDcX8+msoVc0lJF4OSAmLFW1lB34/bjsOzCUYrGpsXdicXo5EmIuJW7mzO5znW8KEdHEK82hORK63ozLseOonG/ci6T1MXHjHrky+S4y1IMtbARkz08AVz2kcB/BzfULwJ/OUOGVMSFgBj7HvaqJuX+67nv+WBcEp916H8RKjTlq50jUkWh8s4w5EEhvSC7yHU4DtoRNGIUxiI3qrngwtWTPKIV9zU2/N/cGmbAo0Ql3i9pGgL9bbhvdcmFIfi76Or03L9EoH9Us2A6B8sySckvCp18vdTHFYAICnXsHRsFQ== 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=wu2pkeT2CbgfgdpPn2Zuz7ayl+XthYdcArrCgG1Zpro=; b=OfEmNfSUNJChy6O6LgP7D+RkPlsi0W8NECAY7AOIYvxVd0snSqTN1SP7gBBGu6xJYTYZpevDQVbLjNcLjzLjEaVew805t+VJueXl6RRyskJxbEVGy1M4jdlexrdUQJoYTK+HnGLwsRHuPIgarISYd/xFfiAefpJkg3D3F5hE8Bdl8CxAtuysQzkIlBZmq7/94W76eIAqzlTr6h8B2EVK+s5LwraJWrFBy0JzcsryqCsKjgqja0A1lJQ1h3C/7XWZcOr1cODZFFmg807j1d7qJcMtbGru94PqEqbHl9SQR0NuhOQSaPLYemskOJre3uKC+8i0yOFKiuQ+v5wiFjON4Q== 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=wu2pkeT2CbgfgdpPn2Zuz7ayl+XthYdcArrCgG1Zpro=; b=g1qbXRjRUCmrVKZoq56Bf1DjjR46X4MDZmRhBtDTppe/klsy79aY+m57tvoHuAkfFVjKWEzpN9qFhiBcVfg5Xv8bAJvc57pKpu5id6+eDtOfcbobFFkV1k5P5wOYmwJQHuDcZvWNAWokCrvn3WdQr0FfOBY6A9mRQzTQCveU5PM= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:43 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 16/21] mm/mmap: Use PHYS_PFN in mmap_region() Date: Fri, 30 Aug 2024 00:00:56 -0400 Message-ID: <20240830040101.822209-17-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0280.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:109::15) 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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: 3fa3af08-7d3e-4acd-e4c2-08dcc8a87565 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cdLS9fsAz5u1d9J4yNn6mnGVP0f5qoZ2xVk4GPP3D5etmuiIKoeVtcgjOMCl?= =?us-ascii?Q?EEoT/HgcwyyXPOaIO04K/EgNe+0QZIj20UPVbRTfDEA9n1EIAWN3V9pd7/RD?= =?us-ascii?Q?IJez82QBWUx8morc5KI42xFbcdpc74tZj13OdFl5z9IWnGWqOP/LKXSZCZKl?= =?us-ascii?Q?zrHv3Sq0WgXhV4EuoZ5dg5fSsD+CsGsYfUDIkdvSIsQ9MNeBBUq/UbN5t2nC?= =?us-ascii?Q?8pMC98uWX7r/v7P1+vvEQgFm4vLwl1HwyjbrSOsAx2+ONwUtNP+4n+cOHusO?= =?us-ascii?Q?aGogRw6WoU4yI/Lv90lssBULBOv4WGsabwDTc4Lty3ssnNyRAF7sUHBY/2Ky?= =?us-ascii?Q?JknszWauxOuwISpVhJNwIC3Yc+RJlvo+DMZZ22vE2lhmy7QpjEbMVyYzJutN?= =?us-ascii?Q?aX1V/2Vljo3/8gnlJDbbbkGvTVkbc2J0RpkANgEzJ+ypASfhGlhNCaCEnDwK?= =?us-ascii?Q?SztTxENjl7ypFtTKKF8unsUR2lR8ufj+5OuvtR1yp95RcYV/yuMBakDGnnRM?= =?us-ascii?Q?NB0uivxD+d1Q19IEuBocIk010wf84qs88hgdkD+4LzdDd405ExiF6AsfGdod?= =?us-ascii?Q?kVx7AjIXVR7NsJHTXu/Io3Pu1qYDKvx3IGRDdcTFxhHLpcD5Lg03VrAqAEKz?= =?us-ascii?Q?msJfSYGChYxzVg11rv5oAr0wUsHBPH+7izLcnpTEPxPJ/hMKIHczVMXHvxLk?= =?us-ascii?Q?YaBPt0GlybkkcP3hD5diuIZ5Lq8ynYB6wuOaOuVDDPGcLe5oL7EL1US+pIdi?= =?us-ascii?Q?H+2FbdQjPnh1o8qmKbXcr9mptrjP1A02lqUVrFcpRaQbBqaVdSjrTarfhhZ5?= =?us-ascii?Q?aL7VU/OXF8Lmv1v4CDWepSk5WamRbwjJamqaNP67h6zgPmOWmmI/K7SCscXW?= =?us-ascii?Q?SefP3eY7V5J/WAHRgLAHMHay6agYe1APs12XT+tr80wHNeFw6wouZwyaE5u+?= =?us-ascii?Q?OnK//kG5IbMrKr/qf4eX6pFI5a4Wrb0vcWvuZDQ6S0vVsLZjSSWjml2gD+2H?= =?us-ascii?Q?nNeHDo/KajTaTaWAKYVT6hmbXObB1w7P5BaR6+L9yhNwKWRbScCYKOhUPAx+?= =?us-ascii?Q?7t9luZmJ+z9MoDf5QuAfHGjx0RYb8pDUEuNbfLmktug19zUNRmgr4CJe3zd0?= =?us-ascii?Q?pgAvy80LWNm+8HKA9QwxKXuicver1l6d0bMULxZOi3BzOJuaVP1InNjL6hDz?= =?us-ascii?Q?Th6lzG9LUcpsmZ3q2Oilw5YRfMfN/OA2hAJDezCAy2J46ltgYZjP04f8i7L7?= =?us-ascii?Q?c2dCBlgN1qf/1fXcxvL1AMp/RmrE5rozZ9/F3l84YURKbvYMWNcqRddesQp1?= =?us-ascii?Q?HbBsshwddU9TFSXtjNDzA7bbv+6uJSpdHyHBVooskPsZ4A=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CXTUPXpezwFqC9FRFPZWEOqcuYg4pE6GrJZQ+ih4DgjndUk5LK6gpa/uc9wO?= =?us-ascii?Q?LZ6krAiZojqqhyZpF9Wn8njI33bC+nebwK5pcnbsN1RrHQfAccFIvSPZ24+t?= =?us-ascii?Q?E9Z3svOmPNRkZBkBCjU8IJFZ0PnRT04EHfulF/V0IFbAJ5uQzIPKZ7K6Sn1g?= =?us-ascii?Q?gI6pnVmgXGLW1ksRQs2PtONeJMdaA5B/JACEPBEwqHuIXodbioR38l5sQZzG?= =?us-ascii?Q?Om+qZYZ+QaWSf8y5H9xAs/Pnv0LUdQ1G5FGTJrjc5L7RqfEghlLnO2BFe9Ff?= =?us-ascii?Q?1wkoPVhQq8yiIr7WtXQd6h/WCEnb8kqE+GzJQGHKc0IRWo2Ho574BViO6P1T?= =?us-ascii?Q?HKslhh+SmPtpTJtri7+OCDwG3rjexCu16CZ6lRhZlBl68FHe99f0rfwqX3Iz?= =?us-ascii?Q?Vvbo028oQuvVicp4fH11O2U0lWNUJnFtyFfh+cprb33MwVq5Qh0DJELvjRs4?= =?us-ascii?Q?SPuyNIdfmm7ylCx4SqvFRgFk8T+ORAKPXdD8iypgApYfFvS1tOGmcWhRmJcu?= =?us-ascii?Q?a/JZuJwV09bN4Kiwia8xEXeDrIu8EdgZWef10zfySPANzmUA4nkI/OM8NByl?= =?us-ascii?Q?vXHmH/mjK3XxB9NTfplmWEwS/AhDsg9UmosE/Fi/vSzHbZsA2hyME0CM8SMF?= =?us-ascii?Q?rQzHqymdX53N6qbH02V5AJ4KcPQ5DoQ73cRCCqAuvHzeB25HbFZnWcCsykWK?= =?us-ascii?Q?t9ShUyQtqiqtwOdb+8uNJRzJ9xIgH6W4mGcawXnQTaeR0EFriShXhYz5SMUg?= =?us-ascii?Q?bBdUSeKHMVE9HJhwIuRP5LiyhMgy8+eXgFU75dzq9c7IN3C05PPNwNpBkdO/?= =?us-ascii?Q?t5AWdFVhzz0SbfdkjXj0wQ/8ym5xm/grduWT1ndb0AqthuxM9/LuxOzv3a3i?= =?us-ascii?Q?puz0upmiZjTYEgvH0axzfpqdsql9/Qt8LCWaAUJzTfCf1vq1+6uFVxXbr9ee?= =?us-ascii?Q?IvHyTiGDK9Tmz5Y6CvogfAodb4QOJOLfNcTMajXxOMYuiIqyFjs8wWUb8VOe?= =?us-ascii?Q?9S4k/jYfx6yGcDlEpvW6q0dDDfXblQ6weTj3gauEzSV2j+IjYP9sazR3W7U1?= =?us-ascii?Q?i3jkIg+wMdxsuIyGzo+bkDHI1NcmBafibdogb8Lrir1d3MFV7dUj7/tm75b8?= =?us-ascii?Q?II5pYp72OHC3m02NH41ZY+KHiHZWzM6X85tBK4ySqQx4njAGo+grEdNjp5LP?= =?us-ascii?Q?wbv6EXZ3sRX8uGog8v0PD+AlH46lX9oBbHFqJ0QUDKhdPNGTYZnUQ9SgDsIr?= =?us-ascii?Q?BI+V6abiDXo7mQDpa3Y+sSxsoKLYDruLi7e74BczR9S2WiRCt9wW4bR3Zooi?= =?us-ascii?Q?xqdlR8R9vJDcnRQepamCWqEudtIfKwEwh7JAPgYKyNxFvSwNB5BziLEYqhDz?= =?us-ascii?Q?7/0huxa8frKbby4lEdKNxlk5VUOsA+q2cBmZDd/rdghFJPjTmYSrDrqCvGSz?= =?us-ascii?Q?A0J8ttKIphm6dBieD5cZPKg0AIhZLMhL8zh/UzXL9WVmoKNvhSkIIMIrRuuS?= =?us-ascii?Q?HfIYgAKfP0ZytZDUfmqerpBOYSvIIFUy/Mkuc1Y5MiOKsoSzfaCWPzQkRzpL?= =?us-ascii?Q?j8/6w/drrKBxeMjwth9c2YOV/VZ0G6voN3VUOZEEOsVhNUXByzfLSZTYCbpL?= =?us-ascii?Q?Fw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: vjJYDxKPjuLEJayaxiWbLOwoptTvnAdF405r/eI9Lwi17DExpb9fgFK4SYXCyufnuY9V/LxplL61wM3DvbgULHp1vinXsX+zE56o5AdFaiHGl1YWt2pICrtwOuYE0+v43029+Ug/8yS1F8Luiq9cvA4r8Lnq2Gz2dxjERF7R7cq/0p7azoKHwbOss4trVTRD2oosp1vUoK4Sd0y9g9/S/3aOfnb8xXQeBrnTSffAMGyxaivHBut/RluNdr6nyiqNxCW8cpocTwVoTuYtIb0x5iTrxcTy+psZo/2L9UzBuMfePZxhti1VqiVY2jUdK8Xhc3f1rNocubrFRuIbcSJMQdIllEe1m7Qu+NsNI75O7A5puraaoumrzZ53k/mTrfoxPJIVxjGsf9OE0XfUGea7cm3TFrLGg22JJtmXpZr1EyTc9LHLx7z6Faepcz/NYba14eaetsFSAV8IvK2ZpBXP2pNyLDXZgwfou6WnGxmajWup805Ef20EMPUEACiase8qq5DshKm63Jt8drs+ncOLxlbuXi3BcIBHOZodj4mRa8qKAxYnJ3fzH/8Hws3BC9FX5I4N0h1mEnnq9xCg6g8Lswro50XackSBhNg3OgF73II= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fa3af08-7d3e-4acd-e4c2-08dcc8a87565 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:43.0398 (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: Z3LTC2rv4wxWELSRkXCA5kzst/kLKALzC+1qWH8+snGZAxFWZIazJ0PfVCvuUGaBqz3xy9cgL+ZgaEK36YEBKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 bulkscore=0 malwarescore=0 suspectscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: xtpqy_dRwCm76aPN4EPg24Ekjl_gyL1N X-Proofpoint-ORIG-GUID: xtpqy_dRwCm76aPN4EPg24Ekjl_gyL1N 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 e1e5c78b6c3c..cd09dd164e85 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1364,7 +1364,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; @@ -1384,7 +1384,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 /* Find the first overlapping VMA */ @@ -1413,7 +1413,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; @@ -1574,14 +1574,14 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, /* Unmap any existing mapping in the area */ 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 Wed Dec 17 02:55:17 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 4908614E2C9; Fri, 30 Aug 2024 04:02:11 +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=1724990532; cv=fail; b=kooRAyE7rDsWxDBniOjO0IZdMGUzt+S+lK02p9kq6TcLnCMdvxkCcY0qXDm9vaKIgueWd+Jq/QBJoqYCM2UKZ4kJTvR1UFhy3ooGUK0ADBdFygAiSHxFcXLDo8IuAkVBZQ3xE8h9lwfub28Dri6dorIvp4eXwxPslwnPQV81Cc0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990532; c=relaxed/simple; bh=jy2CptCrzMacNUzsOBU4+1ShZQi4OmSKl+ctyA0PRXM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=QdpC5Y1Ux/3InA53WKIzRTCliyFw9lt0bb02ei3f78Q+QXsgHLggGahOCtq40RQx2eJ747QpeIWz6DoPI2slgeJXVgwnevCEqb492VSnk5cKEtcRVfBEel8t39MLbLAC0G1+7ch656KNcMi1Z/hER3eNChURkWVzGmUVzwgqL18= 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=AW8qP50Z; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=zOX0Lq1h; 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="AW8qP50Z"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="zOX0Lq1h" 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 47U2spMJ011846; Fri, 30 Aug 2024 04:01: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=Fh3l+ME+2D7vTnslOnVr5R+ASSp1cx2+4oj0ezr+S0o=; b= AW8qP50ZdPrr59k0Awon0f7KVdHmNpQrg7DMAvLeIzrTQQmhWtoWiJJ4AtFPc1aF 9La/UHDdTtIfDDKAfdLLVXfpDHJUTlNIu5XPrFdtlgBi1a62bLs4D6z9Wc+D5hjA d5lolj5Rd5iKbpSJXRX/41feo1UFvExpNp7k2A4J4CHPuIZ2Jgy+V3UBkIPacmQM 0riDZcYKvhEUEVI9Cuc4i7iEhvw+GtVEfQFZpgAR0ZUnGWruOi1Lh1mHq0D1dmTr Ji8LKK1cg+Jme8F+bYGxb11b+DSnReNo2daOGaWC5lgwAWzW8j6oRl6DAY6KIOkR OIzRrVTXhytj0D4GtzUrcQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q3r1vt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:53 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U0LvZl036604; Fri, 30 Aug 2024 04:01:52 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2tga-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AVg/LzYQS2LiG4JE1LgW87riTPnFevCF/vBEXKvGQBGtEppzcGZis0QsF4+pa8iaax/d+5jFMzst4Vg9OFNBBBkNIY93exbajigYPcRJSLFqQiogBp0UG46/696+NMTV/sF1PtK421N/+71pIfHpDmltceE/HMRyVVgyML22wgI21mRG4NtN9w3sd34ULUqfoflsi38aqKyKEsifJw4Gj/ltElwxWcLlftsDBPSu8qYytURjz+And/HIjxwTEVgQ/H1bOdNghTubexI19/tiJCQBz9w6nZ8hrwuqog5R6bIdzkGfVIz3TBgebECOlKUH0P3pG/KsceBm/g/qv/USyg== 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=Fh3l+ME+2D7vTnslOnVr5R+ASSp1cx2+4oj0ezr+S0o=; b=VYFAcJ6lY8BddNaoQV+/bchKu/odF0gPZLXn+AILZwx8P1AMnF8AZdwUNrjXWfhWJrAdYjTZRw2hzbIR7bzhD9itm6seN6SaKPDSq9TEjdWoZ0cJi5TAdkGIgI8h+J7RZOff277Tp7nLqdvOkH5AYZgBgcFTWGSB80HxFW/z2LmX80MWco1gJ1RzTKn8QR84GrlCF/cOjM5um2tZop0E/B2PBrysxc4VdJ++Gomtf9Wpjd6Kz0CryivKepa83zB7FEjxwN2z/CU6tgFS8gv1955fbUGS87ExN+QuaxA5bZtViYRYvm6DOkmBCBcXjsrGGLxzAKz8NNFmDfpWrDcYwg== 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=Fh3l+ME+2D7vTnslOnVr5R+ASSp1cx2+4oj0ezr+S0o=; b=zOX0Lq1hj2KUseFK1BpoKXzRr1RiLEd3Ugr6EWY5trF5Qq/qiNpbTJtTHpoKzdXovIo8ywOhaOLS+QwLs8Bs+bI5w3sJCWt4rx/52vBjFHWA2a1lYe9+w0PwECrz0PASqFsFKL5dOT2LlXglCY+r37SRhpauKg+NCTs/p9eBOHw= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:45 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" , linux-security-module@vger.kernel.org, Paul Moore Subject: [PATCH v8 17/21] mm/mmap: Use vms accounted pages in mmap_region() Date: Fri, 30 Aug 2024 00:00:57 -0400 Message-ID: <20240830040101.822209-18-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0471.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d6::22) 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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: b703611d-698d-4682-b586-08dcc8a876aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MbKYf82IheOWPipB6jwqnALZ9QWjS2XCQoSs+NLxlWTTvQPaRmdPEFHS/96m?= =?us-ascii?Q?mS+0z9DO5OZRVc7w4saf5zbmf0ggKkE+vqgT0rMLmY+UkJbgVPRrBaJA3lCY?= =?us-ascii?Q?zYzibqFUgBljCYkKaB0NseDe0vc9zOPuGPmuafXEakCDJVuQEjW1SZdsgdxc?= =?us-ascii?Q?MHPjrzLbG6PgVGfmrllgyieJ1RiG018Q3UihvJ2jjuTu1L98pw5n+zq3Ng5b?= =?us-ascii?Q?6mo6SHxlpm16/eVVgPh/j3KLIrUgWaYRMliFIYodWvviT9bPsGxpHRe4QhSC?= =?us-ascii?Q?eNmE2Xzj+HZSJsES7pi6vqncv1utS6Uy3NidhjnAWJ5vwTcRNajbEr9WprLW?= =?us-ascii?Q?x+aK4EQhe3mgabnZqf63oABigQKcu7nY6AVys8f9//BjGHoDzXAOX1TwYGRe?= =?us-ascii?Q?JkSCW3qZmeZEzDsNzGgYbapf6z7xp4yanzBX8FE3q7YpJDsnab23Ke+GlHQa?= =?us-ascii?Q?jclX8KAHE1xrtQoh8W//7UfWFuo7Ax8Ih5Zok5Gxn/IXSzSi+nbYefhZeyYk?= =?us-ascii?Q?3+XDO2ktPa+fRtScgM7Lo/ycrj1mSZnS0OEKUV/kW5dlQUzGqfmYWOxGaEFF?= =?us-ascii?Q?uQ6pxOnO25sH3JXI1kZ72lrNbmc3rdDc4q7YDVEgYQSwsd3ta9HtrU0fj4kT?= =?us-ascii?Q?nUNBwwkxifeV1hrvPdPlxVsQblEHn2zUiOBrjlr9dm0fYATDFzEEfsjxkZ3y?= =?us-ascii?Q?n4fiTd6H/JAjm3fIwGhIJuI5eoIYDiD5xhW3esLEWkipfWiAxHEnOh72xf1T?= =?us-ascii?Q?jqgz0KTzAzGaFCRVco9jcdC9Qg1nrwneIEmHkPFKLz7IXS4ov2y2hWEmhkrV?= =?us-ascii?Q?r1tG+IqNXg7HRJJqVGPwzKioB38duFVs1ciM1FQo5lYUGwJjlsbTBMSFNc+Y?= =?us-ascii?Q?VALts2N936db/EesBX2+y9h+NISRm8TN1EGu6pc8+3E2yMibHoQu7ESWYsiX?= =?us-ascii?Q?vlCkc4Rz4CqevHqnLDOLYSufB+9Hl6x4jT0vQnmqkjCAB/QRkw0v91r1fUwK?= =?us-ascii?Q?ajsAsvuH0tecV67RhjvCFYMO1x4ut7FPvKXk3nf5VM/3E/69qFb2Wk5/ndFR?= =?us-ascii?Q?h5wzeS7gKuKOWrHt2lsCUHYfLZQo9LqB2E7DySkFQ30J9vaZZAydoj9vyOEN?= =?us-ascii?Q?p2T8UXcJjZGYzO+j/0i3Fisd3aZpzPv7qkZGrsMJXoMTzs98R0esJUeSbWWl?= =?us-ascii?Q?Di/qSvjA4V/y/8vnTy8WZKlMB+yEoHQvtmezPBlCbiCf5O6Rh3qRuB8B7gxb?= =?us-ascii?Q?iZXAUIGKop8IixPgP81Q2HO9wiXPHeyYVdgKGUiW04r5JAAmXiE9UMlGymXG?= =?us-ascii?Q?HoojjwBbf5odYrga/0QX7xCr75ccFthZzurL/PqVqmxHDQ=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H/OP+8isgW2W26K7s+IcK0vFBt9txn7E4pDhvgHYPgzs6qsci+UcrzxO9ZrX?= =?us-ascii?Q?TYz9S4DQLx5R8KSVGAoXTYbAjPrnuEdRihpy+1fboK39wFUIFwwCRM59WYxt?= =?us-ascii?Q?sLTw6j1tkJJEz040YmoLeLfjK+XFN1sVWCESkJNz4KxxAhRXe5gS+P1alP/7?= =?us-ascii?Q?KmqUjZ/BhBN0jEXSV91v+aiS0o56RhExFDAdY2Lx+N3SQsugRJoNi4EBhg/n?= =?us-ascii?Q?f4aOV1ilxSjxz5nD+ijsp44rIRojhDnbCWwj1dqo2ffmuL5MKcQkcBUA9Jbi?= =?us-ascii?Q?HGfBz53j7h+P/pjutWVttbnJHIvVvvfWMWjZ/pNOi3Oo/eZx3hu66pb+0sjZ?= =?us-ascii?Q?RdaarPK87U9An6MR95EL3znuIVfJCtFPIsPHLNE25i01/+5bxqrsmY37403d?= =?us-ascii?Q?zvvTIAv2+oNhmusWwVLy6H8tLXej/ZxoCKXI0T2pZ2G16tLyzCx5nCreo/Ma?= =?us-ascii?Q?/5FEykQoI+qOfZHqeV3jtlGrMbFstd6VMYDjZNNbnvnxGjN/D1LsJv2hyh6w?= =?us-ascii?Q?f7YorU7MDC5e7Gzb7pyRhtNKtoW3WkOWSivy0UbC9tPAd9gGuB/iJoXRgbPr?= =?us-ascii?Q?l0N/OKaWUGM2cjnBnIvzKGud5ptMdw+RVAegjieAWzvdY5ZzJTIZ6TPyF4uf?= =?us-ascii?Q?zKn/QoPvY/ssvQxFv1QQdciOW8kEQ5EcajfnW7bOwxLCvd8wF6Nu6AgnXkrU?= =?us-ascii?Q?rAirKvnlGvHKq2Mb2x0x3KxdfjDO72y5JNsYkoQwyn9Waj6MFz94EDSTVeIe?= =?us-ascii?Q?pEuJrlMojOX7AHupDrCbvVCm7I+EK9FrVeha51s+nNA6FVcZZl/0abkNV4Mh?= =?us-ascii?Q?K/1C3jcUZGSdYC9vZ78jQJk3+0gQwcANsCn0Qvny2/gMLZmrfLfpBI6cVRCL?= =?us-ascii?Q?fwmfpwb64E+p+HJkUShPD7Ao2/hOz6uXZdcO9TUr1xyeEy4NHDqreHtUSeK+?= =?us-ascii?Q?EPRnXKaWjeFmeonmTU+FgytBf6l3HEQfDKpIZ/1L4Htrhh2t6ZSex2Xmc339?= =?us-ascii?Q?w0898xjHjruw1xJIwz66U3lKk6+cQQ2k7Sp+PKzNBVLOKqA1PEfT0Thd3lUn?= =?us-ascii?Q?k3QVHN7wZJxXl0YxmyczZgK91CM2TcAb4CpUQ7IM8O3ADDw7Ljmdgf+VBeoh?= =?us-ascii?Q?kHcXfyTcJtGBom1DUb2S+KnFOGAnijc3lATBVqKX6CCCS4XOUioIOe9dZ1wb?= =?us-ascii?Q?cljXS1qovdrAMABO50YW4NQv2ul4UTd1wIDWmsYDmYE6C4JHnPY2ZzxPG4FK?= =?us-ascii?Q?jGhLs20rbDO2yW6X+/3EbqJeb2dY/nLTN8+R9PNoaHC3ziLaX0eP8CtYoOGg?= =?us-ascii?Q?q/fwiFS2dHHHG5qVFxkfsatOuNUSUPOpPW05m6jncOiQmVPYmBwAA7aPG5o2?= =?us-ascii?Q?1wowx+5xFSAHNKcr1z3kV0y7RRTg67sAWYEF2mTMhGBs4FopBhw6CFq3TYrR?= =?us-ascii?Q?AVStxOBZuezqogfOULebqy1qQ2t/p9Mrti0kyCadzFUbBLwMpRLuFnZNcHfv?= =?us-ascii?Q?i67Zzka79SjGq/CbllsT01oAANmPjLGAakh+XBgwm613XULqQBZHlakZB61f?= =?us-ascii?Q?Plt9KPbsUHarCXo3rrXX0KrPa9meGi1dtG4zEv5ehazl91fGXvX1gyUSPInT?= =?us-ascii?Q?DQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: O5BnPQCHS421i/dEpaqvmRWx7eRO17/7t7QUSgJyV7CgfeyLvpNT93TBtpAU0V2YdmikyvHOuKysjsxtG6Fr3YIAJXHh3naO18sj9ELzmPJocOES0JNdf4fFrejUN7eMk8OTLYMoRcAMSgEAyARmvVhZtnK2kX17okeoYLEtOwpRkL+jFQmj10eAVQs+mTpdVHXybhMmTpjK7QW4nvJ8to1v4Uet8bR/s+AswRT+t7dy5ERL4+RLC2d06tdkTZLYXLgcFaNbh63mk7givJTQG/rfkJ2ZXlNFAonY+SvMTeQhysZHWAIS02LFUZU6tISilzFKWl33Uu2oPIMOaFfz8QQve3J3N0QJCOdSinUqxVXKxNmTW3UjI/UNhf5LvwVMF3COBzQC0jfkhsOVftVmpuJKYmA1AKndxS2jfbocBpTfa2jE5QUGxPu1YQhcHaLMEeHKLdMEtW9P21tNHQ/lRdCOpDJ+jahsar/kaywcc7SB9WAETe8ZuFwIMxvViV5PCUDldrNKzu9e/Nik1D7COUI4Y/gP2i+0yAkg/4eXk/0Aq0MKjZmRKQk08yeDFj/J+IEzFTx8XISnU6ayeUBoef5iYO6jbJqW+vMo/aFFClM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b703611d-698d-4682-b586-08dcc8a876aa X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:45.1835 (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: 8DSCd3HTkjiHgUd8TIevB3CaQsSSvjkuHDqJJT/P5MHoaYGv9kfvqh6DMqFnDw2mK23C53tyliYZipVgb37dcw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: FmX4xC3_iodGktVw-_nHx0pwMM3pcAdl X-Proofpoint-ORIG-GUID: FmX4xC3_iodGktVw-_nHx0pwMM3pcAdl 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 Acked-by: Paul Moore (LSM) --- mm/mmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index cd09dd164e85..4faadc54e89d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1414,9 +1414,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 Wed Dec 17 02:55:17 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 6668414D71D for ; Fri, 30 Aug 2024 04:02:09 +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=1724990531; cv=fail; b=riYRosHf9tRcJxZxVnaB6fJWczNQcVDSuSiW3UhUsIS8L8Mez2fnMXVC4krSXKo03mw4O4lLwoL4LIV/Hn6VF131VHoZpnpfcnz6re9O/jQmAcrGQ/yAL/PRHIAA83FqV/P4RlQKh50AKE0Ttl4Ul1ck7G+vuX8dMcMTDARGaVA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990531; c=relaxed/simple; bh=EB5LoO8g0uWS85vO1KWgmQgX5gDidMWfZVTHC3fmSMQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Zo8RKeDQXgt7eoncY9B0Hqq/8dpg1L+r0oBSiHugiAy0ScG6HUAk5TUFXMM0LlOmQL9IfQI2nOZRA9ucfffRXU5XaRGFIKS9Fb0NevhaZB5lF4kKroo7VnyhEGVjahdq+WaHr53b/ZdNqRMbu4Kq4UyV+wPMS1OyGdoXxBt8dzI= 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=YrB2yYhr; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Q7SvwMNF; 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="YrB2yYhr"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Q7SvwMNF" 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 47U2fg78022887; Fri, 30 Aug 2024 04:01: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=pb8FfoW4hL8yzz8RrA4fEnWEaS/lgspvQmeLTt4miDw=; b= YrB2yYhrl7FkVL+E9T1r4padjIze9VoK2cGvHoOQ21dM8xmw6RS7OLS71aw+IQHB E2PsOcV1CECQIGEF8+fMyDZVggbZ9GeaA0kzbbictR0AmA8MXaKC+uGXVRObwOqA esHmfd5XIKCmO+eZ0HmEVxGZaMwvC9i+3sutUhbg2wPuUkw9bPCcRR7qbRoW4iID 4OcHKU9bfILralyPjI7bJ449KdQT5TBJtYL60YujvNQ9gD9VWgbYpfXNSFIfn1qh D6hi+wW4gbNlb0ECtCrgLCuMS7Qzau3KcYQ5PKJ/12hd9a7xC1gyR8JVo+D6pt/O gxNWYNj6GgfKQ5SHGRc8ZA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b28508p9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:53 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U0LvZm036604; Fri, 30 Aug 2024 04:01:52 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2tga-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bW+oL7pmBAHqUvCIUdD0nrFv+W0iPZZViNrs9t5VDgzbV2qFA5UAyx8n+cFhfA1dShVabus3LNz+gD67xsi0UlJR61WUWSANtLU8qzGP2rsNfpIZz2Av8ufiuZfF8lnEa1B9TlwWqAftTKDpoodqOKa0M1GT9GE4xX69Mi+wzWCuIUQbyy02V04Cs1iJaFg7WaMdcVcnbmQ2wjm/02TFrzpF4G6s1wz1CTOW+hggZ2MghhtpBRMl5iBlI6kk+JM5S1nolTzEicPe+rQBONmlPnLUVSrzraqlhULAxf36bPbRNknonrHWFQR1j7Jh5bNZIpIh6O8eKAIMAU0vXL8a4g== 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=pb8FfoW4hL8yzz8RrA4fEnWEaS/lgspvQmeLTt4miDw=; b=XjLqOb4LGD14q0cirXGJHrld63i0fOzTQLe6swFvZrbCBS4FO26T5K4PXCcQ2YMMa5xhJzQcT8zICxm+IDelGxeXR/B+XGAHBdT1sbt6B5YQW7LktyJn0hJXMbq8PEOaBW3o+jp9wZxKJrjJJSGTqYONN7pV4efJV/rVaKtuVZzCAPxtBeBlghDAWSA6Xt5g79SvHgqWsGwE0ZSfGkVwnvs43fVEYxiACpxiOsqqaO4WSC6kLZKkt3QmxTc1eU0FkNH1mPWP+P2EBJup/zb3NERtnFvre/eAgpXXGIgUN1oDTU/Rjery4Ix/ngPWG+Iyv2K/dVlZaWaqfqUGMxgFeA== 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=pb8FfoW4hL8yzz8RrA4fEnWEaS/lgspvQmeLTt4miDw=; b=Q7SvwMNF1ZB3Pv8lq6U+GBa30WtwV7Aes80aoDQJHQeFUSPNU7PSLCIlVPpG956ZRVVCZoE9UkdOyqWwZvFIQib62ZJ21p7hPeCl6Wu/Maz+9btNXbpqBe8uGf4PLchhJfydivcZu+DCCFl5f0JsPUZzG9yP0RvP/IXq8LJ3hsY= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01:47 +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.7918.019; Fri, 30 Aug 2024 04:01:47 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 18/21] ipc/shm, mm: Drop do_vma_munmap() Date: Fri, 30 Aug 2024 00:00:58 -0400 Message-ID: <20240830040101.822209-19-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0465.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d6::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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: 642ca968-994f-4f12-bfbf-08dcc8a877ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nirAp6yA/MPSgr0yVCEr3AIZA2a16Qcx0A49E6YSl2FxIniJYje9lXgdCD7Q?= =?us-ascii?Q?n4Q4UO5/Mj6CIqw+FVe9lrAVc59ZdJ4l+dZcRUeA8DYl6/wOvmQQ7EwGdObh?= =?us-ascii?Q?pA7W07ArLvpzsNJbBREBm0YI3x2bRM7nPyKkJEqsmwEJWcu0xXjBTA2//Kxi?= =?us-ascii?Q?RiWiQG/gAehWZ3iQydp1rflO3eCeb9tDF97m+1oTMakk4ki1JtLfU3oC2tX3?= =?us-ascii?Q?Skjd4LkXSNrCUgU+DxsS4DXYY3O5chrbefWIyc2s8IwF4/3Qgfbu9Hd+ylbx?= =?us-ascii?Q?0cBm+FFUPRDiZr8XY7U5WXN6tFRBUQuWd8DIYl70w3WvYIFmAqZvskzS2Tks?= =?us-ascii?Q?KT3YyD9DSB0RpShF+aux7RdGUTF3Bpl2/WasM8POA3Q94TcFKLCjTLJOGaEf?= =?us-ascii?Q?PKy+jZPfBFVSCyFEN+S0EWzF3nC63zUvkgQfhgcHPfuDm7amOqkysBZzj2S4?= =?us-ascii?Q?81hNKwtioLe3a7ETKUJ/InCwO8ruJkAmDdVNvpu85wKb3+IX91pt2dZotFPh?= =?us-ascii?Q?Z0gb8WYB3KLdP2gp34YthZ9XN4ZlJVN9Es5jqOIbzmSrA81vbQpum3Yhos2Y?= =?us-ascii?Q?s3Z50iRDE6EC6PCeSkfyUe5LV2/gwHCDAmg2VXixOEsifmTLGR2EycIhJk24?= =?us-ascii?Q?zBV2dCScD0VoYqFJUhKBvo7z4ZXGxtXDu7se/kndswysKL81Mr8IMolU4SDO?= =?us-ascii?Q?WxPdf2g9JmB6JTdL4nhSzYRTyeUrOsqGDk7HpdqAKT1C7Tfla3O2mCTFvZQC?= =?us-ascii?Q?rqI2hw6MBWyVeHwTIUNzGG9vYYQFlsfv2lUJ8rpIw8jjAXqf9mB2giVkQZIE?= =?us-ascii?Q?8kla/k3U4kM9KeooMBvkVjt6eKMqsiGIMsIfi80twL0F12Fhl9Y5LKmLfvpl?= =?us-ascii?Q?6DQmf8pvdndk+TZAQ9eYJaw6KrMM7Ib0v1r08u4YQxInpYGeLz2LDuEySP0S?= =?us-ascii?Q?iAA0ZciZCbhdgsBgb1YBzvltx3rMjuMPKI/eZJtGorxwBerYAqxZS8V5x0Et?= =?us-ascii?Q?jYQugkUcd56Xkt2zXO2LsemUU4I8IEErznEduizSY895Cjqs/Ur9XaP4Rmpr?= =?us-ascii?Q?IKxu6v4qI766B6FwF84BbSrPoagp4bJLy9MKmk+ysvr34hJnDvXgf6vnhh9R?= =?us-ascii?Q?BEl6sQ1bz5ODhkixsF29yV/wrgArSaZr9wp3T2T8DP7XRl8wJW+Nv8U/1fsN?= =?us-ascii?Q?klbPnGmdet4UlHOwj7cZjIH9hWvSxYbItkg7n8WMsxWNEBUR2X0y4msqu4GT?= =?us-ascii?Q?SjsGIdAk7n1vqzF4WjcFdpO2ME5wiK9mX1MpJR8xFlJArQKEK57Kh/lqGshh?= =?us-ascii?Q?GVH1d1d7BBHTJXqpM4CvHAEYPiN4s1BG5mlsJjiXzE0FrA=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7TnNJlWXlOAvpbmFNMZGaE74giNN4wVzuYLjRtetJ2y/M3UDQtrEIQay3hBA?= =?us-ascii?Q?v9kCuDRPajyD6n1j6kBeos9WDipkQKfsvnrIGqIi6Nw8KBV/OKJlz7l/wauP?= =?us-ascii?Q?KoMWMDVyxPQJgadZOknVZLe/u5aL/DsOEUgBqFGMJu3SJ/oKPYeM+IJsAjOr?= =?us-ascii?Q?8zoltH/yxfVfuW+zWIudtbBjGLmo1zdXlndxQgh9uEajCgZy4q5tB9yLpbIa?= =?us-ascii?Q?puCPELddm6Xvlff+f0QKSBoS9xOZg1REgCZFIy1lgJGDaulReD+s6XdJwJLn?= =?us-ascii?Q?HCTwNlRJq1rR7pK0Xhi0JPJyESobxYfjf0KUQYO94ZrNvn8KrHveiNaUw4jy?= =?us-ascii?Q?LEj2rVhLCKUSCwxjjm0S76u4DoGgO0jABxNr5ufNV8iFu4ocb2u8mYa64P0s?= =?us-ascii?Q?0wtkkXWTzIwAMsztxL4pZ+oyspPS5JWWZAq3lXqjLCZHt/lQxrmtdeWzqET5?= =?us-ascii?Q?p7YOcK7yY7JhBvOigYJsRDVSgRxGyT/V2FGCEaeNnTk4a/ajX/Utb2PdCmZy?= =?us-ascii?Q?g32VktGR2oxsokpZBFbF+SShyA7TghsFpL+0YBPKmWq3KDb5c95x/ZfX5UNG?= =?us-ascii?Q?+w93laMoNbpmAA+mJL+mydMIS9+/zQstTQyIk6ECX4bOg/DdC+u9JpqMNeQx?= =?us-ascii?Q?OgWq0J7w5wtaq6Q+6FJo2ZukuLPLU592JzuiOEj/PK8xpWBaWTv7knin1+Hq?= =?us-ascii?Q?gGv+EtaHMJ4Nn90L5NZctf2g08wF2ty1UJaw7mhbBpOuVY/5TMsOrFAf/0fC?= =?us-ascii?Q?J6PKzXf/ZD2fYTbXjC8f9ZWMCgtVXx60m0WiA+io0QanfniorS7NahCQ0/rN?= =?us-ascii?Q?7X/LyxV5aFJSmr4T91zzid5XywCnh22ixAt2FfR655fbxLegdnLiC2ByA27q?= =?us-ascii?Q?7CdGm5brTloSwcRT59nasmR2Ni/9LdYl4+2bPnSdf5jF97YtMI4xYLRcZynL?= =?us-ascii?Q?JhwK8quvTMURyYiZKTgv0L5whmtW/iYhNu55XiKiDuvzpLKchs01Aavvc9Js?= =?us-ascii?Q?ry17pqa2RyC/xLSB8plQNQ39H97DhgOm3Y4/gtDOcUYZ8RGOZCkGKopgAxwH?= =?us-ascii?Q?RPI08KdPGAiBOrQwx1jesD/KZji5ztWemgx6LBuIce+Xsw2d3IvdJ152wWye?= =?us-ascii?Q?xzGtyn5ngX8QX1A8RKuvXCe9GXJxGkJS+NgBPA+XSHF4j5/lvdhzPgp05UC2?= =?us-ascii?Q?wvqawLpaJnj6yl0Tvd8VoO/e89kUi5yDEvgwTlY+BD6N2YwPUQtKpYHRZQme?= =?us-ascii?Q?nsebiBSVKqg2rcRTSe4tijj5qnmjXtTQyzEKtKD7KCD+LOFBl+rOpj1Nstxl?= =?us-ascii?Q?e5nrdGgPsO1B8GZ7GdHSP+F5bQlBb8mTUTl8HFbQnPZUhaMbAPaco1pg3Uov?= =?us-ascii?Q?0fJ4N4cxHvCp4YSGDkbS8HO+XJioaw3fUOoMaWvSyHKr36dHZXL4eFiHJUf4?= =?us-ascii?Q?SwmgEuMTqn99ELZMCyB+S2jqkDVDdM1IGWTeyNSOePIt23KEVU8UMrJYDaZ2?= =?us-ascii?Q?iBn5F/r3J3Qtkq8nigJz4dHDOBaOiohv69Ptx0lOo7ZWP++BXgjOm1uwtjml?= =?us-ascii?Q?P7ruTg7vNR7sgeh2qumeiGglgWrsfnnCggQRiI2FM8kzzDjflHOtGtj8BU9a?= =?us-ascii?Q?lw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: w1ZftlI5YnnTLcj9YR1s10EMdmzTNWeYmzvPebKvBKF48Uzv6RWubnxoo6L3y9JRZCs4ppaDMLs5tMwcGm1PuXdC3eldJTWV7JWopYUWf8oxa1IonErIQlQ71L5fzMsowER16feZVRPVn4gvUShvdBmgKqWFlxSGunIyFmWXOne1pwFPYZA07KVlFzsBinENyUGIQwXkM8qPgXv1/li2yQGhNDUHmMBL0njaAqxNAKEC/QxQKXHuGPmZE0etOTsA8AP1glkJrvV1kmkdxk3c2dtpcIsLIeuGgTJ9UYZdtj0UCDqtvifoFGdFDceRdIHHGycemw7oMkw58L9JL2kAQ2vDGYT7XfKwJdfobXZd/ctEaCyoPzw9WZ2clcFUW3E7tWP+EdoQOV9AQZbg+UCk0FxWJXoDmSnyIjsQ0p6xFzVGktOWFONbptPxnhDt7Os7xplp2Uvirv9Knmys/RiiYbai1U+6t5GPS/N43ZF9N3dfmY6YpnDwBQcBpkU511DDW7KqEUEQmieele1YqHEdIkf5r72wyr7cGhMlA+ymz6QkC+0my1B9zAt39fJxIUijsg/Jb7esBPHI21w+Y870euwse3KY1mDNfyTa/AgUKPI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 642ca968-994f-4f12-bfbf-08dcc8a877ee X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:47.3186 (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: 3a14O2bpsr/n0s8tKQosAJi+LE/oL5eZNmyIlhHq6AlogsPh6vWRNPFHcJDWZX6OPrk6zKjtxzBNKMjGLufIug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: 4RDZw8oszWaGKRmYvPCSNNQwBri_Kmm5 X-Proofpoint-ORIG-GUID: 4RDZw8oszWaGKRmYvPCSNNQwBri_Kmm5 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 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 Reviewed-by: Lorenzo Stoakes --- include/linux/mm.h | 6 +++--- ipc/shm.c | 8 ++++---- mm/mmap.c | 33 ++++++--------------------------- mm/vma.c | 12 ++++++------ mm/vma.h | 4 +--- 5 files changed, 20 insertions(+), 43 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6f6053d7ea6f..b0ff06d18c71 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3287,14 +3287,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); +int do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *v= ma, + 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 4faadc54e89d..6485f2300692 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -169,11 +169,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; @@ -1479,9 +1480,9 @@ unsigned long mmap_region(struct file *file, unsigned= long addr, vma->vm_file =3D get_file(file); /* * call_mmap() may map PTE, so ensure there are no existing PTEs - * call the vm_ops close function if one exists. + * and call the vm_ops close function if one exists. */ - vms_clean_up_area(&vms, &mas_detach, true); + vms_clean_up_area(&vms, &mas_detach); error =3D call_mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -1744,28 +1745,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) -{ - return do_vmi_align_munmap(vmi, vma, vma->vm_mm, start, end, uf, unlock); -} - /* * do_brk_flags() - Increase the brk vma if the flags match. * @vmi: The vma iterator diff --git a/mm/vma.c b/mm/vma.c index d2d71d659d1e..713b2196d351 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -658,8 +658,8 @@ static inline void vms_clear_ptes(struct vma_munmap_str= uct *vms, */ mas_set(mas_detach, 1); lru_add_drain(); - tlb_gather_mmu(&tlb, vms->mm); - update_hiwater_rss(vms->mm); + tlb_gather_mmu(&tlb, vms->vma->vm_mm); + update_hiwater_rss(vms->vma->vm_mm); unmap_vmas(&tlb, mas_detach, vms->vma, vms->start, vms->end, vms->vma_count, mm_wr_locked); =20 @@ -672,14 +672,14 @@ static inline void vms_clear_ptes(struct vma_munmap_s= truct *vms, } =20 void vms_clean_up_area(struct vma_munmap_struct *vms, - struct ma_state *mas_detach, bool mm_wr_locked) + struct ma_state *mas_detach) { struct vm_area_struct *vma; =20 if (!vms->nr_pages) return; =20 - vms_clear_ptes(vms, mas_detach, mm_wr_locked); + vms_clear_ptes(vms, mas_detach, true); mas_set(mas_detach, 0); mas_for_each(mas_detach, vma, ULONG_MAX) if (vma->vm_ops && vma->vm_ops->close) @@ -702,7 +702,7 @@ void vms_complete_munmap_vmas(struct vma_munmap_struct = *vms, struct vm_area_struct *vma; struct mm_struct *mm; =20 - mm =3D vms->mm; + mm =3D current->mm; mm->map_count -=3D vms->vma_count; mm->locked_vm -=3D vms->locked_vm; if (vms->unlock) @@ -770,7 +770,7 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *vm= s, * its limit temporarily, to help free resources as expected. */ if (vms->end < vms->vma->vm_end && - vms->mm->map_count >=3D sysctl_max_map_count) + vms->vma->vm_mm->map_count >=3D sysctl_max_map_count) goto map_count_exceeded; =20 /* Don't bother splitting the VMA if we can't unmap it anyway */ diff --git a/mm/vma.h b/mm/vma.h index b2306d13d456..eea1b5e9c15a 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -31,7 +31,6 @@ struct unlink_vma_file_batch { */ 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 */ @@ -114,7 +113,6 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, unsigned long start, unsigned long end, struct list_head *uf, bool unlock) { - vms->mm =3D current->mm; vms->vmi =3D vmi; vms->vma =3D vma; if (vma) { @@ -142,7 +140,7 @@ void vms_complete_munmap_vmas(struct vma_munmap_struct = *vms, struct ma_state *mas_detach); =20 void vms_clean_up_area(struct vma_munmap_struct *vms, - struct ma_state *mas_detach, bool mm_wr_locked); + struct ma_state *mas_detach); =20 /* * reattach_vmas() - Undo any munmap work and free resources --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 06A4F166F1C for ; Fri, 30 Aug 2024 04:02:02 +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=1724990524; cv=fail; b=lmgItzHU7aiRcspRzdqZI2xRynSf6GoAdzHtg6V/eQGwlWSpiFveRlTLcVrvBqFeqcHWFXCQla2PMF7IIf80t/+A7F0pHgBiF8VLAacCavlAhO3Avw5W24WKOtnmol+gqAVridCb65bNiWeZi1RlItvlVIuKfw6+VkxT0keE2Ds= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990524; c=relaxed/simple; bh=ussy/GJDTzIR8D5TwyTz3JCerHmIpN9mGwxWHavmKMU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=p03R9d+V+0q/j97yPwp7dQV6DhAeV2tlxhrBjdZEu+mkAMEtI65Hs+CChjomKwa5gOE53zlAU6CnVX3wGg+1/uKToVvmDwq6jHflFdUALXddcR8ZQGgLWNZMBCh6j6lQuen63ARNsbZ1Wv7CA5ZYHaTqIL0ZbNmjnO0Atw+l4C4= 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=OtOETeOC; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=YyrqeELN; 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="OtOETeOC"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="YyrqeELN" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47U2uL9I019681; Fri, 30 Aug 2024 04:01: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=Ls6YlP+qGa3+3FNlDv9PERPNFJAt0V//E29iP7vaPv8=; b= OtOETeOCENI+UV/YzUmpykj0qWupQrlXh75cyrweWNFvEVwOHMXvkHh4t9avgYT+ 3GiHvJrsRrXDRFU2u/pu+imN4tDZtVlgUiiYls1qDbKIEhsgBfcP9wjsWGgM8nMG LWrXUfT8FgVzi4GY3FQvrEFThHb9TpXRmNCA0Fwo4F0SfICaCLB1g21FJ8ueyVC+ g8gQFp65RwrqS8IxjtEvY1gEzwdD5q+2YXTXNQvSjplaSQS0H/lXdHYsN/TQjls3 xy668czWckjo1IMijqCiaBytqhMrplDmgiSRiWtC2ChPOhiTXq7IxYhBbiPh9COV H0LUWxrWm51ABsVoZq3Ndg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 419pugwrfj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:53 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U0LvZn036604; Fri, 30 Aug 2024 04:01:53 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2tga-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FRCquFTjlwz6mjQLAKWK7sl/+oHtnYhtuEpxdupu4owqgPEbb9OX9chAglANmafBlySVRQWbw522KLKZiW3U9vhGsopA7veDl4gOyWcK1ODWiw2obVsMf3HNZRI4zIW6IfwTBRIU833vlERMiL/TvLfELkHEKixHefP3ixnPbub5q6CCEHI30CspmT1Q8KHGLZqPFULbINnv3l6WXqwfKgqLJ96QHjWAj6hHVy7YjcgihjWcw+inI+eNI6OJjvobw4zhdTxTntWUMmdBKR+DY051LwVMA9Vk5onKA2RMEMeqN8BHIBF8GaCHSXPEBRKgPACEjZ0qureAo+JDpAyDtQ== 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=Ls6YlP+qGa3+3FNlDv9PERPNFJAt0V//E29iP7vaPv8=; b=VoFHlwM0cLjlraVK9ytP43qpM9GVB/BGVnxJYBJ70KNH1wPIMW22fUBLn1NZJ10c36u5VDzOVBjDnPyHaq+wVuvUVWeeuWnIQmrt7pbkAxvKgv4FE0A23mk2SOo+TJU0fQG6D0OubvG6CRDZybFJZVTkAHgLlikqSpG9Dt6kZX/5lXHDSDRP6Vhm7plzmefglON71euLgrOS/PnOdyswo2hCFPSRZl+Em9ScEZsIr6TsWd9JK0zM1+avaOH+HkXMHBujg5VtkIMQN9XJk9iKA4ZxUYc/fYlljOVCLhu+LMbC9YUE6mDvu78Abf7z896EBgz2aFpmtJL1uBFq92oxNg== 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=Ls6YlP+qGa3+3FNlDv9PERPNFJAt0V//E29iP7vaPv8=; b=YyrqeELNPY8dyNk0wuBbC5sIBpD1A9jIP5GEYXajt3ajp7hAu5SUdfmC1L6Mnn5xJ5UjiImf+kZkTaJPO2SrtkEvz5MXJcGNY2pOF2YyljBISTUjHQb6LNFkQwQRt3ob8k82xPQ33HHbuuVj/sWUvD1haxCyFbQcimWsqEraBUA= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:49 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 19/21] mm: Move may_expand_vm() check in mmap_region() Date: Fri, 30 Aug 2024 00:00:59 -0400 Message-ID: <20240830040101.822209-20-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0056.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2e::25) 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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: c769d78b-4085-4f64-97b8-08dcc8a8792f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7/tuBpwMzUkHAHnUPRBxKTUV1azZ9uwST74CA6ssFQ2J26MGpJngyKQVLlyW?= =?us-ascii?Q?Mz8a/cFL0Yh10neH/fA5EbdJeIrh/Z3N2JAsyrO/pgkfHIMBYDmtDl1SDlf6?= =?us-ascii?Q?HfmHnpAe008gTizHurHEnoDxJguoZhFILAXupcJO64rapXJ0mwliQDnVyH1p?= =?us-ascii?Q?XzIloSY4skVuGZOvFdFqM9BoK/fZWYU8JnWPRDAOedMRm/X8koyw7IckogOi?= =?us-ascii?Q?/bXJRd1yRwxluwFdOxFyisAtDprsL6iQ0HasrLisj0eQ2fNgbsBfC+m3103/?= =?us-ascii?Q?dJ1Q08Ow6hUgiRw06bUZlyVo1wz+cd3Vzl9GiRwOo+OioGyCqK+gIKUwuQyE?= =?us-ascii?Q?2bBZ1tqaUVhAvAcjwIFZtz4GpO8ffImnOn8Jg+7PGEhIWxZossVIZJLeNTzN?= =?us-ascii?Q?UhTmVVsD+7TWOENpAIWAVXdj6qHNH0xBp/daOc0q3cOjmRm6g0TUPjqPwjF0?= =?us-ascii?Q?zLxTtsmip9DLoRr9uWE8MgNLjNAwFK9ppxBRbkrHBBXJhWqOHFxElQH0lLlD?= =?us-ascii?Q?92BROMZ5AgTCpZ3aUPmj0RENcwULQCSWlnhIeni5G5xFGUAoezG1ezDF+pGg?= =?us-ascii?Q?PkRkc+i2xX8MTBz+IUuOQvV5YCm+y9nAJm1Qz2NHQnyoijr4fM1R66gFGSKh?= =?us-ascii?Q?SwXRRD5RWgU9ChfVlYlVDaSrEkvOqw/ZcZTyN8JrIdEg+5euQiS/b99wP0jd?= =?us-ascii?Q?Go3/fbcsvwqRtnLlFtNoQ2Pdc9qvnpK7Be3xiShrKyzZPRkUYhfbmD/z4OH1?= =?us-ascii?Q?A162PDUaMW6VEzeN4cPH+p18XRQZYJGWyid9GWO+Klt+DvZtSK7UskoZhIAh?= =?us-ascii?Q?rzCJ5C1mNmcUF2nPChEqIbFrcGKKPfKD6vjZiFokYpAofK5irGs+S9sXCX4V?= =?us-ascii?Q?6dM0NL4xIloZqxg3xeV/ASps6UPbFy+muAk4+w5CtBT25v6mX9bwmzGsAa2i?= =?us-ascii?Q?NjCBV6DY63EVuff5xdDcEnS5h+VI9fdyYEIY8zhNvZcVcBKdKF2Tkd2ALXEc?= =?us-ascii?Q?kZahc1U9tiHyeTN3E/2XPnSersXgdkorwpBvi5ISZwjRFdW4i9MlFcbx8PgG?= =?us-ascii?Q?0SQXgQIDqvcKWynJvMajmE5tsFQjbY/0XTOG5I1l3l6rsspPLXoWN0YPP7tm?= =?us-ascii?Q?wWB6rZ7MKCwyxtQ+EvEd+h3yfD1GbzGjwTFfizExZE0dcx1piO5FMeDgcPrj?= =?us-ascii?Q?nEgg39ppbKJ5uOD6jDl/dc/0wJfRLhI+rGvudp5nc/UYDH4kW1XBNsZVQF4S?= =?us-ascii?Q?P35FUZq8Fx5/T1F/VhnNGs6VJnmUqe6HB/gjsIUEZaqF8Cbqmpou66D7FedE?= =?us-ascii?Q?wg1bx7z8vKZF9ukp/RDMcow9HKKukIas6Q3ssEAtjZK/SA=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gXTl6CGO43aldaAfvqb6TPuGzUrWfnmt0ZCgxsUUAfO/lyXJLbdRYrZ+K1Qh?= =?us-ascii?Q?pS4IVH0vfsytt/1YODiEGoVdfCi2UtQbTxAC+09REfjuG7veLRq16XG6wBly?= =?us-ascii?Q?Mxxf3Nnp3IQi8ZvZVRtZFMMnjFJt1wXgESf8fY1S7VZ/5CVQwBcpdETM5rrt?= =?us-ascii?Q?rcLgzRkI1kfPq7ZIDaBRZoHlZmjZQOHFo5swfyCwwUNhXK0Yj0VoEO80JeOd?= =?us-ascii?Q?ANe5J7PGasJNl33Oj3OPTnlBby4Y6BOnIrSHifD4t1Y9OFqWuG/l4ZFicAlj?= =?us-ascii?Q?LI3qGTI4e1H6K4t96ZlperakphzcKiTleZfqCWOuX5knq4qiRHgWmrv+Q/a/?= =?us-ascii?Q?1ZV3Ne+EmjPOydX4XRYhvIwmoTNx2yFHTci4iqgybopYCvwBoSuBT1xmTUl1?= =?us-ascii?Q?aAlkMWfU1NGBy1yMk+J3WhURbUgrRylTyOhF76Ttt8wRWZHr46be/FFR5gjl?= =?us-ascii?Q?ZnvrEr2JKgFH8tKUzqyXlPXSWwfN6oIp8sNzBtvM07PNPgLpUheZAzT9VFOG?= =?us-ascii?Q?8D2nJoScWz1+SlORDSNDcKVyRpxCmAOFmxJk+xSdHLWszk0ndhhmtK1Li79Y?= =?us-ascii?Q?PmErXQ6F/J4J6f9L280i4xMpWEon1Y3XIYqtXTHk2inzhCSJoQVTlgIOYtr0?= =?us-ascii?Q?/mFnhVIeFp11wc0Jp3DYYRZD0UNbchCZ/NsyfkCnIMd7W174zPKypjspJiaQ?= =?us-ascii?Q?WloE2wSbjuzN7M4m12GmXhD7RAZip9whrp6xbmOWvOC3Zt3kfOs4w6i4RuCc?= =?us-ascii?Q?7TCOgwfhAzrRcqC2w77Nz8uEKuihTxh27XrwfnvfcJGe4HdO9IQYJaya23Ok?= =?us-ascii?Q?OGAKB009cchA5V/+iZDbBb4F2eVJ0H4hB/D0NCon7V/nZvgp+66zKXHrljoV?= =?us-ascii?Q?Q8kwqgQ9EFCKPrG8yVvo7i0AUglrFglsBzWOcH38KCTaU7y5HQahPv4OPww6?= =?us-ascii?Q?+67o4T3hl9pmYp8TmWWl++THpnXEEGcqR4244LqdOoaIMDceYbyw8ItUq9+p?= =?us-ascii?Q?CTDvPfcIa1wZwpYldG1fhaJv1Px385hmidCjdnTFCipdJVj5uCcA2WxBywhU?= =?us-ascii?Q?dQBBbimgKIpWlXwpoaDVfPY2bbxQxYaOiDfMg29RIc5kZixKDp5Gg82DIn4e?= =?us-ascii?Q?UO8gl0zIjWwpxgg5iPPuS1hEPxv7pPUS2zXqtBnYPrVfCnGIcOYXLQ5TC92n?= =?us-ascii?Q?mK+5wEuSFibueKD+VXgWiQQgK54Z3L+nhzHrAdqSuZZZW5fvDt17Pw4wYLA/?= =?us-ascii?Q?9YGnCPGvR5Jm2r32R4TpB59pPfrhbP6NzHT+sYPDx+d5DKxOFVPfp4KP1LKy?= =?us-ascii?Q?onOklMRwzuKXXeYuuHDGgIslXWBD1qrf1cjt5LkspDhqtA4OIMGeijJwV09z?= =?us-ascii?Q?4uoUxmpAXg+ATF9YVWWbmn+kCgGqL2ZlGH45EKSXxXOVrpMkmprIQ6aHHu5M?= =?us-ascii?Q?9PmoFYK9b1iyd0zIXlE4bdMKYrlKBRuWNPT3+2uquh3dn0KME44s9uINaVY+?= =?us-ascii?Q?OfSP+sqI2fdkpbOWQ36oO7MuAg9Mk5E10HN6kvENeYAyzY4yLIFbhepR3nOS?= =?us-ascii?Q?CPZaEPUyXgNviw/P4KKruXt8PwgLCaMEELas/rfsJB/wcgmRj7nmo4rog53v?= =?us-ascii?Q?qw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: eUq8eiU7bPCcZegGH5tYw/C7x7a6F4tniPSmIkrRbJGeJV2xbmgTcMINSmgTqZ61iT5iVOQc1zZk9XmZuGeFEKPAveKEQxSLddF7VazQTLEn7vLT0nn1p5kaCnLdy4T5d9miTc6643kmsTNbtf1vklOuILCD3GdHhwLyogTuyRFd24IeRLeQwU6SKI3JR80PWGMQa+2NEbamncTURYnDWtGdgAUF6H6QMIazah3g78ACB+yAehJby5pQ01Tgiy27EJxrniRSGBjPD++dX9MG5uIv0Ibvy00qqB6qDo/JIEK1V8hTQC2IoE7z2P3WuHYZR0qxtUe0delJLy6K7L5W12v118pfGW9UD0ekXjX3iaKHQZnxndZqbP7Z5hGRqMYIeHwhsHkqI/a7/q7I+W6sy3PowqssduvxJH50XON0RIsGa6Me2/5YNrfletOnsVpAOXeoT3/o8xBxObBYVOccsEOC5nzTQ1RG2w41iTL/fh6UHTxd810WY4q3Zs4NxDefrPSCzFHYU1vZ3lzQ728/StTyU/0mbQqiA0NB158yyLU8abk6CwaNyIXY5O6S66vgN/QSkmTHocJggBJCGH13QhMbao4jpuMLto4MMtsFlQU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c769d78b-4085-4f64-97b8-08dcc8a8792f X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:49.4056 (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: rWPs0jN3bfJmaRT/sxcCUk1LJ38oSQH6Pe/I9Suw2gelOBg0hFLfGsXzSKoPEocfn2txSxoS5pmcTYcxpM5W4g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=976 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: -zRDwOCZO6MDemVYfKCuJLUwuhvqzR5y X-Proofpoint-ORIG-GUID: -zRDwOCZO6MDemVYfKCuJLUwuhvqzR5y 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 ma_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 | 15 ++++----------- mm/vma.c | 21 --------------------- mm/vma.h | 3 --- 3 files changed, 4 insertions(+), 35 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 6485f2300692..fc726c4e98be 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1376,17 +1376,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 /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); @@ -1410,6 +1399,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 */ diff --git a/mm/vma.c b/mm/vma.c index 713b2196d351..3350fe2088bc 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1640,27 +1640,6 @@ bool vma_wants_writenotify(struct vm_area_struct *vm= a, pgprot_t vm_page_prot) return vma_fs_can_writeback(vma); } =20 -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 DEFINE_MUTEX(mm_all_locks_mutex); =20 static void vm_lock_anon_vma(struct mm_struct *mm, struct anon_vma *anon_v= ma) diff --git a/mm/vma.h b/mm/vma.h index eea1b5e9c15a..6900e95bcaac 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -319,9 +319,6 @@ bool vma_wants_writenotify(struct vm_area_struct *vma, = pgprot_t vm_page_prot); =20 int mm_take_all_locks(struct mm_struct *mm); void mm_drop_all_locks(struct mm_struct *mm); -unsigned long count_vma_pages_range(struct mm_struct *mm, - unsigned long addr, unsigned long end, - unsigned long *nr_accounted); =20 static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struc= t *vma) { --=20 2.43.0 From nobody Wed Dec 17 02:55:17 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 5569614D711 for ; Fri, 30 Aug 2024 04:02:09 +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=1724990531; cv=fail; b=SYOc3EC0CUvukS6pRxhxJ3glmqoDojGbpqV3e07TD/poe8fIcs+7yOyUupWUmZWWsAFBO3QDGDxWeOV9FuWPjyDQtp5PIS4URVQiCv7/2zNX6FT0M346ETNYyZRCOnefZEziw8n9WYyj1dH1yl3vgC/0xHMPDBpPbrqji8EpHD8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990531; c=relaxed/simple; bh=wpiLau/DsZ9Sa7lNHjJS5LSIVnN5emAXgQvEShKD42c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=C9r77kljg18CsEUfSEe0U7U+BGqySilP+yFbgtG8LwuKsFGLoOMqeSjw/Ic7AxihoD6M9XEPGxayqLK7xXZbVefHuQlScgc10WWZ97sxdnIFBqnaD+dWGTxYm60JxivV9LE0ou44F0zwp5d8sIh2HTLFJ/VtKIaRiTSEb6b5HUg= 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=hDCVX3HS; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=lkt5rvEZ; 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="hDCVX3HS"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lkt5rvEZ" 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 47U2srfF011858; Fri, 30 Aug 2024 04:01: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=MnHfI2QsMe/4zoKN73j2X83vCMvsXwhWZmXTDDHf4XY=; b= hDCVX3HSZEkw2nzYnVTH/+6tLKS/q0w939l3eHRnEOdbT+uQs66m0AcO4hFkUI2w ktcbYoLvuYazxbn6l/XmMwA0hhRk8RMNHDOCRmjycLWbsY1/H18s5Gl8tsZFrJkc CYkz9t2rznh0AAMkv7D8yZvzcJDvX1etJ685vCEOHInzgToe6CyXLOV2ea1dhVBr ltV6v2cb2NpMTcQupgC4tTLEgJnpNdb9OeNYFxdR/VCJOqEh8OcsAv10LjV2updC y8kSX+JLFsT8i/rt33EfSbtcxXsC5R9gSxdLqVmpaez4cpA0mzhK5ktbWZwT1akm xHRME9Ayx88S/nR/xXA+WQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q3r1vu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:54 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U0LvZo036604; Fri, 30 Aug 2024 04:01:53 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2tga-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WEgGtfwr9t14+Hk19fb7OeTedQeEisARfIA7fIe8cZmqYnK+cL9v3CiDkCCA43Bl01k1sghcWe1bxIToq9h3JoPxxOikCpzIrt1v3HGN2qjTryM+MczyH40I2q+U4UwBT87ufNgQMS4rPBbnE2V6o5geYtNxesoI5r12nMlU68uWYn96sYAAU7chVaorJ+QPyQ6IXY0NwCl1RD1GhFv7K5HpFalSNaTX3dlml5pMM7A91Z9DHYgTbEMKKUqAS34RFCtspFPxyGPQeA+15L1twYoGSZZ/zjZdfphs18egx2BD5Ic7tUJN6zzhwEAmMOdXkJiffAxY2jOOihMH8IU+Og== 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=MnHfI2QsMe/4zoKN73j2X83vCMvsXwhWZmXTDDHf4XY=; b=CSIAqAyX1uiQ60gGzpR/9HfbTHs3QiUhHZg+WYeXARJgnGwcKlahyzAtUGmNIrT65+J0vr//pKzfy9kPzMwmfJWuNBk9nwimi/UbLN/tS9VepfluvNsYIxgYuZ/XvIwxCxV9Sw5Le45Jnpmi+va1Ohj/u7fTmGMDVwg1oRM0culRNlB92kUbrzbRUkgMYlDD3nQRlVLrj2Qagn1bsEhVly3b/yhhhkF6U92wZoA6kZb10O4CbZYZ/71T8B9aXM4AUHBJEVLAqHeKc324SQXt3xIx9TMjg8Ecd1NLg419GoY9ySTA1l0JB0pMcH57vCo257wyl71/alHmh/RBynN4mw== 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=MnHfI2QsMe/4zoKN73j2X83vCMvsXwhWZmXTDDHf4XY=; b=lkt5rvEZp24VQXY06uuWC84sb/d8XtXNp82JLBjlW79KSUSF+hzE4HzMJO5/bZ7vbU0+u3U5I2Ky2U0MWijt110yojf1Hv0GYxkrqUeTlyocSNby//RfFzuKnrC3MmRMCtiBTS9q65ozOJp1t98w8YCCRaLfRLM9hhqL8Mwjm+w= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:52 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 20/21] mm/vma: Drop incorrect comment from vms_gather_munmap_vmas() Date: Fri, 30 Aug 2024 00:01:00 -0400 Message-ID: <20240830040101.822209-21-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT1PR01CA0037.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2e::6) 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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: e560711e-e243-4cc0-376f-08dcc8a87ac4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?M42PXbeARSjtG8LPNhvrnfql/DXiUfC0TfCtdeFyzjCdyZwOzmqTXMPiJ5bv?= =?us-ascii?Q?DLcgA7oNSa/y1ET7zhk5dNIq3o2rzrRtTMHHqUIt7pTsUTvH7Tq2UM1G2S2w?= =?us-ascii?Q?e34sLTnlI7OxOvUehUSPcrMLP4VI5nd/qXzLu+Bzur6YGpQsOZfMPoHOIQVn?= =?us-ascii?Q?PgmN4vS19pZg3nn5W/3BCDrqrmKIaQ/JYcSQDrbn4ynyTI6JLFU1TMBl61tO?= =?us-ascii?Q?3weIIMqu24G8IPsKHkMVyw41B/cOxMObb/99KQj/il5VNcpWckiAuLGnTVbb?= =?us-ascii?Q?EzAWSFBbrnuo19qhwHLu/z3L4GyRB8s2mdSPsyCgZpQelmGRkoXH9opYaS77?= =?us-ascii?Q?nOMZP07yNocExn6QlZ6ST2g+0rfvQL10N+OSS06HYAfwFlLQx45NECXql5c4?= =?us-ascii?Q?7AjtmgMo9PW5XyPbwTv/7aOa8jVc7fhuA93AW/njTzWK7JKndyEwxriaZgYM?= =?us-ascii?Q?rncM91ELuw48UrIgqDTO49uKz41TqmIOp4VaWZMoIRyqqyomWVHjAf6Tut/1?= =?us-ascii?Q?t30MpMl+J/jyZNKrREji/gi8i5OVMOCgkAChR8VFF/ZWBtnXsCsu1msNM8nR?= =?us-ascii?Q?EyUXwr1xJAEP8RuC7jirpM3p5zC6JQpgMjXBW5AaocRQQielTSVfYywdSWVy?= =?us-ascii?Q?vnaHL4fBSy20DtxDAWIcfLcb0DtjQ/7FOnnZnLO+0+OXmA4FoUCzPS+KvSc0?= =?us-ascii?Q?CUBVFjzVB2fxtApYf27mi40WmTUMDoth5BGw7m+wLMvrj41Vthmm6vr1lVYv?= =?us-ascii?Q?AUAQN4MCmnQ0tbVELxkrRgPK4Inncl1Z90arwyUtinfUKkjGneYTc6lNElcP?= =?us-ascii?Q?H9ECOW33vGw6kvr5kGQyibh/gZgA4dbO3CWmEmda1wg36aYogIc45rBL73BE?= =?us-ascii?Q?BbrH5aop2oJzFENe+F8ASU9mpZDfK2CFYcuGQMEKYLPd1k6GJObSgpwGGSLv?= =?us-ascii?Q?+jYBevA2r0WegsC1dxTdXkfwG/Z9wQvPFAYyELTCd6KrK/Xu2SzEGk9komvu?= =?us-ascii?Q?PGrXvHHAuoXA+gfQmMLtrNR6wJC7PQd7bePiw/Ja0jENpcAp4n11rfL5THx4?= =?us-ascii?Q?5N7Ll1EcdEN837giUQRRsBEgUWwcP1e8EKFY6miQ5VYyzS3Jk8BKU2juQDcf?= =?us-ascii?Q?FAn/nLP7nwfT0M2F+SFMf9oki1ar5ix7WmPoyJVoYs+b/lQk47QL3NBdQrw0?= =?us-ascii?Q?KTOFLYf4B6W8IMY3maWRHgh+qJV6gEOVbab6BmheAHqa3uyX2mkblNSuy7ZS?= =?us-ascii?Q?N4qkiChhrpVGi7qWfAe/CfqiT7KpW0rtg0UjhwwJi03u11a+qqhNy8/WVFIH?= =?us-ascii?Q?u14H5i7L6D1qVpwQILGHaNUcpjYXSTgi4uWcPR9V0nBFoA=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?X03T0nnf2NK4mZC26S5sZz6RVTfVCvHpduOELOsscZhep7MWwNNQq/gc/3IC?= =?us-ascii?Q?8AB2xiu8vu5+Rx6Vf0frXWIumhJ6rOdinwrP3518ewNaLPdvJZz5Wny1zrXr?= =?us-ascii?Q?rbHWmaYVuQB0PQMNIoPM+Kr0cEk4dJKF/LFHZpQ1wu3r+xjYzLfSRlLLm7K8?= =?us-ascii?Q?8zTpAiktIKx8QysK3LGnsmG9BJLWLlk1zfN4mk6Pi0MBh0cGLiwk28BX3A6H?= =?us-ascii?Q?2rBifhK/7NZO81d/nV3Ayi5H6/ByrzBO8knhOOaI6RKwmB+nK9GfLSbQrbmO?= =?us-ascii?Q?ESfYG4FLyWWlob0R9QSVT7d94qqUMnaIUOh+oSeJB67kCJMZ9OsgaOiJbBO0?= =?us-ascii?Q?63k18H8Tn1GUhhTtX8CoGUkGfq59AHRKc86P9iDkO5LWDyITRTMzB7Wz2B+a?= =?us-ascii?Q?Y4yIgxAmQUYSxpJup7hvyj3g4hn7+iWP2qsBXCJA2yp7nqaR4rdF5R3XuzDP?= =?us-ascii?Q?mRyqNf0QeY4dfho35z5ouuUDJGqMTTdbtEp9YbmHNKuNoeiuurcw69ctyWnt?= =?us-ascii?Q?B2jcVCqXK72emggDb7MnmHXOW6cnCq+5L0cSxAWqJ7y6oYNVuLn69LAHzaPR?= =?us-ascii?Q?hYG51UzGv95qYq81mo9a2kbkFlLJDhxu19zq5LyrSncuqMObXBuc3prPrzlC?= =?us-ascii?Q?Jklosa+K6a2IcEtQFMhVslK2Ry+PKbYVZi8Rrz9LDnKoK3OlIUD22cFprJIo?= =?us-ascii?Q?OTPh0xWMz9i7QmdQfWM/EXPzk2/Fy8XVcwgtuWFIizqVTUwu7rP+hvFWlscH?= =?us-ascii?Q?qORHp5nrO6DgbopNsHWuyMJgJTF9I81AGTYvpJIQRHTTdUZdF6w3RrYnAT8p?= =?us-ascii?Q?HXpdv6Z/0bSBm7pSXTeiVvJJPO8hzAJpGMuyaDN5qHcItjVUfErMFwdIVtTY?= =?us-ascii?Q?FTTPKAG7v0gj3QPNg1dIhTR0flPGWde2VnyF74Mf8OufZq4zPWuq7vDY/3xf?= =?us-ascii?Q?jpQzWHEf/laSiQEaQ3GIUuItYEsfHarXSGPIORF5YCOWRUFKShgN9VyUimwN?= =?us-ascii?Q?5kz4mgQPaTe8HnS+LjG+plX/A2Mvn3vwhJlV/o2q582StdObLuF1SbiKPoO+?= =?us-ascii?Q?B/IT5QsDnppz85iHqRRxSnhUWMxvI/PUD8YVBvSuaDLqyca2FYzFZZs3iB7Z?= =?us-ascii?Q?z77kJQe6pLZHJAYiWzqQQh5UGu/qCfQEuIK2U9kd8pY6WxRMFM48kX5P/zF1?= =?us-ascii?Q?fGm/RcgOQHLAuMSq4oR1k+c06ZLF8OaZ5gla0z0YkgZ1Su56AwUL/VYAoIsx?= =?us-ascii?Q?mgUIcBTGyq+pg1dBc9nH1J1ie2217cjYdGuizfmBVEhhNiL1C9wRqq1ANhTQ?= =?us-ascii?Q?G7MKSRbRPT6W9R+w/jMYF1P2KCumhuRwhjXi0jfwJnwsXrzgGyTEeb/0IIbi?= =?us-ascii?Q?k4TNQtXbtLKUM1RbSmVQuK5eYubW3H1qgSLSuGx0F7vlczoPAWWnTTQgYYqW?= =?us-ascii?Q?kwsb7UbxIIuRB+SqQtAtwWTQ0KeuWbVTfphrLlPeT2lLXVvejllRdAUG6gFQ?= =?us-ascii?Q?57rBT1ah3xjppBWBd9h8SeGOnW2WOjvNTHK+56x3b/3XsNkxzA7xs/aorcco?= =?us-ascii?Q?Ztwx2Qhb3mUOPKaWxx+iVJ/4HpdVnck1NOqiGxJOmlKauFFzfRWXrInZ9FT5?= =?us-ascii?Q?YQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: nLD+u1RBYX+qkWqtzoz7j6K7zpvfIx8g5/IA9Q50jtIGdlClitc1Fnzc2Jf2c3NsKLi8dO/ejRwAUGRVn6MkyUG7ktb1CM36ofI+sNhp/XChTXoTdIK5dRBcJxCzj/6fNm4XaMq1PNjGFWFegu7MvHqv0/Y6WVI67A9Opg45yIDFbRulWbP1MTRwo6JdrRVHKA8cQ05SaX/lEctXbfQz/nQESHL0zw7kt7F1+grJtXwvk8Rzh/xnfLXqqCTnpSm9wRu5F7CPNG8kusNdaHAtD0GPzclgRlKNSxHxXiqiceqGe2RIR0CoDiYzFoyFaMdz7WLUA6LN3oRj/lvIngJHT4yKBquzXNLGfkMGTw90bA0zTmS0e/8DMNAHZVvS3ulq24jMLRNEbiwdLNqGx5KSwHucHOekPjog5+WQS1xWY3R1WZJKirQyHrDKi0BjBUQkKLjaA5hk4Y6fdFOxbfpyo37/0n9M2UyT7yHldqJsamtVVdxLsbRNlMrKxSTjLVUBJc9cChZe7bKdv12/fOsRaNMWH6A+IoN6vCNBV67R97c12jcPTk6rdCtz18Qfx2rSt6VoeW7ZMivdelet9iPLRd6T70BCF72xtM4RslIL/ZI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e560711e-e243-4cc0-376f-08dcc8a87ac4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:52.0426 (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: pqT/QIWynxN4nIyP0STnZ39DLtV9223Sf8HceKBvUFqApnwnAxGvnlvmumnXFTUWaC3R2wIuLO2p9pH35yV8tg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: TLqOEXDFiIXaOHvNKb_8VWoFr3P55gp_ X-Proofpoint-ORIG-GUID: TLqOEXDFiIXaOHvNKb_8VWoFr3P55gp_ 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/vma.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 3350fe2088bc..1736bb237b2c 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -755,13 +755,8 @@ int vms_gather_munmap_vmas(struct vma_munmap_struct *v= ms, =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 From nobody Wed Dec 17 02:55:18 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 BD62114E2EF for ; Fri, 30 Aug 2024 04:02:13 +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=1724990535; cv=fail; b=PFFFY00uxBMuOXwagnmrwEJAYArijsKWWnPw/ygO3TKwLgnpI0zSPqiigMEiS7ca9T0LPiUpa/44ktQgqo8fcJvoEJmIkpvbSChmd5ysZq0k25zSevv1sKP2PqAwXuFeCaBZBT+SwbopiBqN/7YTnft3Q+FHIQXyirPG2KHgdg8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724990535; c=relaxed/simple; bh=4jMdX+QLIvC5a42fwvlsXVROM/J/4prkMvfzrdKjGBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=q9OPUtOXdR+Nd9ZUbK6sU8rRUUoDbz70cY5dBAoehj8xCrtbcPvWD6aogUiSgkTBVyHkrbCWZiWsVROijpuIv87QS2Ro5lSCKIBIyu0Rto7TDlf3SpyUjn7QUGzwoSaT4bXLPGqJb76vbUUhXEIkUxhQMGsXM4xJFcRsZZs5Ygs= 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=FIUxMWPp; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=KVmrCEOh; 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="FIUxMWPp"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="KVmrCEOh" 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 47U2t1Hm018731; Fri, 30 Aug 2024 04:01: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=IkBZ6GD23mbbB8bJTVNg6HDcbosrtE9UJ0jUv27UWio=; b= FIUxMWPpig3MoPvn1N9nov6adRhP8qByjAwvvi5ha3haGaOHTrS9S47LvZZ9o99Q rkvPgLxA0KuBxrqhnIcI9EIUqFAa843cpC0glod5dHJAMlWNmopLfwivItuoKG1C vjbVxXr5GUjqsUIk/KBh54PS6vG8MRT+Eh6KvOzwaoT9hRkByJ5Ww0W9BSSx7kj/ sRT98mGch8VDWHBNdqj5MKg/2a/VPKz0fUx9V/LrD3+aFPnTI5Fl0QIoSWm2pofI YJ8WSepz4apAV2N/SPNhO3QhKEr8Euzgw6zXFKKnuIKeA48ig1oNou0EeEpwFx9k mEsuNby8bgGvsgrEsnqzdQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 41b5q381j2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:57 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47U1FiMp036757; Fri, 30 Aug 2024 04:01:57 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 4189jp2trw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2024 04:01:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UpdL20deIAHzhKov6aCdca3RM2IpLONvMZXtXEzgI8oTlZHKRQIgybUqx2CTfW/AkXU9REf62UB5w6EWGxNl6YkcMv/ur6poD2d7N6eFBRnB6MaruYMbT6SCTWYnsMcK4W+Rt55NsQdV471zqL8isXydX1PnNCLku1aiE8NAR2xcNgFu5ORXshJpEK+LJBOojQ9hxNCTc9Ew/sbgyd0F5TV4pbZcpLFkrmtwmw2aTpsz+DNiF8I/VN9x2PrCf/BAEgDKwFrfMKt6XEXWCoxbz3C7tLFAOZ2GyEa7/kAWC+QrnZ0UBEoCv6MvQGVmR30grWOP9pakqp+F3MUu5kO5Yg== 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=IkBZ6GD23mbbB8bJTVNg6HDcbosrtE9UJ0jUv27UWio=; b=SbIGnQczqAxSxrj2CJlHbxsz9d1ytRNt7wPNOHOsj7J8SB5mnv54FOtWebnJDPWwjV4t07+o8opHDXzN3jzLdRqCkmNCPhk6sqh1stwT4Vdhy/e3Ig5OPnpADaEGsg2bxDmQC377tTG8TpIdZQt5HGhNqwjKdrMnDyxn+EjLcSx1rItAdWZ4YKwf2tTs/454Q8Bo79476KffKoGbKkAUgxSVhFlIyTpqrhtcc7UhGp0EgCnm7quj+xs5n4E9YuZ2N0doxQdO8mVCl2Jt1oFGpgFt3lHmrcphogT/1xTLveXbKkkbVin6dSC3YFFPOvMcR50XRBnWgvulPYFSfDrmGQ== 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=IkBZ6GD23mbbB8bJTVNg6HDcbosrtE9UJ0jUv27UWio=; b=KVmrCEOh81hlGBngWm+OuYkDsVi5rzFuwbGkckjgjcOntFCbNUqst8RL0CtwbBAsk1bIrqsPr5pELkcpw4QjL4/H/4tCD2rzdFzxXlhyZl2KJTyWQkEENsOAl7hUYf7MlUD9ObKQWp/DcJ0baIDN5kaiX43INmMJlflTbXdlhgI= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by IA3PR10MB8115.namprd10.prod.outlook.com (2603:10b6:208:506::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.19; Fri, 30 Aug 2024 04:01: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.7918.019; Fri, 30 Aug 2024 04:01:54 +0000 From: "Liam R. Howlett" To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Suren Baghdasaryan , Lorenzo Stoakes , Matthew Wilcox , Vlastimil Babka , sidhartha.kumar@oracle.com, Bert Karwatzki , Jiri Olsa , Kees Cook , "Paul E . McKenney" , Jeff Xu , "Liam R. Howlett" Subject: [PATCH v8 21/21] mm/vma.h: Optimise vma_munmap_struct Date: Fri, 30 Aug 2024 00:01:01 -0400 Message-ID: <20240830040101.822209-22-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240830040101.822209-1-Liam.Howlett@oracle.com> References: <20240830040101.822209-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0119.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d7::13) 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_|IA3PR10MB8115:EE_ X-MS-Office365-Filtering-Correlation-Id: 41ff8fb2-7576-4cf8-f03b-08dcc8a87c26 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|366016|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?G7jf839ShxVKWgFTzRVkF4+HO4/VytUIjIQFQFS5fy9mUfaCLRD3rRlJoF7d?= =?us-ascii?Q?EKBzGJmb2XeGz/f2ejXAGzcTJgVoXu4+gfdaeF7gp1FpUJiopS73laK9RgKJ?= =?us-ascii?Q?Q9RLApqB/HJbSRi/7eSwWA53BV9XH7dCru6b4EkgrYaNf/FVVoEvb2NJUNxC?= =?us-ascii?Q?3IueTmVi8bJFTpdZQQePYb4H0xU4IV9lUoESdkIu9Z28mfb79ov6QD6jodJC?= =?us-ascii?Q?VEeF45dOvFqRj4ByeUDZ/Ql9e6fOZoPcH63NlYcaOBsI8Eye1/dXYiaW7Hc7?= =?us-ascii?Q?JLxL/eUoB6Y+wgtT8DKPVe6k3yZBl84s9HZow+I9ki/q/aBEEE8oF9PJsOlx?= =?us-ascii?Q?jGQX5sr0V0CLVwozW1H2/Up1AZ170uGFV+pN4eg20uRcv1g8EO4D9b3M6tEe?= =?us-ascii?Q?8WkRvVxSsMAXK+i8KU35F5bFZlAPwbrJjYiXVckvgJmwW0j1UvAm6/ODtAFy?= =?us-ascii?Q?o6FfPdizYl9SvrtA6TfPMO3Y56wcId+qyPG82xufmECiXsiLgfQoHAR1HJUc?= =?us-ascii?Q?1zT8ib6rvdKuQSdG2/0U+0rXXoJT2+RyW7FjLkcu/5X2IvxlO70Cy17dAVKn?= =?us-ascii?Q?ZuDio34lNT1WeTjylzH+5NB4Jx2R1UDWBJLv4+sXseLkIXXz2AXSxNffD0hO?= =?us-ascii?Q?WsTJp1+vZGtfcFVRG++L5z26UcpEyxYKVlNJNsEBQmGwzzOKLoMeZvKKvK3c?= =?us-ascii?Q?6KBwsS/uYOAJid4bO7ghITxs1decIIgHzdJY2f9lHAsUIGM0fFJ9LUTMC0q5?= =?us-ascii?Q?2XmNTKhZtPPujhSI0OaRcvbThMElDwaEbuBzBMt/MLWdxoUPdaEH4gQyBra8?= =?us-ascii?Q?YV9CPIYYp72xRnwFaD+lAulR9C4LjSKfDRhpThq6mW906U6EbNIpyUvgT5K5?= =?us-ascii?Q?FAqFf2r+8n92L0hVT2wzy+sVWD/0kNVWnoDHvv8zuYVAhFQ+fn7SPMAS454k?= =?us-ascii?Q?NSPcby2mSMzVZ7zjAzB90668ne26pMWu5MWu6hC9CYBgV/NZiQP6qMm0dDuc?= =?us-ascii?Q?WuszPadmhWbKOg+KUc8A8+H3Rc5GQwK2GfRAdECtmc32klX4Q9Z0uG9reH6c?= =?us-ascii?Q?p7570kQqjh/zrKybMTKelDwtCJxr6JcfYiRNoiGJcvq4ZwolQefkg7TWAUIj?= =?us-ascii?Q?cDN34J9nBtnc4YvEp9/fmYRjy/5EJqbsX6SrZnCoV5b3haQLVM6x4PTwYdU4?= =?us-ascii?Q?VHrOlatR5xe2IXsm1OkpS86HtUvoQLKApkQ9bsQMRICoXGJ8myOvAIPep9NE?= =?us-ascii?Q?C15JK37nAIYqRT594MESvTWiJA5SrBhfrjjHpyKuz7jek9ao7pWuR2eEyGIf?= =?us-ascii?Q?O7pqJEfK2KP4fksnUX0GDbr8TSE+MdI0OTvzXgFGJU84hQ=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)(376014)(1800799024)(366016)(7416014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d67dAFAilp4OI8vPR6X2c1g5p3Zv+4W1lLCe8ZqyfQFpXTcy7283DdOMVgUq?= =?us-ascii?Q?ZKI9yY+TxxH2FCCpx02V1gXII1hKmeMnEqUX0f4hrNzXF06nMeO4SuIo2WG1?= =?us-ascii?Q?d/zCn7K7X7K/UYnKsWmIY3YQR0WqNYx7JLvXF3zjriAM0Sh7fU5RxyU1f7Il?= =?us-ascii?Q?lOEGsqarBgU9fMj806q+WKuS0R7xCna2w7ScxIQlUjN+84ssCiZlwB7CPkBo?= =?us-ascii?Q?mIC7fhNhpPPkUtwrx5fW5PZTxultJW2lanSSfpmyv97MFFFzcXibh4TfkGdh?= =?us-ascii?Q?MiwBAGCwC5/2yp5GyvyUtWC+oY7aCAPzOeQM0WjOoENtjqjgmRTi63PMNaGC?= =?us-ascii?Q?RMdIqzAD5FjVuOuELs3ax7/D+STZPohonk/BDVAhZM9aWns0f1X8OoVmHgOy?= =?us-ascii?Q?2Fe04bVmjz/IqDZYPZ4J433rPOvhFlTr6PyaSJZNPog7Ga1seL2di60zrxyg?= =?us-ascii?Q?BtWnrwCgVeBdCX8a9zRuNN0i8BmVAVcFfS3tkWGUEj2Ukab787UWY6qb7506?= =?us-ascii?Q?71mOdBBT/GwW0kdcNYoTYVOS37PBqfDlNoqtuehU2ISurgwbnmDJ0Y4d+uY+?= =?us-ascii?Q?b8fTdtSRsvmf/Bmpu69q6o4d+erVaWDW3dixiaL8Sl8mkFPUYiq2aVcNCsBa?= =?us-ascii?Q?fpEQRt86kJER0b5eHOP8yFL7O9ROdl8WEZTAu1qqz7AoyForOrib2DaV4iwE?= =?us-ascii?Q?eWMhVHfdBoh42cT7V3Eju3/pMqY9VqWhrX2DIPYs1A7vN08QrHo//wOxf+RI?= =?us-ascii?Q?1v45WB7E7AhfMfIdBpaZbAJXqxIN4TOaqsiS/t0vp4SKwO2XZmi2CA9NB8Sm?= =?us-ascii?Q?tcjrKIY6868bDq9HYXFlHQkHEpxnOnmypthD555bPx1zv5wI9D8Q4qkkMRGW?= =?us-ascii?Q?WBxdieSGt0SyWGL4Ps95ViVlnF4mVL6saFM5RucI6x4qgQy1/Am0wNuxo1hz?= =?us-ascii?Q?gZTq/XD+N/95nYvqZD9D6g34ryskg9HIUDSY7IaRNupaA1AzTZAX9wfpN+ft?= =?us-ascii?Q?3Q8htH41snxqqogUvOnPMXwKMJaaKHnVfdQlmRNBsXuL+xVuDKj6fISY2gI2?= =?us-ascii?Q?0uga7UGtLlAK6Z36uBleHz9ftBhsVtoktiAr6J5miWS3Yen0yvPZpypndwtS?= =?us-ascii?Q?0huIIJQoVpChfZ5X3/MJUnOAmBKRZT2Mk6bCwqgOvALzlasDd2ji/hkZLNAu?= =?us-ascii?Q?c8aGzWS+ktX+IZkeU6yikskF5nIe55KJy929OYRj4mIHj54pwhKTgzz/eGSX?= =?us-ascii?Q?NUeR0dSfCVdrWe1WyoGl1NxdhrDr6gMHyjxNlBVQA0wQPusHFQ393/qwQzc8?= =?us-ascii?Q?5hGKdHFo1u13Un2+V9R3cQp7gzbaj2/x3bcNdM5hD9wSWekDEmQP71qIYWvL?= =?us-ascii?Q?xnwdmhwIXc+HLYNCjmD3KJi+ymaizR6UzrQQiGB16S8+neXFeqoTCzF5/gJC?= =?us-ascii?Q?wH1cYsweoGuAjTD7CwzabKHiP7e3yWPbQYPuGocZ3rcsBQ6WU2Sm00niJ1YT?= =?us-ascii?Q?tEbfDhxx/XF5/owzkIUjJ3DondCbSpL33zjyjYw23iuHD/aUeWpfa3ZpaFfp?= =?us-ascii?Q?6Lm4EcO9mUGIoxXbasQkzM8ERjQJc8ovpa9KvJ5+ZyUB1iohxfFAI8piO3wV?= =?us-ascii?Q?Aw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 1oQA15hjtjlfNQAwAP1GanlpFtXf0PZmB+yPy1l9jtH/1/a1UA1maPhbHknPm9pHPy4pRK/pML3CkiKcTZCNZvAliAu7dlFko2aKtSzA8DTp5dpsNOFaO6Vx6y+6jNjBYu144zn6yCDHA8b9cZhCanA28rIh8urXjzjsFX+Idh9Mk0xNNb8Nd3GYIUjJ48mQHVRWV1aUca0y+S8SNmkviotmqYhn+alG7Fxu+OTmvmAbU5WwJC5KPdtD0SUj+jmFGTLwo5MSb7R/SfG4OBvZELUWyHTtiwDLs9V3221viLyLw6akZd2qMIc8JGsjraADBxLvGeDwY2IGGLp3l8o0hrYkjX/PTgz6zU3bXuYWBbPAf5wfQsatF8XeOw9A6u0+mVZy6z+3tHHMT9M1FRDWBBpFeL8bfd6Fg70BDGt0EmKXz3OXMhgXdK984yIikie/K5VKcPXsFsetWEZqJNHdT5sN0AYUFmiPdqsG0f18NRL57ZEm7RgzUWbqgzkmviLIZl9GlK7/q0fa8WFXV+qVeYXk/kEYpAdzdrxKa6jR+2Xe+L9UVUNMDB4RYgF3GyVxfDdHrCh/nuV+mLYm1agobk0RSDA/AdzNoH6AowuUK+U= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41ff8fb2-7576-4cf8-f03b-08dcc8a87c26 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Aug 2024 04:01:54.3624 (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: bf7QfIcvpBhcxfum2CBcEIEQUh9LyZOhMT1syy0IsJ0EZaueALB0HvUG471D3Ltj4Qe/KnwO5yU0HUCpTtdlKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8115 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-08-30_02,2024-08-29_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 suspectscore=0 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408300028 X-Proofpoint-GUID: GxSzGFAWR-p-cHxD2Uvldj6tTmhvTIDs X-Proofpoint-ORIG-GUID: GxSzGFAWR-p-cHxD2Uvldj6tTmhvTIDs Content-Type: text/plain; charset="utf-8" From: "Liam R. Howlett" The vma_munmap_struct has a hole of 4 bytes and pushes the struct to three cachelines. Relocating the three booleans upwards allows for the struct to only use two cachelines (as reported by pahole on amd64). Before: struct vma_munmap_struct { struct vma_iterator * vmi; /* 0 8 */ struct vm_area_struct * vma; /* 8 8 */ struct vm_area_struct * prev; /* 16 8 */ struct vm_area_struct * next; /* 24 8 */ struct list_head * uf; /* 32 8 */ long unsigned int start; /* 40 8 */ long unsigned int end; /* 48 8 */ long unsigned int unmap_start; /* 56 8 */ /* --- cacheline 1 boundary (64 bytes) --- */ long unsigned int unmap_end; /* 64 8 */ int vma_count; /* 72 4 */ /* XXX 4 bytes hole, try to pack */ long unsigned int nr_pages; /* 80 8 */ long unsigned int locked_vm; /* 88 8 */ long unsigned int nr_accounted; /* 96 8 */ long unsigned int exec_vm; /* 104 8 */ long unsigned int stack_vm; /* 112 8 */ long unsigned int data_vm; /* 120 8 */ /* --- cacheline 2 boundary (128 bytes) --- */ bool unlock; /* 128 1 */ bool clear_ptes; /* 129 1 */ bool closed_vm_ops; /* 130 1 */ /* size: 136, cachelines: 3, members: 19 */ /* sum members: 127, holes: 1, sum holes: 4 */ /* padding: 5 */ /* last cacheline: 8 bytes */ }; After: struct vma_munmap_struct { struct vma_iterator * vmi; /* 0 8 */ struct vm_area_struct * vma; /* 8 8 */ struct vm_area_struct * prev; /* 16 8 */ struct vm_area_struct * next; /* 24 8 */ struct list_head * uf; /* 32 8 */ long unsigned int start; /* 40 8 */ long unsigned int end; /* 48 8 */ long unsigned int unmap_start; /* 56 8 */ /* --- cacheline 1 boundary (64 bytes) --- */ long unsigned int unmap_end; /* 64 8 */ int vma_count; /* 72 4 */ bool unlock; /* 76 1 */ bool clear_ptes; /* 77 1 */ bool closed_vm_ops; /* 78 1 */ /* XXX 1 byte hole, try to pack */ long unsigned int nr_pages; /* 80 8 */ long unsigned int locked_vm; /* 88 8 */ long unsigned int nr_accounted; /* 96 8 */ long unsigned int exec_vm; /* 104 8 */ long unsigned int stack_vm; /* 112 8 */ long unsigned int data_vm; /* 120 8 */ /* size: 128, cachelines: 2, members: 19 */ /* sum members: 127, holes: 1, sum holes: 1 */ }; Signed-off-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes --- mm/vma.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/vma.h b/mm/vma.h index 6900e95bcaac..85616faa4490 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -40,15 +40,16 @@ struct vma_munmap_struct { unsigned long unmap_start; /* Unmap PTE start */ unsigned long unmap_end; /* Unmap PTE end */ int vma_count; /* Number of vmas that will be removed */ + bool unlock; /* Unlock after the munmap */ + bool clear_ptes; /* If there are outstanding PTE to be cle= ared */ + bool closed_vm_ops; /* call_mmap() was encountered, so vmas may be close= d */ + /* 1 byte hole */ 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 */ - bool clear_ptes; /* If there are outstanding PTE to be cle= ared */ - bool closed_vm_ops; /* call_mmap() was encountered, so vmas may be close= d */ }; =20 #ifdef CONFIG_DEBUG_VM_MAPLE_TREE --=20 2.43.0