From nobody Sun Feb 8 02:21:16 2026 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 8A2F81D0488 for ; Thu, 22 Aug 2024 19:26:27 +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=1724354789; cv=fail; b=JE951rZe7CDmyx/vG1bu11cd7haJRbmTcTXYTXtYqHLOl84OdbLiKryvDry7lxZi/AGcEacY+3lcjI2ELTu5V9gUF3bdoHz/ngo7vxpm3g5xyHy0MDX+q80MvTR0FnkuKmvhpXykFwhKSSumoqL4ysAFqzDcisXnTmPONbWWTiA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354789; c=relaxed/simple; bh=BqQz40OqzPtGsqK+chLoMHo9IBeOINIsNRURO7HunHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=iP8ABkr0ppiErXVhSDYV7MGtWbpfg0UsjGOk24zoWTw3kV2tzU1GSUb5MtQsncH4hwyBFbMU3tMbNniFhAxiXeBEArCp3YA4/Atm7jMQpoX1hI4TbhdSPHA417g4zogSusCTMqvqIq6i1RvcGIrQgIz9cwk0IPqN4jMVU7aDrdA= 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=hLXbAvK3; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=C9mABP53; 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="hLXbAvK3"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="C9mABP53" 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 47MIMWwB019187; Thu, 22 Aug 2024 19:26:08 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= hLXbAvK3NkbS75NtQvpc6TD/FnM9BFdqq4+1JAWZJQH0jkhiwXVIDaOecLPLYnzJ ynVbllmPKc0+MMlbuPZVkmzmBqmr6t8PYwz3YaRyIx1qjQG2cJX2l+zosYMJdoJB ifP999VS1TWyexO/+YICQlSyj3+C/Al1ZgN/ObGr0d+Iy0BKXehCd7FhjzB+1j33 b+KELZmo95B2CX8cRPGtPI5FcsD+70/brfQ/Lz3xzhwcbd4vHEaXP3r18sanRIrO Jq8uhLeJyf2MyWn+YpRwpG2uRFW6fBzly+5M+BWkLyQb0ditX3jJAoyfIl2eYxYC idm+UgMs91zd3X/FQw27LA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m45jw8v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:08 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47MJJBvc028114; Thu, 22 Aug 2024 19:26:07 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bct87dg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IA0zdRyndS7PQUlwnGqe/mtzqnw1aPzzkENiuCCFWjVY843nkD6FPi9b5cKpeY/3eZQhn/CohAsElQcjlOk43Zy1eX6ec2j5+kia2gl5MWaU36qg31/7P1Tuk8dBd4a7j4F6CnamcOFjAur+r/uUdIKLEyL778IQFXmncXBZ87UXjpScX/y0ypXJpZ1OzVe+Smw9BYI4g5MO68xuhxMxyjr2BgMqYSuYwWMFd9bq/878MOMCipvDJ0qRC0eYt5O03xXA3ANmikOKTnNmtUtaDFq1yKLSdkcHg2pXBuWc2ySMAbiR3UNyVwRIo4nf02ZIeWVH2XeJT2YiEqYMHaaQJA== 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=Pl8KLi7BGF0xlZBoRsYKBk8OGckbP1CY9NZc4cudMjK8TK5aCLV0Sj+tMp5HUVCLp1G2QI5UuPJmBLlA1b5lRiv35sUgpD7MIRra8G0EZtNzYDOHZlyoqFO7ppo8vh6fv2HI1YyJEIxLibm64sNn/jhwSKRW07Pm6hRim0xnD6jVzA65HzgfySsxNRN8xg6t3xXG1rZuq3tmmbOw8Q0peOg4w+76U8Xc6krO8jogSU/nkIo3rQe998I73wYWKbfJYQJge4UTTqlvNtnsVbTpn7B6e8E4dEMijd8is5vxEVml62HQq+YMlx4Bb4DR9eN2UGrAB3KFRHkB16n/4nZFhQ== 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=C9mABP53k2wuLEAf1X+r9YKLOIG38XD0zfOvZD1c/v/uq3I0CAQVX5/RDfqBUUamc+P3Pg0KFsHq7k5WT9Wz/XMDAN3gmjm8x3m6bRsHJ7ZLJQfWxEIyb/Wqu0aV7Xy1jBPQREYGqFUgJW57/2vw461c5509SpfjfzuGPqd/UYE= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7356.namprd10.prod.outlook.com (2603:10b6:610:130::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:05 +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.7897.014; Thu, 22 Aug 2024 19:26:05 +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" , "Liam R. Howlett" , Lorenzo Stoakes Subject: [PATCH v7 01/21] mm/vma: Correctly position vma_iterator in __split_vma() Date: Thu, 22 Aug 2024 15:25:23 -0400 Message-ID: <20240822192543.3359552-2-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0155.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ac::8) 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_|CH3PR10MB7356:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bea9c5f-499c-4dce-0f17-08dcc2e041c1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nrojkfse8nWjCvRRdZXsssK3/8SXgusdz5b5kjjsOzJXsvAPMPibyWbfsmpe?= =?us-ascii?Q?Gr6m89Jg7T8T9PT0V8LJyouNon7RMlYVz4fQAj33Z02PSxBEevbdJ4HFz2K8?= =?us-ascii?Q?nTFgnE3lES1pL2IFlSN/JcBg3yuUEwVqoC3yHhZJwPOy+g5WSKlhzbDiDyMv?= =?us-ascii?Q?anqxKyYd6XycZORJqmOra/IdeW2BTn7BMme22s/wu5naClXROKlAeVQjbRsk?= =?us-ascii?Q?m1p0wOyp3Vw1d+8kzxnoOTfMHDEbYBhi46lvUznnpjvRuD+CLNiGwIOvJ8wZ?= =?us-ascii?Q?JIPUCfJTxgYuggRos49kFIe2U6UOBx7wAGnB3RxYeM91xPheG6X17Am4Ieq/?= =?us-ascii?Q?h2PpnVke9mMBYpw4T+RRjlzxon66/1o/IHhZPfqWAgBWMhvfVkjMcNS4Obtd?= =?us-ascii?Q?6cOHUCpCjNSGJ/L4u2ZQcX+kSYTOtDEcWzr82tAJPs1xGXgXErmjNWMieKQA?= =?us-ascii?Q?mREOnVuMeSmeW1gQiysBjhyxlMHfLDbdfNiu9RgZZuIdJTn/Lax3RzsMtQGg?= =?us-ascii?Q?fYb0NVYWJht43OELvMSmoYkvH2DsZmGvoVbMdww8cOi9ho33S212+gJbbiGG?= =?us-ascii?Q?vXA5a1H2JwbPPNKrmCvWxFmdrrv2lttzBuEPS6McgeIivRJc/2Z8He7BlEaU?= =?us-ascii?Q?DS1XP/DfwbgbURi8YcNFIBB8YyP9ifM53CER6e/bn2oWaq4MsqlLG+UC75EV?= =?us-ascii?Q?56Q1PuBbX1XhIAGZX9ONCLizPQT+kMQ7q4qp9/qewME/jMQS7AxtClyRNn89?= =?us-ascii?Q?CknRMNrCtwBdzCWM20cvA5uQI5iKk23b5KOtnMndJ6tqH8U0OLCTrFvnPhLk?= =?us-ascii?Q?GdOrw5DRXuAQgZkkMFrxNXR3Av3r0ZLosNEWrq/723w15BW1O9UJuaJr5RI6?= =?us-ascii?Q?NGve1tcvoDJvjVxmbhs3L83Ew4JSypfb7TMvMBWs5yEcVI11dc0FocXonAbC?= =?us-ascii?Q?M/TA5J2EocnYM2vdQIFK0JQUYppgGD/SduN71lSit55/hEOscnGgUaJXJBun?= =?us-ascii?Q?bzKVg7+ZaCOh7tYgf7Etp8Gr1W1E6TMUmJ5Ob0wxSMMRFIr4E5jz09pEOAOq?= =?us-ascii?Q?XUf7UkCszE6M4wRq1axFiwNIcsKZQwNCLAfRBUYpw2Q62Y7g670wyauLG2bD?= =?us-ascii?Q?ryJGS9NF8VlFuQshYykdauNddt6JLRlJUzrT/de8Nozk18cvAOVSMTp7icpU?= =?us-ascii?Q?zxR7DOEGo1BFflhyuXTYaVXdUqGDiNGqalxGrk3O/5Vv++vnNKpRuJZg9lI4?= =?us-ascii?Q?9bdGJcTjKLAAtYOx6crmJGFmnEj15hs4fsnp9qUVUhCHIwX4yQdVoodoiVcw?= =?us-ascii?Q?Yob6leDur5hLhhNkBTwYUlOj9hVPrkYzpgz5tRFCJVxS1g=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)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z9ebnDYdFG2a88J8qCAsaGDqcYkuHw4eeUWqdiF0gFO5NZZj4zv368krdcCE?= =?us-ascii?Q?nO4e0XDUiFwe5FAQbw1zsr3iiAEMtfKIYFgdrT7b9YhwmKkqagX7mZRh3LrP?= =?us-ascii?Q?k3pHLAbPkXrNdzF+P2RUa90kfqZ/7PgSDMlmDq+OHIrZfqPmX7aamoUTXXsh?= =?us-ascii?Q?eQqwIctd7B21OCf1m7oBA/nl2aGoFqE7mdiJEa8FFiUotczUzt24GvstEvL7?= =?us-ascii?Q?791Zb3oU3bLUKlGT8RCp/5PuQny65yeULAPgqCnO/AFWNCnecD5+5O7D7bxr?= =?us-ascii?Q?RdLb03tsOqpZIY1VBFA0u41vlC4zS2VBXIEzIQXe5DJg851EztEOpHFEY8r7?= =?us-ascii?Q?Eu8TcER7O7wOAGR/d7c7mcQ00djf73imT/AORi2RFcZOP0TsmKVrqKVYAzHR?= =?us-ascii?Q?7a7JHE9i09/cazOtuNQaE66g836x0ttQppdCtrlO1Z0Pq0onSJj74xQQxbLm?= =?us-ascii?Q?30vMXprzJKqAMOSqppCIw2nOiLDhq/KihCHsNXKQnhTNSIWDyHb3SRjMDQEm?= =?us-ascii?Q?Qm7zzubxxUx2ZeSVTSMOBQyPVI21MqGMIE8iEfkyz3x5apM631dgpQodPhJJ?= =?us-ascii?Q?0gAkgTYgHVKU4A7/4WM+28h0eA4ARNN/oIUAUyYj4mYZ6drzTixvR0aO6V3X?= =?us-ascii?Q?FkY97RX1zAKqgTGa5xg7INaF2d5GBmBkqD5LGOFiWeiK5AsFdilWcgljzJNJ?= =?us-ascii?Q?YZeJGm+05hTyDt5Ih2n+6kSOG+gFLUb8fxWFxi0uPWfabpqvJy59bOqGn0O1?= =?us-ascii?Q?swBf/KfgEn7o6xTZVMTIdyP7gO1oG+KQU62pPtGyfJTq7mkwY7hHn/NbJCVs?= =?us-ascii?Q?arqgJxkjkJr+ZDclO+ZlUItR9Lsp6FcE1WlwBIYsbZ2zxgAfu13UmidquMQc?= =?us-ascii?Q?sYuLmpepOLX0aA3RzJ6OpWpjU0ZKO8YKHCXqWPkrr3N8u3+/DE0FkNjkDJ3I?= =?us-ascii?Q?A2L1o+a1Wj9TXdCO/A6XoNt0uKjk8CJQExKM7RGullMsaQe2xsPuesAe2h0+?= =?us-ascii?Q?oWoI3//za3SW8GUb+oRzDLqGjaBwaOqZiyjAyOwfAoaSPag0Qe/18G5LxzXH?= =?us-ascii?Q?yfABzCcZFxVWqf008a0iRlk3QBqxMhVK5nKLr/TS0cUlgdOSmWoA0DGZzeIG?= =?us-ascii?Q?s1lNgeBLXYwFpr7ptvXfjirGRHx/BTcuHyWjmy1Eq4a08wTAEU/RXQVr/PFr?= =?us-ascii?Q?W5rdGbL0dLzaCJYLKfKQWvV4p7UM+axLLHTi1vqC/LnpsBmWB1NyLJSSazdW?= =?us-ascii?Q?pZz4KfcepG5JvpUO0oteBie9x9HVofGzBvHc1SFWeTz+uqeETik4lw42AHD8?= =?us-ascii?Q?VNbjPHMBjQT3rZVPK745MVYxD+kAK1E9hK2d/7Eedw+WjXPwx+7U5/6UIL7g?= =?us-ascii?Q?WCxge4hTP2KG/qhh+o0YZZ1RnRkVyYXuPRZnegMEzQekzhvc1+nOmEFnh9Mm?= =?us-ascii?Q?DmKgyaQOCVQNC7djEDhIpDRZ7Sjar3PJyH5dHTrvUoGtQd3UwPDeudrCaQ1M?= =?us-ascii?Q?hApwKZevMW9L6OuhocarTAvr+o5WR32EBPVSz1ZX6hB2CbKcqFcjB+YkHIMC?= =?us-ascii?Q?yCNUSqbnt2VcwablIhi9hEKcqvUBFMO0zRfL02LCfe1FlNX9MqEgWQjqOQnJ?= =?us-ascii?Q?Zg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +qh3KrdtlvkJW/kb4UCEdgADbMkDE/+PSQMLDCYCNmweVj3cFcpHZ5bfosMBh18bqjKwxHw6UarDI6CylinpQNThAwbf7TffdXs950+++NtWFhW04C6VQ+7kvyb4beNrQlZm8PqHCLBJ7LQkepnV1Ym9WgF5vBtoqljwM7WNqTDWbjSoarBoZE9GWiGbu0MyavUDPM2Xuy52DlXJUJ9CxNKuQjrx7zZSmGb3OQcw4VzEikPkAJnBDleoQqPXMJdLT490yQ8Tc18Me6/p0lB68qoxBvpq9eONJalNrkWK+yEyEcKOP2p+zI7cywKW6lpIYbb55anr3c8rApUkVCk8sSzqAQFEjExUKKbOSs7ZrT7GofYGA/Tlr5nh4Umal9EdB/+wHz03tItlMnNubg4iXICWQsX5qQNaPFZm1AQp7wHD8kULwvDjm2BuGTe7MnADgzquTZzLOVFT4SGo7QZ7hLQ1sbqSN2Ksgthyz0mq8pPi+n4QzEplFhcV8nJmCs2apwdqyZVBXCF+g4U3AI+ihcuO3JpDWPKh9uDr6kTE5gQrQaxV6G4PTnVKij4Tqeb640omU4iFyyOj3b1q/pViWi52ctPCErPxWKX0MYbKu/8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bea9c5f-499c-4dce-0f17-08dcc2e041c1 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:02.5333 (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: 19c+xLbuu8cD8IvYxsyXaN5sp2Ej6TAUG/Imqk/Z6/qSM6zudNhgIvTddtJfX8cItOBQ4/KY4TjAMULEBAM4SA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7356 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: PM4w9XTmSZB4njjbw5GPv7D9Scax0FBb X-Proofpoint-GUID: PM4w9XTmSZB4njjbw5GPv7D9Scax0FBb 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 Sun Feb 8 02:21:16 2026 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 EE0121CE6E0 for ; Thu, 22 Aug 2024 19:26:25 +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=1724354791; cv=fail; b=fdDIU0jysIq7+Un/if2of0kQBb3mKh8/bwE8NTMxeOY8lfwGgj6adL/2qGo71/Ob7J83//0WltEJefxCGwV1EbY9eBC5pYrTUA+vIbLL8pzq5pFCEn/O0j3DOAKz2jxGfZ/nFBBAKh4oT+bit78B1+8wXmwGmhHMLwvxpdqn3OQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354791; c=relaxed/simple; bh=VOUDrA/3pOEobvQHsjhY4Mw0X+i5TXp10gtl99DoZVg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=okQoukt4tktsKcT9/IJOvSdTHvp/WlEMg/o3FVZObTouCoxceLgG3Ft54h8TLCAtDucIzMnhHfB5FyphLyu4KLXrzl0YS0HbaHpM4c7TIXGN6A7HPFeX3+37hbFKO/MwM56NWx8izqjS/WbSCxTftn76GQuihdcADnTMDMD33vs= 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=gKQ8utzl; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=qjM7W4vq; 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="gKQ8utzl"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="qjM7W4vq" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47MIMWus029723; Thu, 22 Aug 2024 19:26:09 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= gKQ8utzlvjAp7q/BXzx6kIa/c8Y+gl431/Q/QT6iHmgi5C3CuW98YVjF49dgPQ1g 7GCnTe+C89NyB7AlL2muRv8oqhS06nWO0H2fcIfCqvDX20v6CSEtw2yHw3NH4OJO 3iv+SHeiLK8UbtDrCR2o8FoA8/cF+wgfE+6mZmWqGpiFPNi8oeQfLWKmicZqlLrl VKw3BaNko9hf0pfiUYbQmldCl9Egv3Y77xCpEJfj4RDtSHu/QGI6IXwKToBL4OSr VtPVdnWriuXMfwceTY9mUubPgEUdaLEvRQlokJ34YBcUxMK1PZwgGpJzx4kG4Bsu yu+PtoIFjVF8L425CoJlIQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m67jrq5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:09 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47MJJBvd028114; Thu, 22 Aug 2024 19:26:08 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2168.outbound.protection.outlook.com [104.47.56.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bct87dg-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o/5RILsvsbkzSgFGAvLWuaqrqWSAo7zjJHWVfT2AECMZEIY/GusFJcRv1A++qJ6LCHPeAHCACas0u8Qc6TQUscu822L+p5vUB1DIbJPDLx+sQt1LQa9tm/sHh3+T+6T+ShVLpChEXp8tkarPr+VkRH0q6QxCGBEy4wLnpMiU14iqpR7kF0AEryp4gXLYm36KO+46zc/aprgJpyQXJfbBb+OLoFUybXcdvdIpUZgGJNxo6FvXP8TvT3DktFTC6mLnuxOQHWnWH2fEcJvnguAFGY/7GQFK5nl55nxmyaMlTZ0c7XeS502rb3Odud+slO1bsmJIvGMeV7jyL4eUKuxG7A== 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=b67s7NdNglawLPDU+XXY15wLMiWKPIRtZijQzf4p0RPqo8CrXNg3iGhu9QxQCuW3BpE1vbnwNYkHcpYUWPjw4OMjWRGYqrk5pFzqRxh+TmcLBd9JAtIzZcZ2lDolMyiQMqjdQvzWMgFdlnKbIerAmXg3AkbROjQxP5a2OzCEeqbcH6E42bVPkReETJYv0+WX/M03bW0LlXO30CcvHwea1c0JdnL8Yh9Vlhg3QAWJYRPYr8zkckuqeHYtRMwmhElhBYWXdlK5XbLSY50qLJLP4t/8dctSjDuP5CQX4jddBvl4mjhWEQ17vAoQVg8xSrlQmlHIU5d8pO5HEdJRiF2vGQ== 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=qjM7W4vqgKe2obWs4ZKZXwX6FRdhrcovjRMUXtz/2KMRpZ5my5PlefUxfXtTEoyep9zquE1JMmszgue075NiGE5TINcc7Kkwww+Ng6maTNQRPUPJrt7l8oAA6NkZ3FBybDQSQQgb0zXRFDr4oi9cpM4WMVpUJ8NFoD6xbsEgvLI= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7356.namprd10.prod.outlook.com (2603:10b6:610:130::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:06 +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.7897.014; Thu, 22 Aug 2024 19:26:06 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 02/21] mm/vma: Introduce abort_munmap_vmas() Date: Thu, 22 Aug 2024 15:25:24 -0400 Message-ID: <20240822192543.3359552-3-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0210.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ad::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_|CH3PR10MB7356:EE_ X-MS-Office365-Filtering-Correlation-Id: c1b148ec-7f5d-484c-565c-08dcc2e043ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xTv0v7D9RIzdzqhD6DGwmbwTb91fnz8kk0oBaOOgJDMBK2ub9Hg+goUVkupf?= =?us-ascii?Q?M4gPmmCTQ6M1u/iPIx6fc+ztjWexrQ+OPPxWt/rghGU3sqTVtO1mSxKEDXLp?= =?us-ascii?Q?x+RNT6OD7BoEACUWY31ssvizPFfKX6he9cbBb5ktFO0n0EADm1w2mDXL0sLS?= =?us-ascii?Q?7Ok7/uk37J+iujTRozwr+f5TwYDNLns74ydls3PMJpW8pWXY17RDb4pOg839?= =?us-ascii?Q?6SHBQ8J2DVt4tzXL6AhPxi0iqgOwJPB4RUTCx6C2ywwmbDKLJzQNYNVCztKu?= =?us-ascii?Q?OeYDli9GgifNXa0qbG682iFGBzyI8RTBxwUkuDLVowmZnSVMe/CEckyctTK6?= =?us-ascii?Q?OeXvDYPo3beq+Q6qH+SIHD6uHUxJ4zLCtMbxBShPScJlMzucOKHAndzeWGt9?= =?us-ascii?Q?iepKVZ0F+PS2HfAG9mHUh+gKjiLcS9V3VFqNUIWEAIcAZmzbdrCNFSOyYxiR?= =?us-ascii?Q?7KmSCqhFZ4JXg05JWas3WYaatf92CxTXFG8P2j+4PmTBSDYREivoPUNEK1ru?= =?us-ascii?Q?9rA796F5N3eXvN5Z6Tc2a9+E2wiJPzr7kQOsDQkwiVAdUG5MoyqqwxcJ+rRT?= =?us-ascii?Q?2mg/MHNEJ8ILY3lQv8z64d9L4Avo/a9rQ0eUKmMSroFSMdHgdENGWrm2L4Uq?= =?us-ascii?Q?F18Z9ZBo3YtAjGEOAWRLlzBfcou+mAVrG/jU4/8pK5DLRMTMHVrO561W9uL0?= =?us-ascii?Q?kEx7xMLs/rojmbsANiHOVYrMp3GpMVHajObbO3wPgtoO3w/oa3JAcJvSo9mo?= =?us-ascii?Q?fBfQLULuiUrNxXAVe+XcUNhlW1KjymHsHfNceWYmUXWv+kuSOOBVXRsj0eAx?= =?us-ascii?Q?dbHLkFE3Z/CKfTtLBcPtyFFvwDZVBKKSdJXkvLCGBfXsbH5qcyAWWnsLbUFT?= =?us-ascii?Q?nU7QsvSR9Uwq9jd4v79wOsLcGdh3kWI3pUp9esDFn9oFNin49izqqacojJMS?= =?us-ascii?Q?YHIn7sjrUAIFqfXkTiDx6mqyQh1NnQIkDoLn9UrCwbpipuOZruiFBDPUy9Hv?= =?us-ascii?Q?v/WB1PgxaDBjXlEbZU0UZSVNfE3mVFv4pQJPsoSrUjINkhOtwcmPEOnWpRR3?= =?us-ascii?Q?475ao2LnwDd6s+/HELWSoITSqGiItlHR9IEdCxw+5IKf2ewwGb0tU2aOCxE5?= =?us-ascii?Q?GPI8eKimqq4jZ66sazkd0M3eRXkyE4br4Z96OCQbKgx6bO0qE/BoUn0OfatF?= =?us-ascii?Q?GHQpbJMWS2cGzrOApZbOli/JFhz568L2XrnQvJeCIAmmePOrVWIS0f1RFHfz?= =?us-ascii?Q?MtFLpmvpVQxPnc3RoEf5vKbGCH/NCHR/QILrtjSTmJzu0XYG03Uzd0+n0Bmo?= =?us-ascii?Q?Bn6OH0pbueX2/gEg1VHEt8TB2jW3E1kbW8W+6yKhaw9rew=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)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wO2xlB8Wa4SFdAKRQzSo+Fe8oajBTtu6YDdihygTnV0Mwccjy+0VCwI5ozch?= =?us-ascii?Q?Ml8TNIyyYLipqL0pR5Cyam95M6pE3C55f6X8QFoU32oqI3TEClpqTh3R0ulS?= =?us-ascii?Q?jtuKz0A8vqOCA7AJAEB5qwVZKvZp7PgFyw3dr9cJSgTVoA4xHtCZ99TVOU81?= =?us-ascii?Q?/URVzUaAXlfJTBcoqRFVDrc2h5u4Zprjk8oOp8ubDxG/zr8PAyt5Zxdr/GIg?= =?us-ascii?Q?DSdMsrFHF7E65WxJXFDOAERfqYcORb2f/DZi6GP1iLalPv8eKXJ7AUEBJ2eT?= =?us-ascii?Q?PC3BKnm7/zj90GLtwqncbrpQ2REMsqjL3rt3ZlzTdXbgSwQ7dVitjOLc2xu1?= =?us-ascii?Q?V4tzwvlzapaFv0GHc6hzf0y1lsH2F9xtYMxiAzVo3KA59z3VtzUjcvPmiFpH?= =?us-ascii?Q?0d4PT18RFOXRqsvcFg6VTko8pff+GUqaVtQ6dX+iXZ4S9qfzUpMj11NG28Iu?= =?us-ascii?Q?rOfHDxZbdV6pIU/6pFaeDm+AMBi7jXPA4O+qGh9yVdEke/hQT7GAHpa+w2fR?= =?us-ascii?Q?ym2MlVlmMh1lF4jOm7KZ6wUEhxbZdvWO/RCw3cVe226vkWbJOnEle/K2QK/A?= =?us-ascii?Q?C854HjG0gG3+4wFHQDI8f7E0qL2Dw9FjCIxtDEMJa5KgsedoX3S+MB7BdlSn?= =?us-ascii?Q?C8XJo3ijYcsIlcM8v99uAf30FnRohKfGyorpKKgLqnZAW9hPR+D2a4KejGOp?= =?us-ascii?Q?3gyNwk6VebkoBzqYt5UIl0/xLG/gmzYliqxQt7jIz8bqJjQpWtptee5/3Hds?= =?us-ascii?Q?8eq+hPRvPE8W9DYDBg8kZZWk1vnyslYRfJfHKMOpkmxSjxTNp640KfiunCBL?= =?us-ascii?Q?aRChnf/iTBEBQe0mAuk3h07rl7E3IvlvahEuQxy/k9zToXCYrobXgxodYCAy?= =?us-ascii?Q?OY/VRo1Uc4KAwngD/betjgHqSXEhZJIP6djG6Gldwl5T2HQqoYfjwmzAV2F9?= =?us-ascii?Q?vhMspFCowh1hl7FMglixTCLKuZSFEr0tUudYEMA072lGJVXdA92Rif2o8KNS?= =?us-ascii?Q?dGRPvJc87MsFbJlKZ4EzG866U6wzP7jV/ZmhEBGy3zulfybbazmzPcn8fh5r?= =?us-ascii?Q?BM37PKHdzgmUgv1uBZy2kGAfV1UQFi5g5WUt7qDvPzlBYnjeEgi3gExtKqD6?= =?us-ascii?Q?Dp8UxI+JituaSvSjEMDFaa2PReNVuLDBP7nEo17Wg362D5nzxHZtIwTVIGXj?= =?us-ascii?Q?fNlCW1i8RWK7jmFdOWoXUG60bRDdHt2W+r4h8aiEW63c/70fLeTn3yawf06S?= =?us-ascii?Q?kybprzqPnhO8qaAFF263ykb4qXjRdcjsdL7+dU/Ho8GbG0qmT45izvzBG0Sw?= =?us-ascii?Q?R9Y8gEtMdijIiaAzgZi2ib7XcOdVKrpxM2K8GKnfAIcTqoPhdVSn8u3TTBhk?= =?us-ascii?Q?VuP2rezJRJFLa16oph9HJ9d94CHJHpo+b/CiVdMWLnzvtMRPH9uOrXMdv21H?= =?us-ascii?Q?8Nhyj9wmgGIuIZXAH+NbhAEP0OtvEb7oCo3qka8L4zSVx7q5Uw91bucNlwol?= =?us-ascii?Q?lVLUr4EN/FWXYW/iclKKkmgTEjP+P40YKYcvXo6uChHRCvy3n3TZ9pR8JP3j?= =?us-ascii?Q?YhygfFWWFea7+7CiXN6vU5Wtw/z3zbjP0JOLQatHOADp5tnhERy3mNXeaquR?= =?us-ascii?Q?rQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: soKAiaZhohOoEd+jemYB+9M4civjdqm9PowouiAddtMFYPQPaSjjsCxyJRdRkBri3IvMt/MmRSFocpPCF0OdtXns3nQDpABTkfwsK2zQttUqh6PYXlA9dJY+p7nT6S4HMA7q6NVi5eiSW+wflCy4uEgvgoKDyFTUJWJlwU5heaWqIpyIwIZNDJ6GMg0Zs4k3u45tCSsjy9IMpVJwlXkCblDGtbCuIJQLlI+3fZ42zM9ya4lP4YRe42gChoGp02KfEpjFUazsUW8fpU399xyBzur1iDzAQIvKOFCwLxi72b7XL2Xs1kdjR6E4/3nreZz0R+xghQqYs76EKcYmn4clXuq/IibJiACZ94BkT9k/kVWoI/QSGrGO961mIR/wLI2gRgpQzAfZKkQNKlZfmK3RHh+rI13vRt1kyEUZkUaPeCkmKNnAccNkBk6oo1uyGskCrx2OMnK0VGEP2aByin53vR+1L8Nc34CSO/3O5yARcf49QGXq4acaLcyWFll14DQeBwc5zhnAXp8FfoDidoF1bzRiVMR6NPINGnXSxkORW5/y2fEcSnJVmGyRAS1J6kfm9xA9RUvsn3QyjrwYqIHBa1kvDcVNPTY8iovyFSkx5P8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1b148ec-7f5d-484c-565c-08dcc2e043ec X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:05.7147 (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: PbejhqFJ5G62Ya5rg1btcmSORiq8rBW2Po7iRwGFCizdf7seSvwRMVRA5MKj+UdxK3ixZ3/u49TvvstdCM9U+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7356 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: qO4n_krSUpo-SGONhQuPymv_sdg4C2do X-Proofpoint-GUID: qO4n_krSUpo-SGONhQuPymv_sdg4C2do 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 Sun Feb 8 02:21:16 2026 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 AF9151D04A8 for ; Thu, 22 Aug 2024 19:26:30 +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=1724354792; cv=fail; b=sgGaruzf6InBZ4dI0XV1oJB6G4wfLRONOcKFlvaYbEEf+K+5SwsVFVT+y/vBeZfvh0yjqWcZ+ffeZCvq8cFkaUWoAnbiDk5ew33RqqvzYjsU7ss8yuIdFp8QkOADZT5l4qbIZ/D5hlp5nX7O2LGmiuBCq64KU96VDR2LKaCzKGE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354792; c=relaxed/simple; bh=4BoDbH+8BYl2x5PGXsKrkv0NY/DVKc5EY8nphVnMq0Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Z4nr62igTxVb4Aegb7C8QjfBWhwi2OVfG2hxfL4zR57ZH6m6lqi5Yc3lBm75AhrgGCmqAFx4/8cMeazTPmXeI1KZrqhBifnxRQDe+wVYm8NP2FWIV/65V644CUUYQWIu6jwH1FHLmMHTNCpcOAtYGjHaNv0PSqwozdu3Lc9F7b0= 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=dupAzYIT; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=pXYo3iGS; 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="dupAzYIT"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="pXYo3iGS" 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 47MIMVOt026316; Thu, 22 Aug 2024 19:26: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= dupAzYITeS52BILtOjtV4BO9piYoydwjSEHsPPgom6f09JOJXK3tFGGtaRS17R4o r31+J72rZrMLmIx8gn9UEZJ+ILxAhRdDPatqmfuJVfHkQJ4m5GCJHHLD5qtqK8B5 VFY2xME4OLYjjimR3T8AarTlk3El3ATYOQccT2ONhFbpWOc0kkyMhl9bMAzvLN8G rAe7oNzKMc0fncSGuzU4fAwNsgD7ZpMSTaOMCbhXkQ/7I0b/DSB7op4XB8kAZiGy Bax/Ry/kAAW9FhzGpKzGitXRR4D93sQ/NOxyg77lU8B/iFQKTHSvVJ2Wd21lHgJx 5ReKH7JzGucOzF9iIa+GrQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2w8h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:16 +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 47MIqZYC019418; Thu, 22 Aug 2024 19:26:15 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b0b9cbs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UI0cPL/90wKn3BMv+7Auv2sai2JAwl2UhLlN1j9dECQgO3ZapQW77QwJW7jXTgmJS0IJ+2IvJfnpVlIU6fJXbMOu5WLOWaCIGJeq41Ad7/hY0P9ppkzRJbUSbPPprwcs/eVz/qhYaTnX5KLAX9+AoL2RjLac5t1wrQknnoLgc7gQ7pDgCL23+LX6TPIzeR1G6rXUNXl7WKVs+NaqqEQU9fKPDvXB0t4Vj9PDQpfKSwl2HBCm6bzNw1wyYWoh1x6l4sx5jxQ3eEmP3B1KFTJL5zlh11KOLG8fSoIuXek5u9rwf+vxbl/4mX5xlv379q1WMOzpjsj4u2fEXdqht35Kcw== 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=trK8UqMcK7Dw4eAcnX0ja772JlIZmWwIXPKNSryfiDo0m5TaIVP7yuliKwdo6tCQBTSUz/zxAVMt1IrYmVRmZW5GoXmQjvYHYlr5qWvf0nXyVKLEzTefrziQ0w2For9qfILROMgVWcH4BmYxIznGrRu+2esUXQ3PgDGXwzhtL9Siu4GmO014Qaq52LNEHCqQmpXLOkbeaWitvVPrQpNc4jBDJHbjMO4+ATByFj5WRqFRxsYcXzaP9qFwdwgq4UynplYV0RM+W0xGEhLcsjaLacQfBYNoOa/gqPsedFH8bdPCWNIxNhE4HCseY6yLSc+hFnwOxW6YdP5AYz4g4G/zBg== 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=pXYo3iGS7Izz/mUZ8sgzK1712KblpdhequA2zvrdV/I9DmFxskoU6hKddLvWPVrj/Pm90zVqoJuWk2TTPidMQgVjtmk0lNDAAkDsjetVYwayTqMFCvUHCcmryfuCgy3Ldxvb4V46YahFbLccpilrdD793eyYm+tCuw8RlAcxm5g= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:11 +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.7897.014; Thu, 22 Aug 2024 19:26:11 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 03/21] mm/vma: Introduce vmi_complete_munmap_vmas() Date: Thu, 22 Aug 2024 15:25:25 -0400 Message-ID: <20240822192543.3359552-4-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0200.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ad::29) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 9bd4a611-180d-4139-31a7-08dcc2e04621 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0v/0oO0pV+E0h9C5Q6lUV1j2ymmiizEkuXa4S8OkXigorklb5e1DfM2SDsyo?= =?us-ascii?Q?aphAYVefAV6P9GzsTD+v+OkZVRa4KGWE8WZnLHm7qbSoGnmBWgO4ZkGVMyIS?= =?us-ascii?Q?jKtczE/Zbj6m7hhpAwylM5gX5ZUyaMIHEKTVvlF6GykfRpJA3z6yCPqmp2CD?= =?us-ascii?Q?j01+JMYbBCxf7ve0Iz0OjZOQqoGkXcyns+y61EW9tuNq68INJSH55ZafPVAd?= =?us-ascii?Q?J/Bm1Z6D0ABrrRMcwx7DvvDNKo1fFlzi6qx02hXM9caOFQA9xySPluJ6WUB4?= =?us-ascii?Q?rhZbYKCQIufG1Dh+pOL+uIlSgymjCf3kbVRYlleGbeg/S1FX1NKAsHNSv+l6?= =?us-ascii?Q?jog3wz88AHvWiWPHlexKlCdDHProglwfx4WAEZsBs7DmChA5zZYXQkudPz3L?= =?us-ascii?Q?RPvYqNt/vlBTV//RLtLRWUBgZ9DXMqwIbmS5C77WdJJN3HYvo+W9APZFbtSK?= =?us-ascii?Q?Mo318wWhcpekOS/QhcF7mMb/vo/cV0T8luzdq5IyjJQdMCIFL6YEY2/aLbo5?= =?us-ascii?Q?zAqXdLQ9t9x/1WH/wSccpzj8PQpXOygcYGJem45JYAfm2RJ4LRZs7/x08fJN?= =?us-ascii?Q?hGK9eGJnndLvyBNvsh+mp5ImjnHZACbBm6HqWrodfXhLDsieWt3prFZMDBfi?= =?us-ascii?Q?6duiL3ydmjwtmL/wpaegFHAEq6bZWu5RLxQ5+9BusyUgRo6K+yzvQLds2pI9?= =?us-ascii?Q?WYId82r3Hgxf2y8VMCTL4l4hv5H3ksqtOYkYurp7StXS+bcqBteYYZ9fIyiX?= =?us-ascii?Q?SurM8XSRnSYhieHLO+0cHL9AqN9L/IIgwUAUMQa7iGST5DmH1JZebfcdGWfu?= =?us-ascii?Q?7+Eq4m7BdR56gMNo0xzxKKGj2xwcBbRKNgTG8DqpUr9lCJ6R49hml+/pnoyD?= =?us-ascii?Q?IxrMj/AwloALIvk8kbmY6WXaf9w2zb8H2iOkQeeQrIJvO74jVPkj23cBFxiy?= =?us-ascii?Q?NmGHfimC1FObj0dI12JxJt5TUPyoY431Asutx/nqEdbM7/DtHvV6yd5CPZ8x?= =?us-ascii?Q?/jviaas+Duy785MpwK9cGDCj1E/rcnbgS7+yAJamVpffAF4jZjOpq88UBTD3?= =?us-ascii?Q?UUkH+ZjOvDz3gm6KZKKFgTk8QU0oGhoSvmH4EfF/EmIU4LryjHkcdPyLq+2w?= =?us-ascii?Q?cGThlKZK1ryYZQx06GfqLPRSmQ1ViWesFwDjF+89Etn/aA9jOds2PkuJI/tF?= =?us-ascii?Q?6ZcjijQKYKt2bMxz2pWItg9yYHsHdgMYjRev/gS6vUU/fDCcpL1P+GX3R8XM?= =?us-ascii?Q?yDDKxvpoWU7efzWRRst4NcRp90HEi+46zcdIt9eLIIxS18gHazo3kT3AdAx/?= =?us-ascii?Q?rIUBZKmt78McWBbxITrb+JNFMAILxMmSjJyLbp4gNGuEcQ=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lQyvgzZkMurYZmLecR4tQeXUCg0ZAOyPcrjNvnB+WME5lQUduQLcbAIBVaMO?= =?us-ascii?Q?YVZ1edy8nrdB+IAjxbm0H1d0keKq031JoiyIDY5XyUC3UmuYdrXcOVOQ7LDT?= =?us-ascii?Q?w+wCgAFZILvfGit9pIJFd2uaGvKdfj0/e8RUCszHhV1s5lrAt1uqfTlvUgtW?= =?us-ascii?Q?RCGWmBcca9uqWtyvqiegXR9J1Z2rjwPfcZeuZAt4K6g1VHwAu4iRSbaZgGvv?= =?us-ascii?Q?9P45rvDrzuMj2pVT0sssYvuR9VTXITqCiv95fsFVcPcw6zsqCJEBKjMgJZkm?= =?us-ascii?Q?0BCSrBlY5xJFGQP4IgDzF28hXdETZoinNHHNUeItGJT7itSMPYEmOWQszuZD?= =?us-ascii?Q?rL9PkgT6yojPX3GvpwgKUpfCVSen3nLrSDmFA0Ad8TkLkfCj7kCwJZ+pRR4J?= =?us-ascii?Q?vDNogwORPhOH5LsrSUeZUaBxkXmGo+G+0/p60FQgXJw7D3EShHlD9S1SP/XT?= =?us-ascii?Q?9Ml2QJhgCof3/4wmmt0Y2reMsBCYuwE3l7/zXm7YH+lA8ar91xmCrZSHXWie?= =?us-ascii?Q?C1xsp1LHYNzeJWPkLsdzZBnt/7UB6u892OffNhz2EVoYxSXb3hB2b547/qmc?= =?us-ascii?Q?kInWCJjvt+YnZ1tJVaAB8Hym18PE3nvDxIWU7pCONQ3gtmjl5cVjZ9MDwvjR?= =?us-ascii?Q?Ol2cY9ZfWJoK8IMf8NJitw2LC3gxsTNdYHCbbxUBRlxuKqAufo31z+xKRTW2?= =?us-ascii?Q?anj3abCqNmPJexNEt0pRZT/Nz8CaHC8Egpk/YWVZYUNyRsNKFriCnvC7N8PL?= =?us-ascii?Q?NiE0jbEopzMPLg8TSbrfYx5qRsDP0OLb6csrRiFwsZ5ytNwrRzz7rAVAQOC9?= =?us-ascii?Q?KbFXcwAwmcW9drG67UYBHkERTojwvf4Dzrfiq1HyM6GQlT2M5y/a9zL0A9zD?= =?us-ascii?Q?34b1v5o7XvpmMlL2C6J9OiUQT2BTaFKSSNKhieYLX3Yihrq+56s3elgWkg2s?= =?us-ascii?Q?updNXBeNqFqt8hr0T4qDlj+f0LaN2KPpkwmOWU7X441ZfEvtz4E8Z9JXyjXr?= =?us-ascii?Q?OlMrbIBy9ziJ3Se/SC9ktdvCetcj5Z2UdQmSop6EMKKxkpUHV2XPaOe3/dz7?= =?us-ascii?Q?fAl1B6vdM0NcMk9S8KVDNPH0qvdsa1UhItA+9i979NK5Y8wg461hjVP71GIb?= =?us-ascii?Q?zZZDaAywpsE7tuRndUZH5kEc8pdPjVzy8d3N0GVby5FGKA4dqQ/QaeUImcxf?= =?us-ascii?Q?cmHL56t/tvMW+21Ct6Dw9TxvwKfy9qylmX+kzx6JtJBgTP10R8J/mHTgnVn7?= =?us-ascii?Q?x4ipzAwcmKlfxNQ+6Y9lKN+EweIjG/oeoGT6pfT1aeWdF0bmV+FIBF4y4dXd?= =?us-ascii?Q?tgDhBj02bE4QGUNIc4yu0ssqYf+TDM4V7gPQSFt0RsPaT7ZdA7xPwymwv024?= =?us-ascii?Q?jCoEYMCTPPToco1L4dLG0mpozC7ViK+DY/JADj006If7JvcjcKKg9+2W0PX2?= =?us-ascii?Q?OAHcOq/xYnxWreBaNFEc+e783bP3Q1urs9/30WQOACLvcANk2n1i1wjWz8Ea?= =?us-ascii?Q?zBJD1NT6RbInlUGvYsNZjhaNCYulLhTvDq88pB2lr7S8H96yI7EDFVZkYfba?= =?us-ascii?Q?UEbn0tk/O8SSk7JhXzASPWXVCGO8I9brseaxtGwl?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NUzN8sIqkCkZa6NLipnkLFpVhYfyFqDgxe3V7Ocrwa3NgBFFm9aan86WfYLXPbh3dgAPcgHweVAybaMqSFrtqfLKSiYpkelklx/At9eRLcb+K7P6LGf9WFecAjcxqvYnwROhPoSUNvALVZDI0go1iRJgB/4IzlO7d3TvRF+KbahA0OShwRi8C7zPL8Qbg1iGaxL8laVhA6Mr1DsLp6bjc3ocs6oLXD+mADf44yKQQhz2SkBAAK+CKqrzp2G3XCl5BWDO6Eg5Fljbso2Q6ekspBRKO8QLMRA3aWV/o32H/IHx+SqTN6KoU3ngb3M65zNwnJGzT49u0JUqsh9HX5LYgHn5ojoreiuPav18ShMfhEgAB2p5P+kd3HmjDZrv3HrWjFQ1+cime2I/Wm+KiThU0cVtSZlaupCo6dQSe/VS7J7nFYlazGvaYRk6nwg3/h7+gS5D/YcgV8Sv8kdMbXmYwojMx3ifhOXNeGQQMkoEu6iGLBolcfZ0YPVFgBT7dh3A9vpjg+AgT6HUMYXuy0WeJjC8VsyahBaXnu4pAFK42N0LaFSfrNeGRoNnbavStrkXYsQgO2VDTkDsvhzdaxA3fUqTsM2R6hRqBKL+/LKFYfE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9bd4a611-180d-4139-31a7-08dcc2e04621 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:10.5564 (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: 9YvamDWYvzPsBuxhnqXhGpa4FzO2HcJv9eIm6PYQKA1GkrSllnZY9Hy//gT/a0j8Pmh+WubLEtYXzmperjV0/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: Ne-zxH17H-MO_gQM2zMkd-G-NKT_wia_ X-Proofpoint-GUID: Ne-zxH17H-MO_gQM2zMkd-G-NKT_wia_ 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 Sun Feb 8 02:21:16 2026 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 665741D0DD4 for ; Thu, 22 Aug 2024 19:27:33 +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=1724354855; cv=fail; b=RpRx9Ypy041bCSzSfPxE88c2OmROQGGyo3T/9cd+60zn8xUTf/SLiPvLkopZS+8U3S0BW826zZc462XpVNmkyxMXHZWDdnCbpGPM0oorccOjTICt/JeUWij8/9kyLMKEabXeKqOIWiAi9AOkBKRE8qayUGeID6F3uusilzakevk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354855; c=relaxed/simple; bh=3n/0eoFZaBEsTFSF/sDM7IeJudyjqS/ym9HvOX++stE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=mdCSWf+5QIEbLTwVNTM8JNfUCd9KPcsVKftbmqVjlvXTHmgEcy+6y5RoJGxzh7LPvbVa8f8e4IveiiDSwz55ypxfqihXFkKo0jf/iJgEud3BuORRb+TuoUJAumeGsTp9Khb0DfmXaf6mId3fQZ7oIUwmqRct8QowwkhM9boX9VQ= 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=mlXkmc8P; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=zei9FVr4; 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="mlXkmc8P"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="zei9FVr4" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47MIMVOI029699; Thu, 22 Aug 2024 19:27:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=cQBQ6roZjofnRdkNhVdNis6vJDFY3ZS8i57oI04+9wY=; b= mlXkmc8Po6/KCAoQzVI8qOo+BHYa9KNTlmIyRJ1jYDxTIRNFlRS2fhNWFAgcrGSQ GU/F9U2fOuBp7WFdVt8ouQYUWPhJjLPLEaBqNkFysTUlk1SGZt50FHRNY9wAKB3y rTzU+j6CZ4o0v1w23gJaOOv1Osrtutm6LiBbj5QihYmQAAijjQPGqI8jr77wqswn eGlsx6jd8eZ84ZCGXvIYlXD21zGmz390OOxUwfDXeIrpuujnIft/AI4ZpiCmo3C/ KdvvNLt7JBeXOfmp9yAB00DTUbYCxu8WhI8UsCV5EE2wzCRObG2luEZqYXgfh1xb NzfN3RC7euIk8ZCltcXVwQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m67jrt1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:27:19 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47MJJJKm028323; Thu, 22 Aug 2024 19:27:19 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2045.outbound.protection.outlook.com [104.47.56.45]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bct88au-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:27:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=czhlbSkWWHKUTwDXsI+KYP9U7554ppXEwvAIIjXBAE++za28D7Bo0TdZ8C1QQrgqAYAzMTML2+CIn1XalBAgJawIPhJKueUarGyrpgwd/xio3hvTDwMIoerYfCSqhtRjT6GFHDpJQ9xPCrGXXBHsJN6UYpSofh2cJOVQPX7nhyQCESjGCF3Yqya/wyxpY2BnpgcZlb318/wBv96zHlIlIEh4athbc84AzeEJcHulDrQzBrnrk1ERdImj118QrUoD4vP1iW/zvGU7kK2e3nYpnlqeoKoo5/KkFyylxu3XEkWuVGcuiVgUSmNzNPeoVTLwsSA9SrWP220cNR9YAj2WIA== 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=cQBQ6roZjofnRdkNhVdNis6vJDFY3ZS8i57oI04+9wY=; b=EqSlV5VoHWVAUsPV0tMq47aeFKx/iX/+QPywFr2Qa35kfB2kU6cU41JmV+GHQbwqyNAXrpcTZz/VHpGVWXlX3WbUTq8fttfkKSDW61xM9MakfHpMbXHp5uW0SJYUh/KmJlo9/6XcYa//M+8ljKgYYjx1dx4zme2rF7zXFS+G74FttzPJpotFA8ngNYJKHj1fTNCJxYNafSRNlGRjM0Lxt9V871KZo6oLumg8UWUwLYuDkybqN4+UIpmWa8VU5eMm9LXirAnifBTqXRf/oDL5rH59Vt1JtjCyF1FRgu3K0FmLlSrXE9nBJGPzpCBeKlDq3H7YflcOfD0jC5YCn0ukSQ== 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=cQBQ6roZjofnRdkNhVdNis6vJDFY3ZS8i57oI04+9wY=; b=zei9FVr4eMif492iVDn+yG6ko7WQjKtj19Ug/q6KFPAtjyj7sW0wa9kUOmDEiUy0ha3OGfFSdNSLKqPZ/OfsOd3nnD18iPhxItDYYkJ1IkSu0d83l9byLCnfLPrmUDizfsaHgdwUmzQ2ZQ+D1Ek54hx2mZfgBPzSnQnII8/Owr4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:14 +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.7897.014; Thu, 22 Aug 2024 19:26:14 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 04/21] mm/vma: Extract the gathering of vmas from do_vmi_align_munmap() Date: Thu, 22 Aug 2024 15:25:26 -0400 Message-ID: <20240822192543.3359552-5-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0282.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:109::28) 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_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a16c7da-5664-4ec6-4129-08dcc2e048d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?87Gv1SsTzuTSEp+t0azdve4O2bs38yh9EFtZ9oQEz4Yfypbx23UbvgnRIaZa?= =?us-ascii?Q?W4ZcMEyrFNiSdPTHfzqEprEZ8ENUpJCLPn4PxnWP9D3osvTBsZ5ikP2c2P8f?= =?us-ascii?Q?6NeTKvacxR6qfjoB2/PP8MOULdbpw+CSG/QYENh4JOR5YuSNkeQ8HagVtfm4?= =?us-ascii?Q?y8Jl2qBG+FfXHlscejhJTxFxxHWDnm4ZyKVjLe+GW9pXt9i2b45FUA0acVCq?= =?us-ascii?Q?ZqY27c5+M6gFQ5UEsgX85gt1DZuiXwZfMHnh0emby0s3EjdAbnyZa2bIr5Dw?= =?us-ascii?Q?P9mzskL5pmRge33ad9IKlM6wZkwpx5JoJiLFnrMU15a3nFnlOBedgkc0DL+k?= =?us-ascii?Q?ftGiBegPJbSAyGpa4Yu/Eo9yrRbcLbqO6UPYH5R4Z6cOYjB2879mDa20ouOQ?= =?us-ascii?Q?6ScI9FUIAi42KY6/gyJTbgmwpYuessFbAQGgtqeb3NTH8JcdHaiAf3C/CzQc?= =?us-ascii?Q?ICaNjjInhEQeDhG/q9mO18PhwYalHEa4Kqo7+HBsQHijnkFryRz2yi5byiVv?= =?us-ascii?Q?cuI1z1Ulnb1OoMj0lkfeYo2Fm483Hn/fGX7vE8B3gnDRbtGIOXSAkYaORFBq?= =?us-ascii?Q?WhndrGmJi24HKZgDYI9OitJ0OOSfPVnDv/zh42JaSAZjfiahIPzRpXRgovyL?= =?us-ascii?Q?+1fsIdQ8bj8renP1ckGA+qk+mhb7CBp086tMi7fvUcnZVb5TYM/xp6QxxbZa?= =?us-ascii?Q?utT+Zj5916QpY3U8pnpBxX4FOFjo9tEJOgSVvzu6xluklc9ns/w80ZY8sEoR?= =?us-ascii?Q?clDAXD5B6y2diJZ1IefUzdCPZeO4IPqD42rsimVoh0BIWPvuR/xR1VWR3nvI?= =?us-ascii?Q?+V3yLwcOes7RywHJ6wDxoUjtXurpKIA75HLrOroR0mtLj0SQ4uxVo2EDlWfg?= =?us-ascii?Q?drzX9rULURITS+TnD0vxECR35QLM9Yga83HiaN7M2MC6D+Jdgg6dxDz6nTCB?= =?us-ascii?Q?8w674GcS+GmBg3jK322VvPCCeCSvNBmsU+S4d+xODZGfPedcTfGylBrIyLnS?= =?us-ascii?Q?5x1c+VnA17mYA04vwG6Vtt+X6gza37P7D8oeDWbDOPFwRB+8GG6bS0NUB9Pq?= =?us-ascii?Q?KF1uRImKpT+yCR4+aYqLbNhrGKuc6VRnwyf/doAAPHnn3DSApkxwlPHu455C?= =?us-ascii?Q?OHbocVEK3e7lHcRJAsMOZeFwp4nnFaFe9+NpsKVvxT5PeZfK1xc9PElkeE29?= =?us-ascii?Q?AwvsyE4afhuKrrQ9JI+S+MORx1+sNepFVGi1FhxLd2o+C+WX1NWG0Rb/rk/I?= =?us-ascii?Q?L/FT3EZUnG8RfK627/e7pcOOivJMhRvGrL930yxI1XgKTSITqN/uYvenNIaj?= =?us-ascii?Q?wz3S+D3U7MriH/IMalp3x2Fh9mMrreuf0GTcQeLW2UFqbA=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ff3xX5FUZhpT3NYrkagEaL7dtjUAR8POaA2QfUpkS6ooux3cSaVnVs17XKaQ?= =?us-ascii?Q?38HEES1YALWn/0yoXXqc1K2ds9yWK1e+s/uRiaAGYntjec5JWAbW1bg5h/gb?= =?us-ascii?Q?9FG6JuWdmcLlolDIRb2rv23z9W0mjHqitiltvIBS0pUaDRhEWF7WptzU0EtM?= =?us-ascii?Q?VOqwCc8PtFJPEYn/9v7J8ZN1ef6rP1j2zwrQ/GretyB5TU+Kv7dJs8AKKvVs?= =?us-ascii?Q?u3wMfJyOGsGWgJGh+z4aChIg0ezPl2/EdUIksPKNk+nUIGp+6GvyKcmHbuov?= =?us-ascii?Q?q1wLwSRwtLZ4PlXaFInKtk5pPwDf3En9KafaDndm8LmmMCZJPyjFG34E9/g0?= =?us-ascii?Q?W48b3wKFUhDA52oj2sxXYY98BVKDdODxNmv68kTmJY+qJYGzBjVbRiAT/fBw?= =?us-ascii?Q?h4hGhda73X5cThpOQe4FJn+4gLia4yDnpkLz5ZC/2DzWvssohpfyR7URzLxX?= =?us-ascii?Q?oyb8weh8TtEtdmDa0c9rkubYT8G8e/bqpBPOKsVBjvZkcjeY4ldTfhce2RT2?= =?us-ascii?Q?BXjembQWz3wa7dnrRiQ/9PpbG8f8hDDd+l/iIjytSh4PjX1mmYdmO67bi+bA?= =?us-ascii?Q?AgI1wX/+HvS0gR7VSIzIlYKyKEg5ZuVso+ldwDZdU2QLJ6ZPdpujXvqNwWnz?= =?us-ascii?Q?nNESR79oA5ks0DnZPdTRbqbhxOZOjeKhxB0V6uUYptuIPqASo/jjM2HMZd+s?= =?us-ascii?Q?xBqBUxbDIIo+/TfgH+/nMs8cHOZ/k83c0BC4GoPE+wLniBwbUOO60WSBz8VW?= =?us-ascii?Q?XHwIbon7NhEWq1Y6TOnrJjuj9tb2w6/tYiAZHkUPeDYfFmeIDcX3hVawz0If?= =?us-ascii?Q?yKCxd9Gml620ZxXLOcWtSykR6xBXhqrXCu3bprIHUHkCKrdXyX5xk0VbkRv0?= =?us-ascii?Q?GJTdT4IvfQ0SFWEF6aAWxXRXWuvtWJGsAU5r9uZQj5BCy9DJHOtbYIBdz/od?= =?us-ascii?Q?i6O6egYjXl4XHc5sGambQg3J6mPyxUpBr9FHblbN3E14ORrZCzhnk6q3eAIu?= =?us-ascii?Q?UzWAsrumHpRRKXdQvPYktAN3JjC8kU1SNeXLI3nC7aNy85eTvhxj7NXe5VcI?= =?us-ascii?Q?kcTeOYGPqyoSk9kr6SSH4he+5M1kmQQbFk7iBrnHrBeIOxtg88uYQfyhHbIm?= =?us-ascii?Q?2nltUHg5osGgQpdtEhuY8kkSt3HmsGIVWSne6ozoSIn5yVtXtdBoAyIEexvI?= =?us-ascii?Q?+BDH5gduCaxUyGvPTzT/8WNT7RF+4pFdvGVynAmW0KIXFeOnUYjLreOM+Qzd?= =?us-ascii?Q?N/Lh6P0XUNMWV2eVgwRwbcr3xpHb6hTBb3iishWDD5uHkY86OdcNdK/KZZ0U?= =?us-ascii?Q?RdnIWu/RV65sqQKk1zY9r1QXu7zx+EdtZTDcBCmlB3NUzH3o7rwM/pdITJSu?= =?us-ascii?Q?lLWTkZ7ecjXyr29f15Kmo/E9ktfUPKyC0qm+HIbJ93muNatQRwV8sjhdrVJ/?= =?us-ascii?Q?8ag9UlYrlBxPCW+m65qs6BAWSBMFbLzRCyCTRPEUivWr6pCTqhiMNvaSZYm5?= =?us-ascii?Q?gF0X3rXXaETmKPMW39eh898Q52i43bcc0cKYQMMvr8JdLJGauvTAYoYPzHbT?= =?us-ascii?Q?JNq5TIS2OJQkSkfTpX3nwCGyLJ63/CMIfdKfa1vV?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: JhE2OfoTarwhTHmmrW0e6meN9YKDhPU1NomE8dhmSEgm+6bHFEmI04EPJfBQCIL8h5/fQzUuN897IjVSS52xP+wYRBrQT8EYhiZkreyLS6TWTbiru++QWshAE/qGm+ztfE0LO/8kSxpMSiMk2fczPyg5BgIaLKEx1ZUmM5MieHkJdRdRfPCbM0wCi7dQrn5W/eCzmgXbeFdIcrnjZr6tI2RDJwYFNzXNLq83ePlrUth5fkVgfQKzT+Dcqnxia0ffqcvv0IKcA7ZrpzfP7Fj7/351KaccPryALNj7KW2EE57X1MG9vM2LjXuKHeh3qk6Q42NWmgxFOpkpmnAlm1KYjLCPqKL3awaep9jt9nAVhg7SlNnL3L68VW0/4pLCD8xzRQJw+UBl7jBlg0JBQDQ18Z1chvu/svmG/cu73AySrXXVHc2cyQjBng9wKFsiSh1DmrhpEJVD8sxaLLbR808KgF/PEwyhidAaqukMwRuAo2Xv2++GIi+y3NMUZQmgVd4wexY6yyhSR26LFmrRIod2jXb042kMzwlJxRohpbIuiZHM3oYPWwi3rKm/MIyKJSUK7fyheaBNiGNu+0fqu3bsozVbML1ufhdl/D2AarWjV2g= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a16c7da-5664-4ec6-4129-08dcc2e048d0 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:14.3433 (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: Ypxva6bjSGDO5ri/rBG36q5tz9QeXbzKNrJ0sqIYMW0pvx/GRWJn3x2/+2IQjZHylE0Tc9OZLNjdlqYQxJPSag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: IntJzcRh19xmNhO6MN_tDhiinq-XEC3M X-Proofpoint-GUID: IntJzcRh19xmNhO6MN_tDhiinq-XEC3M 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 | 82 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 24 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 3a2098464b8f..da489063b2de 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 */ -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. @@ -812,15 +810,15 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct = vm_area_struct *vma, goto end_split_failed; } vma_start_write(next); - mas_set(&mas_detach, count); - error =3D mas_store_gfp(&mas_detach, next, GFP_KERNEL); + mas_set(mas_detach, count++); + error =3D mas_store_gfp(mas_detach, next, GFP_KERNEL); if (error) goto munmap_gather_failed; + vma_mark_detached(next, true); if (next->vm_flags & VM_LOCKED) - locked_vm +=3D vma_pages(next); + *locked_vm +=3D vma_pages(next); =20 - count++; if (unlikely(uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas @@ -845,7 +843,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 +863,47 @@ 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: + 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 +911,12 @@ 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 Sun Feb 8 02:21:16 2026 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 44E0B1D1746 for ; Thu, 22 Aug 2024 19:27:07 +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=1724354829; cv=fail; b=mQ3f+W+hmZYh7raZJLRCXahEg2xleoORJocPp/pt32S4RjDNtVuU+hatUfCtzpgc1NJ8titZKz7015JzyWezll0w299hl7ln7USfycuurBGnHMNRJ8u3wmKplcZPVUC4sxxff9bbkXR9Ua00Q1Efs2hoSTpKQjpN+QQjkLYnFdo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354829; c=relaxed/simple; bh=USyM0d5e+NS1vAmS7PvP+N0ZqvpcyNvxzzdwm3sdw8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=N4pAG/m6T94LgemfjjPdOHUszdeOoFJEUeHHSsRefPvidpypxTZgxV5qq3Q8eYUx4X+01fmlSrVWyZ9N0FYczJaeOiECXpsjrAX15V/ZKrwc5LDqIJcIORrpIjrgn57Jo/8WeG7tFVqJ5FYJIS+rYP3n0T2LHXirQR1eh6EpCas= 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=RTl1liVs; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WI6zJDvu; 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="RTl1liVs"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WI6zJDvu" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47MIMWJF029718; Thu, 22 Aug 2024 19:26: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=ttsU2jqtp5fvXasFNgS0NAcV2R20c5Zpzh7VMtrTw7I=; b= RTl1liVs/WFF9wMNs6ygEgt/OcBx6LRF7BcwBLHuVM38rmY7MnHTjA5qDCh0Udys VCPHusMf1z6+a9W2WudnUlG/pe4iM+/PKAJS3cR8Bq4P2dRR5vdYkusN+yb7+jMB re4/nQ0OmiWokRqcVdiO8nx5f+rSfAXi/lAZirS70oz6Kx48DovTCWDSZrCkUbcE GLSHFgNWV8/lseZE572Ftyht4m+858pEf4DYehVVs8oqwU+pOYwjb1BPNctC7JTS z7om/7JAdfPNX9dyTAVGIh16JZcmjoiBPtwnEwrabIHRSKfCIFYHvJb60cCrOwE0 xvH8zlwcdFnQp+9zRDpUsg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m67jrs7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:54 +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 47MJJK8c005374; Thu, 22 Aug 2024 19:26:53 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu08ec-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dn7O3W5N1fvsepHLGZ1Gwgus+1P7w89R3qbY2pQfKTktQjc/VLISks8kw3zdTn4s4sqV+5dxPHHFexTXhZWRAkP5/8WXJgm2Q06NrPStjHABAidvsr8HcuTfXVo5WKacw7jcIfqqDl1Ia4Iv3dfbRirvQxBcTmPNemS51C7fpgHhgXJLOc8zpysTGRD10RSxn8ahFUuIlyLW1L2jEkyMWNjtuEzopE1gTJo95Lrani0BH4eEWhKx67IJ34F3Yk4gi7JvZHhe9MwN1qqLyQ0gA3X6bEWS2j8feHTXUiHcFKanoMVx3emYPC/NYvYPvlQ7XpkA7CAgRd18brM0Vc0XUg== 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=ttsU2jqtp5fvXasFNgS0NAcV2R20c5Zpzh7VMtrTw7I=; b=MTHH519SjBTuGMuVeKf1wynqBM9rLoThWlZEo6k8vJeyIL5AvRHHrOznYHSJ+0ighc08FQL3pj/sbnj9wLd5tGEdqKSQ20jYs21OnMUWxE4IEiYlBuAtMxAi8cQ+CrRpLTuZW36c5WOjX6+7g57tDeTgu+tS7HGB/3rhcm0/Ok1mO+4zqgMgckYcK3cqlkFqE35ycCz5vdNrmrwvn2T9vqAUPVJKfELRcBINR16T8LakIR728YaaMQWp+LEfIhCnKdQnTsq+VP6GlJgznqV8WN2kalCsF95LGPc7G9/dnicG4IQl5yv61UggeAOTtDa179xcCjc0Q7MPh1BrYsytFw== 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=ttsU2jqtp5fvXasFNgS0NAcV2R20c5Zpzh7VMtrTw7I=; b=WI6zJDvuP0B5ZtBlEx9abq/Rt604tUXLSsNBcgPaWtKRA0dLg+uipHCcPyTRvTXyuOOE7w2syjBRsDkGR8xHMkN66Th5ZG1P1LST+alCUQ6l8eSNbFayVzj05RK3nQW7tfw+o1TMe8HrHgGBsEgDkGNU6fzcVS9EkozXpIJYKT8= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:18 +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.7897.014; Thu, 22 Aug 2024 19:26:18 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 05/21] mm/vma: Introduce vma_munmap_struct for use in munmap operations Date: Thu, 22 Aug 2024 15:25:27 -0400 Message-ID: <20240822192543.3359552-6-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0035.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d3::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_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: f7075146-539d-4c9e-3da2-08dcc2e04bac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EuZLaPH1nA3kWq+lrqi21uknqlJWRkN6o87TUEmKN2NOGq22NetB7SIu+0FI?= =?us-ascii?Q?EI5VdROdXZirfjkov0E/lk9FGMwdwJxIM6JqJI9zUwUY3dAzDUEFDp273VRX?= =?us-ascii?Q?bQdt4rP8XXLuQCE4Obc2IoFb66mYlxo0bq1XdfLo8/o1LSo5Leh6OZxv7HAu?= =?us-ascii?Q?TwnbV7CSY/lZaKYSmrpGyzAlthY31iZwc3i0LHATu8cIUfBTzH5m3NRvpZFQ?= =?us-ascii?Q?58UJ+GAY7bMUeH+aylFH1HsKlIIc9gz6TV72H2lIfDqz8yIU/xlezEOxEtYF?= =?us-ascii?Q?kmKkl2sLsoxcOEr6GoZbbxLtzQQ5B+lMnafJTH5jKoLROzDePP417KyB05Q0?= =?us-ascii?Q?WzBlpZsEXZ5vxFAkGckLC7WPIZ+phc/td+RZVBaKYpoZfriT3GYTJjl1pxb4?= =?us-ascii?Q?OYDih/YV3iZHyH91e0yGQFcAxt7oBWQMcKGhcidqlrxYckx9XdsxWLZlx9uU?= =?us-ascii?Q?LW2ZBjrHZrtZgMa5ynXE4xYIW9UUZHvnDsxaFIDPkkXo1GH1F2lGa+zFXxhk?= =?us-ascii?Q?Ud9IgVH1SSbvNL+qyoRM2r6juKSzNHWImgI+shIXbVJQJzsX33JQN/R9HT/C?= =?us-ascii?Q?5J8Ym2C2pDyHf4tsqu4bYNOsIEKzp22cIQLOVtDe2WWwE3pPa+1l8sfnDwB/?= =?us-ascii?Q?uXm3ViQuZazwPKPSL0shHPKNJHypGFxStCa+2DvZFkRzYqa/cdXgXtrfL12u?= =?us-ascii?Q?eH0zFFQBj9OH6auRvvK8B7KCy3noscGxqaaggSJBvwd1rP+bPRf8oUJrVWaR?= =?us-ascii?Q?LeeBsU1LCBF2jSincp4tGlhxYIQbHwDaO9kKzO/W2DpvfSE/nhRfky1ueuSb?= =?us-ascii?Q?hNU9vZskZgEWpaWyiHNqg1hz+nAINO1c+GxlfWAm9EEgEzZ/d/+1dhCXNV1e?= =?us-ascii?Q?Mcg4gEP1K5PG+4BHeLeAb6tnVZ5vHAVd4FjtZcLIO/qqjCpTDzSFvbbmqvlw?= =?us-ascii?Q?Eu9sosjt6BRjMNIMwWcjkFxQBPayTXV8p0BE5OGNB7/kVLvKt33GcpqSSypC?= =?us-ascii?Q?M0Qz5tleVi4XB7aWQoDny8dTL5uTVJKutce7bK7Ne6htFW0u/IEJmYnOFJSF?= =?us-ascii?Q?4qSfFkCX7Gmcgc29yfRkMLEtl6bWgqyQ7rmI8qZZifMDJUGCq6BoW+tb3opf?= =?us-ascii?Q?iF+wp9j1YnRATeK3ez1XVIpM+raydh43nRlcCthB5s8CBKy5fDYWd+a1wGnN?= =?us-ascii?Q?xMp9sVnsCTQUW0AEgvzVHEcwvtpPd7JKTQFdFzv/3t+gnpXoHT2snvFXwANF?= =?us-ascii?Q?j+bwAfHKaVqx+9ioKkIHYUF2asw95c9YMeVmc4XXpKTKm6webJTGBJaW2Ohy?= =?us-ascii?Q?+ifc9buAYAgswKM16ykTPyA/1ilwE6uZgWaxeRetuArqrg=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CTvpmUTMdQzCy0GljSCM2jznwIvXIcy0km/fungs4Iri1S5+PgvhJlkLuLUE?= =?us-ascii?Q?rmdascwf7N/MTHKNdb3yBBs5jw1NcwYFe6zutPD7MZPfMA6Ow4j4lIwmBoV7?= =?us-ascii?Q?gUfP2ir8RLRjzYE0xISug1CJ480phlFMJES/I7MyRoomvAz4JGjOc6hMfKm9?= =?us-ascii?Q?9bM/aIVOQlruhYRc9hzyLAFy/9884pZw5tLyctYkJaHB56vkaN8awTT5MLYI?= =?us-ascii?Q?/TLp9Wt+EK2lVijWUA5a6nP7E8xJnd/0W6wlSjumNbiej/9MCMtDKAOjvEFQ?= =?us-ascii?Q?DOR0vk+w42RZCZ4pxMJ/aPcn5edXulA+WzzTbeYmF1RLHiGYtXmE3qpQiB93?= =?us-ascii?Q?1z9xWr/akcsRMqlu9fmUMymYSYVe0D/2n+6M4+kNbzdGxUuv3wNQUhAbsLCg?= =?us-ascii?Q?bsyEtps/rkpBsgXzLO3xUbMqL5EXIfb4p1pRyE35/b8acVW+3O/NoIS/idlj?= =?us-ascii?Q?z9ithcecujlrUOVUVC7LrH0ThLeyEIYYaRG4ze8dYAQIYNi77ayLnX3b6I4f?= =?us-ascii?Q?3WrejPH893oZA5tqrVFq8JzOv6xlWdkvYLtuYX/SbOf0js0tk00rItDrXQXU?= =?us-ascii?Q?wlN08KzPB7ZbkMzRhoptJZHy6rPTM8UzUkZAe+A6sgAaXxPqwhHNb6FKxa4g?= =?us-ascii?Q?6Nhy3u2pqyvXs/2PhL35ilxtFrciqQHbeklWXrj1AUURu3CYOhvxBvW64TWN?= =?us-ascii?Q?aN+LQ8xaAYMwLGDx76P+EPcejRzJIe8CBVBCvWhlR6/3VhP/SpWMIEZkq6Yg?= =?us-ascii?Q?urSgkIlRMqBvhoWkPmVy/Az/g7Aa3JkER4t55hCoBiZwyvP7C2kZjQeOwHyA?= =?us-ascii?Q?X4GOiYpLaZrU/GkCpux2zSgxKflUYs9PXWvJrPDix2H7OUtXw00Iitz+T58E?= =?us-ascii?Q?hF687CpMzdh4Eu978kE6MSlkcfOrE/U+UQRQYepAP8euhz84Hz/WZQSiViZ5?= =?us-ascii?Q?qQC/TsgJC1rnvL93Xv1vDUUyFgqSL8eEAbH0ahtVePa3aWkbFpd4ztqPt3ob?= =?us-ascii?Q?+STNt7dZkZfk4nJJVhkOEvjL8aH0tyNRSzLgaYlo3T/Zn86/toEebkUQfTu0?= =?us-ascii?Q?9tcbwZFLd6pWhz9r+JtlLbX0rq9z82Bm4/22qWy8kcqqBJA1sxX8S5b71Koq?= =?us-ascii?Q?ctY0feo8bNWjgLfqK4U2h4iNa5+2zH/gakAv3haUkyV+EQTmij7WzgnNy5NN?= =?us-ascii?Q?i/YG3goC8cJ+uddZJLWBiwPviTriiHY6/CMk8I18vWJGGhOrchHaeVevghx9?= =?us-ascii?Q?aoDJ6QA+3l1g3Fs7w7lK5usuGA74DYy8dPOGXOdS10sUJv3UKyheNO708huU?= =?us-ascii?Q?UPbUibzo1DMpnl0ShI/IR1Iru8GL+qdesYsf6SdYjt5UmCHeFIWoTxnF9ns4?= =?us-ascii?Q?Yf4oYr207DXXdiVj+J5U4z9j7Sxi5jtRGPN3cR4Kls6QaxygCvUGC1r+k99p?= =?us-ascii?Q?MqQgGVC8MOFzvg+KkJdDwe554WspxD7xaWRfZXqqT7mKXq17NoEq0KDlGqi7?= =?us-ascii?Q?8vX4ZdEiUBAAo3u9QtMIOqmD+L14gFEtL4cZut82SQkf7cueWtTO0jHSvWVN?= =?us-ascii?Q?2Jd9ZWVqEkDIsIGeRLQTfXj2XPciISxVoJ3qf/JB?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: iCnTPBbq8ZYmO1qlbuiJ12WjMlpHUZ5XOBs0QB4hnmdMb4SB3z470SqAOBRfKFpbkHgxWCpiYnPl4r7WSsInDh5rTQP/Rj7c6OYAdwfl5htEwf1qO9hFpyq7sTd4rKEwYESDBCIcNmsRjwGtrLOBFkAsee6PMoMtBHJqqt8ZE/ZEqmfM+nieQTNnqxg3Zu7eUddCSXcKeKHqCjXARa0WnAWItuMDSgdRGJTV/JchwWIF5/J5EtpI9CxBLRu0sK50X30NvnkSy9bJ/E3fIx18dPwi12iV28T/p7P29xatKLeMKvAjBAsn2e+QM5+KBihOaz7+g47wmDhGHQwi+ewoSQfWIXXixBY9QKZ+MlAkLaQ0by9dZnW8nUkUmmMJxhRU+mZvgWSSEybpq5N2hBoIyirxYK9hJbvo9iE5VxIQ2F1TCSPQNGDiC6q7wA+VIzRfCdZNne1yEC86E8Z2/gMEirfTgb4iSxi2l9FtWhGL2YpfO0uHSS1yenfDK+eQDBpwpwevWB5fCd25K+UT20zyiicChxlaDwmxw7fIkeXZWCxAmSTauyR7T7jXzAhX8ay+wGxfRpLI136Al6iRElM8ZkAKRr8X1ohhkD6yaMMJHxY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7075146-539d-4c9e-3da2-08dcc2e04bac X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:17.9432 (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: eo4Cu6ij5vmMS93IqzmGusQAs6/Ny+9v6KdU1SBo+b3zo4nTBYjhjTg8+Uyl5E8BW4CdAqdtfRKAUYjvF4/8xQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: Q3sLeL6SZmcXJJi6C9zzwXOGyvA3ttBv X-Proofpoint-GUID: Q3sLeL6SZmcXJJi6C9zzwXOGyvA3ttBv 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 | 142 +++++++++++++++++++++++++++++-------------------------- mm/vma.h | 16 +++++++ 2 files changed, 91 insertions(+), 67 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index da489063b2de..e1aee43a3dc4 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 */ -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 - error =3D __split_vma(vmi, vma, start, 1); + error =3D __split_vma(vms->vmi, vms->vma, vms->start, 1); if (error) goto start_split_failed; } @@ -796,7 +804,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; @@ -804,22 +812,22 @@ 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) { - error =3D __split_vma(vmi, next, end, 0); + if (next->vm_end > vms->end) { + error =3D __split_vma(vms->vmi, next, vms->end, 0); if (error) goto end_split_failed; } vma_start_write(next); - mas_set(mas_detach, count++); + mas_set(mas_detach, vms->vma_count++); error =3D mas_store_gfp(mas_detach, next, GFP_KERNEL); if (error) goto munmap_gather_failed; =20 vma_mark_detached(next, true); if (next->vm_flags & VM_LOCKED) - *locked_vm +=3D vma_pages(next); + vms->locked_vm +=3D vma_pages(next); =20 - if (unlikely(uf)) { + if (unlikely(vms->uf)) { /* * If userfaultfd_unmap_prep returns an error the vmas * will remain split, but userland will get a @@ -829,16 +837,17 @@ 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. */ - error =3D userfaultfd_unmap_prep(next, start, end, uf); + error =3D userfaultfd_unmap_prep(next, vms->start, + vms->end, vms->uf); =20 if (error) goto userfaultfd_error; } #ifdef CONFIG_DEBUG_VM_MAPLE_TREE - BUG_ON(next->vm_start < start); - BUG_ON(next->vm_start > end); + BUG_ON(next->vm_start < vms->start); + BUG_ON(next->vm_start > vms->end); #endif - } for_each_vma_range(*vmi, next, end); + } for_each_vma_range(*(vms->vmi), next, vms->end); =20 #if defined(CONFIG_DEBUG_VM_MAPLE_TREE) /* Make sure no VMAs are about to be lost. */ @@ -847,27 +856,28 @@ 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 userfaultfd_error: munmap_gather_failed: end_split_failed: +modify_vma_failed: abort_munmap_vmas(mas_detach); start_split_failed: map_count_exceeded: @@ -896,11 +906,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 @@ -909,11 +919,9 @@ int do_vmi_align_munmap(struct vma_iterator *vmi, stru= ct 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 -modify_vma_failed: clear_tree_failed: abort_munmap_vmas(&mas_detach); gather_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 Sun Feb 8 02:21:16 2026 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 53C031D2F54 for ; Thu, 22 Aug 2024 19:27:09 +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=1724354831; cv=fail; b=MEoXy9vsJyNqBVgSRQCVtPZT9qOeoWNRTaXEtXbTGirw4jwYLyEhHooMiYXP4jAHk/ve3AIFNcE296MpoFwllCQJH7FM1osSQjPOGiR1+55Q4TomUHptcF5zvkDG/eqIPn3E+z47jeKMEWDfEw8HHSI57cVqVJm6rMTXS1xw/I4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354831; c=relaxed/simple; bh=WlrZn9Ii73I7x7rQX4poBky1sGBd8aMPpGlmjGb/Sac=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Z7DfGKU4z8DfrL020A3ud6bot89BHLVIbEdhIHZAoHU13BPDYamSEOkNHiKKbZAGRWFvs9xMSQOANCu+xydtS4OmnuTl71YF9lq+wSe/+vpqExuGgzkqEOoCzyRCg67d88V3N/w9HA7ByAsKtoZrdHaI64+MNAZusVfLoDZEK1Y= 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=UyjSsk/4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=K69pW+Tu; 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="UyjSsk/4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="K69pW+Tu" 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 47MIMZnR025771; Thu, 22 Aug 2024 19:26: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=Nm50G8hesDrXLpOFDcpgh9FovxUYHbMgImgPa3a7NFw=; b= UyjSsk/4Vm4KBnSht8mONiqj2lqkFq1xaWYS8zUJ5P9YtW83Sdvyr7H/0pDQGReT UC7G7qLIGRaN66OlG8TeTM977G+EuVPr3xiqLVOEXgHA0GCrUeRuOP/XCZ64zh0K I0AmA4+UL9IRWHbdLwXenW3tuLUs5EFd5Xy9zwNtHAS4ZUkURsOzs0XVHmaO+I1m Pm/pjcDjSVuQNCS2bYtlK+x5bJXQSzawA+9TYyr2rGtrC1/Itr5ReJXJJlvrl3eU COLEh+9L7GVoSphojlwkDX/zxjpKmzhgOMM6ad6gKzZ3hlmihZoWuduiRnpmvf81 inYXqxAGA78J2zhEZxBwTA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m2djxyg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:54 +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 47MJJK8d005374; Thu, 22 Aug 2024 19:26:54 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu08ec-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vQG01Df1ldRuGNyZ1elBjHO4rHyxYP8tfkgmUNFLj+ZAiAX25pNR4mkWmqRNiUfZ7i3EEcfSVjOZucEDPSd0ZaE6+ixcy9eCMHcLKt8JjUeeJ4LsPIhDaN8xuabHr5+vlNgx54cdyhVOo4atf6d30/xLNgLg907A1RpVKQyk6izdUMrAZU3QqZmgdT9cfnd06ZCcnSLQhyaCN7ojMtiJ0Reot/tzVN5XlYXbpb7Gi7dOsq2jH8aSCSEbqbcqK0DuKh3giTZPhYvGzWSpfFT6nf846Kty6WfsIJcREPXS+Q43P81LHuKp1CzvjRmkHdaTz1LSm5tBu5UEGo2eCbM4qA== 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=Nm50G8hesDrXLpOFDcpgh9FovxUYHbMgImgPa3a7NFw=; b=IGBgowwmZP3cwOVsGHIFjSpi2Uf79Yc8n6uRvL2w3rzniNInIquAd5NWK5eroNhX1MT6hNRC4fvmQrE6w/K8FnaL8xPjwXKbivMr8XCOhDN9eAwVTUpA7gmo1haalb42TY57vtc2xCRjn2/Juxke0Ntsp6GSOjVUmE6wGTaPIPBFmQ0i+jT69UUXadxzMh6FFSCEX8JvgYnErz+msT5KGnNzT2RqQimZRgHkZbryz5szdwgLBfwqZMk1fkf5FN138GpOx1jz8Cc4CS54iWwu18/yKTeQZ+n+FcTWf8dG35ueAXirQy788aiNo6mcw8Jev/3uNXkPuF6Zy3UA9lPBXQ== 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=Nm50G8hesDrXLpOFDcpgh9FovxUYHbMgImgPa3a7NFw=; b=K69pW+TuHnznUN3yZKKIJzqpF2BjKZTyzIiEqkKqDhm6uIek/QIdM5+2aNObd5tdfXws21gAn2KxxP8ova5yMS/SmaKEnIguo3WMpaWFbHFTCGVWm6z9xqPedaMI3UPoy1zQyyzCJg9gUe8SObLF2MqybD+MIPCO68RW7ZEchI0= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:21 +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.7897.014; Thu, 22 Aug 2024 19:26:21 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 06/21] mm/vma: Change munmap to use vma_munmap_struct() for accounting and surrounding vmas Date: Thu, 22 Aug 2024 15:25:28 -0400 Message-ID: <20240822192543.3359552-7-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0046.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d3::28) 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_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 780c3f00-8115-4fe9-a8b0-08dcc2e04d61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?FQUYcPTr3YHZlMRzt8rrfylU1s5o0vLUPKx7RzvHSXQ/TBXtM1u8qek6qNqf?= =?us-ascii?Q?UiJGne0RJqrPnOewzSc/eruZ352wXzKwKkqzfGL2sgPtJ2NmOD8srhcAPQeO?= =?us-ascii?Q?o4FKAOkEI/3PGYbbF9RqduIoswSFnxz+CuvCjK/efJvJvAI9LD5dLqR/+qpX?= =?us-ascii?Q?OISNzxvkg5dRkzDKRnJfMQTODJEjMupsJs4+uAQN4oTgp4Olq98XkOzKAq6u?= =?us-ascii?Q?+cp88cuVO8jwC90fH4XORaW33z1YE3Ykl1CP3Yp61NQDOjByS++ya+o8a9h/?= =?us-ascii?Q?AoF/fzvXx9bTrE+di+PPlVdIrunbwr3NgcLJMZQi0c8387rTfug9pN/6u+bJ?= =?us-ascii?Q?GmXSHzRynaj7e8SWZBmrxC3HpV7Tr+JE0zZuSi60y8wduqzouSMcbvkCaVKx?= =?us-ascii?Q?qOLLXt8dacWQuKOtEzFRt4GSNN9y6MpPFSIMIMtuDOs2cp94MFSMMvXwCwVW?= =?us-ascii?Q?eJaQXbwsX9pgsKKoiDOpzhLr7Z6bPpt8JFfYddGkTxohV1M80MoN7vtdE3EJ?= =?us-ascii?Q?xdEO7GbRTFc9qJFYMcTyvT/G3vXO9okjJrAqK+c7tzirdqKWi386R7mrQDKK?= =?us-ascii?Q?rWqVL7ny9moLKMr9UAGG5/YOlSbEim6ajOdxkFiEtuFdSc2jdAUYTXcZW7G2?= =?us-ascii?Q?0HYfuiiqJ7tMrWBkZnfLxYDZzHXvyFPCAN48ApEg8NGNescdw0PAJL+zXDDO?= =?us-ascii?Q?gB+c6zrKG+VBwOQCAR4HRZKTMm3GkkWKbyq/PUcL5GHW8pyFt60cVNWJuQuV?= =?us-ascii?Q?QJt/exmQ5+XYNwmUub4ADMzUci9n7D+Dgu3do+kKlaPZ+viJQf0mFo2ZOGJL?= =?us-ascii?Q?gBefKTCWlV7NRnyMH2qZf1eWtytJfWuyEaf3ReMDTys2qkAaBP7yOOPWI89a?= =?us-ascii?Q?kn4xiOC3P33B7xDfgmVt+kgmlD0GarAYX0WCEM3TLuelvi/v0sO2b0/QQ1z7?= =?us-ascii?Q?sXrAy+Mzi7jS3Kg2Lv39SBTLV/K/rNVwYn0T4MYtSJDJR5/KzA34y1KH/06M?= =?us-ascii?Q?L6HYUtE0IqKajuvbeJVwa6Wrj/+2lt8b1zy/uvgr4TAID1GKkKK1TBzirJUT?= =?us-ascii?Q?LTLFKJ6AllSn7ioLS2BH2nyxk0+PsWU0D59iMpX+Nux29aJ9zRRThF9BvoIB?= =?us-ascii?Q?qaU54C/m9KSrJ5GPnW9cgakHocNJgSNFaOuB4mUhbVWy7+SEDrvMlCxxRjo9?= =?us-ascii?Q?RwcOnSj4GjHmPuEwEmFMviBQmDoKzUUhw+jPt2Dv0U0NLYVXas17BQeuaF+K?= =?us-ascii?Q?c4cSx5tOcch8JWEq2NlbICTaTqQ3Jg3CmqKsSVT2qLfnt4jsB24T5gPPU1ZG?= =?us-ascii?Q?/w0VM+z4jTaLvtp6+Ld1icUWC/dGwiT6yDReEVA8sxfaow=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OCmKzSWvX7hzlWZn6tNCEgTXIbqzdGtaOwK6u1dpBHoLKlR7VEDubfyYxniU?= =?us-ascii?Q?EsKEWfnosiOuKga2T+HzM7gnh0+mCRgNQVUwQxWSru1N4pfjMDC4B1yPx01j?= =?us-ascii?Q?+0L91CI2vgiGB1ffP9GY4ytbQFu6p/RiX0zkSjtCkqFDnc2VQeZRXY6zGSdJ?= =?us-ascii?Q?H3vJ9gIt1ZijXoAi/LObfRpVslDFQgYoGQYCJ4rxCKVLAzXQY7sGgJVWkeVA?= =?us-ascii?Q?g6TD61IkeWjGMRAbjW6lqfHVkMd4zhP4hiUz0ig6htcKROksRDl4P7XB33of?= =?us-ascii?Q?chXXm3fs/FMRxHbxiL+Vhv4prL0zCBC5oZLS3Vc35XT1Rn8Veef8Lt75LBNb?= =?us-ascii?Q?ZvTgh7qiAXmMpk731VO9O3FQL979g4S12JWksW0apCo/zN5qO/vhfmHMV/LB?= =?us-ascii?Q?jCHL7R2lnPyIL26h/UNuk0gERl8ubbevtzDEP13zdrz6qbIZ+nsvHvU76CGJ?= =?us-ascii?Q?VXyQcvpEHYpQbQPflcmREHtNu6Y0GsBw+hxaU2TS7sA9dlh/ah1HKXwB5Pib?= =?us-ascii?Q?7GBAVg7sB66lr6CvfLmS8xdAKwzMHQyfpQWIoEn4kbHL66Wf7J650L26Rd5+?= =?us-ascii?Q?w8gS5nJgXOOtabPZ3ygt1VYrVwuBEBxi5QAnmBB/S3nb8narghZJbaUdYT+F?= =?us-ascii?Q?bJCsckAstdBFKi65N3YZhYFEI9IFa6N93qNGAdQAw1lGkcAVq+KM2zaJXKEl?= =?us-ascii?Q?/px+vFv6PbOzrPkKkOsz5nS+eXAfu4Z/ZjZHuVSNKFpadJ9w8eQr1ZRmGC+L?= =?us-ascii?Q?QjkBjMibGtKcHcMCmszL+eEpdrLOAS77yJCxha3hIbaHC6JkjUThk/D17ahj?= =?us-ascii?Q?Rm40VFL5m8mbnW4yRei0h+oOdyBu8vvbHqaRVox755cMidZMTceuAj5042E2?= =?us-ascii?Q?tGaWTWCCqbta2XmnyhPGRzVR77xQ9zkERT5wvmJ18GP8kL6upJTWZtyIB+TP?= =?us-ascii?Q?GAxmXqBVZEikZkXZ6KnQoD8Q7Qnh30YRHPKpZj5lF+xK44SgyfyegvGorOxh?= =?us-ascii?Q?IJ59ZtteIlNpdQTpytb2vR7KYYtqok2xVcj0REA9Mgx2xjX45czKG3nhjdBQ?= =?us-ascii?Q?ZsaaxCMZumA9Dqb7pFoxlk8fmnSbVqj9OSPBHCnmxnjY99JmP9L/9Tth7Ip4?= =?us-ascii?Q?aTEmzlHXljx+XhKfCS9WjeJWgAOBbPTgt4b0ErAcMeoRxLFFGn0iTi2LITK5?= =?us-ascii?Q?D/sS6UwVImpFV5ytPI8MJPkEKFmCsCom89blMAhIMJ83ByO+8ck3S7OWljL6?= =?us-ascii?Q?Gvux2iNFJHRPBaWfgxs57Y1ZHw6iPPI7p/Zqla1FId1ahGvEIW9j5zsHmptI?= =?us-ascii?Q?uG7fbNcgKjD5lpQTyCeGcnC484j9tS4LS2hMU8SUmABoeWX8y36M4RZOGzba?= =?us-ascii?Q?KRETDvZeaQWdh2/LwuK2sVvm7mI6vYS9Z8DAHE1nnQcXE8M4f+1AwdWbewUy?= =?us-ascii?Q?UkgzmtsroslngGw4Mbe/NJgbT7jZuZl7qXmate1DEahSq7N5wKdrYYRHeIFD?= =?us-ascii?Q?UwZC2BlM2RZhR9TRT0Y34pY+pSwJn9uaLlNbZ+3gbVY88neh7xCuV8qV3HoE?= =?us-ascii?Q?PWBL0b3fLDinlHCQYPg/xMVbx4rSWxEIuqRCpNP9?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: F8V+pcFNYGanK0xIhNdGUrG3FvRFqkBfmG6poy3261+EpQqWLK8GYcX7TQWXhP9PyJYethR6FKsr5a7WIvC88Off+OyvpiahjSk0aPStba5j+cExaYbv217H2TgovIMKB78h/4gKuE4olRuQKD+iBWbausnAf14rAMBUjgcAxaJIZEJJ+CvmqeiHTZYeNRtqyKE36cfenoKBOZyBmQIvp/WmlefVUcLo3KZBQnJFfh0c6OM5vnxuueSOmt+5hHXl/vojGDSratczH1AN3YoNoe/OGfGw/T8+ILjVzm7E/i5839ub0ltI4DiCgAtstQNgKgbC+XSpwZIErej7kt92wd5hV67ckOWjzhAqoKR3f+DgJzVw+mOzVdXK7SyaAZJ/KOVOuM/Ym6OcKE1UB2UycS3ylgpFFHwW1E4GBK/Jj0E39I8gOecoSYBiZrNLRCVUPHC+aym6/RMN20mM010UqoOPw8KZnjovHwsFpL+WO9E/Lmyod4yBevNoY2ANel7LKKCpEipk0IFtvbJPIV7t4xJ+qqiXFs5Ul/Q0QCmcULwdwVK8xt6cng4an1avtvcUYLytZZU4BFCFEU8qpI7BYxITz8Vaiobe5qtdvb46raw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 780c3f00-8115-4fe9-a8b0-08dcc2e04d61 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:20.8584 (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: WvIQwv7ZqU2bMmO/vCef/lDNz36hDfwRvGa2vi4bAIIZ8x6ue8wYekpAYqPJpMH9OYNjukoLBuSfsJOIz1JyBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-GUID: q_GWAb19fzAGBZlH96lLEyPpnhj6Bq_4 X-Proofpoint-ORIG-GUID: q_GWAb19fzAGBZlH96lLEyPpnhj6Bq_4 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 e1aee43a3dc4..58604fe3bd03 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); + mm->exec_vm -=3D vms->exec_vm; + mm->stack_vm -=3D vms->stack_vm; + mm->data_vm -=3D vms->data_vm; + /* 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); + + /* 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); @@ -799,18 +786,19 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, if (error) goto start_split_failed; } + vms->prev =3D vma_prev(vms->vmi); =20 /* * Detach a range of VMAs from the mm. Using next as a temp variable as * it is always overwritten. */ - next =3D vms->vma; - do { + for_each_vma_range(*(vms->vmi), next, vms->end) { + long nrpages; + if (!can_modify_vma(next)) { error =3D -EPERM; goto modify_vma_failed; } - /* Does it split the end? */ if (next->vm_end > vms->end) { error =3D __split_vma(vms->vmi, next, vms->end, 0); @@ -824,8 +812,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)) { /* @@ -847,7 +848,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 Sun Feb 8 02:21:16 2026 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 27E7D1D0DC0 for ; Thu, 22 Aug 2024 19:27:08 +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=1724354829; cv=fail; b=kkjsV+dqdZeFrPYRC7NIUrOMjMiERuORqIQBoiUVXYyiu9dfIDWhMbLlgb8TAmampql8WDGE6Xcb75NW+LyGHK4f+4EFypR/wn+J6WpltPGX7UgFPYyt/Sv70Z/OVss8a0OVlRmc1lr/YM8T0sDThqNMaDtYNQUS8VdLYHTzvhc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354829; c=relaxed/simple; bh=wu6YGWxDjZyl98ILSVqqCgq/3uNZoMpiULCziU1+zJY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=ozfQLokMOOTvrOyaJXzdF132ytpF/P4XlXlBu9xzKiJTp6pf6HzOz5gpKgE/hyc4G3UApNAgCCieKy920UqPAMrC/CJW6EBIyxfEJoGrOTDemOjFh96hndw1gV+wIRRZ/6/dOGCcwv12+4VedN+LbQ4B1h63RGyn/m5dkhBwoOE= 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=O/WJMKxC; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=mU+QhrPz; 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="O/WJMKxC"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="mU+QhrPz" 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 47MIMXrf026383; Thu, 22 Aug 2024 19:26: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=6vYH9SFXEQO5KOTSg7PMHGnjsSkAedVllgsa8y7P8Xs=; b= O/WJMKxCYiPs2dSBesNSprA/RP1Vn7sxD1jGn0lWUakHVcfmMf7ywoaeGJ2hkpjg pFCb0RmNRHqNlYuBHSMOs7ipVVbaFS2ToahzBrXgWc+oM715eC79TGTTdefsvwHK LUbZjJoQidDC38kfM8h7OQs8k10pTyL+VzrayyzbAXu+OHseTJgb1ahzKFiF0TPw cSvyVMjc8iEJP1V8UTx0SjanB8wXTzBukswsThPu197zcPCbo/KzbF+YpzTMe9OA zOZUIcyWhdPJHEgX7OD89IhQ3y5yrSMYy25mdNI5pp8WWF7GhDJa0O6Wcaij4p9f Tn94wqLBsnz5BNmF6UhPZg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2wag-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:55 +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 47MJJK8e005374; Thu, 22 Aug 2024 19:26:54 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu08ec-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dFkWXXG3Tuq9pJBq0+bchU6T4CRvXCND+kIfRQarUrfpUDfEGBCuz4E/ky9/nUxcg/wid2duPpAp57Zkl66Ncqc6E9w/Ydq2tZwXnDERv+JMhBi6Si+cTJlKWr+yXQDkBAR9WKNYAjPicLwt6caGznu9GAYjaandug37x4m7zbsw6jnTSyrR+LLQRpNud8922dKzIY/Or+BL0e33/HF4VBHouA7RqcO/q4GW1fTfq6S6iIPvLZQxspiBjP9nqi/qMb8jK6nts6Bl71JawBfMRRPDGvRSG8+qxGmD3ZF0hp7nKXYACyY/rQ/YPKt4734YNwAV1JV8YMq7/95dN6G9CA== 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=6vYH9SFXEQO5KOTSg7PMHGnjsSkAedVllgsa8y7P8Xs=; b=uPLmAu74y4aBVCBdLwm1DlS9jL/CTXRU1iHABB7sTmRyykynzyC+kujWQnOK1StRI6LA79U8i2gmCjXQHg0PmsA/3CuX/NdgB2ZaYnKVVexzv/ux8BxUH3jxsymbE/HgKQwTidPSzzWptD7pCUtrAVU+FuiOkVlKjQZYhFa888IM5Ba5u4erV9FXf3rzEeXm7QsP/yzQs8osEAEp47tleN3LeqPi2wvOqxKoJ4/v6QAJRYglSRx1GhUZXuoDiTJ6zhSijG5jOnbmyOElqJ9OXuUJMAt+2JJ7qA584eURGkIRWSs6AIBxeQepx/xkxHTBfdCo2w0BrC6CgYgNmUkOmQ== 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=6vYH9SFXEQO5KOTSg7PMHGnjsSkAedVllgsa8y7P8Xs=; b=mU+QhrPzpavotwIjunPeb0u5H0Vsgt9Dv/D3NaVHeyuJuFQNyamzZqxWKmKSebGJ0wV3eyL4q9HcWxPpr6LvPS43seDYE0cNU8+V0Qf0+d4AAjObwVKUIjG/ExRF5LLLckzhbzmPONWPBd8m9OT8CZ0XD8zbNw5hTjWH9cCGgvI= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:23 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 19:26:23 +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" , "Liam R. Howlett" , "Liam R . Howlett" Subject: [PATCH v7 07/21] mm/vma: Extract validate_mm() from vma_complete() Date: Thu, 22 Aug 2024 15:25:29 -0400 Message-ID: <20240822192543.3359552-8-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0269.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:109::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_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 3aa4f20a-36dc-485d-4253-08dcc2e04ec0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gTYL3NMMSVB1Yq5Xa6NgeWT6QNWosn81z6Y+59RlL1omlI39VF6nfRDeO/5c?= =?us-ascii?Q?WPj1XvOyNrya7sGOwbtmmzddXcumoOIwCXpDhA3y+9eDlNicxXn475rs4w44?= =?us-ascii?Q?eHY1jfttQh6REX8T6RX2vLwBdbYG/6x3Q5352GYnnL6nKSRwmFPxllnTO19F?= =?us-ascii?Q?eWAXZICn/HfoO7cR/sQl0EyNfppAm9FJoZIXJ3DSOJb98a/mTum48TB+1Jwf?= =?us-ascii?Q?EB6CuLa5WgQDND7dQfNEW8EB0Y+AaOfGMssz+M4XvOmfZZI3R79dx6L89Aiy?= =?us-ascii?Q?EBVOnED/nv1J51bx2nmeMaECgKMe3aAiGUSSoZ64LmE6n0DutKg2ejjYjjJB?= =?us-ascii?Q?sQ+A6NtAZH+iorsRlRfF0cu7aLuTQ/DOo1oJGSVXdD8HD/puWpDA4Wu97kL6?= =?us-ascii?Q?hd6wTRgc1xoav4NX8TVPmCF9UMY/B1fuZPpXOYqTOfK1tRfYpdFN2uB+ZFLv?= =?us-ascii?Q?j7rZovubyA9FEjOuT2yDAQl5uvlDxl/UyB6fCUBpKR7tgneTILN37n+O3So/?= =?us-ascii?Q?mKJUi4omLI179lDccIuuzDiyj4L1mtwL/9rVIFxrzYN6YPT71r3pLaUHnn6x?= =?us-ascii?Q?4IipYbgwK1fmLhHY5IYCz27W420Tl0jPlB7PVWqHLQ3F0euoFuOsztWqelfM?= =?us-ascii?Q?Tl652Pe1J3JXp9QNqrIPD3tbgMZ7Z5JQPcAx6XaVK6WTKq5vhy1YvtW4D2BB?= =?us-ascii?Q?ggKatHt6SLXOKVym5EvPxUwo1N0ZXf+SqUw2ixOopjYJMmZUhTkjvB6fBEjt?= =?us-ascii?Q?62Bs8CnaChc9u7xtctF8oboZ6lN1Hohr7aXKhtNSu9H4SQd5VWSG8V/iDopK?= =?us-ascii?Q?QAfnlQoIZqjGyUsFdP2cY1nrIwZejEVqoqrQ+UJ4mBpl18kQhvB2VDI3hB28?= =?us-ascii?Q?PdKAoqCtTnu9rGZnQAd31/44xlEj2e2mOL8bbW/Xjq9qR5783vnzaivTuRJZ?= =?us-ascii?Q?ogK9wdatRbqIQxz/ScLNMlSuUP2EJmjRaG+r0JSLgiXpIYdpOBrQ0ch6IbGR?= =?us-ascii?Q?zFDceTfY5FeH+LlqkLmdjB0wc8Li7VrVcOoFwulWZdDfiwhV8hwaV9nOmv2F?= =?us-ascii?Q?1qjAuuivwONiCUdcAHc2w+dLr4CsbIbxj2gCRxYX2y+A+vscxDqh8ftZCSSF?= =?us-ascii?Q?+Fdv7msR3uRbo0YphQiyc4+JjBqLc94xqWDPLnUU8iX2ve6JpLGmXTvrTG2E?= =?us-ascii?Q?QMNJhJ+puDtZZ8GVqOSw+CpJ9EmoCwbL1mIXfmXeR8YZvAFKZB1CTb7KQ5KM?= =?us-ascii?Q?rf/HoourZopeZsqh1WniGovujwi2yyk1uhgXppGBmdEfo03n4Z13kCS8eJya?= =?us-ascii?Q?7a5GEwacoUQqoGNda0vR028Gf/nrJeNjMx0oi4OtMWMcoA=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?L1Smw93KYn4B/eVzUV2vwz/CdmSYYYTQNcV2HTyrq2Nb2oft96tKdbOUTid1?= =?us-ascii?Q?uZWZHGdlkR+75+SbTNxaG9nMJIvLz3VgPZs0nyUlfGQHTHKwUcCFgvYb/jMk?= =?us-ascii?Q?gJLr55YmXTo1rz/zByuhrz1mQsR4yVoQQiUJyhkz1SOhf1+iNxV4Krkr64k8?= =?us-ascii?Q?dCVYSnEqxm4Y/glWcJWtNniwYyk6581JV+6mdqLTLPQBbWuT8AWuv0f4HdNC?= =?us-ascii?Q?XKRq6Nubu8Rtl4ROCzr/25Wt3N9VZ5Bs5LQq0v7t/KZjY/f4FtmGzk4SZjvw?= =?us-ascii?Q?O2b50cHppNxoVxIYQHbpl+wzfRN0lRUZOKyzmV9sN8zvd00gkU18RYzriYlc?= =?us-ascii?Q?dxxUTifFuUgMeJoVp9SrV3DXi2Yqq9mXRv2JWe8pCx2rlqfB1osgrtD49S14?= =?us-ascii?Q?gu8/7EzOy7zuToYStTw70U18iHm6NwNiHgkFBlff8nFRJLAkZTZY6zxtN4yq?= =?us-ascii?Q?zGTzR+4CZenRRxiaw0D93hBkuAOOuHXbzYlOXbZAU3tC+ll1QQVNPO8Mzay7?= =?us-ascii?Q?LExNSUsn9BGojssS4YCY+clrBnIl51rEQ1x/Zf7MJ0CLUAw7KsADhoKo8PWC?= =?us-ascii?Q?hOYSyotsTUdCkONj+fbWMP5GTKaVGlEiuStatVaBVOfYGtVMjBOY6n8VCU8+?= =?us-ascii?Q?HN/t1pN+leL0v8PKEF3G480nPZvV+rdg6zt7x/ssC+Ww5qANoqTyLzwF492V?= =?us-ascii?Q?om4oELTsfe4n32MJU6nzrHOePT72acp3n/i5sG0HX3ubHZnetTOf8Po85I9q?= =?us-ascii?Q?mR84+FsBQXFkNfB4SvQcDH9JlcbU4LND/lnp0pLrmhCjJxvSx/asCrhrKeOA?= =?us-ascii?Q?xkDDUP6DbpfJyjOMEBd8egeOD+uMk5jqYoh/guVeRxB/PdBiq3NDU6uE4uQH?= =?us-ascii?Q?RRIc7Ayj7Hze8uhdUtcdQzxCXZWcFQCsGTVNXJiK/MFq+HtW17SXFLOKmLtO?= =?us-ascii?Q?OzKJQyWxfJhn7Fr7F1oeiWJBnUnq0tozW54bs06dwW0ttLsZBbn2t1zNlMj8?= =?us-ascii?Q?VWljqudxTdvbSPTM/m0aXhHc8UjrrMUmKwNJw6mn5TzB88dmlWo7l59NRWLf?= =?us-ascii?Q?RqXyfDPL33xBltto6oNM10HA1fmc0y4VB5x2B5Ckx7/t1fa7okzPq4BZOir1?= =?us-ascii?Q?JPlIxVuXsF+RB9ihesYDOyTE8uHG/hNJJDt6MK2Yljnd4itLa0B01oemH30E?= =?us-ascii?Q?mpsp4Hvjtvnup9Yxfce2MAQQMbss9e4pcqf3b8Babe3qpLL2edV8zC+AuJIi?= =?us-ascii?Q?BgDDo1yywhd4b0GyLIbdvpAvPg394eG8R6bL8B6Cr6Obju7iiOUmSsPB/5EN?= =?us-ascii?Q?LfPesbR6xUgEHSd54y9GidB7GaNwI9AcCuAarFajLQhX9KcfuPUMJr8zazNz?= =?us-ascii?Q?3IjKSLdwDsFfqAZPdjvwyMzmXvLvrR6FpIjvH+GfK/uDlf22G1Goy0ppd/pj?= =?us-ascii?Q?f2BhuCqnU5ZSyro2nBVPjbm7pjNSUJJ91/UTuYmaX5M1M9Qk3hMqGRcYjoLT?= =?us-ascii?Q?xt8v48Vher6SyI685J84HsVQKf9g72qCW0r/OAYCItrYrnzjOrVROxOzhJ1m?= =?us-ascii?Q?vjnnWWxF3bzGnBGUhf4Ulbr69s2VWCr53/p2o0lvrNBz9mpqOtlmqikcoEEn?= =?us-ascii?Q?mQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NuKRFDgr/whdDhR38O/J7UktZPXOwdA+kvf5kFNtFjeFKybbCtlpfy9bG9GTvDueKLVrcezH/H9MvyHL5MSnRr20qtmjylYxLrUhAdpH57HRtVTcQF19bsBTLzBjhy25vMGX9Rz1cgqXe5sKzhUhS0DxHjVA09z3731NIzCL1kTO2vr3WA5+386azBKMoUPJdJbsG9sjk4ZpJguXabUOY56fPSLiFLQHDI+VcjgtEBH2HmrzmZmmn/rMS1xWj6tjo7sNFPqoLnwFnLfF1m1Sz4CC0lzmnv0krhQZE0TpLfByNrpLBn9WDz4GtN+sK+relfbJk9YFAtcRTj5xWt3bq4uaUNj/pB8jlqKGdgoA7LpmzkSGS1k4W5W+u8gjFMVJVHfmSxXmKVCycZ3A4j9/8meGRNwIYqxZsHfkKqKRUU2W1UAQIxmpXck5NEVDD6hnL11s8CgaMiThppYoaRl/mIf/tllVSrE6dW3CVfoEKaF/XlFdjBt9TDwREQ03km/5Fvq99J7745np37Gq4wq5Z+VwZNhBfLM881A7/zX4C6Zzd4IdrSHthEzbvSeSY0JS3xNUreZN94Q+mWaMxiY77SIL69seqM09T0TyyQwLDLM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3aa4f20a-36dc-485d-4253-08dcc2e04ec0 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:23.1717 (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: eoOikg5A0OFVYYLBeqPZxJDFz6iGgwmrnG/VUIpDfv13j52WkpqQ0LczBL2maTBcZRnHwH2eEPtJnHaXzpTVPw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: oni2CGUnKqc-DXUWQ8lgtjynDhRirt2l X-Proofpoint-GUID: oni2CGUnKqc-DXUWQ8lgtjynDhRirt2l 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 30ae4cb5cec9..112f2111c457 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 58604fe3bd03..f061aa402f92 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 /* @@ -1202,6 +1204,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 Sun Feb 8 02:21:16 2026 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 99B741D365D for ; Thu, 22 Aug 2024 19:27:15 +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=1724354837; cv=fail; b=JB9/aUsnKqwjRqTqo5pknl4cV3Fd3/S8Lh0c5D/x46yxep95VanyHpmLjSJcEEmV/qvFAzMZ/s7InlcthSy/xF0/q12ZSIw3R76hfyI59xRGXNf9R7JvHuydE58IgBQEobLX/uKIlO1eE8Yiz8OBHv3OFBySBOsfU830qoug4XI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354837; c=relaxed/simple; bh=wCJ8vpY4Ox3YnJrb7FttPRx5X3KT3nCRfov9u8QYjwc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=eqkiSdzsptAa43FZN991SOrun3kQB4aHjLA+wauPwJ0tXpsBM9gjmMEI2Gmm838OlFi3tLgrLKDMmZH/N5qvfE8dMW7uJ7ot26OdqmuiAwNRKfv25bHRdr8pGPPdCLT8hE3V8xs9h2vg7/jsvJfk4yTng14k5g55C2oTZx+ERJs= 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=Ij/wZyPv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=sMIiuek7; 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="Ij/wZyPv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="sMIiuek7" 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 47MIMijE016087; Thu, 22 Aug 2024 19:26:56 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=MpWIi7cMQmivMHPf3/Pmr7r1vB9/WxBvplax7ihq6P8=; b= Ij/wZyPvePB65w1aeiQDxkwS0v6kk60cTbqXjYGw6zz6xE4zmOZCeRY/lxwcXKmw 9GitBAFTZLDi9wIAIRbTJky+Huw1gMO+6tl8ui6/E+rYITOdMFcFLfyj6VxAAyoW IKd3vEhxzDyLmcG19XaTBKMjxo2j+K91qnXjueQLj7AtwGM8s+b0ZvxsC1r6ppiW 0E3qUVqZDuaaN38QMisflmDnmtZv83qWxipiDU77T8uZgG2KT6J4laLISdHLFu0U sH5Ar1O0s9Ca/PTi6Wa1RBDPbKMucgXDEW+s9llsYOIQcY8veao2I7D0/41nCuRx FINV0gwsvX3Hm59RQCmqoA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m3du5kj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:55 +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 47MJJK8f005374; Thu, 22 Aug 2024 19:26:55 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu08ec-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ho7qtT1nbx7Ahu5PZjjjZs5eTZekmcwM6tJuUkaciGxlLtES6mfZhLkzwWtfjQT2CgkbZHn7ySzWTaW/T8XXq21hMadMWFvMabj0TAbvVbnFzly4xuwOUclFCtopfinV0UmwAwxDmSmDjvTJ7XgRCNdR0qrnhf+lDBmRseLKH7/xmtSGzu7KEacFZe6gDVPHD17fWsZXhNJGbmWv7l+WbajmxmSZmSgm1rNRxIfToxld8TmLTCFIGvRp7tVDXHt8bKgIWX3taR9lVgHTsq5XkuwuDNFlfa7xVsToo/AMo+k3zsUk9l1OcXDWRt3MqUgssC6XWUhI0QirlDC0uIL67g== 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=MpWIi7cMQmivMHPf3/Pmr7r1vB9/WxBvplax7ihq6P8=; b=g+Afx9R74JCqqQO2zw/yjdS9nf4qjBWBzCdOo35F0HrS1sLJYIFjBe+7/uPIcYWv4bThD3emsysQGXzTGp85v8e9B5FmdeVfbrI+d2N2IEfPB6T5S0/uPz3wrxaQcW9SctqhiZTm+BKwnqbY/7N7bMg5dKGiwVQaRJSZwKWbKiwU8BrPMDCqjgWOCGR26q3c2lsB+NinHUhcIk8rX3EGr+ngcfX07pOvo6FdOp0Nx2h55jDc8K6QbGPBeE4I8Zo+2Q1ExJLqK0DoOPXaYdIZ1V4o5JpyD3T8mPflbQ3RtwSsaDMZ5TkPICxapC301dgy6qeZCmzKQDhVvsPyerT+UQ== 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=MpWIi7cMQmivMHPf3/Pmr7r1vB9/WxBvplax7ihq6P8=; b=sMIiuek7GWajIofwmqdYeqvyVsjyaCzH9XormY0+i6HXg8H3RlfrKKcMMce4SUjRVfIt363I5KjnFUm3G1jZ9S9Si+viWE7I7kqVlGljcHu6lQKcTXOtxnmarooTHmzDWr+ikTPFaEGXeBd77ilmkND6YWyc4UAFsLiTVSydoDc= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by PH0PR10MB5729.namprd10.prod.outlook.com (2603:10b6:510:146::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13; Thu, 22 Aug 2024 19:26:25 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 19:26:25 +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" , "Liam R. Howlett" Subject: [PATCH v7 08/21] mm/vma: Inline munmap operation in mmap_region() Date: Thu, 22 Aug 2024 15:25:30 -0400 Message-ID: <20240822192543.3359552-9-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0199.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ad::23) 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_|PH0PR10MB5729:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a8f1d07-62cd-4fee-253c-08dcc2e0501d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mouoI6yc4hFWSx5nVhptBO2SlM01D7zirctezm0WCGd9y7j+BvMT2n1gIXnu?= =?us-ascii?Q?pqV4IVk6ouulEgNrqNf0QrK6FYzdXEGE8pxF3cK/vVRbi67nK03/R75XsXoJ?= =?us-ascii?Q?PwqkdCQ6e/kxhhsSrk5EzZJdDZPaVsVXtciY/oF4indyRp4En8EfEgutcuNj?= =?us-ascii?Q?QwZ38NqH5EhEi4ucz8YJCvSGGj/ANUhaJR4ymSiYcJZZSEOXKVfkMvKa1On3?= =?us-ascii?Q?XEU7p/AG0yWkZEOPj6WGyNpE9BVtuezByPtUkqQyAi+t8HlIorFR3TwojI+k?= =?us-ascii?Q?tu40ejkHafAXvgeXls4s1c/AhNvz/0m5kzS2P9+2b23rWk1yWRCoC5cW0roq?= =?us-ascii?Q?hZQOf9Gsa0sOhwa9wYL4Z2tfwmNCsypBiieonN8WsbtaLbJSsS5stJY9fzNe?= =?us-ascii?Q?0tGDY8BY30rIMhUWYt4eemGMVmH9BRFultMtPpGWj2T0e20LSPFECzw0bikp?= =?us-ascii?Q?TkuoqQDSU5UGschugR/EN+ji9OcP9IZYT4fvVIaMfXBnXa7u4VnOSKey388L?= =?us-ascii?Q?A6CztFSbrzMJdTUSXaB/YZW/Ai2hN3QX0afZopFja+bPdkTmsmZXe3X1Yr+M?= =?us-ascii?Q?vhAPbbBzgCHrcCByaTePX3/pHuFOkaOLL9pd4KzE0OggSLLbPIR2kKYDwlg5?= =?us-ascii?Q?uPK/FNd/zAGVFTJ91sP26Qw3bj6WJt+OINZMCOzAaZssO3Gu4wH1L9937als?= =?us-ascii?Q?IqZF+zHpa1lo1Ew/DuIAGB9y6GzV+EC40Rdvyn1Zpfl9tgJSZhTPSgwAiCox?= =?us-ascii?Q?0742DJfKC1Z2zN1jkbEPI/7TSH/VyJiMloxr1D54bWeizSxZWZQ2oJaFVpN+?= =?us-ascii?Q?otKHmFhf0FNK+66kOnKsnh+ZVtm6q4/AJ/a/I+ZYNW1Dg1aDkTm+Ckp8w7Yx?= =?us-ascii?Q?pESqkc5DipoBduJibnEEJtiEcScFRFDQIQFTf1U2R21jX2TF167W2J4Kahmc?= =?us-ascii?Q?P/u5RJzqMPN8/qvDXoAdbj4ZU+347GDjOTIspqH/i3j4KQTUzOXq6G17H9Zb?= =?us-ascii?Q?oAeBoOcjZ9L+nbh5FkvbM9mdgbKKFLNRukqrwSorhUsUfv1BJ/wQIucydhaA?= =?us-ascii?Q?TClg/nVTye/5EDU6XsvkVs4w1YtYfTDUW/s3sjpi5xRRaES5uVo2Jm3GSNch?= =?us-ascii?Q?LapNOoaMWzMkdXyRlJmhUab0Gsxy70lkoCosrESJ/aQiRKrprbXHe562kEpS?= =?us-ascii?Q?8OTdGGW9qiFbPXZp1k+dyv7SdYpbYphfwpZlTuzC+5U3KeifWzPeiEZLZ9nc?= =?us-ascii?Q?+tKNzoPHUWHYS/y+H0VrCrQ3bI8vjig2yiK8Jhbg97d/xb3D9XFBg9oRB0wy?= =?us-ascii?Q?+To4UKmgodiFAOAoYqIfvfQlqaPNw0j8l1Ugu+ixrRtxRw=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)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wl6XKmCWNjH5GZMbhNrQkrJ/ty0JFNDoYw95DeXOx8MvpfbsGmg31EriMQuG?= =?us-ascii?Q?YZU1lWVINT83oBhVk1vN+lcUg8gny8/BEv4hfHBMe29JuU34SVQz3vO1Sk8W?= =?us-ascii?Q?EBlUpasi8QRZ00ZmX3gs/hEfSMGsKgqGqAP9p77YRkCT+U3/OhBCTjTD1L8X?= =?us-ascii?Q?svzyPwgE2jdtRLEHMvEze+lgwyFAt4s3AYznlDNmVTc0bOpN6u0NzJKkPUns?= =?us-ascii?Q?FjYpCqzq5dOMlVvPLlNSS6sSbMbKjkNo250wF5OUzMJLIi53IOrr8IjwfU72?= =?us-ascii?Q?t238OrziC4Y+/RpiiPhhwjwEea5n9/AkH5nIaxKyFCC79ykJgGaE5jotF+rL?= =?us-ascii?Q?W0BpgQHYc4j6WZbab1U2QnB5oPm7G2Wg1KRsdic9sJG0R3cruKBfchcdyvLh?= =?us-ascii?Q?oq8j7V278bm59dC2JW2yDOeX/afuJPSY83tIS7Ds6R6j7wTvHXd/11gLVRXg?= =?us-ascii?Q?CRTwPdD4+Ov1zx9LBT9SrDJAcT40y3khbwT6WyWqr2CA1GBooibTdxFka9O7?= =?us-ascii?Q?GVNDaeGboVsLqLOr+b4J5M/laHx3ihN+xK1nX8gYE+N3o+W0aQWC8NIMuDeL?= =?us-ascii?Q?rMRIiKBqjUY5kkPpoyOv83dv52BTwIzjY1P8HzVG5wTAU5CrMekWOgUvcrfv?= =?us-ascii?Q?sn6yaGoicZ6mBquXpSvN0KXuGpCqOMc7Nu6DRAoPUSXT58hozTqMwSkLWwBG?= =?us-ascii?Q?j9ss5HTmYKEumLk6ltByu2eRCsaEg1vSq7lqbuMsNIHP+UqGlwGdh2qRIoc1?= =?us-ascii?Q?0SmrdM/SSzdQ1uSLVvtGlYjs0FRmywxxeBWXZE2Xj4NPJpn1fvZSf6e9cslB?= =?us-ascii?Q?ZQR5iZueO9mGdXuJmxNh1ryiNELf0vHK7btLlZ4LQ62HYcrB3CvWojaJ5lNX?= =?us-ascii?Q?RnJbL1zWJZmPrcpoDETCXi4avFwMoguJEkeiE37u8fuLJlT8kOc6N0p3XFGp?= =?us-ascii?Q?1dWcrpNEvSz9FBhQDiGD21Oi6zB9YTvz8unNUpaEug6Z0AIIpAMUGUywUikP?= =?us-ascii?Q?CXQkonfrJ/TyN+kXaPRf/1sDIDcK+YmyPRfbIVDD48/fi5bRcQN4HJQAo6Wv?= =?us-ascii?Q?5/QHdI7Kxu9DxzTuZBHZWgigw6O/hvEJETkDKRnthehlwEq5s/tkOKBKt41X?= =?us-ascii?Q?Son8iI9gxjp2QHgqcEHlSP0iZigPqYPS1kIuiiI/2wq4TzBU+/PwfB2OBexT?= =?us-ascii?Q?0hmQizYO12I7yrFh6YXfvlWTlGRwth/GBPGxvAnD8zi/hq58nv7jUPU/uhi6?= =?us-ascii?Q?6KinCbcXiQ2hR7bipeW13uKlvgFIh+OuS/7OZiUYRnLJ+cHKp0xIJFy5G+Nq?= =?us-ascii?Q?9j0aAU098Epr8fB4R0ZWq1vsQpcDkPNoU/55X57qaZMb1QEgG0xuBQ5qByrr?= =?us-ascii?Q?A8JsQXkG5DM2SRfM5G0Jv2wMmeVNe4I21PHET8Vw0w1TtIF2BxFLy6t8DV1S?= =?us-ascii?Q?7Zodc2aysSHhHfhlMwbSWzFh2butpVj/zoa9cWlDiNvU22QQGsSLaNd7W6M8?= =?us-ascii?Q?VM20bMzjfXnXt7o37n6BQCljkdeJ4X5rES0M21HTcJrLMLNbQ9OH0YWJFJaj?= =?us-ascii?Q?a+NhCpc9lfiOKyodis1OvjsnwFNbI5Pgyb8yTfvXzW+OyXciPF0+0nrNygTX?= =?us-ascii?Q?KA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DM2tRcH7LKgK2QzPyvqnj0080OPj4skzKpaIkmtP5/Ctx96bkG+AysYrz4gcwHSilib+s+4YANhhW7DUuLzrQP1ZRSHLCK/WzvwG8M+cg8Cl3QfeElNJhHlhtuhKimNDY48bmY8kyYtUi94qU9fqSs8yEijqdrpI//N/cYrhuI2fAG4Yg8fypx4Capyqt+J839DfJks8kVEwOf1NPnyFCVIHjloWNvRCGq1ipe6a4e0HZVyHwFe/syY99kO5HJ8BWKgBlfiNl26pGrK8fqWEAx1+zOe/PkFsJNHBg0SOAdPlG11BsmPznXQi9g8MLTCG0yEtnfrTmL53ev4vaUxbErcCU0+YmZ+bwFsRHowanJQ7vCYUf4Rou2CTIGISedybRztxwbSrczrVC11gMD7uY7UVlXcOt1wPDD05Lru91cAldXpVDbFEBJuEZxtFtVeT1/YKXiG/mvB/ry7HBqaSZHSEe/8AFQACVuRc2MV8gwMqPQP+jFQtezt6UBdualWk6bYmY5JUc3H10me5zTu3AgQVwTbr8SW+vAJmvaeHYneQZJo7M1T8PCBCCkZtOM/7NuTd+ZP+/yyrf8ubEguDe5tOW+PA63XBgxofylDGiBQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a8f1d07-62cd-4fee-253c-08dcc2e0501d X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:25.4892 (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: FAHVP44Airy2GUCJTw54OifSDfbUPYxlD2Tmbik5mcLHDjLicOPglidFlqWaWCHWkFKDJNXA2JxQx54whqiGtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5729 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=925 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: dW8BNL22iIqjVJJGV-2vlWIi2aFHEq9G X-Proofpoint-GUID: dW8BNL22iIqjVJJGV-2vlWIi2aFHEq9G 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 112f2111c457..0f5be29d48b6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1388,12 +1388,14 @@ 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 */ + if (do_vmi_align_munmap(&vmi, vma, mm, addr, end, uf, false)) + return -ENOMEM; + vma =3D NULL; + } =20 /* * Private writable mapping: check memory availability --=20 2.43.0 From nobody Sun Feb 8 02:21:16 2026 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 4C73C1D04BB for ; Thu, 22 Aug 2024 19:26: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=1724354805; cv=fail; b=NeyNfN1NEZsuRoBsKjQlb9TsKI8jH2ZurGhXCsVQHrCBhzDEE/HLUVIbzkBsvRZYOiBPhGfagP03CMuvuHHdeadcSgphuSPLcLFr0EFuDin4CWGbVaNjVTHON/bz6/9ti0Frm6mxENHrdPqTXTJ7alBJnaQ/yiBCCq5lgGaYiJA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354805; c=relaxed/simple; bh=n7bMIWyNOfnO7AnknnmotZ5t3XZizZpBj00pow9yzA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hs8ylwJ2jvCwnQ0g1j90vgXXVqdtvihJ+dMwAQrb26h28p2QdUH0qcOPuKNWnunF/DWkfWjPKXN3qbXVjrYEpWKlNaCIa5gR1LrgWF3NBm+O+H+8Dok3MUaZ7WpyBn2cOTG4YkmSmhW3NeKU8k2I/E1Pkk5OyEq6h64a4ql4HLg= 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=K6l03OSv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=oWUDkyDG; 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="K6l03OSv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="oWUDkyDG" 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 47MIMWp1019191; Thu, 22 Aug 2024 19:26: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=jbqzxUpWaWhe7HX9TTqUu2TcUsDnEJBssn9V4YZ/Zgw=; b= K6l03OSvOpzRptIlJrTntQ44YyewF3XNDFmUO0KLsF6uxQBQKFCq7D841twyZGj8 eMlOyy1Ts8M5Y4cOtOtfbv46pcnQQLUTo/b5BKmEGPuqPZ/pTUdUx0PZEJ0WdLn7 hG++dY/RE6GpyPfMMVJFBqP41v4Nk5VkKXNNxLHWOpIcUCKH153r8Sksep7/Rm9C x8vh4BN0TtEz63aGTN2VFzPKl/0n/COUYJz9CgFUQkOLReVeNSM0SDg6VEYx5SDX 7egTvuHSIsmIC/abup2JhAsMNFtWIb4cL7k0RKSM2DVvxl+BaqAFbbdhKQ4MII2C ntnsENVfO+F4V7Xzj/XnBw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m45jw9t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:30 +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 47MJJDAA005150; Thu, 22 Aug 2024 19:26:30 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu0830-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UzezXIb3l5IvbG0edol9qE+NzezrHfQA9S07W7Jx8obVj/dAYKBbYIpNe1yvOBW3ujx7i4n0pbPX+k/VBUvtJeifPy4F40R7jho0a1vWHCptZeqZLwFRsTNvxSOrSSrKG8uRkGAuLdu2hu6bWyd3Ue+sIOv21zqcYCYxPyWHAZXBDl5NmFmQHOqRJZ6FN6U3JQ0fpLSnGrYXLH7lFObXek0cUj7Ytvw7iEFfZbELwHZ/uJpoHhOlIjfu0YYjwqqvnZiyFUtHiF8o2gltq0B+ttAKW32UkAziP1TLCLjfksRxI/o6glZcrvWRLxbLokzQK96xS3MKI/HqkDnIeG1PmQ== 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=jbqzxUpWaWhe7HX9TTqUu2TcUsDnEJBssn9V4YZ/Zgw=; b=P+ST1HZMOhfeYHg6huLximeHUZ/QHhkUL5ogGv8Y2nW1rwh3Uc5QJd+cmjRXAf7cFhrX4aaaAHekNeWLMAnHbUFEhfJtUxBheS8xomqNw/zT9e5z8qVx1klQt4Ujh2J6UA3jlMC0/ode98gvF//PxlabVsU0ex7YPO6ZcNPbdZ5PkR7cj36RIDrozHFfTq+Z9a+FoUuNJUvkpHjsLK/9D0MhuSAS/zgKrBox6eZrt/6h1mJZmRTYnCS452DBTU2A0DoQUF3EVxLpjftEiW46vhqL/yFjud62ewSGordxI2LbnEHsRV3ITRWOCNPf2TmOcSFOx7YD4N8+7Yq76SfVqg== 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=jbqzxUpWaWhe7HX9TTqUu2TcUsDnEJBssn9V4YZ/Zgw=; b=oWUDkyDGcDEu9JsI3oUKVBqWyQSXjCDjX0u93+CJ3x4XLQ+st3wO4DFGt53G37NNpkTQZGMYKqTt5VBZHQhrRB88E5RumW2PB5z6TIr8cg0FE0paSBzHsXQcGwkDeMHODoLswd/ki9uqdjPNDHLo26BehUi07c1y0g+Y+W77sKU= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7356.namprd10.prod.outlook.com (2603:10b6:610:130::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:27 +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.7897.014; Thu, 22 Aug 2024 19:26:27 +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" , "Liam R. Howlett" Subject: [PATCH v7 09/21] mm/vma: Expand mmap_region() munmap call Date: Thu, 22 Aug 2024 15:25:31 -0400 Message-ID: <20240822192543.3359552-10-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0408.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:108::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_|CH3PR10MB7356:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ec38b72-d7b5-41bc-99b9-08dcc2e05133 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LEsX88v9PAIfVgHjRJO3egkqiTLScIJ6wtrGDCdzBOEYEVS/7NhmoNpJhtO2?= =?us-ascii?Q?djBtxpe4bJuyRcy4dRSJsUm+rAeRCTmQWVSmjAYwVk3Glpp+fQ8wV65gtuts?= =?us-ascii?Q?XA16Yy2jOLSHzFZKMMkBpwvKj25dzJWxWvIKHlJL+JoJg6ax/34j+qQZE6WW?= =?us-ascii?Q?5090aECqYcu//7MnZ9DEqt9xWvs9+K4779+ARoV44scyN1R+isrfQl5Df3Ng?= =?us-ascii?Q?KTxFS+KAGXxrC58ItSpphbYjo5hWuthinqvF6NSA9OQl9G7xy7Re3W2IO5d2?= =?us-ascii?Q?+WO0m4IXzB21iC7HF6G1ys+Ql8EBozK7yTJQH+V2RXaBf4qPw+iJ7ZoYVH/2?= =?us-ascii?Q?07UmoHQv0xOVPkasWO5pSAcM4HYQrKOlKkt/8s5aIQeq7lZxmTKa0QcIl32z?= =?us-ascii?Q?u0KkwlDvmz7qeama9nfJwCvXIJoHjHxZ+Qw9cEJRfxIEmqL/+AN07H1P2s9A?= =?us-ascii?Q?No8sPdwCJyTcRtKtG4PppDcWjQ0KC1Of+ZY7w48Pgz3kqFOOlqA08EFSMalL?= =?us-ascii?Q?T9bi0dJ86FUywXDFlcsCe6EZeCqAx6+Gc38CHiNHOaHbXsIPMlfwwDJIWtaO?= =?us-ascii?Q?vvCbosLcjRnW8SeebcJX+XDEM4Nfq8XBZl4C2Dk+TmLu4a0W3dmNy0RXVFhK?= =?us-ascii?Q?CCAliO6QIGGggxqUc+uK72jRAfe/IyYTJULdQ7YQIKc8Yi+yvITpm4yPNPit?= =?us-ascii?Q?CqSkXPJU0N/QAW1eV6HkBnUlEA3JOZ+higHO3g8X8tngZfR6BsTReaumL9Tp?= =?us-ascii?Q?5WXlNthNpOJ1uZQGLnSt1nb22ZbPSpd2cVLT3O2TICOwCq0S42tV6V5cS2dp?= =?us-ascii?Q?GJxOM83waCjU5T9uyAzkpX8ubfGVeFArFRxGKNemQxtQYhzbl+7NOjKVQoH+?= =?us-ascii?Q?5RGQZVcWD7t6O+q8qS1BdzwvMqb7dWeFcSalnBA0dmVSbFagx1D8sf/Gva3u?= =?us-ascii?Q?7S4kpHOYUONTZSGoqdbCEoigKe6o/pYAahrc28ff2l5RVr7pfNPcARZ1pwOB?= =?us-ascii?Q?Dyj6mNEjt1jPDXfbjNhINuRELg7JUDwuujnEK10LVjPlTvbPeR3k5fbTtkLR?= =?us-ascii?Q?e3Z6tN2J4YeYpF3WTgu3EY4x6T3qYbxi4wZnyE/p4ulA8oJy7+1pLs3YgYBQ?= =?us-ascii?Q?pYq0ctDeUGCdqVEuM8GVReVs+/qv52QSLfImOlj8Oqbv4SVwXbMcQ8aiVZbc?= =?us-ascii?Q?Beqoi3X2Y4iAB0V+mMp15+MRDKK2wbyVIWL9+PAe8SYZFF8PN+FsY4l0pa8j?= =?us-ascii?Q?QSpRdBGhvMShR+Q6tG4RsLJzpoJcU+OrKTE2Bbe2FG2gOHAeZhtsyf5CRqCC?= =?us-ascii?Q?jPKpbids0NtcyWBc0Sha5yXH8W0TPJthH3/6ym5Ln088cw=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)(366016)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s2JXRcJLYvNAEiZzwI2bjfv2+sp3cou3XENZ9DVWGT+wjYAR+mm2jIQYWkMx?= =?us-ascii?Q?NrcKcx6TAZWVeJfRDnLFDu9r3bB/PoDg3yA5+UTE5y8VfXnupzN7olRmf0rX?= =?us-ascii?Q?7Sc/m/BYfoy++dSLMR9Leidr/rMYWRXzgxj/6Xjsd3mPZM8GCIdFUNKb1Oxp?= =?us-ascii?Q?nC+IAiJn9dKjqPUP9Ux3ikec/LcaOxmuUhKPK3cT6/u95JW7HGj2AfbKzEVW?= =?us-ascii?Q?jBJKzC1AzkNh0zb+UNt7ub0pj4Tn+phuo/F32BGDMAmmV9a3mlY9tFF+6419?= =?us-ascii?Q?NYi/09w+f62YXTj0fLHIRHf1AuQIOkKQlDUQx5bcjPUwME/xyUA8CE/ATjMo?= =?us-ascii?Q?daMlzxFuMSoBsiyVM5KGKOSk8FZv/XrXRap8a+G+YGYKl2JGsIFMvjCY2cIi?= =?us-ascii?Q?X8+RwpewW6yhSBHS6WAAbVbBbFJVMlS+ISr0M6lWhy1AX97y05glb0O5x3GH?= =?us-ascii?Q?RtUdoyl12FB2M+d+K5MlV8X+qD/2Q5/lvAqD66afpEjPrIaRSTDkBouU3Ahz?= =?us-ascii?Q?LJ9yFmD91pUtzmbC/uZ9nmzy7sQhNuByMF4jIY0XevPwZOouvB0i8ZjoLjzo?= =?us-ascii?Q?FX8Q0E5X+GcZzS6GGaEVQ+e3Wm+fu0bEjhVHAgCZcyJ89yuwrn10h7oly7x4?= =?us-ascii?Q?pF5z7RXrmeK85zfLNRgFgRJ2aDOtC5cXZ311YOxp8mN4DgjVNNzcbW0WEJWh?= =?us-ascii?Q?t87Uri91M2ZhAhKSrWFpYyOpcxpns/YYd5mttELe3qtniFCDgLUDqMHVx5FK?= =?us-ascii?Q?mV0AJ7+vxzAdSRuDyfy4RnTjLBLr/fPhDIkHRSf02js3O1qUaqokZucnAzfl?= =?us-ascii?Q?HSIi+g2ohX93GjSsB7nJDLaRJC7FhAO69bzpi/lbslmLyIVq3DaORJBZtU2p?= =?us-ascii?Q?zFkmvxj3q+7a2WcylgNcOHhPRzd5JHga/JRokW3Gwm3RiXXjJUHf7WS5rkye?= =?us-ascii?Q?GeWDgC+2vF5jAQnQzJAXm1FuQhILdijJy+IQpbvuIglx4caqwlR9I5VSVsmd?= =?us-ascii?Q?1PuucwVafqZaHBWq2AP416RTt2M7nkWAZofmzpLPMg0QG2WlxI5WWw5vAqmr?= =?us-ascii?Q?0DAkOQzdG+HqJOiZg7FnKuTkBvxrtH6c2zO1Wt4NGlC0tMtfmOf9XrZgwkNM?= =?us-ascii?Q?cRI3G3EpaxsGz6yZhywfL9UmtF4IKqC2VUv3xpmPUT5K2TzW/8ST6sB/7unT?= =?us-ascii?Q?66uDqpmX+6ovtA6NhychN4pqitfrFXQOxV3NhG8wygaThF8vbOlOLaTtIUK+?= =?us-ascii?Q?Ac31j3zadNPSav/LrRREOaiiv+rDwSkl5C1iCfvQj06oiHIDJ+ziywD1OAmF?= =?us-ascii?Q?5Rpdeynh2mtVLIa7f64tUK3C+2ozqoTeN0AxjJYiz0ewqZs1k1WwFZU1sh47?= =?us-ascii?Q?CUw3FrDmMVx+qwKYp9+T70TVPPXqIIFjQKGF4zW0sheI7MYJEHkRItCkAd3m?= =?us-ascii?Q?z1CRq0EMM/yhtidIs3BiFLtma8XdUc7p/mMN2L/MPlsIO4kibnzRYT0astam?= =?us-ascii?Q?JNHMUdhEigffcIffMAGvNNjN+A/eqPoAcHFj598KWL5VUOoYQ0xfPsnwL3dA?= =?us-ascii?Q?UTmuP4Gi27GDJFRFuMC6P863HVUuYmQgf9bD7t5ick/GxE+dfgHX/qfdoTFW?= =?us-ascii?Q?Ng=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ip5xySYsH8W3ZSq4IRupNB5r/NUw7pz8ICUrv7zwWVs/k/y20cQtckxoWNtlqD7H9sDsREp5bs27XhUrgqEL7cIrp4BLr+/3vlpEvrkaZs+nnJgBSETgM8KRKsCBsJVXOj2I/5D1/c8BKZotUMLyRHKV9mUtsmn0pPGiG+rUjzSWzug7C5/4L30tQDW0hreG/DtgX19+QAeVUF+jyqIz/iR01W/kcqb/gMTTG1YbUF77gzA3oNdeUKmGJPBhRL0BuowU/T4CqDNQBlYikXSn/mUSTrHi0SwYgFPdUu9tsPAjGcbcpJiJ1DBc0vXBe75p24cN8YEsH40DshjhNZW96MmMKwTvuavVA4jJfb0Z+fjLO93GakSDRO48RHnu5UW0DZKtUqA5BBiAbfNPcx0jExcWfWlYiqbsH94XaLIoBKStR7JWnFv0ab6OPMBhNaL31f0II52fctvcHfPXSqmUGAEq+sVdpECYwmvgd1chVpw46M1D90/tv9M/DtHzfLVRTDQRYUfUF2Ho5gTEfQOMkvq3fUtBttep3UJcjU5sDAuiAy7zFJ/6n6habkeClIJf5I1XzRDRr1qeDIJfu0E/1kyhG+X4TIvT+yVASXHPDxQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ec38b72-d7b5-41bc-99b9-08dcc2e05133 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:27.2878 (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: wxjpVKx/aAihFkLjjsOrc0OHttvSit3O9Juf4rthlm//io0M1N3O/4Xzfy5skWHyZaMeR2TfcAfnfaGy8JPVlw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7356 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: -oVfmSUzkAXdTqBC8nxOaJP-ptN09o9d X-Proofpoint-GUID: -oVfmSUzkAXdTqBC8nxOaJP-ptN09o9d 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 0f5be29d48b6..e7e6bf09b558 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,10 +1394,27 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, /* Find the first overlapping VMA */ vma =3D vma_find(&vmi, end); if (vma) { - /* Unmap any existing mapping in the area */ - if (do_vmi_align_munmap(&vmi, vma, mm, addr, end, uf, false)) + mt_init_flags(&mt_detach, vmi.mas.tree->ma_flags & MT_FLAGS_LOCK_MASK); + mt_on_stack(mt_detach); + mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); + init_vma_munmap(&vms, &vmi, vma, addr, end, uf, /* unlock =3D */ false); + /* Prepare to unmap any existing mapping in the area */ + if (vms_gather_munmap_vmas(&vms, &mas_detach)) + return -ENOMEM; + + /* Remove any existing mappings from the vma tree */ + if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) return -ENOMEM; + + /* Unmap any existing mapping in the area */ + vms_complete_munmap_vmas(&vms, &mas_detach); + next =3D vms.next; + prev =3D vms.prev; + vma_prev(&vmi); vma =3D NULL; + } else { + next =3D vma_next(&vmi); + prev =3D vma_prev(&vmi); } =20 /* @@ -1407,8 +1427,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 f061aa402f92..6b30f9748187 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 */ -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 Sun Feb 8 02:21:16 2026 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 1B2BA1D1F4E for ; Thu, 22 Aug 2024 19:26:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354820; cv=fail; b=k4wkUslvpzOwfTMP8AcmVDT7y/NsR57ATggYUpU2pKKAk9GiPqcgOd6YCy4z4167wZCT5I6Okc9T/xJr7NjokSPPjbJRU9dfN62HkEZoPrFdXRPP3aqKVg0XICPvARPfTxETT7wbveIsyvtdzAED1JPpeT3aSx7mqmox3OaGQAI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354820; c=relaxed/simple; bh=FTgPHsnHJZh/sl4Sa1jEE+kHVAYm/TA+EbiK6qtGo3E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rAoG9srcAD0o+3wn/5DzdPgHXgKeVcvbkFCE1Gw2MepeQEPpaSm6zPvvBVpBZZf7UEOo8yq5n4QNJB6/Ym2ScURym8DkNCmJHHSL7dv7Q7+hdVnJDZsMqpPf/V/OI/qivFR5w4uIHpj8lar2zOEFa1LM9Jf/I6kIzR4UdDxBA7M= 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=VYg7RxJM; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=bGwzU7jx; 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="VYg7RxJM"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="bGwzU7jx" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 47MIMXAO029758; Thu, 22 Aug 2024 19:26:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=RKhc07Fbuk3qCe2lrKepHFoKO/JwtwJK4RHQzIAhFhY=; b= VYg7RxJMXC58fPuV0nhFlldKDexpm5j2kPsUsWFjV4Tcj+OAsmPESQ3VI1NfTuRQ ctvac4oYpHu3zfcajW+pkrEeNKb+nO6LfVbkue+80C5BipqWP3cHglflOinfCej0 WVu9EISCns067H/YOxkIoGOtwpoOeTjn3R0R92iouVxwTryTpMA0BjZ2YowRbkDQ +idOCEbYeyOuk9daf5hdwA+mK5GbHxUH8rocBvp+u7D/dJdXI0j9XJilEPxXc3bY jr2Qs+t/Tj2AVt+qxqji64ER9Ga0FlIGy1F4W9+qbZqO2chD5FdSAJoCUIgrs6qj 2kvKIzCgH3APs4NW5Nyyuw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m67jrrd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:36 +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 47MIqaPw019453; Thu, 22 Aug 2024 19:26:35 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b0b9ckf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PfOQSiI//qph2J9YwbBlhiWCqFYxiLAouuDLEbFld316M/mYg6SdSg0O8PazuYW2ghsVLNRWbgRjRZF/oUzo69Gg8t9VETNhK/2LDV+7iDsQGINo10QcCbDlUV6JdPPVEjHxktXmd+Hb7Z/7z5NejJBHmqrbnUjDb7SgL4Dr8glzf/ertUnAgZql14VIlXfPyKoj6NgxSWdOV6jH2XscbkBxQGuUzwHHwottdmyS5vJjaq+HhpJlEhc0I8BD8NGEmUyArSbQBaLddmIW9Il3qYUWKun9k2aeQLUWwJqBzsbY+wsbcvLzoNJ+4eAXILugPFNGgVpzIgbDkUq/D5lYAQ== 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=RKhc07Fbuk3qCe2lrKepHFoKO/JwtwJK4RHQzIAhFhY=; b=dUWvmWDw3Ks3MoHt49csrzGOqSVWf42c3YRIcdHcWUknDSFyUu28prVnoMqvtZYv/679Qnxl9jsTJ9bjmvxYPNyEF64fU4TtoOU1TTuKCsJZY0k4eMHhDrYXyaVsrz2FpPHbEF+HKLXCge3BE4LnsKt1mH/h/iTPgrvVtVuziIQwxYpSZrV1sMfq39QOzm4D61ibwuI/bvrVWPaPqcW/0cD+cEsyM1/OtzIj8I0lTOesJGApuyJz5PcvIS1/Jj6pjKlOiVmUSwmQI2w+qgb2lPrJ3EKILleQtfbRb2G+B1eDP7eMQ6UcCa7bpzVxiv/IqlsG71mDsAtFeRq/v6WBJw== 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=RKhc07Fbuk3qCe2lrKepHFoKO/JwtwJK4RHQzIAhFhY=; b=bGwzU7jxn7735D+qhG4eDj89ka/22j9JfvjfBmpDvStZyd7BpbbXLLtoHt0dAfuR9DhAd2UFf8oZrrWO3K9iRjVyk8M6suQQjAqQ0ers5ArV/ynZYtS5ieM3tjWwkodeVYT9GVcbo8cyQbmu2bM8WqkzVn/1zLGShIJIikRnVq0= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 10/21] mm/vma: Support vma == NULL in init_vma_munmap() Date: Thu, 22 Aug 2024 15:25:32 -0400 Message-ID: <20240822192543.3359552-11-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0037.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: c89b1153-a699-40c9-3512-08dcc2e05261 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fDxvVSCYSgsRmEK0wd8IrowfhdGrp7zIpv316qvoWn0NYcDED0ZPKPqiDU03?= =?us-ascii?Q?8wp9ePTkbrAPRvnNEKGPwnE7c+dYeUYKOHDz7hyX8VoW6sS/gsJRKLu8DCNY?= =?us-ascii?Q?9KlfwXUeluNDzGho5MMZe9b+Fa5iYXJMUCGgbEqwOQ5pHVxH+/LhjQoB7S6s?= =?us-ascii?Q?N797e7Tx8GLRU5JacYxBJByVpLVVkcM4N86Nussdn6b8ic9ySLavBIYMlkWS?= =?us-ascii?Q?UnjGioOwDJ/nX8M9SMJDZClYGQp1oxVNgyZQmJqRlQvq5sLtoNyAZ4kJURYI?= =?us-ascii?Q?7NzXAjt2a9JpwW15JkV2uiIRZQuC3QOJlyH4M5SPNXkaRjGEd6jsScoeyNw3?= =?us-ascii?Q?nGGCNTAs0cwCrOU+iMAXirPRRv69AxJDqXHRbuzrdMx5Hq0J4wFPJpUnYTkb?= =?us-ascii?Q?YQXDBIb2p0yBjVPI6bUhmszBj9NJ66pZhGXO52R351hC//eOjZH4dXlW89Kf?= =?us-ascii?Q?dUXGAnXJa1llM+Eeown2o+UXBEqG4pDMM5P2NjB2mp/nUpk35UY7EIZRsRcJ?= =?us-ascii?Q?PasJBKE9uxEELurnS4AAGcQZc97aAqusq5/go9HrrxsdbdyCkVT9NU0HEiBV?= =?us-ascii?Q?xyoDGeN62fhNWByW9v0x/EDsuAT9AMM70pg2seVr1ppgBYVg9H9cUnUOE0HC?= =?us-ascii?Q?vTPWcVB4Zpqo/5hW0m0nREOd/vTFqyLOW1NGk8UJ5edIv0X3yO11elj2DK70?= =?us-ascii?Q?1D4aNlmwhWk/U8zaWeaZ/Dp0nOsLkiBd6BiG+rapIve2t8G5pBeiPBDtkrmU?= =?us-ascii?Q?2JgFI92zlDnLMA2HiYhALS7qy3sU4Qa+6djoxuopPddfna2QbG781Qb8/Ly3?= =?us-ascii?Q?BWRxQLYr1hNm0DQPyEYId5c+SxR+sY+jcUEMnRWvFJQYvFYAkFsHJfm8DEXn?= =?us-ascii?Q?sAL23Rb1f9z1bTQMAbUOqokL64i/zNVU608HJZZz0ILsB3GIAtWdgyeRs+Bn?= =?us-ascii?Q?SeMCH5QnWgJ97zZKmqrYDFAzbuz3AgY1KWGC/E3mjcsfisaNcD1N1LanGNM0?= =?us-ascii?Q?hLLdxkEsFt3ktoRg5sgF1fQzIvByi41DmOkO3qTqvOfMBISWhvc4P7+vinsG?= =?us-ascii?Q?Atcu2hQ+WLpjnbW8cRi3KiEBUCDruc6FVg8IpXk/gxCOaM7oLqPiNh4jUqM4?= =?us-ascii?Q?7rW/k9rTgYsLly0MdC1ccNQxP8ipoIT9viHdBRo29phnFBEvUOWK3rEhn3BM?= =?us-ascii?Q?78la5GPruFBjyIc1Sqb6NQuNyK3GFDoL5wnqtTK/9N6xh1U0MI+khTM42obG?= =?us-ascii?Q?Hva0FFxh2W9kRmtRIeU4HOrEHyAA/wLRFwjeL/2yPN6W46XlQVakEaIsafbU?= =?us-ascii?Q?mBsUuuSxmo1Pb44Fw3eMkGwNfDsYhd8pElIFStMbtG/TVA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rt+XRtI6eoj/EYuZDINfdIpnuPBQClN0vQZMU6Q8Ra/7UlLj7o1pp5mJe50O?= =?us-ascii?Q?t/fSCUBGriVBkwhwchOQK7VzWgkvXsifdwKHqeDSuNL4gbKNFeoltc4ZGDtB?= =?us-ascii?Q?Jp66TJh//TOdfB3plBoESuFk5FHZpVdmDwn720Tw3aYH/OvHWORecfimW4wi?= =?us-ascii?Q?aTmpDAF46J7qWjBfrWqxdMc8CH3P138ZyGsqPpmAEjJz3QffdwlgguworTBP?= =?us-ascii?Q?s8THOBeVstswh47suASSxF5hb2KF1ouXGqScqaZzga946bcMB+vv2PHLLRIZ?= =?us-ascii?Q?0JmU4J43F7PPmTgoavec1IUGLqcN1B1arB1B0CoAj7VYz1vBb7bVs+q1I/7e?= =?us-ascii?Q?QS/wB6SkPjIK6Hm2ztdHBRkdQDM+E2CPAwwIJtsHaaBDr2y4eJqGTVsL967j?= =?us-ascii?Q?17fuiEq9vae8L4qAedy2Gskh8QdiDZpvR8HixbMcittg5Zms0BNaJHmIoZbs?= =?us-ascii?Q?kLkCQJ/RA7kO32miA1XxmYwwn0syK9uPmYccoj5iccgA1sZ4CXDT1cK/mwcU?= =?us-ascii?Q?AR35v+9bTsHKG8YcaCPPgIXKO6KA+l5FCPPntW3muX6di7EOpTTorNp1JAT0?= =?us-ascii?Q?+o2/doajizGGcyYNZKiluZZoJwAn7xakV0EkFKqz+qfJdT2vS4wU/NE5maST?= =?us-ascii?Q?1UFKJbOtifRc6gEuGX4QmfdWN/f2CFCzFlHjxTxavqUlrdRdwzinIAwBO6Om?= =?us-ascii?Q?2LzqolYjmWfvTNnyXjFLwUie0fCjYHVO8/zV+2FWwffFc48M4pihYF2ZpbBM?= =?us-ascii?Q?2TMmamS+iMWCdmJGS7oQNf2pArMxOwMSuT1me5+6juRc2WYxxpr9Foc6WnLp?= =?us-ascii?Q?QQoxCv6S7uCYJQFF2Jx9eDNVe/DDK26HEYUBqGTW98gu1YAVfckk8UQLkzwj?= =?us-ascii?Q?7djIOBEh2F8isVON7gcOmPr2nbjm1sYr8ytvVbMVQHY1IMQHvMyfwyrdEWnY?= =?us-ascii?Q?V5yVqaZ+AkVK/AolLx1Mepqn0pFQOEUsH/apWfEC48mNk3kxMErEOQzJutB0?= =?us-ascii?Q?oNstLGnAj75wmrSwr3trLJh/rvHesxc/oDeQeu8381MptG8lx7mppnVRH7Xh?= =?us-ascii?Q?qVJ/Wd+gs8crzF11p0xOROZxMeh/MWoPJEti2+oHjSaiKLoqSRX/9/yqiBVc?= =?us-ascii?Q?p3a5Dq2EP6qrYRJ3OeeOvfBH8nnWmhJK9zhIbVPp9vXR8Z/BckPOWPHW2Yyy?= =?us-ascii?Q?tX+0gVCL+L5nNOTEIfihaS2HbekaHawO8N8iBTr10f/34ik+PKlN7dufB0iM?= =?us-ascii?Q?+pil1TwY8n+YGtckOQ1SGbW+uw8Yp1nsWyjaguhlEPN0ObzN4EXr9H076me4?= =?us-ascii?Q?QcDqu8YQYkEKilEdKfLI8LP+tZGhc8Metvjn0pfIPd1soWgRAnGtYhdXo8jP?= =?us-ascii?Q?HbwukCEKDXd3lEPjOTbi++IBdF9YmKR6YCzj5umDE6ozpc3NPnYKTMShp9zU?= =?us-ascii?Q?hlHOFpSeghaH0smtKbrl3kayPkmtQh179cWxvJXDAfdKjJuwXQGiZI5Cuy7R?= =?us-ascii?Q?Lo9akqs3L4mGeCWmbvArK3bS/bmMJrWYFtrEdH7poyLwTduk//EIy5NyLwQp?= =?us-ascii?Q?xDnIl6BnGRbI85eUfr2rWJ+a+Dw4ANpgqETkWGSdUu2l+sSIH1wFtKK7y77X?= =?us-ascii?Q?jA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: bW/wMVG7JkO6k785Rg04yBnEyOhlYRru7+L8AWLIZfUL2PL8GCx2EPptwfhq1pF3X1Jf8AW+ScaAWgH2yrqi8uwFbTwhsV8yoB70KS4XyDt6EUoheqBN1kXzBAJoIeCdCr4L9nh+1h3lUoPimIb8O3OQf4F4iogKIDjpRscvOjAxjGODzzMNU/6GmW+prwQxp9TRv3oryi1hTat6z1/3neU2e3GPwXy/H3I1otNVYZAssGohofndfjqVTIbHulLLlmu2Rtts/HTM0aT1gT2asLTpbmy6LhurBHZT+74nL2hhWgn0UOvdoRrnIFCYSSpdXJNOp9j8PHzz1EwbyV4c0rKX/RLS0r57Hcxo957jhJNPqllNLUjbDC3it8M4Vkn3vaCEDeYLHT0OaNBxs5syhwnD0rRKN2p2m3iU0v9P7jFuJq1NqqXGtM5s6XBeTsDjwT0gUYjSdM1sXq8lY9IlJiaFkhAbY9atNoMT1p0IxKLT55+erI0OvX9Oq5fG3SFnGfX96OMVpoQaee7P60Gw293FdfGdqsAlLxF37Mi2U+ifbn+RU6scaJZ+8LS24uYF2X+pO9jAgMFYPlo7iagof+j9Wwc5K1Vdy0BznBs1AQg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c89b1153-a699-40c9-3512-08dcc2e05261 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:29.2401 (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: 6lt7MTMHA5MZC0rJ02GvpMnPVSL9V8M3fNJvP48Smz5uWh/G7LKFnMmOczX48RBS7Cl4tSu+LbbPxbzv0PYCig== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: ksJX0AYixcUgqwMp0-Iif4tsc88hSg4Q X-Proofpoint-GUID: ksJX0AYixcUgqwMp0-Iif4tsc88hSg4Q 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 e7e6bf09b558..2b7445a002dc 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 */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) return -ENOMEM; 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 Sun Feb 8 02:21:16 2026 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 18F9B1D1F4D for ; Thu, 22 Aug 2024 19:26:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354821; cv=fail; b=uVIHxtmvPtRFXgV/gbjgEsYHhtapdFjh8ZzccZbZewlKDOAMHxTAFAhaXuD8XVxgd+0jE+GIvLscq98zW1nByoM6AqucggvlBqkrtQF/7Qc5JoMHOPIJsmljBdGZ0Q2ylsNVgIvsAd7gZDtDFjPHCf5MFKFXRbRajuT4rGMl7OU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354821; c=relaxed/simple; bh=h6yEM6fCOcieEV8KjzMcS/5yvcJkxHLzeCuXhpzU+jQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WzZrACfn8qFtTqOOTP1JdSxydSEXxV9qdfVf7uKeGm9iDh04uUzMgMbCw9kr8EGSaVAskpIS6RYQ2yc9WYwCdN9FaCZ8uSy15a4KFyf4Pl3dF6KpN8IIxlOHASK87goGXW1ccM6IGWSKppTDKyKOkvCMkDM4fQizUpeBA0K+VA4= 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=nm5rvLNa; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=TMTzKMoo; 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="nm5rvLNa"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="TMTzKMoo" 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 47MIMUY8021045; Thu, 22 Aug 2024 19:26:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=0LLZ3RbsTLjZoi+XWRh7T3mXeaSWkQv5kP+Gqd3u8CI=; b= nm5rvLNayggSx6nNjcRrDvawcS4XkwMeNKVRXBV5pLN0idtarfv0G4WOiMyA5OaX nKe2LSskSPQWIioWWkjprn8bP7EgBh6rpmw/bgAZ8iRMvOzQy298WsVs+5kBh7Ys RfUiIN5t3dKom6TEqH3Ffn8Bxu8/D5oVoQu6aXvxp8DUtf9tjHsOEB5dWrKEnaGM XQ3oShKDTh9cOZ7fMhoP38tRwCa0XmKNktRhqgMnEE8HXZ3Yqcs6cg5vtLJ6UWyg vBnuv08J8bgW5vIrC7I6wzzxx5LEOjVS+IqF9Fr0Jv/I7DanpPdsYac7mWeRsJ3L cLm/vqpXjSYeGx1hUJdpSA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412mdt2w0y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:36 +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 47MIqaPx019453; Thu, 22 Aug 2024 19:26:35 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b0b9ckf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RCwiZ1hYkklBzckBckEyK45sYFUprp15FzFx1smCgA2qz+bucH9UdNBTaD9vDMCSk2uFh2mKzEO29uKMkbOOauXncD0VKd3/qtec04ST/mzqAibxekNobnRfM5nqeFWL6pXHcITF9B1I4ax0PqYrheFDLWFJOZyrl1GFEZakj6JMSDTORKjHp9MVi9SA9M8KdmNfIa/m/M4yR4nH/+UGkdQnQC410mmBvx3Cg0nKMBKlktjzzY/hPjls61EQhmN/5P8dDB2ylF5R0O29x12wjCG7BJrzLN8gWj5hhVEFrEUuuIyfxqCBeYBfMthM2baTRmENZD80fXenTYT74N7hBw== 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=0LLZ3RbsTLjZoi+XWRh7T3mXeaSWkQv5kP+Gqd3u8CI=; b=BCHRsie2uTQgp/fuiBRPJB7M5LoN8lSM/2MWITTDdnX9M9GSqLm4Qcb2G5FLdXvhKkMiEiMJm5cAvSJRRW975WZUMGfPFZgu7Q3df/gWM8zQgIqiI75kZDqWmp39TmXSMPBhdg+lV767iXTCjd/i6sopJ/XZZbF5G4M+REnWnADp62u9XYLOM6tQewWvIBq9/6GdHv8Q1M22dCrc/rIHxSXZleWB+mF+nxrAlkQDX/v7LTDma8vdtPGWD1BKYEzY95MuKplLeg3iu4+BSpi7w2Q6V97vn7c3hmkGtj3zSGuGmYZ2k0LaDi13KtRCOARLoboMUI1hpQsyhXp1PyLD9A== 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=0LLZ3RbsTLjZoi+XWRh7T3mXeaSWkQv5kP+Gqd3u8CI=; b=TMTzKMooAPFdflTd8A8AsonJpVk4knAhvgzdxWP8H20skpZ/uI0cJ0+0RGG8bWQPlXPjVRicy2d3b1O5Te1/Oc6yuHM/+Ytr/BoNBEsnWam+Xjv0AC3QyXSdlK1ycUaa1y+ltPyRPUWomhvDRSNiZoauExoeVunzQP7wiz6PgM4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26:31 +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" , "Liam R. Howlett" Subject: [PATCH v7 11/21] mm/mmap: Reposition vma iterator in mmap_region() Date: Thu, 22 Aug 2024 15:25:33 -0400 Message-ID: <20240822192543.3359552-12-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0054.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 79d22c16-ff67-4ee4-ed3c-08dcc2e05376 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wVbN9qBbEX2Yr34+iAkSQkwMjF1XhPNlvnKbkWQo9bmeXCKZxr3Im/zkHSnz?= =?us-ascii?Q?45oXFuhsHiR2b20v94xs19atH582zP+xvVD+tQNq9ufAT7gdJJtZyjlXsF3r?= =?us-ascii?Q?BRY6i5OFIm+jg3rBC0nTCUUgeC+v1e+bDJD09Oq5vbQPjrrdJaH68aYNmqDw?= =?us-ascii?Q?Mi1RyWNVTfHa+hw9oalZshWSwjhxrbk3Ae+qwWqayiWkHuNGDTHV/LExtnYW?= =?us-ascii?Q?vGEPgzk+lXNZuN1/G1s7tHOke5agGzlD2nMrXR57KnQdCWkgmiem4gUmomrq?= =?us-ascii?Q?bGA/Y39xmkFe2JEzcT4UmIhMW3IIqrM2oaL+U6ylFnrehSDmcgcjDtLO5bav?= =?us-ascii?Q?aDSrwKkiG03RQCU9UGGQyTxswNGRQVXTh4oabD8LFOOn7o5Ji+Q7NwoZ7s1l?= =?us-ascii?Q?oFk9zqjqEoicPBY1VEV6xnKqFYBdoUs5DIpPBm8VdPlbf5xtO2Rts7NhxTM8?= =?us-ascii?Q?NUGtmpVxvgaFTrdAJzvbelDso8sOOM5Xhll8en44gFlI/j337+ByYoNnvqE+?= =?us-ascii?Q?dV/aOeu/eQf7G0jHwnlCsa4J6Hnf/5NY5MP4ha6cXwFOoW0lSeo8sPsOOh7/?= =?us-ascii?Q?1lvF+UQpYQX1URj6AJlbjbGS8lbc0iPIyD8ya+CoqtHxrMUiAD0B/R58YR69?= =?us-ascii?Q?9i+m2euDfE2FxGKol70pV9SC/PuBlFsG73KlUIEJtco7yCNIqq59kNpmso1I?= =?us-ascii?Q?HIMw0Oad9vrFNLuUE22jBbgmvZHWSIZ0Xoekcd0S6N5Vq6j9SShFTtizbHLw?= =?us-ascii?Q?UX38lq4yRBzFMfLzJAsTo4munul2/agvMkYg7IBjpMPyEsyjKuyc+yN9xlSJ?= =?us-ascii?Q?3F53O2k2MaTCCZDBZit2ow9FrNMSCZOrXjLd7acUP+MaF/lq0NDNuNmvJLl+?= =?us-ascii?Q?C80N8GYMh8g6QLs/NiRFnj/snSzoU+HTGsdYNJWa5muO2EyDbY9j/XpwMV/L?= =?us-ascii?Q?ysjtfDBHtsJYusubEXZsw4utGL8/pOPGUw/qIidMzt0cySgBi/XvgB+5dGoH?= =?us-ascii?Q?EMoL7WGj7nELNeskQ9EqLn+VkGeSxj1Q4MZxBh4K0gGTFzIeu9vR258Ra+3i?= =?us-ascii?Q?CTZ8Gdoa/iM2yFUDOY4vFvnCWBoWBOt38gfkornJ55rHZiNivHb/dAR4vSqN?= =?us-ascii?Q?JrBuBsuw9R8HBHqlfD6IPrQ1BIe7/vzqp9/FF2PzFW7IRehkpvj1LzTIHqbq?= =?us-ascii?Q?eCWXuQGUqJ8n7yntFGhaAGDIVkHVW1JKhKWWvxEBfYxXpZGcQCWHKoGOT7Uu?= =?us-ascii?Q?wlzUemPnl0ZDVMuKzEyvz5O92ewxeVpoDbcsMagz6Y0MvXQikb+RUYFDvVSG?= =?us-ascii?Q?MkES90k1ePg2kHsyWeogNUAmB/tShDUgujc3gS9CVXvWPg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tpveRwNbbGb7QrFm1Jz2/6m1MJnoMZjWfHO1KsHy/ie0Qm/ChxWHi5qDewAq?= =?us-ascii?Q?hdEolTr3ufq88jaV4bKkKsHeLtvVmdmpsra/pNsWSZnnJULm7d5fJagikayx?= =?us-ascii?Q?LGYThg8CBg7Mfe/ZmmWmuQf8L8mU9gQ3jRfJtEF/pHCL1oe4IM+Al6hBgDfk?= =?us-ascii?Q?T+c9tVZiq+Le6/tTLvA5+eMq78a8o/9kRBrDp2pK7R/C6Wt5r9ExIKY9SXVd?= =?us-ascii?Q?KbazpM4f/dDmhP4rpb8dOQimdb13rwKxIQQZyt1o6XG6El8p5SLjyjLmrXFn?= =?us-ascii?Q?LjWxHZr+siRwdMrom3QW9YScCS1QAd9n4ZuFZklQFCMlOHgx0CJ+VWt5H9MD?= =?us-ascii?Q?rMj62MU6MBbjaPlW38FClx5D/DJmdgzIXjVSC9AhUS0Ff3GFeoVO4PnjRHP0?= =?us-ascii?Q?ucxVwZOIm7y5f0taAInls2xfHjzCkQMsGZcXwZt9Eo3Fn1QKTiUn+7yFYDC7?= =?us-ascii?Q?6ti69+lKVPvBMW5AerqTZn/4REl6QGkX6rk+sXlBgKcscODRPd0yFj/YuDLf?= =?us-ascii?Q?KCI/AxatTfeQouroFCFmixOr+b18N+tupTLhBRIkYsBTthelFTIeLq7pAFYA?= =?us-ascii?Q?laLGydUbjzu7D1I6LV9m1LNBK1JpQsdvsdQ/6//JRaTiwe1YY+UpPEKhbEnV?= =?us-ascii?Q?Pi1rjeqDrXBe60oa+96+A55SqUetRF2LdJgMNtyx0OOAoWAflmerFvtGbo17?= =?us-ascii?Q?T7eSAjv4B3yvDH9cFk59Dxyb8H/bWUgsWQz6fpxrLbBaT57InAW8QonXT537?= =?us-ascii?Q?yFZRfmiNNRZ+shnwuMWPItGJW5k+yGAg+VZXOeU4/yDQvaYvuTYRh/0+NiY5?= =?us-ascii?Q?DK7NuLLx8Tb6sVeeR5GWWNcklYhZBZVMdKuQNenStF+VJeL+CxjeYwBt+5pE?= =?us-ascii?Q?hrzLG1bpuWFqcTytzEk8XdcA/xSyYOi2uD2zJxKyjjxfqy+pWJvagt4iQ2gy?= =?us-ascii?Q?zY/SmCDtX8CVG0lO/aacI3vqWNtcGfS31JcYWl/eJn0TsIRfD68iEzXYHeee?= =?us-ascii?Q?Im8/cu0egYW2Zte1V8P37UqFLr7km7Sk5GhxZOAzY6V2wtc0aQImcUL/6WNw?= =?us-ascii?Q?VVMqIVdkAEpYgM0nRKkBjARQO+s2IQUExmbCAqcLjYqF6U9+/N+id5Gok1QK?= =?us-ascii?Q?v9SLSVcpLof3LngmUoTqJJPOfHz2uF3Z5qGjHOy7R5gEFIF49COnSgnf+sx9?= =?us-ascii?Q?E68ceSRaOod7riiCBJOuoG5Z3lB3GGAVJTQ0+yG+ZTl8dq+D5tNv+sq1bFY5?= =?us-ascii?Q?DJkLDPbTHjsysgU4FPwL6QXCwgBEk+YccitMUn524u3HdE2uFZEIbRd6dv0D?= =?us-ascii?Q?ELUY+SUUuM8qPQ+YRwhhPolYj6EDjcKNCAygAGDULWbaGfv3xpl3PDYDq2O+?= =?us-ascii?Q?jVqGc7DadCBIk0ugL63F4hfadJV7B1vE+gIWAYoz2945Mrj156rKyrRmZBT0?= =?us-ascii?Q?2jpWHWSmZsjkiV+9DnShvRwYny6/gcpIeRz3gxexSRX9UQ6CStysAxuLnWcc?= =?us-ascii?Q?tMoeBeNQDW6LwDwPkKbXjv3jyjsAjmP+3RdRPOWVhz/7MOyqU4THG+FpZ0mZ?= =?us-ascii?Q?9X5iKrrRlhiNcGrD5NppuoJ5fDwy6FhixRtmXDjse4pOkOA4552vAOsDLD0Z?= =?us-ascii?Q?nw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gR0bK7kbp09HQ+SokgaPc78U+YdWyPseakTQOiCbBTYRHVWARSos4RjAnW5LEvs/TZyNgi1fqwyrn/dgYTOJkoro2Iyq+kuKjO6KqOpbm9zghX3L/RvIzYc50LIyu9prKnU6Ebl0JW7PIXpwAZy6i20Fz9WG26mKWn8toPHFz12+bNMH7Z4Tiq/DrS3bUvOiyWWxRg3c4oPAxiwpWj7TUNmlPLsw8eTZFeJ1qp5QZpSxwZQ2S3ZsoNDG8WB5/LzXWyv5Ohl8yb4odl6TQ+h56cSHQmANf9p0FoL2kPv9c/UoQoTtBS3q1/TZnQ9OI7ubv0oCKpXfn5gnX0ndF2X/KbggVeZwWdqMYTFbRU2Rkfne9h35acUmzn0DqjcpM13RmVHrBpVljupf3NkP9/7mliLNw4lcMLOo5wgeFA/xTvtKJ5ds0d8vf+zVPIZYqREeAL6Gp0uRxmi+pB4PAbQfFSRf0+tOQ116F2/nqOmzRuiGGKytYjlPEExIS4bu2JdfUfx7E0wWuOpJkarSd9bwSECK17VWHsRrRxJQbjnbs6ITYgfFTkNcB5Ga0iIRK9ldjntvvgspdtDC2qtyoa8Rr7T8yWmWUIrd29Xpmya0ha8= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79d22c16-ff67-4ee4-ed3c-08dcc2e05376 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:30.9921 (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: cnoWFhziwzOaUOy3ptztsGgaMlcSzAjZbVhJXGMpIB1k2wrSnhpRfk9freonrWOkzPDHdlQ52BYCmGQ4nUn15Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: FXYv3_2sO_CnkqvU7CMsW2o6DeTEKatc X-Proofpoint-GUID: FXYv3_2sO_CnkqvU7CMsW2o6DeTEKatc 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 | 38 ++++++++++++++++++++++---------------- mm/vma.c | 16 ---------------- mm/vma.h | 16 ++++++++++++++++ 3 files changed, 38 insertions(+), 32 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 2b7445a002dc..9285bdf14c4f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1400,21 +1400,22 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); /* Prepare to unmap any existing mapping in the area */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) - return -ENOMEM; + goto gather_failed; =20 /* Remove any existing mappings from the vma tree */ if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) - return -ENOMEM; + goto clear_tree_failed; =20 /* Unmap any existing mapping in the area */ vms_complete_munmap_vmas(&vms, &mas_detach); next =3D vms.next; prev =3D vms.prev; - vma_prev(&vmi); vma =3D NULL; } else { next =3D vma_next(&vmi); prev =3D vma_prev(&vmi); + if (prev) + vma_iter_next_range(&vmi); } =20 /* @@ -1427,11 +1428,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 */ @@ -1452,19 +1450,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 /* @@ -1625,6 +1625,12 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, vm_unacct_memory(charged); validate_mm(mm); return error; + +clear_tree_failed: + abort_munmap_vmas(&mas_detach); +gather_failed: + validate_mm(mm); + return -ENOMEM; } =20 static int __vm_munmap(unsigned long start, size_t len, bool unlock) diff --git a/mm/vma.c b/mm/vma.c index 6b30f9748187..9de41e1bf3b2 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 Sun Feb 8 02:21:16 2026 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 D62AB1D0DE6 for ; Thu, 22 Aug 2024 19:26:50 +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=1724354814; cv=fail; b=Us0gJ2x5ATt3QXkz9kKwujirq2MODTs6Nok7MxOadlnpVZ2OiESKijb84sKKJm5m/W5nkx/dAI47MsOUZytrVJgJAUPbBqmX8MRcM2MeEUcEvLIUEVTsWIyG/hsuhdf0qeKrPN71hllp/CiiJsLnuPyQ0ffgINfX+iEfzaMJ7pk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354814; c=relaxed/simple; bh=/psJFe+eAvZXArjnY/+3VeKeg+EaFuI+beJ39+gCOhQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=QrxV8hS9VGX06vvxwBJZFdp5Qbs4HOjtGP23hh2q9g6AkmQ5RP3UzlJtWh/x7MUGRW15Dooo0I9aFvwD5GjcYhAwYE6sfQLp0IwoyBPvaeSlHM/adu/4WU00UvzKC6hhZls1fOLpyvQ2R/5mIzHL7TIyu/URzCd6fEDGQ2SuEl4= 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=cJ5TO2Fv; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=rP0qG9Zt; 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="cJ5TO2Fv"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="rP0qG9Zt" 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 47MIMWwK019187; Thu, 22 Aug 2024 19:26:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=cmaw/1Mrrp9JLuXw7iqgGPqWl0hYk2ZF3JfbQyhb8XI=; b= cJ5TO2Fv1xutqCEkrZaC+cCFyxPBh4FuCsuCDLge7LCcUqa/KavUJUSLohN9C+d4 muNB9xs+Qj9TOH/tbrqLTy7HdEUcnPyynnHzFSFvgz7aVFM/R3wixulj1497CNMw X8yNbcdeuNHE+Fm3mClEk309/2s7E1LIw4nX3AM70uH9584pieu7q9pIhRi9+6u+ w92MllYRWyAJ95oWIl7WjCKE7yckrb/IUZiOSOPUl+IWVsrPzLXUQGqMqPRu7C7q MwZU1ecyp/SUJF4tX0C7w3axXUdVwjCbXnEM8ermM6s1d/sZTY07Q23U9z7cE9rp G3nlgFgza2P+BvFDPMae6A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m45jwa6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26: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 47MIqaQ0019453; Thu, 22 Aug 2024 19:26:36 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b0b9ckf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=N51eNV7Ul/gPm7P1GyfKFYsZSVlhooWiF/EpZDn7S4IMPOkNJtmQuJKBeOqNJqh0iWKH5DcTkUr5FU1UWLRyrw0WKdqTUN/wFt7FCKLpEiNz3JPSTCSEQEvEix3q1rnWkYGHKHDqQbZWMOtZarRhyoqrI2KAjaqLQ1ZQrjsXcPv6rrhy2qC4/eJaXeNjh8XFaifn8yhfDh4pjxKIKDDoSmaHdSVB+j8N4mcWkOFJs63DoO/5O5IR9SFU15R1MehTyDhNHpXyAt/wO4r2cQlVGMrzvA9pmTi3J23E4t/VfRZJvIsIqthQTfKdI8nw0OBWtaFnxq2aNYf7QnB/REJyDQ== 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=cmaw/1Mrrp9JLuXw7iqgGPqWl0hYk2ZF3JfbQyhb8XI=; b=PqyeddQBmqK+BT+71osGUBh1pG7L4uTMugRGil7lGMFcF+v7bK/6ECzRhWO+7y+YYwn5wZMnXHLdcxrowwgjOIit+ltf4aWBQ11rL9pfilICOJ4Rpjqf8mz6c3LmGZ6TwGiICuGI7pyS93bydmf4dLjB2pOvxwJy5Bee9DFNnmX8gK1Uc1LruWOs+bXJ/xzC9kaORKUn9P7xCb0+IJFSJVBRYaGieUzo9Qnfwz99iGEu/Iw68GZbKl4l8qvclmfUwUYm25qSVUgUFGkX3s8kbnPayzVp/r0nWdGYPHIsmZldFNeGw7s65ZaDo8bJ8fiGJ94crBskFD4XRpvQKar60w== 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=cmaw/1Mrrp9JLuXw7iqgGPqWl0hYk2ZF3JfbQyhb8XI=; b=rP0qG9ZtaH6dffR9INs0owwEoL6gQje+f5VkJq+AnmASF6HCVKnVTD116yfBLa3TYmDJqGTF18kRpgxXCY/z6S555lxZq3YlnHHF6YDy9oqyp3bgyXoCZW6VZoTnV9CjXeYPC9VnOPOStkjPwGaO7qO2dlFug9aPJZhbx55CZKk= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:33 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 19:26:33 +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" , "Liam R. Howlett" Subject: [PATCH v7 12/21] mm/vma: Track start and end for munmap in vma_munmap_struct Date: Thu, 22 Aug 2024 15:25:34 -0400 Message-ID: <20240822192543.3359552-13-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0076.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ff::20) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 7fce7fb4-eb17-4ee1-1eb1-08dcc2e05495 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Zl5m9uWswjpJuSyEA83zUyeoHPqx8LxlXge11OEhw4KMZVxPo6sHYGEbSPg5?= =?us-ascii?Q?DJaXVtQM6UsOXS32jH5WpY9HEKfs4d9MyBGfqe0SjIFOQJ+Oe33h75A/8DWe?= =?us-ascii?Q?bgPo/9pVfeyRoFmPiiszIBi7Nc27pXdwnJk0JWFC2EkbClBafB2KaOoPaA37?= =?us-ascii?Q?mZDOlZMxpHVz5q8W+IxbbmKQl17fC4k4Innyy4znaMABdtGbNRw4a6wCVANQ?= =?us-ascii?Q?q+zHccbPVkttQQ/i7xa+XpvbQBENxgjteWVURnt8Rl8m7C2qBWMZr32ETs9U?= =?us-ascii?Q?Cz2HrdY3WXZIk8Z3O/6VysPrazBpbqgV1oN6d6wSFlMPgLqG58N7KSeC2daz?= =?us-ascii?Q?m1cLH8gnB4wJNHxjCV1CZeglVNqAndKoPbJ86XbbJgNyLTNRG+tCKopnpJ4L?= =?us-ascii?Q?6HggEAcvZRH/RM6GA7Vqi3+04ThCnXep+eR4voa4X4z79rTd6gH0bIq38lUs?= =?us-ascii?Q?QMcJXOLkEof0vDXY75705TrG6v1ZgSfBKu4JLCnmgoHHwFMB/Xzqd7htwwm3?= =?us-ascii?Q?xo/5rRh04WDJuW/W65+hpfsXyRtIH4j+UqcehOBzf8mEifE+pZk5U/Z+XiQ2?= =?us-ascii?Q?c20LZyy9GsBWO8BIDc1ge2wnGBJHQASKYph4XY2wNTlXsSpKQ95L7rkStt4u?= =?us-ascii?Q?3A+fsvUNollK9qa6HVU08wLdiakhznZ9dGs3SKersolvG680uoIiUY7ariE7?= =?us-ascii?Q?j///zugy/0IzA1QvJoaZl+24AIC9Ld2Q/u3Pg4aatWx1UTop4+6v1aDFqZU/?= =?us-ascii?Q?9lYYd0AvbdN1/I5VANJCPGddif+b4b9QYkIjsgBHBcZRV6rGyKcX5HRrz4X3?= =?us-ascii?Q?BvrFfWYmv72AKeKvO6ncj0VV3tN8E5ozVIV32gN2luZVguLITlVhxdfBHMJt?= =?us-ascii?Q?qm1PPu6/QEIG/PORjULDSipNeVFxUUmxzzQQTZ+3tqw4hd5SVq8P4c+PLoOe?= =?us-ascii?Q?BLWb3r69j7cWZzNTost2E2ZVgNxIw2M8ZMhp3T2yNE2Sot3eNe77/YsNVMiL?= =?us-ascii?Q?xQ6TFlq2jgzIpqOLQQPX6N8GKfYJFiue4A7DMUd/HQSio0mEUJ4Y160uI6aL?= =?us-ascii?Q?mk4REUuyxGINIXd3SS5QAYn9O+kWa6g+DaOKbd+qqiSV1PqVXI5cUWzAQlx6?= =?us-ascii?Q?WnWXcUaw9WljYWLHfAkEFfDP/tEaQcFxP5/7lyFk8Ue6SHK+rN6PNPiqk7Ea?= =?us-ascii?Q?mBwyZ4NUBe9XNWu1D4Qx4uu98ogwYUP1y+EFZmlKwlyFeZ+jhn+7ZMQJF6JB?= =?us-ascii?Q?9b8CMou/1nNUXYRQTSofYs3DIhpQWcByFhUipurmprPGpnqCug6LhB55xLJz?= =?us-ascii?Q?ZeIPSC7HEeeRnAcjc+AQ1aECBJBqvXX9cCzVmEvPbJ6lQQ=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?70SiWU+v6TRYfytFuX5ktenH9a4W6O2MQT4F07VviKASyXiH1j9icQyA6u2X?= =?us-ascii?Q?vRzy8sAFfxoazAWvmZjIX6St7DIMJn5CJvF6unGbMS0Rtkp4J2wrnXQkJgBn?= =?us-ascii?Q?vzKNO+poaXoApKH0YYa4ieUMVht/Hj5wlY7v0nxQp0IrVfFhsd4GcbaYTSPm?= =?us-ascii?Q?zZM696huqcW3Uvrk2vB5qxCu1Y6/GLkeQozUEDgR3MK32k2fAKvoZOtWfQSd?= =?us-ascii?Q?/A7l+AVXf8uTaFWluagM3hMvq20J0UfdOtnmngrEb+i+5VddDO08+O/rO1E0?= =?us-ascii?Q?V/INGGTMW5dqesXhoPOjgETknm2pjhuQ4AN9FRSCY94QOKKS9GslW7mernPb?= =?us-ascii?Q?hzQb54qxFwMPnKzFn0/MhkUNDevxfFWIkpFK+NuV0h5FhEvMJXjlO1kbG/UL?= =?us-ascii?Q?PZXIZnqjZs7+oNs1h+8JI6jtst00KVAQhIehN1JaduwJJTTMCgXMc21dSFin?= =?us-ascii?Q?ZfZY/0QvkUS7hhmjL6VGy6TiYsAumBEYP5PqYOIMkL9bxGtzICyUZrxHqGq1?= =?us-ascii?Q?xwRFLEiPOhUqt5i5CMQxEF0DorDVFzWqcLG7Ese0vC3nJgUQb0iSKQJL5P7s?= =?us-ascii?Q?PS0iURGFkCTWVmGLgaBqJAM2wrd8SRHrk6V+6V3eAsn28YNmsjPSrvS4lIpB?= =?us-ascii?Q?+rtRcKfGMvf7EccXVA3BmHvAXSO+Gur0JvSaXetye8Kk0OPqckK1Uefd9OqP?= =?us-ascii?Q?T1zGF8YDpLXCLSTMoGl52DtFs8UfUuTMPOA8i7mS+DrAXA7CDqnLxInPcIOr?= =?us-ascii?Q?k3HcFYxyzUZ1+D2hFSwUPobHajP+6q4eVmyullOjQv4u0aBs2EV06754BeWe?= =?us-ascii?Q?sXcLNuu1JYGeBCCy2QU+IbPkC/W7JAyEX+yhZIp8+SGHhtGOYHlAMnIgA6mF?= =?us-ascii?Q?sOIl9/9kZn00OfM41RDLMYXTyC81b5UIjRzSePO7M3aWaicVJpl9Iwwfnld+?= =?us-ascii?Q?Irm70OMYiwykizGWxZvXKoleXfLRVSjAAt+wRzd0Zt/dKPyKkl4OLZmyUMFL?= =?us-ascii?Q?u539Du1Pd04wvtYnTh29oIgTwj4vNhSi/tzUiUiJnb7gJbujHNtt9T1zH9kB?= =?us-ascii?Q?O6Af8WCDR7W7oMGmq+9CqQUAwthf/z8umXiygI4JVEziHRLuva5AY7wwbKzV?= =?us-ascii?Q?zYM6mSlNKgH8vKLsZrIS7z6QaSxA4y2vWN2TXmzSVd69n8nro1d/e7kaHGmT?= =?us-ascii?Q?K3lLMV9wiDn4E4tKS/YJQkpNDkEH7HS0ln+97FqXkHyAOdb9Vbk4vB0sdDcV?= =?us-ascii?Q?yGKq6dYw6ioBLaDahi5qGoEQ8wVFpq/xpNIp9fMWj3mYAKxNfKpfnWMlyHCV?= =?us-ascii?Q?w3yxeBxaJ3pa9FTAyObiZY4c9XbD8xpU51L//ctELwTxRb5iroeNvcIJOnYa?= =?us-ascii?Q?Qu9VWzYQRZSfznW2kWlJillgE+ofCwkxM5geXPv2jFkSPIM8RQNBHr3PphdV?= =?us-ascii?Q?IjGSHT0lJGYvULhjz0urouVMKKHuDcjkt8bu6z2zTAp6+1Zo/ZdocHPxdzDp?= =?us-ascii?Q?1AE+P7Jh+QXiKJO9t4g7Bgd+WbdoZiPNbvRkk5q+ZkmOoJebH4ocEu/2iWm/?= =?us-ascii?Q?J9KDReoTud3sViOs8paS2fo3nr3szk4owAaIo89Q+MVxByNdSnYhIES95NZC?= =?us-ascii?Q?Iw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2j8d/EA0tN9TUx2ag+qe02ed18qXqaY6x7o+LcNQmELh+lgkxXaOVy0cFAzrxGDOtrIR/vgHF3YOcyUjejcOwhiL55GpmUvcTk/Z/Wn+vxHfmIwBHQI71XtKW85hhtnAwPPxYKlVwl1f6X/gjqnfE1fpIniM8LQzfaAKVc4/rjJr/db+EApJxDR5qPdkH/AiVjXfynf9TRw3g6JGgf0zaHX8bCxnDHQSmX/IHuXCoJRx1rKWzbU4CgDfAfE7Jl0XorgIByQj1lZplwrkh3Muh3Yh3Xduz6098fqF6Gv0aef3FlZhNRWAcoyPqWK220ufeCp6FX/Nzf0TG3j+54UHLQ4gPgS1Ms4PcT7bf02Hd14eNXUMSffDZ5452QTqMGAvUI6TFV0VDhTvHvak1cMfjHzoY6uU4OKFmkyBWBcuBxXORcaJAidcYZ5/qzRkl0a00KarIunqXCvnpAmjNoKtS7MQYrb7FjRC3s3+E4Tz7lLPqFiMNrxser1BDUqjB5f7DmgtJViDPVvrtDwf2BJYcI/BC16Yux0DpF5G/V/Oa1b3Tlm3LyL06kZYgf02mMe/lIjn6YtZa+KEPv+1lK151qK5EuEjrJZATyHNvocWWnI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fce7fb4-eb17-4ee1-1eb1-08dcc2e05495 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:32.8850 (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: YaaJk9UdI+AEI3Z8IIZb83/1mqkens7BESWXG2b2W6MsoakzLOYQDJ1XVB1nBrEnGDHIJjYGI6x8orJ9q4dtHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: i_8CGIDrfEBl9JSAre4-N8OErO2kVPbw X-Proofpoint-GUID: i_8CGIDrfEBl9JSAre4-N8OErO2kVPbw 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 | 4 ++++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index 9de41e1bf3b2..dda0dae069e2 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 */ @@ -746,6 +760,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 @@ -810,6 +826,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..7bc0f9e7751b 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 */ @@ -108,6 +110,8 @@ static inline void init_vma_munmap(struct vma_munmap_st= ruct *vms, vms->vma_count =3D 0; vms->nr_pages =3D vms->locked_vm =3D vms->nr_accounted =3D 0; vms->exec_vm =3D vms->stack_vm =3D vms->data_vm =3D 0; + vms->unmap_start =3D FIRST_USER_ADDRESS; + vms->unmap_end =3D USER_PGTABLES_CEILING; } =20 int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, --=20 2.43.0 From nobody Sun Feb 8 02:21:16 2026 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 E82161D0DEA for ; Thu, 22 Aug 2024 19:26: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=1724354813; cv=fail; b=qlcL0OchC9o/IbO5ZfniLcTnEyxZX1ol7i8q+orHJIwcHroFJ4oJgmCsZCHiD6cII462Zm49+PXB+QAiDtC30G2qYK5crjePXSvlGbY/KiBwRRj8f0lviqRYxytYTnTnu3ylHhDjh6unQY4UW5Kc5LewlGy+awsWdslqDMWyllc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354813; c=relaxed/simple; bh=BkuZn8ng+MPHRdv05kMmtr0tJKYPuYt8BwBzWvxiKMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=kRMHkgd/DfrTTIE55mX4osHMBHt+9IeR+GrGwPErDIGL8NhJdz2QMQ0GBI7v8XfWoViWCyx4KdRmrFK1KuH4g4K838xmW4r11mDyOtJJdhtaSt80FXvQnD8PKYbTEyyn6oAtfmYVTTMFmjwqyeCng2fEDR6SgtAuN5XT2Ke5oHk= 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=o2ZJQ3qb; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=O8BHHaiU; 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="o2ZJQ3qb"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="O8BHHaiU" 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 47MIMWMd026319; Thu, 22 Aug 2024 19:26: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=cgnPrGOzOxWIrdBQ3R3NT9Fecz0tF71K+188l02T6BA=; b= o2ZJQ3qb63qJAQ6p2MH04wzbS2CXWwe+C1mGT+HyDCGuPSsaNkWy/wA1OSUXIXzj GLi46Q3utlqecBSNaIrF4ROheK2d2stv8RFCnqPy7jfChcns80aaIjq0rhVoIyl8 1BhNh2b6q8dW/6QWtsEsvCwAvh+pArPD7VeAu2rgHUIPBquPpwwhUc9FvlmjSr0e RtVlpewyZ6NN0itG7cHTo9d2KgFsuWVas/01frpAXs49nW75Nk0rH8g7BpojdRDX SBjt/5xCN1+JlIcp8TY7mLHSRxPHCwHj8LfYaWtxLaKocKEaHVNoLmJqz4If3HPi 12ejlfCtqTHxFIElfFvUCg== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2w9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26: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 47MIqaQ1019453; Thu, 22 Aug 2024 19:26:36 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b0b9ckf-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DNd7l9YbWk2/jhl/PyEmFNx9k2hFBNwdSI8NZohEe97TGFNwaXXEeOwt2a0RU3XMaY9fLqtiz8ycVzvMuDER96sjRs4/GjgwoxCGM/p3UBYpidz83qIP56bI2qZlvCTxg01gKRjID28zLVX8jUbIPHndLA/eB0w8Aa1dwFFTYfUOYBnokxf0OFcF0UqDQCBLmMIRFuqExW1r/8p2MVptBIEpARqx3hMXl49p9k6YKSkFX30YIrR36p6rALS47sbeVNvyxo2yZ+keGMH/5Okz1k/ETXiH5sIZaEyRcWcMnViGLh9SMu2PdiU9MuwfgFzbcfzKUsEDvKHfbdmBjsOhfA== 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=cgnPrGOzOxWIrdBQ3R3NT9Fecz0tF71K+188l02T6BA=; b=i5kHbxywR+keKx7i0lV9WdO6LwLDgCJp+lc8tBu4M4ftO0yP7wzAx1WbaDUPQYOptDMl2tafRPtuAhzJcB+D71o/b84Gl4f3oUqfFTrFp0+6aYkArrgxi4Zh5u29foL7ufjao/uFuShtbUkr34Us5NLpCPjSScVJUFr2wycF3v48Jv/9G0+THnt55uNyXiyR9CCHiLzVAHEzWDpnR+fn8RPEkEWULeGmKt/l52kNg49xFPTVNhtJER8C0DQJZq4OrB6fFTqbTgTfq7vNjc4MVu2DcYo37cXzEf/hvOjhNP4UDAX0v5k6Yf8zUUxmEvAIMiNdFL3SddO+y9rl3YRO6w== 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=cgnPrGOzOxWIrdBQ3R3NT9Fecz0tF71K+188l02T6BA=; b=O8BHHaiUqYwWZs0BmwUosB1TZJFtJgtflGwPMpUb1hKTBY2L6eKxKaC9D8+WK4Hn9wXnWnN0+v8iHEk8KWxYySGwo3kf2UnFgRkuVh2sjUgTX5Pliz1L/CExj7eFUWa99NVOWaeqzwfRkz5fhnlyp2/necnMVEVx339l3q7QTJ8= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 13/21] mm: Clean up unmap_region() argument list Date: Thu, 22 Aug 2024 15:25:35 -0400 Message-ID: <20240822192543.3359552-14-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0385.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:108::24) 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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 227d80f3-a105-484c-1fa2-08dcc2e0556f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XlY545hcT2Oip0m7q9MiJzceeWY5ti3nfdR7MJvDvPS2/YoomGUtr+LSLUwa?= =?us-ascii?Q?o5qDRKHo/iyQrhv5mtXUHNvTfLYLMC+uEWWAhbTkhcLic9NPNyGeujgpNOe7?= =?us-ascii?Q?IVAAMMaOL0Ytcae0/VOLPxVCzLa7B1Af4Zfroga5oWlCdliGRh+Bq9aQuHmT?= =?us-ascii?Q?c6e8aIEehaSQXCz8W/yibQLzNm0S3vCgyR7nlgFRR79ECaaRt0tNRE2vxUXH?= =?us-ascii?Q?H38Iv+lJmxs1n0Yn6XycTFX+3sCgVsATe+lNFlSLZQxlmUwqwGp4eZBbEdrf?= =?us-ascii?Q?YWSyuI4WeUdV3VC8F27EQ7UcrKWF7mHwowso4Otx5NTB0S8SSwAiQI1m4X6J?= =?us-ascii?Q?oAfDALdKJLEsYrFbhvGnRAcBTWjAldf6L6ac0ygG4Dm5khXbXKCiCbiiwNy8?= =?us-ascii?Q?NxCU2gHqaXZc9NCaawxQ2Qp+/J+L8me+EdaooYJb4I0P2rWjuRhlg+eOuI4a?= =?us-ascii?Q?wVUwEC/TNwRhl9wPjNV3CruADzPPa9Y/wzxiSytcvJq3zk61W9fgcBBjz/8Q?= =?us-ascii?Q?V5RE/exBQVgVMwm/jeaAOBNzxfsUw71/KvSLxThjEcZs4ArT4WumfiDZ5VPV?= =?us-ascii?Q?FwAs0m5s3OVW8B33UTGthPnb/brjVB8uoAOqbuUk3VfA8ydXDcS39Id88mzb?= =?us-ascii?Q?PmOkrXyF4IWwT0aXvZ3uUuanhMzPmJclwAJS8OcKRM7uJKJFv+rvAYQZD4yR?= =?us-ascii?Q?mng89VglppEuwsvR/rXhA7wpZPABkAyqlL5Efzg3ENUVEbU3Ajhbn0Fj8WSV?= =?us-ascii?Q?wdcgI6Q211OK8e8cEJkq0RdxrI3ChhlQ3g9GyP1Y8KP2DVmeQjTa2w7egLZN?= =?us-ascii?Q?nNaD21wBTguoCLkQ10zoqcGeEwlgluJe89LebNjk+6pdBtlhYimMN1hHT5xd?= =?us-ascii?Q?LitZ5ySebo1fgiIsekk2MbsrOvvt8w9Z9GHKVUihq7d0SUlIsz1kcMJsF6qv?= =?us-ascii?Q?d6CBwba7NXnG1+ISpWZRCwZMXFvMkS0LG2bECvbJhKDQwqk7gpErizMgh6b/?= =?us-ascii?Q?8Xy9qYPCQ5y1KGJq8sjKzufwLBAZExehfAKSIEdAATFCYXvsJku6I8B3+jYE?= =?us-ascii?Q?MFsXmYh9wOcFudaeRwqYsdkrAlLzV7RbzLDmRCvt0bXDhGxt9oxbOa2B72Xl?= =?us-ascii?Q?c7BfH+kJd5T6i4MhEgztLZ4RpW9ND+O37zkDOSVib+Bx9vruMh93L1GeLahS?= =?us-ascii?Q?XSIkLFmPi2maabqrFirXzwM0N56/N7aM+jXpUqzeIDJb5C9i2qL7oHQlpfMt?= =?us-ascii?Q?PIvp21N8IM3x7vgvaaXDnYIVaMe0g6kBLj4JZrPpfrgZMlqrzl2t0rLDvWkV?= =?us-ascii?Q?++dMd5Z/1qMvzdftSqcRCeFv8EiVmnSbE5aCDvijsHRHeg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1OMKBu+PaG7eMD/3FuAV+tIjQKZKzOPziKoOmnn3rnwVB28KRFgh+yCK9VfH?= =?us-ascii?Q?nRijcRsbj68z0QACKYReMV9JP8UJ0TZSmfahpNtmyv+ZhtMXy5hW2Rpx8KI3?= =?us-ascii?Q?/UCXMzccFT0Gv0byqjAbKLdc6jhXautfksN952Gyavb5YbTbIJ1ja/S5FtX9?= =?us-ascii?Q?kfTsXSN/xC65BanLv8WIhiDnKtWvirYxqwxw1/9U+DKyRdPj27V9c6xv1HoR?= =?us-ascii?Q?qiUW2lAiPnvgRdcfPbAJpt9W3zrNy7ywHAxj2AMJrGhnpunIevuxHcw6tFO+?= =?us-ascii?Q?T8fDKLvOg7pHXbMHqueTI6B4V2L2xZVSwDjgwoau9SUox9rss/xePUph5ePt?= =?us-ascii?Q?HVrXkDu6qXOK2DtTHTx48Al4S0hIlbRMR+KodZAmVTrQDizXkwAn8lzr7eQu?= =?us-ascii?Q?oW4hYwBKPOsPbzS/3j+Ccp6v+mUJQny0b7aJXDA5dmK06SFax2uwYk0LiUaf?= =?us-ascii?Q?ta5cD+YL+ziuZues/bdvLCmYz6h2xMRnt5OnaPQD3CvaB5kx0fb4u7i3HVA5?= =?us-ascii?Q?XmsS1gkojYOsiXWEkct3WCAfDqaEsMNnbg1icDwV66Fip01zDJTJghLnY5HJ?= =?us-ascii?Q?9UGPsYWwSN7uFm9EWA3N6gjgcvsqQ0zKiepnQGCt/L9tS68rDH8ZbOAOI8pq?= =?us-ascii?Q?t5zaMOFPL/ndtbO5F6zJFl8Zs/NJDru9ZajckzrEdWGAXq31ukcH3ygjLOqE?= =?us-ascii?Q?OEPQhGIyt9A6garrA+TiI57iqTq5X/6Fr6CqERan9RVbwVSxtY59LQP1d/fr?= =?us-ascii?Q?5Zy9sHVCkeVpzsA5n5g2FCeNUm5aeURYVQbK0sAMDe/3DK3+tRT2HLGAJUn7?= =?us-ascii?Q?11io+1+Xhq3d5VW4u/VCYs1Sp09j+Z7g3nLwBZvTEeKqoZblbcKuJAvgnrMq?= =?us-ascii?Q?ztRkvrnp18em2j59wPOw4e5L90ZX71LgpnGFwHNHazbE9iuUkXtf91M5sC1C?= =?us-ascii?Q?JWpZB2+CAEL18ZGnYiKsN9lON96b54ldHtlVl49kFfHSvjXYHseX7z3/TQuK?= =?us-ascii?Q?2gUGfISMGOpyA3Oh96WgsJhyfvY3/3O/VKSFMV1638qkPE7w+yBVpv91qtgE?= =?us-ascii?Q?yxEBrQK1eQhX32G3myO7NIQuugCXc4mvaMCcZ2sifvkEAkgapTu2ggACU56S?= =?us-ascii?Q?bL/PQUJyzezPFU3UWTC/sgm2WVbDl0oLPuKvOYIEvYl1HdNEBbR6DJybQXEY?= =?us-ascii?Q?xPjPbOOmb+5hSBNSjaxFolN4ay6puaIbzr49KBEYyOOqvz2D0tXmSwET3a2C?= =?us-ascii?Q?8xBQ3UwdDZEfC3NlNDkjQ/bUxd7/NG4g0kGKfvCj7HZquTUy8K+gbTXy0fac?= =?us-ascii?Q?1FWrkN0kCZ/EaWzIccPA/2BoShO0HsPDHb7dXgxrIeITXyuTrfnPPCD9zoPJ?= =?us-ascii?Q?38Fg5ZoDqkQVWVlA8MEtuO39lMwvA7j8peVpQTsIqNphDtR2t3CByBMLPjDN?= =?us-ascii?Q?I7OelESTvO5MrvHGBa+TcVmRP0AQMUD3yt/3xAcD0sLJh4rgXHG7sxVWs/Sp?= =?us-ascii?Q?uit/+R91Fjm5UrdVlV3Qr6RORTkz8yHWNzWiANuTcLAmfTRbAvtprM3aR5nq?= =?us-ascii?Q?d9LVhOFDM0jleRtfcDbFnqeR1Tz1+F42yjPHoGQk1ccleEce8HHZKqEW/U6f?= =?us-ascii?Q?dw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AxfSdg7x6OawfYdODFMsbTsQTOn/LDxohO1SDfCnUmVtNop70faunE4nBdfS862jQUK+JCGosIps13QLmkm30lUqXhNKw2bGvXAmHqk6ohgw/oa9loTOxb18lsQV/wKJhp40sxdswirRcGve8BiLTbTI29Y8iXYXmuGFAy+OTst3k9HO0BgX6m9YMIMj35jz+l80KKjQCfDkZi70f02BdTYTnQJRcWkI5ESvzucwCCx+U5PS7lowNKDWC60/vsjTg95Ekbq/rwLpIOOfX1+MU5Vc5E/FEbEwGbM5Ook3X5Dws5hdhrMQoT8Kk2xMLMKQaH0V35Pb2p3cnvpz4qVRUTElI1SIPQ1rEAYaKQHyOY9gEnFS3SqdCR37o+REswX4DyjHtNGfNCkAuZRAClBIVkpa9pMfVYFXQwm82EXsk8PCbSUPyxxpWKLL2f4o9xXCMPNdErvK2l0GnHJnvmUoJMCScvcAHSo5WW0kOFsdY1RoK1Jeuw9+BPiveiywoNKPueH+0xzHkVfcl4/5vUDvTgEWbew5fZFUo3x0eYL1H9joYL5HlBhW+Ml0TBfIGXeHnTOktkcIYk0o9CaBi35g0iP2FHE9r64mxdAQDL81BS4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 227d80f3-a105-484c-1fa2-08dcc2e0556f X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:34.2807 (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: qf9h4/hd5FU8UUq1zyWQOef59A10GQDt7quNS5/KURL6pETIbU5/sd+0fiYu0o+Cdqt+SjzM66hIFCK0YNMhvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: cFL0Gs0ZQ8Qc-ft_vAURaoRk6ov--8Il X-Proofpoint-GUID: cFL0Gs0ZQ8Qc-ft_vAURaoRk6ov--8Il 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 9285bdf14c4f..71b2bad717b6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1613,8 +1613,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 dda0dae069e2..9e11892b0a2f 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 7bc0f9e7751b..6028fdf79257 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -147,10 +147,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 Sun Feb 8 02:21:16 2026 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 CA64B1D1747 for ; Thu, 22 Aug 2024 19:26:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354817; cv=fail; b=AaRexCxhbnA3hgTQX3LdyOxuj6LiaonoiV5Xav1P/sT+2OGyImS6I0sBVKyPb/DCJ1sacKIjQuCVcx7ydvV6q0A+4y+gQNJQ8VVumxzkYyPsXF6l1NINUHxpuaSe2E7pfnyryjQ/uUuM5m39hM3F3EWl1WTMddiH4llZbGQ2NIw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354817; c=relaxed/simple; bh=WPT6n1iz4tvD/2ljpDnFdpTOJpEDPwLKsJsKMIdTAr8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=rc1sGbB9MuspgtOxmcl7gmBufqmgN8SLYSEnrfXzO7FoylG4RDB9eVdJcVuOxu7ZSlYMaFzAT4FpPgk0Nw6d3poA0FkDMWIIuczs6jQcoaqOwyMVQsuFti1dIZGOyGT87gxLSyJLBJj8CSrbdiWDCjADPhshJWqg7nIBofB921Y= 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=Cp5EN4mF; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=RHdtwA1G; 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="Cp5EN4mF"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="RHdtwA1G" 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 47MIMXIP019213; Thu, 22 Aug 2024 19:26:42 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=bp49Hgw37mOv99yWoEdLs2gNO2kzyBNnJw0rISKdOsU=; b= Cp5EN4mFaDleZt1mTbvmU4ZMhU5nVN/1CUcl9h2kISOOsazZKGw47eRSBAVvEakS vkkmqb3RQFAjw431XgIZbSSMhnH+zhIMpe24US0v3AjEFiti5PL/KyGYGUiHvEqH T6U4mrB/lQc7wsjca5/teVh5Snqfe1XU8erVChI4J4Kq9ZvNcHMTNNAgM0DnBfqv qDIGZx57V7pc60cQYLa/S+YGLfKYxY3ymtQ2ll9m8uU/TEjvmfvkSZmZD3T2vRO2 CR1qOiwf/Cp/FhC+slqvp0bigUmEEJ4lGJSV7hvjyrYqlrsZUj63tMtO3SKSHQIy d1ZkXtZoK2D6E6lpagWCng== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m45jwah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:41 +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 47MJJDie005125; Thu, 22 Aug 2024 19:26:41 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2172.outbound.protection.outlook.com [104.47.56.172]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bcu086e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZWARxIBNXVD5p4gCNQ+CI/WLyREbzsdHVJRHuFcWu0bRAcm+U8kKNhlQ9cx20yGoEW4VmGKLQeAmzLmBvlwVy6sIwIuprnhC+e3LT4YQ/ISMSL1Ctza8BtuxOI9piuLtqJVaVcnNM4YL0Mn6T+UjpCOk/efJyuBzXZGWS9pyucyv3ohFgqarzjsYBbhV17/2FnqroAPhQMvxEixg/a0Zds9yuRJsnSWf7d+OdCRNQ9Hizc1E/AuzuS0oqwRw2WhnOb5iKV1qEGOwTMIM+DRZck+gyTPkBKQmjvjFWHfAE+4utzbmRxye86ZclhSGeeGwUjfhWRwxEi2amzlShWWlAQ== 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=bp49Hgw37mOv99yWoEdLs2gNO2kzyBNnJw0rISKdOsU=; b=dgtTjDDhFHZbnci8FkEK2Ng7D5CzrtCsPONwWpabJj1evNPKTgDYaJ/o5u7s5BZdZaqokfIs4GHPWlpt1js0WvR5l3+fyMGN7fklHxHqDqmMg2bCPa2Ubt4e/F9NH6vRF5jXYcscqul80clFMDpcamvarAjfEz9R3QKNGfNABV/52fMHtOqCrI9ixKpYUZzRQ4gfFYDYWlMOBAujmp8wC9fPUqkyP1MWBF5YmFbHnT9nCsco54p1pEfQtmeUwkIpLET97HNFieF2cdU2sMNPQ9xtZiyN2anR9J4n4bN9muKVTJ6wH1CJoJQv5KI6iOnekp+N6ond6HJNTA6a9EZZKA== 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=bp49Hgw37mOv99yWoEdLs2gNO2kzyBNnJw0rISKdOsU=; b=RHdtwA1Gb7ydDEHldNuTwW/iqzp2dnnfAfJqPVn1kMAgf3nF94tThGgoJWUfdRAb5sdTk0UbyVYnNBqT11qPchuto9aS+MkSxxQKf5HfvVGahxiLv3yH+tmKGOnkNxfVDfnhZuLlnFUjgBdEZ3utdo/4jyuczpm/9SP2zLwWcV4= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 14/21] mm/mmap: Avoid zeroing vma tree in mmap_region() Date: Thu, 22 Aug 2024 15:25:36 -0400 Message-ID: <20240822192543.3359552-15-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0161.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ac::11) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 6974ce3e-ed00-4bde-2b2f-08dcc2e05692 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0oieusz2rCb3WMT/OZyFsaq4SnpGvafKETOgnUqQQtMKuikgSBBqq8wQA3BO?= =?us-ascii?Q?4WLq1sgMaAgb4m6hrg8cAai2pYY92bq1bdaGGtw8e17rWeA3UHo6F6+OCp97?= =?us-ascii?Q?dLA0cnj+NR3l0mm7vmGC2EW9+Glt8M5CafkJYugTFgUCF9qziGS7tRsSZUoP?= =?us-ascii?Q?iuK5MRrKFW6vvGKsi1YpW9lRUIeeNZWStapYSZ1zmcmRBjAucu2rK+/i59Oj?= =?us-ascii?Q?LoK9L1s03fAzVYEcBgfLmDx3ZWDa2jfN55FzbNK6PY8dOLp7vqejpy5pMLpT?= =?us-ascii?Q?gaE9XxyDbvv7Ye4ilALFwZiDiHfDn5OFW6nAosnicS5exrbxHwg9Dnq4pTYv?= =?us-ascii?Q?opTb4GhtTiyC2cmSmlaZV+nU+9Lu5FImsr9paYun92leg7yRpFzyQbB8QerE?= =?us-ascii?Q?hDfqF55qCFFcfQsExm9j00/Q8CmlujmSu2Ae8QOeF27GjVaHNmM1oT5GjzYg?= =?us-ascii?Q?FQ6/jN2KPPacqQElYbtGEgbNEe/HeW6DjFliKvYPuJaI8nT8c0M1hMmshSee?= =?us-ascii?Q?f3zMwhRb/33R2tyM7ncN5sMCBCLWUAs5BBAYtyxgcSyAxWMiJ0HOndXoct65?= =?us-ascii?Q?ECRyJ94aR2uOt/jfFbWd1lU8ijzAyEFdU4zPPeCyIdkNOTIoEHCtU3Rq5ia5?= =?us-ascii?Q?I+1EEnI88/1XURhNx/RCu3aMxHteE4VwX9Mj/Xux1837VWjmwQCUfRzzflde?= =?us-ascii?Q?X5VbAIgpVLTUsHkgoDgLYsuxNROgtIRvJMThrRxs1mrURHd4rdVykEZYTbL4?= =?us-ascii?Q?IMqmj+5DEzKCel+/WlZDINwHSxwtvFPzGn9q+6wjXSjW9FMJrTJxeBtP9BKE?= =?us-ascii?Q?H+RRV9dTctAHRaW5CfY1ZT1UJP3fn/DgpVfmBqt/3m2WpykMoXlDTQ8/cvZB?= =?us-ascii?Q?+UKv+F09JR4E6XGkbPlFJo8AlCoULcNXG2e1H0lROTmPTnUsvI0dwxU1/qeD?= =?us-ascii?Q?0XGwn1bq9ukvcfa8kyrVA1UMbrnZEMwvUl/iWnbS7arYtpLW5CEe4rn/xhbm?= =?us-ascii?Q?3GnANIhNcjDDrLJd+/bPL57cwzVVOvmkAt/+/uE3rBejM//sR9uQ1nNSWKsG?= =?us-ascii?Q?fb662EazbOtGN4tpzLRZJg8BAkHdpF1yaESklNsc64wtuqq1H/WeP0R/9t2H?= =?us-ascii?Q?Gn8YfO3LCQ+yO+jiZDDS8FZyJQOoCUMNOto+jBcChbOcoEkqIZZ+j0ig2ueM?= =?us-ascii?Q?6ihjbY9cF+DLwGpZvDxpPPiENpSA51PqHow5YG91ml9754bRav3lj4vUlMSA?= =?us-ascii?Q?Y+kh7yS76QsivmcoFYYYV7bvWrEKONUkcKesdKf/QqaBAJnrwPQHsk2RbniP?= =?us-ascii?Q?sdLO0vrdzqiYt/qdkJcFMZy5ic4ZujiBMYEryy3I/0hCOw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2nS8sgHIuDVzVqnjlXJZhlH20N69Qn5IDagZq+t9w/RRaTXIZCMbFXEtg42N?= =?us-ascii?Q?lvI3miLSSlDOU4wQPLe2TDaRThUhtGzQZpu3+9y9PiCDGPWMZ/ThJ7NECXnh?= =?us-ascii?Q?aSGeW1JisRXicfsRjUKOzgMZQME49uDYflNCGXnhYp9O91Df3Cq3VJJv8ddU?= =?us-ascii?Q?yIwF5R2WlGwjJyx63V3glHyJSYHnYcEuBkW58W6gyboKMtGvTKFk34oORZVl?= =?us-ascii?Q?aBSa6X34wLbdJZDngAZnYwuvCLRePwb3U9Wg1Nvn9MQenTAuPSxEHSyUxhhn?= =?us-ascii?Q?b2Z2OXlOKWGhpYySkL5OJdhJH/+b4d/75Rhgh1vcvAnIou3n0hQ3iI3B8KUc?= =?us-ascii?Q?YEHVXg5azuKMaQFB+E/1UHewVAP4NGPsqRWm276w/Ska6MJwEBwotKqkx1JE?= =?us-ascii?Q?ENSKJjuMXmiA42bAPsnjER94rMdbdhrbzm7qu5I9L0OrOH9SncArcBLz8QmB?= =?us-ascii?Q?WBTBOoNqL/fEbkr1CnPdsbOmGF+kpg0IAb/MbEX6gX8kJ8p7woevGHqGmwoD?= =?us-ascii?Q?JVOutwtZObZ4Ag9hIZMpytO8gFlyJJ/X0mwVNVaZxyGkAZnYDWGwNaxC4VWw?= =?us-ascii?Q?8J05yzY3qboMx+Q8wPxUo73HTwmvWFf451RLi8O2clriUkDJr9pRmYXtZqYv?= =?us-ascii?Q?7u+dfNZ3vKRoAsWndOMwx2Xv7JRRsH8WHu6gtR61z326pO7z4pnuui86Dljh?= =?us-ascii?Q?AdiH6EQ6E15ajrygLVXn8mSfWRUzZVZWXn0FEPLqDQDTm27K5J6dTT3oDoY5?= =?us-ascii?Q?j8w2w2sxzWAW8+o9v9F9nbpWkOoH+wjiG0TpGr9uQQR8wqmq9+uxI38z6t37?= =?us-ascii?Q?qKQhiXbG8gsVAjU3+92i1q7yXF7ny3FrtHWakktVcOxse353Fxs9jFGrhUiP?= =?us-ascii?Q?x/BDgEDodtIIqjBG+M4n6a8VPKkitMXLrbnJpnnZsjcXlefmcwmYHagTPzt6?= =?us-ascii?Q?UnesD1LJiU1lMPuZtJnFLZbUGgV2VU5z9W+lSvVcTKaW/11yMsicy+Yo+hMW?= =?us-ascii?Q?9666D/wwC8xm3WmR/7DY3lvGVpzJPKe+Wb2klbeEqswz5Z12OjJN5Sb7fAkv?= =?us-ascii?Q?lCN/3Yrakdu461nnhuhIvf/yScf6ZI1KOmd1BWRshsEEwcovdVjPAOmL3sHV?= =?us-ascii?Q?DdqlUo/ANCBC/EU/HyNe8qH5C/RuH2ESPcaEjCXE7C6LKpeko2U9uyOZG3jh?= =?us-ascii?Q?3BFgd0vwmqf5lMYqW6RFM2NE1Qdi2JXtp8G5Jpq01jXTrAs+Ae4bD4VAYfOl?= =?us-ascii?Q?IbXYZflQ/byXLakSdJxuvKmc+BD3Av8u5ufMsTtiuyDYQ7R+90D1wLU6SKkA?= =?us-ascii?Q?K5urjEdvF3K67o7CI+Jxl2OcQGhw6YMrLGVUDfVr75iNgWvY1KpW4TKdZPul?= =?us-ascii?Q?2bSvA75DJmYHZNeH1rDsG1i4xK9T5FNMsnZnxALFHan5Sq6bxxznVbfUVbFU?= =?us-ascii?Q?wqDsfJWhe7gDBYbzgVIa1xUxfXbMeN3mDwaw7UsU+eGKvaWHXjR1Y6dkTW5M?= =?us-ascii?Q?QFSsmw8yES1BqqbX42xl109NCY/wHSZTvZH/tc2IKpwkUrALS3wj/7WOSfNX?= =?us-ascii?Q?J9sSf/0+UPjX83VOuoQT17UuAY0JbRKLMPV+pXcBQAr2rYT69aixuC9f1u4x?= =?us-ascii?Q?Hg=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: UiUYVzC9rTJTv2LES7QtLiv5Rk7BGwxRIrgajWf98sXrhX2hgDAgyII+L39VjPWW69P3rb4gRjh97uv1T45AVumIHcZeE0W/vP2ESnXg5VNcMApV1i8+4JDlh+mkq4r7aGSU532JnlobHgV6N0XBK0yekBSF8Vvt/7bSBe9NbSpMfFNeb3HlHZO5TsrygExqoo0eOtcVGG+721YpET2S2rYS7wkpAFojGYzdBtubL2wXOxfLJUiK6QE+juRlp3sZGLGncwp9A5oXKHzYWP5puCRPZZti2yqpFnC0YrlolLBiblPTMnzHlcYqlazh1crcgXEhC3pURvrw8UaiL07wrSvSoz/R4Zu+TlS24ni91Zb2MuDS5aLLRK6ZA7/bkE0SK5GczXQ40kqY4Hvo7ZD07iSBAe49vHoXPEryRQoXFjwxrihmRyQagryn+uEWEr5qdxCr+XxbGlmmm51jIIZRugslrVQm0/4dA3v1T6ED9J0Un0wEYB6eGYgkERBwNiR1Su1bMODAW/ybbcZJULPyBYCTpQiFDxji9MjgG1/m8SvedhA4lo9Jz6SGcyMhYGReIVA6GCZYyI73LiEUIeEGboEaeHJSzjhrSMxa4eJG3QE= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6974ce3e-ed00-4bde-2b2f-08dcc2e05692 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:36.2041 (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: j1zW/WZxso9N7/ZlUuTmPyTltU3rjAqtOUkqkHUFy6ET28EjQO7w8D0nMCZ3W9Ktlkg2dHntInbC6i649Mls4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: UH_k-W4LfbNaNtCA9yaoVaI4_cgwOAQ4 X-Proofpoint-GUID: UH_k-W4LfbNaNtCA9yaoVaI4_cgwOAQ4 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 | 62 ++++++++++++++++++++++++++----------------------------- mm/vma.c | 54 +++++++++++++++++++++++++++++++++++++----------- mm/vma.h | 22 ++++++++++++++------ 3 files changed, 87 insertions(+), 51 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 71b2bad717b6..6550d9470d3a 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); @@ -1400,14 +1396,8 @@ unsigned long mmap_region(struct file *file, unsigne= d long addr, mas_init(&mas_detach, &mt_detach, /* addr =3D */ 0); /* Prepare to unmap any existing mapping in the area */ if (vms_gather_munmap_vmas(&vms, &mas_detach)) - goto gather_failed; - - /* Remove any existing mappings from the vma tree */ - if (vma_iter_clear_gfp(&vmi, addr, end, GFP_KERNEL)) - goto clear_tree_failed; + return -ENOMEM; =20 - /* Unmap any existing mapping in the area */ - vms_complete_munmap_vmas(&vms, &mas_detach); next =3D vms.next; prev =3D vms.prev; vma =3D NULL; @@ -1423,8 +1413,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 @@ -1473,10 +1465,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); @@ -1485,6 +1475,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; @@ -1575,6 +1570,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) || @@ -1603,7 +1601,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) { @@ -1622,14 +1620,12 @@ unsigned long mmap_region(struct file *file, unsign= ed long addr, unacct_error: if (charged) vm_unacct_memory(charged); - validate_mm(mm); - return error; =20 -clear_tree_failed: - abort_munmap_vmas(&mas_detach); -gather_failed: +abort_munmap: + if (vms.nr_pages) + abort_munmap_vmas(&mas_detach, vms.closed_vm_ops); validate_mm(mm); - return -ENOMEM; + return error; } =20 static int __vm_munmap(unsigned long start, size_t len, bool unlock) @@ -1959,7 +1955,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 9e11892b0a2f..3715c5c17ab3 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); @@ -851,13 +876,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; @@ -902,7 +928,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; @@ -1620,17 +1646,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 6028fdf79257..756dd42a6ec4 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 @@ -95,14 +97,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; @@ -112,6 +113,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; } =20 int vms_gather_munmap_vmas(struct vma_munmap_struct *vms, @@ -120,18 +123,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); } @@ -145,7 +154,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); @@ -259,7 +268,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 Sun Feb 8 02:21:16 2026 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 A16BE1D1746 for ; Thu, 22 Aug 2024 19:26: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=1724354819; cv=fail; b=niGlzNTIfxXpu5UwQooLUjhFWoVoR1qgrya8kJ8UfLO3L+gooKdCpDgoqIEJqUyR21Eprjn2axkPoE5SSDhKdG5mTiBbiTY4YJac/HSFKGgGTqOes3oUqPcxir0quzKv+2WMq5wliyZckoCBGQhNLXwKSOBEdd/xkg8v9HFM3aQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354819; c=relaxed/simple; bh=ncxLoHOYvKhD9p0Uw7yzZOrTBl6n+t9XSLekvMBO7L8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ej79r4vzfV9fQ4shCUp8K1RuDFU54IAJxSWYCfjZv36ROxB+TlQDlDKrMPdyMACgJAVLNeXatRkD6YL0Ml6BEYjpX7q5k8nYEQmEwKZSwnCAs6hxaNzFpG2B6v16XQDP9bWBPndH28IF7Tm1ZlowhnwxOROCQygtRsWbQlWs/40= 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=AWYXOXwt; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=uSMO7MVO; 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="AWYXOXwt"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="uSMO7MVO" 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 47MIMWZZ026341; Thu, 22 Aug 2024 19:26:44 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=3MlH+o+RVXMOs3uRNnBWOsfwouftTpxW+3+Yfxn9fgw=; b= AWYXOXwtcwa/oPvCiQWRg7oPYBPF5QX2rb2x12UPjET1DPQPE6tI2H9J0T/mrj6c 3H5y0jXlShWrNqdQNz4JBQkf8EiTtkFOp/tn1GMnqO4I2aNbvUEYdpLjlY0neyTZ SQWceC3+lS5eNhR5TPs0CDKKxaNJtGMxNDYrL2B6FSlwQ90P7O+2clF1JYFE1jLw g7IWygBwoskfQmJgYANaX90hEvFmEzHWzvNUadOTUS6KTZjC1fBOO7tTlhGd90f7 aBrBqpHYJhR3DcmK2B4SBW+MFNs3oa5877aowBcCCExO/KVrV31TVuUDIPdNT0qt NtLDLuVaTxFh0BjkRLm+WQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2wa2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:43 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 47MJJGAK028263; Thu, 22 Aug 2024 19:26:43 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 416bct87sx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=plmq3VUVrJRCD8HI0Ty1JLfa2jrog+NTZIpo9qEUpMsSFwQOQTxH++T4RWpYhzLA2RQhWuE2f+kWpaCZ5oxDl1brUs7ZPqQRDlgk3iNEphNGvPwyK6M1K6Iy7QSEkCag/RstKHXN6OnIId2V+VkkDzjyM3zCHm9i+cAs2zWjTLX9cnC6SJUbJGwDo5QBWJ1K9kZkDTq48PxYP6CxD3G/3h+8q/pEXIKdNsQuv396YkcrZ7qgS+O98zth3rqDZb01VTUMktZzO1h83CkqThdDFD+nTZ5GS5eGpuTA0nfJPhrwiAoDoJZAJ4wx3YCy+By0z2a5TabPOYZXdrf5eSvguA== 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=3MlH+o+RVXMOs3uRNnBWOsfwouftTpxW+3+Yfxn9fgw=; b=tK+hCrVZ9ik0DVkxBDcIA7BeCwzDwyJBX8zzSf7sPiYAlz+CsHSH0h4uAgMqkoNSLYdzk9yuUI5s2JYVqYGmWnNrXC/9ycO8ztDChQIuNjI0TlMYCUG2aB5zRQrLQWj6r4k67HCYPrcTZqkT2vvV+W0DXytqX9yMUkL5H6mGkjdeCR6RR4Ez6BPyLR5xHEc9UU7lrLqZTAgbcVygkI2fm+Yse36UpIsWmOdIbljclKP3UwVlokAYYV3fKSAkqKt16lVIzg5ar6ldFtdCJ6R7NeaybNKbMzK9lzVtiMok3PKuTcL+fsDz/nZmsoQGcvsJnEVrcQwok0hFq6Q5OdRV3w== 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=3MlH+o+RVXMOs3uRNnBWOsfwouftTpxW+3+Yfxn9fgw=; b=uSMO7MVOAYf1FGZNGPiiB/lbHpRnPlKaTfhIwJqlxrRjKhIdikWmcM16XiD6Lri+fbcOYAZ6sRykPFSqWobdpxV+//HhQovJdSkjQP5FWyvsOxEl62pRokpgZZ9WsRVmiB+tkMEmXvneT8tfl/6yFPnlWnSWOsFOoIPeoH0GB2M= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 15/21] mm: Change failure of MAP_FIXED to restoring the gap on failure Date: Thu, 22 Aug 2024 15:25:37 -0400 Message-ID: <20240822192543.3359552-16-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0045.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:82::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 57581fdd-0d88-45fa-21cc-08dcc2e05795 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CpCtepK9bkSLT3PwkCq7o7yb3+mxs7b+XxMfGtT42wy6SqexosZEbf4Pr2Sc?= =?us-ascii?Q?HD5LbA1luF7MHno5mEdfSXCF2CRtjrrlNf7Zzpr+w3JgfkJ6kSyTMEfaJ2Cc?= =?us-ascii?Q?EYIpqtBfCaq7MGgxybj/vBe4b238HdfoiMDqY8WaYqTnYdxcj1QJynfjzCp6?= =?us-ascii?Q?0vRkb4h06Sa+MziYrNTy3Atouk3pNCXmRaKpnp3bDB4Vc3NRXroqWrM7BuLJ?= =?us-ascii?Q?MMobyC6zK/4h1AJv+6zBB6e2kg/AUdmVxXhxuDX/5mIQJ0nozlCpBzaslvfK?= =?us-ascii?Q?sJp7QYpLAVV2No3rea5HFvDH6+ViPUdw4A37zuiWikCUNzi6R1inEEh2hvjK?= =?us-ascii?Q?osRtANfRYtooRmLRRfFUK5To6We+YIRpk8kHbX09s5l0C9sYRCSYRtbxFeWi?= =?us-ascii?Q?PWYhal9HojR2NlLtw/TAhc8CrgsUl4sFXQ7RCIXOBNIVaZIqhfM/v3hOjA6z?= =?us-ascii?Q?vxlmwgNP6N1lGDXbmKQNefWbXQR1OvlnjzKciprXy2EflPmjpurMX+VAMFVc?= =?us-ascii?Q?9kmX2Nn8tyRvNw7qFMKVH1MrBNWqemOKdcQ5vOUuTymHIZjjmtYF24ByuP+I?= =?us-ascii?Q?zR8YcVDECMXbSXXBcHmRkSP0Aa8t9ekFh7kqS1omVBCK/Mw7Ib0yoe+eopFr?= =?us-ascii?Q?FjVxRAHSZ/YirFnhb6to7CE+aVhFTe5dvAujn90uuwXUtvEjOx8kIrTmid1M?= =?us-ascii?Q?geeV2jBogZsC/vbVUO1UhzfVCGy7jYGRl/aECWwmdUubStYecuLzcLa52ccN?= =?us-ascii?Q?X2XmG75mSIdPS44oeCJoC+ShJa2Mvf33b+aoV0l8RFeKddTAfBNuxsI5h6mo?= =?us-ascii?Q?oStKR8YnuRaD5EYn3U5KMdlUMIg2XMybONr1qsBggKnCHG2P5lM8weRQK+ph?= =?us-ascii?Q?AK6J8dnQ5IUPeTYpVBheTvAtHUQpyws8kC3NZ5Gcn0EAr8aOhYF68yEvfEE3?= =?us-ascii?Q?v6Z5Rshmoh9Pj5zjg0/TkXTD/BJthU2aFxHfCq+TAriZCbjik+20feoWL5u/?= =?us-ascii?Q?4+hV8D/BH1lxqizo1rcf1gov5tGInnxhbwc7gGrYLHC+0EaMaw/EI0yXjx9a?= =?us-ascii?Q?6h8tydRoYHDXA3IC1hP/8rHX6Ue+KnoQIU6zxLkerRnGyb8AvM2+fg4vWUwC?= =?us-ascii?Q?EB4brfgpiOVAqYqydA3wFhZ8xX2SILqLUvapprIrSyu9d1MnyDX7RVCVS0wF?= =?us-ascii?Q?DCbI1rBqSe0JZC3jzQBwaK/5/dPd8aE+I24wJe+pUEOzTNwsmiZAAB1AQeWP?= =?us-ascii?Q?k/a5+TVYbv3A9VciPTg/lMTOisYs5CJJ0J/iqLflSa8Krqe0FF2xpiY4Xelw?= =?us-ascii?Q?np0D6UB0PkgeU3uKR0sp/hMgGxFY4axL0vU2jks/8ODBDg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OU8q14i5FdYt8lsuES22JZX38MDgXIaGT8v+ahiIzjn/5kNTYnT+rJbTwZGg?= =?us-ascii?Q?XlZfgXMtv4so4J12jIl05bWFBPX4s0eRzqkDeBswLqcYB4pgCG4liQ3LqjBX?= =?us-ascii?Q?nw7cH5y4nVxzfSdbmdWH6lFC1vtUr9pB70wMG/yzI6ytE1SOfaxX0mUh6BFi?= =?us-ascii?Q?9itYt67b3I9SHE0Qfnjtycv5y1cRznnyT3dtLkavEauTE1lM+ShxJGs56WO8?= =?us-ascii?Q?ShPMZ94rzpNQzERhA6GRTqQj5esjcuCDdaAxoQHs5RYpKpCBkBD5JLmi+Jdh?= =?us-ascii?Q?wQ4a8c1zByFa/CG8rCtkAdjHoTlSy/n/IWOi0hj3L2/SPYGa/LYGrD1RI5ks?= =?us-ascii?Q?DT8AcoCfyTDf7fDCeITDKdZZOOpOgz23v5BgyzkZTGZAwbbY5Sa5eNmtf/cs?= =?us-ascii?Q?2SCpnbQogiduNbL+aNEEbvfGi+Qir4RjFED1YGFJz9z1tGzcyopqD5Put3Eo?= =?us-ascii?Q?Jjjf7p0jMD/E16OF9jqsLof7GDIDaYBJVtqTbuEP7PiSouSbhMgCJsFex0aM?= =?us-ascii?Q?UsERdyFOplVp9EWeddVptBi4vfbFOgshIydUg6FaNFrXyrtIIygrZ2EeUttY?= =?us-ascii?Q?dYkFu2sfDDzNrrJuXDRCV93HHdFYy7jXqAyW+O3XccjR6Q5YEDXcLWt3nuxl?= =?us-ascii?Q?SiVAZNrRiUcQd8GAAdz8Nf/He/dkvErmm7ArzRvL6o0IwVrN6Soqb/eC2hEy?= =?us-ascii?Q?YCwzlkMUsSFMX5CabvaLHshet48Q+yUqAMkStRp/K0Aj//2WHQ9jY0PSp3h9?= =?us-ascii?Q?DXE0hUosXXeZvgLQKV8nx6LOk697S+ctjSDo7E6C2XHPOXJ0NIUdLabkBSK7?= =?us-ascii?Q?CoG72ndavTAjveX7kCFU0OJxeqF1ijTVXaJywoxsTiKRp6IHC6tTJGrlYeh5?= =?us-ascii?Q?ADorBXBa+2hrPtfebZ9noLtTG3eeAZF3VBvKNaBiWW/V0fhhsveWVLqxB9wL?= =?us-ascii?Q?CYjRTdg8dOgbgGT+IBCQD1GdoZvdOZJbKOxhZzeigK55Cnx91tMq8ORTM2lp?= =?us-ascii?Q?oGcHVfluMAtVyxQyIPgrSRvfuSrk92YrbNfRbpMIJjxfQz2qKxpi10e1TEm5?= =?us-ascii?Q?5mSnS98aI/q7KG6qHZp9Ihm2hQMV5MaZzQ8tapP1lOGfWC3E58cswtzCYZmZ?= =?us-ascii?Q?2HBUrk+kFrVmtn4U+m+/TT5fpnC5EM5C20DSxqaFDi6Thx7srjdq/OmR1cck?= =?us-ascii?Q?8SdALxZroepVtGGEkKkVtCvtvPIn+GTsANuodygbelv8tyCiN3jooA9QXoCr?= =?us-ascii?Q?ztWSVooTyE72k66ldXar1K2V//Ka1tjmG/ssHlKkhLPyZZuz5RihOoc8TSeo?= =?us-ascii?Q?muLyfGXibMzTuF86tYEqCIYztVZQrU0kqa4IbJIlatbvyNUrEw8f2iQa6qYd?= =?us-ascii?Q?H3WIZs/tTc8zS6LWDMTK7QBTWrg0gMY8hSTb3aiMCsizi3ozKkQ4b21a4p4u?= =?us-ascii?Q?zGno78bU/7yPiDBsdJbbYfDTeZEcNiQQvO+i936cLyXopbAzh2kAm1JyLjik?= =?us-ascii?Q?CgjYIIFd6NKW/ZaS+d2X/lclz+dIPko03TnPjGoYYUy+9mD4APvFpwl37ggi?= =?us-ascii?Q?GRddDiIBa6uMY+jsrBYRTpQyKurWNHFymI1PE7f4j+xakquEzqXO0+0jxKdy?= =?us-ascii?Q?Xw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 42vEWhJ9kcjTlPez7aP61r/0bLOszU9+oWu+LkfUx5+mumOVVzZ/O5YIsE5mUiEmMIBDslJCFl9znfAsFY0CwbhL14fB2/9DrXWihLGPW1Q3XH+aGOrTn/KC0zHYcWhFuiVkxKi80QmDHzghAaqGYXMXLCG0LQmYXzIei0n4nC3pMdSbpJCSfttoeT0ieLYY7kj9/SiWkTLp44OaD0VZTgRTxVSHW0EUWH1srfZKOUwx9HAuIiKu9ajJB0cfBIOnDU55kPu+TmAbsn7nB6rZbaeNGT8RkV04hSOYqtv+rIeirl9k+17M+hAVe+yHKeYEUu4P8gZfJvn5GCP1DnX1t08SSWbOOwNOKv62en2o51rIBJcvqaL/nvTLwcNrYH5cpts3NYzddC6O9Kl9eGy8laIGCWNgQU7Ok+Xl3y+sB12p+yKy1vDiAtTcG4XZRJgEQlvz4hRIQSy32kSkPPPltgAJO3M5eghXBhhwqmW6YdEK564PrDVHyjfIRInXHUtrkLAU88Cf3LNt/KlNKxTKe9Qui25ZDWYpAbkK9fuw5iFDcqUtAE2NB4X3DSV71ZXlgh5IJGjU5lusGtjJUBcERGybhW60CQST8biIPyaS6lM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57581fdd-0d88-45fa-21cc-08dcc2e05795 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:37.9639 (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: rb0TTYoLKo4wr8wOPmfYzMlSr2YRDr4Sm6Ss6JYLp2kQs+EGFOuIM74DYbnbkqW+g1XTDpPNSV6azLPOTHNzOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: 172SnK5gjyVSOoobUO6vUBRuQDIcSWNi X-Proofpoint-GUID: 172SnK5gjyVSOoobUO6vUBRuQDIcSWNi 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 | 78 +++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 6550d9470d3a..217da37ef71d 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1622,8 +1622,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); validate_mm(mm); return error; } diff --git a/mm/vma.c b/mm/vma.c index 3715c5c17ab3..8dc60dcb6e8d 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -883,7 +883,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; @@ -928,7 +928,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 756dd42a6ec4..f710812482a1 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; +} + /* * init_vma_munmap() - Initializer wrapper for vma_munmap_struct * @vms: The vma munmap struct @@ -127,24 +143,58 @@ 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) +{ + 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. + */ + if (unlikely(vma_iter_store_gfp(vms->vmi, 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 unfortunate the 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, @@ -297,22 +347,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 Sun Feb 8 02:21:16 2026 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 5904E1D174B for ; Thu, 22 Aug 2024 19:26:56 +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=1724354817; cv=fail; b=g2Seu5z4ck286vlewK4uGJGWEzXQHmWoY3AYuE7ASWXgygE3he5gIRi4B1HYM/k+fbtuZpw341auVE30OE7xJmajOsRocVkAef+XYx5fUlc4zgFg+IaB+EbmwPCsDr6sHuT57RtBGfasJLQWNiuFf5YzuTmHpTQDmhcyMlY4n4E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354817; c=relaxed/simple; bh=JeNyjEYotExh6kBf2xD9KGTbEOPrpNiT3lZeVF9sCSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=fqMbLzFo2+z6h51znwul1u+os99OEBqkYdNXQELQuZyZ7MEIeQhG6qNesvjcVQna9hgkpCegDVJ5QAyRzRQRROt+ICSop+FCwO3KOBBPzLkwTuaF9vr9jFlKBsRYhfZbofRDNvpBK/fpJTDfF568UV0J1hiN83w3bTN5v5SGDGE= 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=AD2fBBFm; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=x6Xtzvtw; 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="AD2fBBFm"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="x6Xtzvtw" 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 47MIMVFh019167; Thu, 22 Aug 2024 19:26: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=VJwZMoZ9FdNzvr9ihYDV0ermmuz2Um1cqCOecEEoDKY=; b= AD2fBBFmmkqng7sfAsrMu663P2oGm7R2uBHkJd6vMwMa9JjYdMfptmVaNXy6Lg7k g0+1Tq0KiPhiOPw8Wna9jvVkikDd1mNQWPYp0uV+vyP0nZOjVCaNGxPvw/Ra70Nb c+UdWuCYIkB5R8uv/THzhB2zEJEIqU8wNAlkQebtJpv76QV2zgupCUrnuGMLC4gi RpydR6se7q9JE6RvL6XXeD9R3N/01JjzrTYODvbofUbrvLG+7KZkGW50gNQeuCKM GNy59oXNfaw9kK+y166UxSa8XbnKpBcpvi+a5x0iJXRmCrrGj0DjmV5SkUGRL/9k m0QlthpbYL1odEXW4JQlHQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m45jwaj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:43 +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 47MJ3jJM020764; Thu, 22 Aug 2024 19:26:42 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b5jryjb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WxiuAV6Z9jHqu2F0joVZdM8b82a76/QlHAyDUxrMf1QRBS2uKp+0MIggrxGCchrGr8VZaGOWDzJNri+kQ2K3fCb6+CUXb9Q3b5v6lXXkGym3XI3wW/vf/5SMPc8Zy69p5uDkCf599FDKK6HMu+X7LVRD27PRUSt5kayIjRD2ZByTyz6qLK3BIz0Mut5sW2wwg09eejuDvJyHh7puTDjEvjDxgtkLBqelTLesHQTwdooKQGBk+mY+5zX2fi870ekkxexGDbuSa9k+sF9+lmZAfvNomv6u6/tZOImSYl/w+ETZbGP+YYZpc9xM4gTVBBk6oZfBDrBsvmPNXEkMasTeNw== 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=VJwZMoZ9FdNzvr9ihYDV0ermmuz2Um1cqCOecEEoDKY=; b=bxaOEv+LeiqUES9/x0CKSkXjR8wpgM1B2CI3Lq1tXYTUzLH6Y7qgS5yqb44xvFSHs5xG9Eeg3NwDcXYLvwqa4X3mhpKjQFWHNbalfVJiYNB+HoiNnoc8ozVjpxySYy9BD6rsmSmnXnFYyDMiflGFIwpmxlRvYnveTIQ0fZx57AkZ542YvibxmImkjbiDjzfZshTew2lHiqFEJnoq7ow5P5bOuCLWhBkiq0UCmqY3xj2u5W/XbJ5V2MijoqkHMoYd1Y6SY/TMG6+aiEWqrkJ1yQ2t1IxnxV6HewttArLSc+yFO8lIKNAinR2n+qrVaRfKktoEnLeUMDeobTWdQJEmvQ== 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=VJwZMoZ9FdNzvr9ihYDV0ermmuz2Um1cqCOecEEoDKY=; b=x6XtzvtwPi0lPkibN+XpZz33QUnegDZ3zI+lJjZX4vRbVPXfXcX/BmuVXZ548iAwd5LjMPyO2aB4artQiaFrD+g76Gg9H357Uuxx/UYPlpb2pn4oTdDIPf6OGyBPxSedomXg34QvezQgsMfOA9CXye+Y0koK6iUVNjMV6QqPlvc= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by DM6PR10MB4202.namprd10.prod.outlook.com (2603:10b6:5:222::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.18; Thu, 22 Aug 2024 19:26:40 +0000 Received: from DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490]) by DS0PR10MB7933.namprd10.prod.outlook.com ([fe80::2561:85b0:ae8f:9490%3]) with mapi id 15.20.7897.014; Thu, 22 Aug 2024 19:26:40 +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" , "Liam R. Howlett" Subject: [PATCH v7 16/21] mm/mmap: Use PHYS_PFN in mmap_region() Date: Thu, 22 Aug 2024 15:25:38 -0400 Message-ID: <20240822192543.3359552-17-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0323.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10a::29) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|DM6PR10MB4202:EE_ X-MS-Office365-Filtering-Correlation-Id: 54d1ff7e-779c-42b8-539b-08dcc2e058e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xLgfGiI8HXoCqPqlnO+DBDfgc0DSiPuioK00H/rCDbE1PGT8+V2kuI88VKNF?= =?us-ascii?Q?NlnfulabeyjlqZHvKnmRGmHl2Om0IKHRZlXX57K1vFbe9nktk1yWG9H6T0zF?= =?us-ascii?Q?qD0HQ46Fx5P7C6aUwf6/Ev39dTUtbSZlvCmnEfu4nxCcBVZsp1JsEvZ7ArJM?= =?us-ascii?Q?pClKc7v/w5rmk1Kle2VgXy82lH4jNZi7p0Sxi3dL2XY5uouonzmA5idulX6g?= =?us-ascii?Q?+uhv/4iT7fXit35CFXh8TI/0Pp8pBYEHFRh8CXTTx9VDHkdyQ4VSDE5uLt+u?= =?us-ascii?Q?4wuHMOerf+PqFxaTsyXRrSY/wyGW7DfnpD6j7UzdpVmvfDWj0GSaYkRnce8O?= =?us-ascii?Q?zuStAI4d4wGpGhIJJNBgHw/9CHXFxobpBYugQ+U/3kfKUjAj8Sw7xFXm+shS?= =?us-ascii?Q?Mao4pnIDb29IIdjGstQF0Z1b0imMdKtMBcJuAWkWjM6Yy9iQxHU/0DR2cend?= =?us-ascii?Q?XnsGTPPOY2+8zuhV3CawOSiFxc0BiNDI8dS5v1lxwDyyoU5FkVNKN75R44+R?= =?us-ascii?Q?YCVzgY+Cbg/Cfg0wkLlz357Ffz+J/KP4xLwGWPBowppttktKkknjD3fboQqw?= =?us-ascii?Q?lv9athrX7+ClsicXwBjI6MX85iYtxvVSI4cgglzbGSGtvZHYEYEILw2D0s/E?= =?us-ascii?Q?YOg+1GmyMgffnhXk+Zsb3BTqbASdtxBiGvoVyHBfjRK1796Tt96j2S/oIPkA?= =?us-ascii?Q?nXDKvGD+2y/spXSFlXUsYRJDm0hbQkKjH08MWuJ8xnsZVZ90x88ryZNRnftd?= =?us-ascii?Q?ADaE35eoktAuCKcjRbPpkS6SGuc6/S9Bdi+cFmNLgFVJQc8cyARKdBNVzyvR?= =?us-ascii?Q?Lq4DK2RXs5nnuZssr50Fcw/C8OPG0aPS+iswuHXRXgot8Ru9W4RUOYc9my1L?= =?us-ascii?Q?PY1Q9dOKZdxPGcI3YMtV5qAm1B/7bCGW+xBbohrcfEJqmSxqn120gxGkVUEM?= =?us-ascii?Q?q0qdW3/N23hC+5qJbOZqF/UiF8OVDdz5fb3GDkAPwG5b0mVJnoizE/zLdj1x?= =?us-ascii?Q?ldPxbXzL8HnyYysWBQeUc2z1KKJ5xTFvQVSma9kGnaJql0vahAiGN0DwwSOv?= =?us-ascii?Q?PhibJe0WtV50nUuiFFpxgUXp9TQ6EL2Wjs4yN8AxPqU42AdUyK/ZROD06+ST?= =?us-ascii?Q?eWoeEX9WEQFj89hkbqouT6oQBlH+NhlLbY7FFp+R2A1ORxr9ix+2R/wE7LZ9?= =?us-ascii?Q?VVXBPG5ofXkvJXT5+cgVrJ6K5Itio4Z2jVKcaikvvi1mcRv5bZt1XqaCA98V?= =?us-ascii?Q?ot3Mmxk6xr3ZkU5RC0vGFsch6IzyakRigHdBcuxJk/NOIRZpW3AkkNjIzo4Y?= =?us-ascii?Q?/oxwBOWh3FTEPms3q8b2vzQcoC+dTwMQ3eFNzduxiaV+jg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lnZKO4Qf4upTMGtahz/bMOqBqgbQvYPiYjct2O2KCsWWXzCqPcH9qqgAidqw?= =?us-ascii?Q?P4HgPyZh9qEUDpwwdkrgx0D196PbyuAm3tiMe9fxszzbYFnXJq4re785+W8w?= =?us-ascii?Q?+YfmXuloqqLkBp8WpqsM7RrInE15qLWBe2u/pbpWwsiCCTkzS3L7HprcTxsJ?= =?us-ascii?Q?XQ/7pVxPadSxmrYB1+EBVg5kwqM2s9TEZ/LjynXIwnzZcC96Ei0lnq5COL9G?= =?us-ascii?Q?Zgfi/SeHXOXqjffLcsAMxwCzdCUodaBy+7cFGJV5f3JCkjqfrATQtwSFId5m?= =?us-ascii?Q?Lz6ib2NxtqWd/nmkwfBMWfIZV5eVEurIWUadvOIDTkUKxPA8L58GsodecXoz?= =?us-ascii?Q?12thULXhJY/8q06jir0pisP4KKUg5vUlsck/T/EFOwgT+2AUX/IN/APC+UTI?= =?us-ascii?Q?xmIp19KaG4nxCuMeoQkbotg4TvRhkDd3EM4MP4fHLfjSErE+bTl38B2JZ58p?= =?us-ascii?Q?VxKDkFyw43DcOdU4CsY1h6sXfDIinwy/t2+ZC9hIrYL+4IJDx8XDIXJdLkwi?= =?us-ascii?Q?D2EEKwCSKOcxvmu4feFQEwCRpke+8vAzTbF9iUY0Afa9uhMsjbggSBn8rnEQ?= =?us-ascii?Q?6wsAP1c/Fgp0f582hYjd32oOgG0kqvKCGVaiGQdJhmCm7laLaGhqzu7KtXmQ?= =?us-ascii?Q?qKoAz7m8G7e5U/VxWkOiWLN54FjLX2qeKDQJwNwM2yrsFAu9nx5tPF7n8LYm?= =?us-ascii?Q?Yr2kAg0zi9EnjgF27T9CIdCxFAReBt9uMLIBdKzS0GUYY5wq+hnGW/W2qK1Y?= =?us-ascii?Q?lpzS32fM2n6f1ceCeoTryRu8GbjzRlWMlbFamNl8LMS2ONXjaW/1QSMt4yY2?= =?us-ascii?Q?rOZovH/GH0fW0qaI0LM6easkx8zxRH3YFduC+9YdzGMRyfRi34YqHNcUGDH/?= =?us-ascii?Q?TiFORQiwX2P5l+5a6cB5vHK3FTPMxZO8YsX24EextdooP0Yeefgv/T7cfsJm?= =?us-ascii?Q?jPa6j3kOR7Doe/1VE/7Yh8M+OLVmt2aRpQIazHLjje/kc4A0Ni8S+K1WsY4q?= =?us-ascii?Q?ZO4IiGtBEtNrRVDUsDTwowaNv/YgsYHMGodZhXy9FqBQ6TdnqEhDu8tpIohI?= =?us-ascii?Q?TDJIlbGAGSHir5FUvo6+n3I9R5syGL01NJX5K76Mb2DIu2vqYUmV12KVYUgq?= =?us-ascii?Q?tF6LiD4X9ppLO8e2ZFPqaxEmCCGHJ84qIXUv1BbNTS5TNhsKie/TiMtcHSLZ?= =?us-ascii?Q?7SV4GTMCTisqd7j60SKxpnjH2v4eqT2M4q0XpkdDEHTCGTv6r9j8suLmWLVD?= =?us-ascii?Q?TRQ337JQO7H8ov6oojVbFy4LUr8HZTBl756FdktAqhMRaXdWl+52VI0srFnm?= =?us-ascii?Q?bOQDFxNxBZlp4XTzIUalw4jFhkuYZ/r/S2YfQ5a6jcB0MM5cfMdMwoQR+JB4?= =?us-ascii?Q?HptOnJ/S3/jdhXnn14xODxvYIn9a/G0oZOdgwgEkTyajSzkrhHUn7/pTZe6y?= =?us-ascii?Q?+4PjEkXpgyGksQ3sSA4DtzwK2nfoNVsKwKnjib3hjivrrT7H+QFAitTgBHaw?= =?us-ascii?Q?Dp+Pt/z0nFJ9fWyUjmloL9VYwKBryXfU/KW7ExXeW2fGWmsN8/0GEYhjdh8T?= =?us-ascii?Q?fYH99MuTJYwp1xYO3sil+ZONsFEb5orthP6ujgibBufCnbMtbO4DWiLA8+yH?= =?us-ascii?Q?6w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: O9LD6sxGvy6dmy+3DqyAcRVvm/B55JgORo6I+yXKtjuZse0lU5oajBKc2k4Mat8UnGoZFXwQWgkyWaDDXfrzIczBXO/mQHXIFRZCiSDbzT9QQB3n4A+rxMjB4P6RUyDsD+RwPTwdfg2RZ6QDsItyMNezAr+JJ12zo90tallIEDSdkneF1aiY5HJsQCNW7gvCHFuSWZfw2yIAKxjUnMVwVkS7lJdn9uNwsENNpSqOJWuKnOKj5jnpfriYf6hQ7qLOBeA/T7yWe3qN7Tqf1EY6wEAsXaG7Dk6wDjWvCsdlOCdYUzHoH2dkqWUAGWlr4qYFyPCSegrXO+di6zeR5on9ZL2gWF1rMQu08eSkqfKv0tWPAmvn80uTrswDf+JqBMmcjs4X7lGAbg38uKtTIZ+tW3Wl1AN1mUdivsldr8KsxNzI4cOXM5GQ353ToJ+D5UtpbIbrCKGy57l0rC6n+lXZzrbV/SVnrK00kfoXoVKLpo1dMin6MNFVWX0yB6IjxrdWJBWHbBI+ByKT0dxHoYfpRB0GG8BCMTvG6Lj7Oky7womEGek0EM7Rt93jN046aW6ZTI0+/DaO9ATt99AS0C0GwcQP+FC3FWblTjjBYMKnlKA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54d1ff7e-779c-42b8-539b-08dcc2e058e4 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:40.0976 (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: eeiVupgdAwVXg/dl9xlOb5+By48MtMsPwyeBicaJlhfQAGIevCCHZ0JHrNF9xwW8Pa4z4u1pUV8GSJEQ5DO7HA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4202 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: yYUrKUJc4UnKRUsEgQc7arG_aTTZmklZ X-Proofpoint-GUID: yYUrKUJc4UnKRUsEgQc7arG_aTTZmklZ 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 217da37ef71d..f8515126e435 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 */ @@ -1412,7 +1412,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; @@ -1573,14 +1573,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 Sun Feb 8 02:21:16 2026 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 C12D31D2F4A; Thu, 22 Aug 2024 19:27:07 +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=1724354829; cv=fail; b=tVJ2H8k+d4KpdOvqObCVPugLYJzSJTMbpkF+ER2jfyzWmvjeiJIBXAEjlGxEOM18qun9jy7jeNBT88GB78xhBL8gA2xZxObLsmoSedHpVLUdThSkO3JtbjS7qUxC5EY7ljWbAMRKueSc/QMl+ECfO7PweWBz03K7yt0PwVKF0TI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354829; c=relaxed/simple; bh=8SOE8pTa7FFO3wQjbntIvjo4FOuBX8Vr4N/o9FiLxZ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=UT/PHQi7F8cbKc2ILWMYDDNEVh1EysqJlkZ9lhdLWPW1VJwZ7IjRd0Wre20cXkUtAaDarbpb/I0YOKJ5r86WDaW2MXj5bqPcfIL7NK17Wzp7GA6eg74gWFf8fe5YIo8zm72HTRMRP8rSdOIilelCdH40/7iMJvoZofb03R4IszE= 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=lSHD8SxZ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=y8oj/EAq; 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="lSHD8SxZ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="y8oj/EAq" 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 47MIMUUG021048; Thu, 22 Aug 2024 19:26:48 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=ZVYsOiWFMcykFDuOByyZ0ITVxyXF2Jr6xdqxlzJra2c=; b= lSHD8SxZnLGoPKzrAV4gSu3/j2L+QLkR3IXhOXmiXh1ulVdX7dVFJXwfrmzhEOBH KL7o1AvF1Wzej/65bwN1WVSUxMaPQlRV4I0WyP3T4Zk1lGup4+oQ0qRsUCI37DKR rCTjHOGQlwhnUOozlkZkPMzFLDtczy212OCVoinngPqCV9ltiVeRt1/wt2ELJB9G uWMV9b03CuET+mKvyGT/9StbCWF7TPIFR00+aTgZgTXXd/R/c6bZORO8jKvOP+1l 1+ahNvaOghhbZgK656S5r56YgD5T0Itz/2Fq4cQZKbJo8s0HkiqqJBlxIfhzQct2 KM9UMWXshhyWZWwdBd1a6g== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412mdt2w1f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:48 +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 47MJ3jw8020777; Thu, 22 Aug 2024 19:26:46 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2174.outbound.protection.outlook.com [104.47.56.174]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 416b5jrykb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TlJkLjmvD6TCzUqNzl3cuMjqyQ9qxri/ud5/ydWgFOfpkrnty1j4LItdsb8tXUG34EDTRRkjwPIqiIKqvhFSra3RBmXAs+TbwM0e4IyJOhuwKJBHrQm18zyDpkCPxfMg5sIZvTad4CV7h5rb6Mz+uz3pF+uYwDnQkUiivvSEMi5CXLMyjwfhaF0hAD3zTsJ378YNeQZYF6iJ5ZaLgtbmqTmTV7VtOp6A/mdeDgWfN7L7KSf8vmWGZGJVzMA6Xsb3rgxD2kRE6YaoZskkUii+UtMRIfBR9497o+uu785NrT6ff83hphIGk5zMRjgz3TCzJ8SF0/6MWaUAXrN1K6O+Cw== 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=ZVYsOiWFMcykFDuOByyZ0ITVxyXF2Jr6xdqxlzJra2c=; b=azRFUAKN2eiNDkLiPDfvecsUIDts828rz6Kei01Fp7r+DEJ+g1p+FuiNTkV8YwhsW7iYJosLXjgKlcu9g+3X79T2g6L+iqxX1l6uw2CLofmiGTNjyMJsoBxgeIi60kwkNp4zhqtpfHvN5xTza0/i+rrO070vyNjeidCyaPHh+NfLeXB1E8p0sj1M74Sgu3Uwog+QZYRlxdHqNQRI/FisxLiDEtF7u0EVXk2r0kqZLaW72cGCqpCA8J02aqql8H0zrUd308exsAz5xCq3i5zKFN2HEUHu8Qqa/dL+BeQpZYFYY7pCiLyreKv8krL/YW0vTy1j5Xu2iS4m08QFjg/AXw== 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=ZVYsOiWFMcykFDuOByyZ0ITVxyXF2Jr6xdqxlzJra2c=; b=y8oj/EAqET/pxO861qxTkpL89SjiFS+5B2kR5z+KJPUfTYAduTxtbRitsal5aMkvyVh4XyPzDjhwWXu6uVm7kjunw009aEB+T9yt3bE5NNOlP6VCDBeEd0QqWUJ3Ovw9DaixNHkLTY/6Cf9L21M6lp+G8MH9TeRruRGRAPy+o98= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:42 +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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" , linux-security-module@vger.kernel.org, Paul Moore Subject: [PATCH v7 17/21] mm/mmap: Use vms accounted pages in mmap_region() Date: Thu, 22 Aug 2024 15:25:39 -0400 Message-ID: <20240822192543.3359552-18-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0332.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10a::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: e3695565-e080-47fc-95f4-08dcc2e059f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?URcT6e/SAVD7Lad5bSOqLIRNxajJ0cAXHFCVm6J320bEOGtMA8qK2G/TpJRz?= =?us-ascii?Q?kuVgU+u9DbZSWWxgyKkZpsHR4xqi7G4ByhlRBQq9kxPWmQSOWNYcoPf71tde?= =?us-ascii?Q?x/SuJ9t3jF0mTmEWdaKWcbAtpBeZ5hIBPuDlURItIOU9iCpxvzBjdaWSTnkP?= =?us-ascii?Q?HrybBRu2ENMi1quULEsQIZmfHuCH+gvgvw+HGjr8ytgmrGIhTimiJ+MZHzAG?= =?us-ascii?Q?hpmgAmYfVV9nEp54V7DN38scbzonz8AN0z4Q3GQgmsH2OHY73sgow+rIIQZ4?= =?us-ascii?Q?gGJFYzQEWR0nZUjGW2YYD9gwXhjKG6BJcd8JiMY7dn7sgPEcD2KE1di7lbP4?= =?us-ascii?Q?ctH6C3tvZEu43+b1duOl4+JSG1chzMlng22/CsJDTvn0epxI5kM5pmGQb7OW?= =?us-ascii?Q?MaX1EMp7xrEEbzTgwb6L8+3RRblerB0JKR620euhnyRlmMovLa1P/XXnGz5D?= =?us-ascii?Q?UpQjHQnTr9B+OtIZtmNAuZcftXZahHIrikBuQmHuYd7gAu9pkDupuDjMRWAY?= =?us-ascii?Q?jejH/AwM81+08Dr6ZssMfsY/Pk1L5oPxiB0JJGDfGOfXNGZavppa7y10O1S1?= =?us-ascii?Q?n+OHvunodkzTzpl9akroIGKcL/JS4EGct3WaF7E/IwVQSZCFkMAk8VBNF4hG?= =?us-ascii?Q?kZzrbqy3QLrxJgRLyJMepeYI8dei7ZxO4MzqPoSb41WK93hDdjolTQoeoM9J?= =?us-ascii?Q?+0wUTSLdFOvHxPZNzezCqc9dq6vfiLBzHyxLl/gdW0Qtq9TuFWGXF6tqxXsp?= =?us-ascii?Q?LYncfI4yXheJIbExth3bePM78Wuc0tV+bTQj1yn90PiwE1BsV6GrBIqyAQjL?= =?us-ascii?Q?yESf8t1o9Y+/J4O0NclRO+9vHwJCs2xDVBmb2UY2pbwf8X5C+101nY4lGr1P?= =?us-ascii?Q?coy/I4S14Ileitc1gsELFgRNHOL6h+E5DRzHXl2C6mfluC38hxTKU+aq8c3c?= =?us-ascii?Q?Mrd1Hxqkete7/e36llXd0nxvyH+LrFUx+O5NB+NnrZWMQZUMWo57DJw/TMbM?= =?us-ascii?Q?QLhx6lLTu8zin8Jlm+DQCpzRU16oJ7iP1DOW6urwxxKZYhLGs+q3qakdv5UJ?= =?us-ascii?Q?fAkWiUSqlDJiZsChFcYfVVaahPy6eHrHGaIVcTuCmJR1aOqZD2fSF6HUsO5k?= =?us-ascii?Q?mGGB2a+A7FK4pSO0sbZOzAzd9WLazAi/tNEW/YurJxgNTaBBZ2Ijn3m/QW8Z?= =?us-ascii?Q?KhdJ7R2LfM0bxmqD07/9bTdBoHHlsGxddzY6ctUFSxwFrql/2CxqgxpAmJ7h?= =?us-ascii?Q?UKyuqO9UDKcvIQZsHcDWCUnTsDqwyh8xmy/iuXweDUa/xGzP19qqZ3FoSGBF?= =?us-ascii?Q?61WT1YpdLVFBxX70Odlowcw64sFf/Amr8iKk6fNmnH0qdA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GxXykM97A893j/ki0bZbOeLVBw6pKvnMoULzeryQIn8EBKqYFXynK9st7CIT?= =?us-ascii?Q?1/XeZJ63X4vxEYOqDJEdh0oLJ2wp709sjyZ9FeZpwcWq4a+PNRfZPGMIiwNd?= =?us-ascii?Q?mhXnkPoqpLJmAfMzZF5mro6/pZf8fZrp85Ww7P8T997OwO567fBlrf2HnP1D?= =?us-ascii?Q?dR5RfU/QjErRGGMoE8itzvs1uf4zGXbetEV72rvwzeeH28wn95lLUpu51+dV?= =?us-ascii?Q?BicUiHFO+quNwDQvjPKnrL/AkDWY/0G/7YsSuVt7I3EQkL+x8216uy0pk6WF?= =?us-ascii?Q?ajy9rNsJ6p9hpwoOqjJ4E2dY316rINqhiLrByOPMUzBUdQllwui2Xlu5kaTp?= =?us-ascii?Q?pwgK4LE4zCQhOOMEvpJqOy7OPFWfbATf+OgkdJodHHnQk/xF96fF5o7O9zNY?= =?us-ascii?Q?nfGcsNfI/kteLfPjOcwHHh5xR787evQmUfCfBeIXoe48gOd0EHX9IZqOnCIE?= =?us-ascii?Q?v16VS8usqnjf/1cq58aimpVdNqIRFgMTr5Nd7Tqnd2vXbbrQR41bh9q5Y024?= =?us-ascii?Q?xK0niXE06yqKXX++rrbs6kWL39EmmQMAVfaFe7Vfzm6+WdzcsKWAW/WYiayz?= =?us-ascii?Q?AohOV3uB17s4hiR8u5r5DI6wWAHCDoyuGhox0YhygtFvUw3aYDuHj8sbMBxK?= =?us-ascii?Q?aLjAaw0bjOCEThoVhiY4QJgbnblsYr4GbgAyuWaXhUbmRDoOKGJG5NKBTGew?= =?us-ascii?Q?qSRMYBVK+bH5cuZZhY7zYrHUZ2nIqkU1fluyxbqZcRdHOYLj+dap+3aMAnyj?= =?us-ascii?Q?Tt1Murk/s6D+bujnFwEAyHfPvjzbKDKyw0ccaU/zKWAWWW4uwX5rg29lc3fH?= =?us-ascii?Q?+VZOvHuelQ9Rb+afPNl2rtlPL7Tg7Py5GhDog3H6XA5UsmeGNI93O/abPmgf?= =?us-ascii?Q?07cH/JijXHuEHwf1ejIcP5edbHk1KHISSjedXlCZKHEUG5eFw2S5d9a6pH/H?= =?us-ascii?Q?p8ZHVppSpqo4mDUxaxlLcsqtLyNh5bBA16QaHfyuFIB218oFGuQGLpt6/bW3?= =?us-ascii?Q?w42AClHYsL5HhqOT/LMOOmC60N3ZRriAdDDW13nWtQnrUm65Cp2CWOGpgnI7?= =?us-ascii?Q?7rLUyKtMFV+gYA2u5xWDgzNkKdkeHTEgXL/jxx3nKsXNhxGVm/2tSLA12wcd?= =?us-ascii?Q?ohw8nB3fFZdR12D2aWFmqjuniM54X3rVdl6AJZ/GUtS+kD/SomGCo5Ksrfmw?= =?us-ascii?Q?rLtJoXcD4zrHMzUr2X0GzXJ/3j/aFGHqw9GyNkRgcbPdabumaB+DepRTRkUM?= =?us-ascii?Q?4D8vcERK0azR4xYJR6BMw5gvYtgzcNEPk869QM1yJqWV6dufZ9/09Ql7y0wt?= =?us-ascii?Q?JbbUfXGKPJnG38jEZbdHw6gFUIrzpS/uG3T8gM7IhcRypf9pXiYA4g3FZvGv?= =?us-ascii?Q?rmTSg47jqLFUAprvRTCoUjRnbUQHyHXx1Gsz1MWPo0WpzMXTUSp8pluFzWfW?= =?us-ascii?Q?oTextj+XzGIn6ne5bY2McdPN/t5I3+HEsH97kIGAuCxvSHwIKMkDsva3lm7i?= =?us-ascii?Q?BiRP0uw9G9oheKYBaWRVB+mqUBF38lE+lGwUD7tFHZw3m2ksf3G5rHU3uDgG?= =?us-ascii?Q?adwQ5bB9wXPC+nqIqixJKfeWPwcTyz70yDChzqphY6S62wPtWlGmfJMAcJW/?= =?us-ascii?Q?TQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BYT82CrKXj6idFfUKVM4oeJ+gGL4MYmZ0Koy3jXqRZ9fnfwyTFxvfbAlUTz82EQ2xDEJqScVc0m3vt7bIhjVFu33b/cIg8RqZIas2jd53BDWlfnwDN53lVRlCv/2AcNqPRcakh4xIg3dRthySsGnbUnoW2RagB3KvtVWd3fULEafyBbvGk+8FDZpMoMlmKrADd89PCVJxoNlpgUT9E5cRmDAO1Dv3/KduR2VWKsXrDWhDjQRNg+YthAMo1DXMEAhl3kinU/DlSUp24524ltO5aD4n2k883ItJf5ErC4hcESssYkJkfVqxs9f5vmYDC2PJehuib6prptE4nrv1aZ1W2+/0WmTFTJCgyEd/AIJrPNJxjvrGSjVnn/gW38it4uurTRPDYDrYRgLPZaUYgnRKoi9D9PcrpgKLVD1ZccWR/W1g5PQsbNZFy0xGT0hUIm9esX9Uxov1w0enuQWX0tilMFVYMerCbB0z8TfuULOYq9i2kYn95NbYc2kKvXyiG7lLkMLSounN1EVn5q8L0nFsXTYDBcRLlL3WSQnBb4P6TuN4E0LrpXaK4248x43eBDpw0XYdZn034LMz/RLZ26RtxjHwlahvRmiVxbnYCn8EsY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3695565-e080-47fc-95f4-08dcc2e059f7 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:41.9154 (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: /ljBBHeME+r/QmTipq5uY0Zw1qoeVjj+unGy/OA7tup74LJt4pSAVX/5IEG0b+s5TpiEhEerIs+VLyZpe9MInw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: wLnVLnmcQ6AXPqzwX6EZxXtDiRQHr5FG X-Proofpoint-GUID: wLnVLnmcQ6AXPqzwX6EZxXtDiRQHr5FG 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 f8515126e435..aa4aa49f3b97 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1413,9 +1413,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 Sun Feb 8 02:21:16 2026 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 88B4D1D2F40 for ; Thu, 22 Aug 2024 19:27:06 +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=1724354828; cv=fail; b=RQ7h/VEiaZU3wl65Wtf22AehRtscGKpvErKP45pNfsqJS8YpS4yMABxx86sc4+vc/T+D1cs7HlzwbCfdZGQz1XMbb3R2r0TOgxm6M9bB58UUcuzENX4HPZXvpojKDHt6qB6QZlHWCEeNipMJinofcgD7Gn83+0rCDMplvgLOxwM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354828; c=relaxed/simple; bh=C6W5URgnGrozEDlG5tbQEpmXloLQm4sgl+FoFDqf5bg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=V6KgcOt9KbF6Cg0/9VUlJxGZKr6MGhb1gZNGwZpDcGY20Ti/C3nSnZilVFY7v/DbOpc9PIqeRhh6knOWxWvTEZYr1ORE5J1Z1DIKgWdFdVvcAGVMyAYhIF6U1DoOoEy7fRM1t0Jt8WDtHwRePusEfjwYZw3iJX6UjNZpwbous8U= 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=k6CpqPnD; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=yVQ0IEDa; 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="k6CpqPnD"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="yVQ0IEDa" 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 47MIMYVF000818; Thu, 22 Aug 2024 19:26:53 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=Lq7kRWDy/JaP69JbRtRp7VUtMeb++6kHnahDgE9Gb+s=; b= k6CpqPnD8aSWktIcZ6TwZNm3udxyuEOGh+VUcTGWfCToMmHA8w7rT4WZ3v8TDIyb UBLs6wcNagqFCws8HhIpe/Y2h9H+RL0ZRnCunuGpuLsoghC/GJfFyF6ttzumxMeH n6rgmswEhQ+MY3cmuqQvipK0nYtCAt+6FH2iuqGy3xOvSH7f7uVrru5oif02qUsB JzYyJccq0CdBEEqOxfJKHNvOQroatfAhnosEV4QwjtVO1Ffd3WLkyl6KTCOXdcf6 9B6kKorbGRMOHYbtqFxlvLrfOeSvRZ/cvfLg5dm6S/xP7PTcufrPONX2ddE8KyQH o3MOml8YGM9dYxSnTej5IA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m6gjwrg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:52 +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 47MJJOnU005646; Thu, 22 Aug 2024 19:26:51 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 416bcu08bq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cG4FSBgOOC96TlP4ZY2TaYtx8TvbwmppN7jCy1lp2wyuB6usjzs05fuMCDDbKH2toAIn/PGqp/OumPz3jIjbQD0d3O0uFDcAdStZwitIoxCCTW64+jmWEFpMJ4dGfEHd6SNbMdh206MZ1d9JF3DO8D4QR6Glbg6LDWKCDtzALg+VhTb2znFlQu/kU8b9bc5VFce7uR0TThpzheTTkz8xawAN+1MADOdmKWOe+Tx8Elvc5phToFIRMY0xA2MilYbYgGVyNjb3EbHBxLqsJDxKUJX639i7CdjnMJbDQLY+qI4hjM9HMe2PbuvBXvRZlPr7tbvN1WdodU7UmYZWOP/dyg== 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=Lq7kRWDy/JaP69JbRtRp7VUtMeb++6kHnahDgE9Gb+s=; b=uUWdHQ9lY6D9buLCU0lQpTzpm3M38JUgPr3VNoeAx+YpDjxqlp6KjprWPLvLZtZIzfmhEe1c6uOG9M0jeRy7oY9fOHDdvp0b46GL+X8W73+0Ay+/agiPmznow8133Tz2ro61wkVeHJHdbJs4HEjX1ICdj1ZBRB3HSUftRCj4Tenr5XVyvUK9AqKo8P+a+9m/MVRPuOHJu/ZCvlldyuU2Kx1gU4+pbDAgn9UdZdqV6lgMoiLUhtWJ3BhnFdxbnAS+ichKuaxWTBsykXOujQQQ5waMQVG9VZIXmfasc00tjHqCRDolx42gK67+hyiowTqJG5Yx6W38mCxxb7x6JQIPig== 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=Lq7kRWDy/JaP69JbRtRp7VUtMeb++6kHnahDgE9Gb+s=; b=yVQ0IEDa1c2wt1248cjptMsTF7Rw+vjLFXFsKpL75cow7ddEsh+XSA2phTcsAVZWkt6f7TkAp5skfLAxMBcvf5giwQu4rok7GNPSyWCNiMoIO/fmrucC9bwid3D4MINfjFDLLl3j9IRTX0DcUOlQt4TtQ9Z67X2aj1s+RlUUxLU= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 18/21] ipc/shm, mm: Drop do_vma_munmap() Date: Thu, 22 Aug 2024 15:25:40 -0400 Message-ID: <20240822192543.3359552-19-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0017.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::28) 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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 912e77fb-540c-4d1d-99fa-08dcc2e05aee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Jk93jM7BbsHqigYiyMUBREvP2TNhUYzVLD3hN+6xM7hLpqDsr2IzEjJEbN1L?= =?us-ascii?Q?3aTEPsVvuDlUF7Ahi99y2dooPpDq7+CpLf3Lm4JxnVRDKhojIFCOjAR+s+v0?= =?us-ascii?Q?j2NA+DwQ0DFLaTQKFiGUGt6ge6bT/dQKAx5EJGd77GvqT/9FfsbVFufz3QMq?= =?us-ascii?Q?vLLaMqkgoLbi4L05yYwUs9WRUZTEtyE1q9vWuhGN/aJ+efPo0Tgod0rPqO82?= =?us-ascii?Q?17i7gznvvZLhbx5ivsMnWvpW05cOkmgHbnc+pstCebpe2OqyM3BNIQBk7O4r?= =?us-ascii?Q?SycEGjRTsLEWJRDwcoNxaz/nCvBSQiDlUrczfcHkjsPHy776VOanr6g5QBPp?= =?us-ascii?Q?vn1NaFhz2bEB0rhB7KPjXdsCqTuVrPSeFrUSzYX+VJgMzgjiyZS1O52q8Wam?= =?us-ascii?Q?TR06kffpGfj5QZWjWqm8kZvgc8LVzFwkbpRsnnEocQhtbKCDO55X8i90Ksct?= =?us-ascii?Q?BUVCWENaTWJdDiBNnie+Mh2Vb7xrUX0dxG6juj2JyGAyBZKnLa0HNFVm43Ew?= =?us-ascii?Q?19/KfrDJce+NfqmYEEbM1RB+ufMnn5V+/foSmAZfCZeUQGUbJ6SGxzf1/Byv?= =?us-ascii?Q?0iIqfy43C6kpGclxQmcxj3EjlU6gihuginy141s2wwmb1bzGdXjlzoqSsFAI?= =?us-ascii?Q?exf3mAh207/bGBrQPq3BjaTqe3y1seE6bb+1wqD/ty8CVXvhL8+EmCwEr+pG?= =?us-ascii?Q?A3V4wQeGBnbldhtgP64dzWqiLwJL9FRM5UAlAKfw8UQqaUCBVgx6/1y4TtwM?= =?us-ascii?Q?1d64F9aLflTtSwlZklXsqyD6WRu4DGwOMEqgwNapj7pWA/gh595ZFt1hu9Ky?= =?us-ascii?Q?vcO+mg0OcM1wGrEy3+qcsmAxvfRm5n/cWnKcJQLcEC85Aa9/i6J6dtsZuLak?= =?us-ascii?Q?wPnU3LKcQ0szfjXBiOsRGmbxGfEp+HOoc1OON5DPmqMwCykZcaH40Q4vw9Ap?= =?us-ascii?Q?hsRLXlRZrsoXCP+rG/sQXc8OW1vAzF0jJiOiOs8UKCuLfjWz7fRrJ2kKUoRN?= =?us-ascii?Q?YRkVrebJE+iKH5oZRJYAAKrSVkP9YUcIxkWrBBM73lPQzmtGbKAvaj5FPCDU?= =?us-ascii?Q?z9NKo19tc8pk3FOvFftm3x9+T9ndRWi7DoQjCBXnUJn0DGQJElbZXKvsJ6rZ?= =?us-ascii?Q?rrqdx7n+ZZ5WLu71kRpGclMNBKE0SQmgIqWAeeG1atYW7DZdnYCaSiyI6gV5?= =?us-ascii?Q?hjOA4nnGIqoLXLMVNiaeybwFu/GxGcVajnPoG5XEnOuVeK18bc6dOF3j8+m3?= =?us-ascii?Q?5bFkWzFNyc+kqGMyhq1NPQUPxuwV2BkHWPmBJnIFIvJJn1ca+LCA0nFhcAFR?= =?us-ascii?Q?BI3XgtkGKa6Rds2OxMb1MldohguUOqktvexNSnzU4Iei2Q=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kynkB7Ree5EiqR/nCqaSEiv//0jODJS1MvLXBUFBXB9NODsbctMGF42XDH1p?= =?us-ascii?Q?IjnuGW5THlWwmAyPUrfONlfW34zeC7ZuOcQElXRsuqBCe2gM96sjY1whX8zr?= =?us-ascii?Q?Pk0dc5/zkad5xxqHFu3hTCmqlK5mv49PJ0Vf/T8z4tvklOFykyhOgw+LMS87?= =?us-ascii?Q?P8zZ/2RDvfsdemidwDaJDyMqYQZuelkzG6tRYlBE6o7PwJdAnANp2z1derCv?= =?us-ascii?Q?UhZNKKTgErk9pOp2g4y+eDGjR+fSUbczCnp+QfayMGuZ668TJe/nQlMMUPdZ?= =?us-ascii?Q?v7/RsUWKXuv4u9huKIxDzbEjpUNjL3PQ2rBpoa1SzPYZXxRS7YvEuHTO4eF6?= =?us-ascii?Q?1MN9XdIObHTvYzOmv+RdDfznphfWeONb0HPj0XDAgHNaPgGYgzhQQKuOBD2m?= =?us-ascii?Q?8+IeOPFwpzzNxzYrCfJY0ZRpyyyKkiFnxIlqb9dWwShST7TkIVkgjVMz0Jed?= =?us-ascii?Q?TDGrc4H0U3r7mpnjIWm037NsJYPfWAXfCU8u/PCTEqV+35K09lKS/x2RhdcD?= =?us-ascii?Q?VgbcfI+JRK6ENNh2QYc2rLWWgyUnxCcd3ULszNXmKzMMqve8E4jJEfDJbuMl?= =?us-ascii?Q?b20uHgN7uVKd2GeE870bqJZ9HQ1fX0p3yaevimea0/qTi3UwRIoqf1xRMrWV?= =?us-ascii?Q?ph75fMaq5QAzhng/RjkcmU5/5xAiMGh+sekxDbx19O34lUUtAdhoXtZ7mHmB?= =?us-ascii?Q?gYf+ycsXMZPyXhHe3xaEuxKaBZXwGXLpVr3Y1iESDsJL8aUKNx5MVhuF06g+?= =?us-ascii?Q?MrIIdy/b85J02DU+ZH3Gve93RzxBHOzGxIXaJyRmZhpw52Xil6nuCf3W7B6R?= =?us-ascii?Q?vgwdXsy+N8EsWFqpqWcjxTDyHkm5JoqpHHobjXplXB4Hpr8xmdpBlECzUSeU?= =?us-ascii?Q?ySXM/hPgmMlhz8UpCsaZl/bYIMEv1btr2M0IG7eQVj2sxvKtXmSFvWvauBWR?= =?us-ascii?Q?bSuh5i2iOk6Z7qcJXNC31/eJ/xnGCcSRLvfaJDHDpSnFPWd2z4f/QMOK4+4h?= =?us-ascii?Q?cZC5Z4bh42uhF9cKFXtcHBWVD5YtTCX30GuHzGE2xx/5bFfsHGh2Jl8YpC6J?= =?us-ascii?Q?QwEjIKbEUZ9+Y4TsfD/OD+hpzlCoxZKbWrYnjE36Wq8Ora8I5ctOTi53/MoP?= =?us-ascii?Q?Nh7lrX1h8gvQiWLblTxQYbVSsGIUddGM9yn4VOpB4aNO9gp/di0/W0HUwGw8?= =?us-ascii?Q?k0FChbAsKPmmXSf1s9boQ1kWEdb+E7ZsJL6/NuvWU6FGGCyOyPv0wsmj3kqO?= =?us-ascii?Q?iecGOI7rNt4mJAD7xmM6LJ9UDZcap12xmo0i4RyeMyENEjn+neW5+44vo7mL?= =?us-ascii?Q?c9ZPUJLu7WNbtcPJdlmZ7ZAXB+NCQ0tav5xpmzFu9KD5QskLC64qILHrk/31?= =?us-ascii?Q?WWsnEx8mxtHNYtNretcHu6jccRtzbxgEKWlFxob/z3Va/D2bDrZU6Fm86Vl3?= =?us-ascii?Q?dvcrVLRo4lVzzdbmWvOFMalKDR4cf4LN72u/P9nDS5IttM/zM7ZZodd+RS9z?= =?us-ascii?Q?ONe04obMe6a616r9EUWSNzaZF/fyt1oLxok9Iu4klmXbY6uf4yFFuiE0KFoK?= =?us-ascii?Q?FtEfqD2c+bzn7bS7abCc6/8JAFy6pQ2QQ5Ctn9A0eyQERSEvKVGq22/M8t1s?= =?us-ascii?Q?jw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: EP9KscxNfeGRCNLd+Poc1wZzUFaME12Jzp2pCLD+d+oKZjEExIHSHXn2RglX9IFpaMkdm0J+JHnOt/OQgp6kWFIleqyA1c3+TpRYv0Q9U+39RIfw5yb3zb7Gu3q/03zojzQLRvubfU+mIb+8u04cgiYtc1TcFst2c0Hb0x50kacz2Le2Ahzan533VMP9PDq5LZy6U7ByV9Yl0LR3/JFLkQWgbTHOw1bAytYiANX+POXYtHjykmeB0M22KlaH+gnh+LWerbm+TJ8pO3YIqaMzXy2GbpGqOpJO+IcjzfkLjV3w1oa4GuQGhBnqVjX8N/JpkhRe8aBDombR/0BjvyNwENlP544dxl+vAyZmfkfKxwcGaWEiKvDDYMPiOB8SLcVn062PtOG1QYuQ7BZaEJVa+W5jZB+DVrvDzYBsYg5qxMf58dzJiWwZzCZ0hNlaOHtJpn3PdvwfiPzlrAH0KMVgvb3HRu0vSKQMvtqmWplPqGfDeSOYDwdBDLd6nopQnBE+cSpEvuUTt+/chXVFVBoVAjBZHVsa1FZ8g9UGD2V5keHnitilp7xtWwz3dIR31PCOPBB63yKFMgPv04uSObXGCOOV99eM7CjuLrLugOfPSOY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 912e77fb-540c-4d1d-99fa-08dcc2e05aee X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:43.5711 (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: /3ifNBehNGlnfbd9s3Y4W5JgQIqLdc5TsoQUm4lqdBWNc6NZ+rAFH98+tOhlxXX/dhsvQqijpZbN2bSySbSL3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: Heg3FD0VzmWVWVKfoCUx9ddUPeAg4YOd X-Proofpoint-GUID: Heg3FD0VzmWVWVKfoCUx9ddUPeAg4YOd 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 b1eed30fdc06..6f1835e3b430 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3292,14 +3292,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 aa4aa49f3b97..51ab0bdb856c 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; @@ -1478,9 +1479,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; @@ -1742,28 +1743,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 8dc60dcb6e8d..91b027eb9a38 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 f710812482a1..8ca32d7cb846 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 */ @@ -113,7 +112,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) { @@ -140,7 +138,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 Sun Feb 8 02:21:16 2026 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 BF8F01D2F51 for ; Thu, 22 Aug 2024 19:27:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354831; cv=fail; b=ESeaEockEVhWtdTY1XWQmCJNNHIWrHeBTuIWcKBr8tNPa0MZ/gBBbLkzRhe5v60MqR55++HKZfvjD2pjqtKhNZ3sSzsWgLdzna4R+59YcZZJHErNpG5DLO7vcPcJqUaTCHEy+EspJHOQmssSU0+l+O+cUmU57UJmoyYs+1gbANI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354831; c=relaxed/simple; bh=P58uGWf10T14Go3xsX3Gq7tRhJBYzn8dlHpue7RZ9FM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=VV/Il34xYGUYt0eAtQcm068RltlUyrXrtoK3gsTwqxZ6Y7iYRthhuCAg0H/yDHQpe4V6y3JzwJQMk0CUCZwmWjMoRxyBcXzS9f5DX2zkC5OQAf+YIx9Qr2i14QPpNuRlobnGwaC7o6EN6NbOdjv/363z2xsxAwFdFbyaUbfD6+Q= 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=ZYpnxnYt; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=J7xyziGl; 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="ZYpnxnYt"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="J7xyziGl" 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 47MIMr1d026289; Thu, 22 Aug 2024 19:26: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=2k8vIZw4lxINxvd4XX+iaMyXmk11DEGFPw6/UBf8xuY=; b= ZYpnxnYtusDbMOdnGVMe7Snaz2B9kKhh5L19BADADm7oLcJ70U+ec4dBesFWoYQs l+yP8qqC2mAlSufmkTeZ76fuLhahqFfxVDTEXQBdGnuZ5B64B7HcvNjAGCxVBKnj A3KuNiD/BNRHC38ix001YQb+DLEQJHwUOUDKHG5ZDKbOEjycFOyU5GCOaVzi1k41 azw55clO/N0plQCAmGRc1jrUdEo5xmG+sttZmBNN1Gk+3NzWLZjrzWyEgA3jG2rd RctsVUzLo1xeGKaY0cYbAsk97EUmC5wrX0K/9aJfRfXG3b6mOGCX3T8R+X4jjhsg CAtVkupmsPFCyK7xPUpUTQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m2djxyf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +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 47MJJOnV005646; Thu, 22 Aug 2024 19:26:52 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 416bcu08bq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GtS2lWwHosv5dqqVd4A2hDdHrPolpnfql7vF5Cd/IpDn0u/N3wNiWYi6AaefurhscMv7dm5M75zftcWP1vwJvFst0peuvXzuT+eVPFyqwKxp3tH8EZAV6yjQQiW/0vH8vpWLCEKJ+tIUpVSL83Kai05d3pa9otXPzhSR1rWVmTixZBidulxvbL21bXz6zJq9LJgqyX1Ve8WZm52ziNf22SKyZThVkYnYTe8znRzQtozQgWM1CSFjA+GnJQPKatf4aZt8MwrxNdHkVIjcjNPMkNWhuGq4fS0nK1kIDU8QBYsajOmpDx5r25FMIXy6KYyceqhRcdqGhTyaHnAhs0plLg== 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=2k8vIZw4lxINxvd4XX+iaMyXmk11DEGFPw6/UBf8xuY=; b=o6PdJhZH5k6il1QlEP4QdhXbxz1V9noi893PRs2PkhsdNzSUPZSNajO3yyvy7SWtD9My6soVQV+4QVMnwFAx3+kmGydZMIZs5S3T08toR5G61D6ZHRydywioGgshs6ZGREsP2JBS0vhr26TJX0xDVZG2c7CieKWrgBBOY8nE/bpwdQYlRwKxhBq2G67Rfe4sMMkoK959jyVIqlVUDwhcFQGqIcU5UIVV/a17TN+7IahuS+BuNAmnkCrvWE7mRU7JJr1hqhNK+/mqdfbGuINYwKbBm67ocJg79EF2ItvbHcpE/z9W+vkOyXDXUMvw6YmG1JiLbmk1osDRCHeASFBAJg== 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=2k8vIZw4lxINxvd4XX+iaMyXmk11DEGFPw6/UBf8xuY=; b=J7xyziGlt9qpmWf9AAJWX6I1CT94S09siIIhnjLM8P0vGYmr66D2BBd9PSXTa5Iuc46/wZStM8zdYXhS5XiUANqFgYZXoFQJh06LO1nw3TK6P64UJxKBMxekmIbTqCiH5D/D+kRs7xbRSLNTUKPBqo1BnRU1JQrLnG3q7snideU= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:46 +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.7897.014; Thu, 22 Aug 2024 19:26:46 +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" , "Liam R. Howlett" Subject: [PATCH v7 19/21] mm: Move may_expand_vm() check in mmap_region() Date: Thu, 22 Aug 2024 15:25:41 -0400 Message-ID: <20240822192543.3359552-20-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4PR01CA0007.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:d1::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: 46e1499d-837b-4ddd-b9b2-08dcc2e05c33 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?OBXVGMw08qUaPiIxfCQ+DNAlV3xXbKEdLnQWzANLbcag9U4DqieD/lfKRm1B?= =?us-ascii?Q?irmPAyHMQBTkRQOi+PqlGl28dJd0MfixuuW/SMwTHLwR4TGZO+GSzikx230Y?= =?us-ascii?Q?j+7CF/9uh3zUDjPbgHgFcQbNpZCIasLSXINS7bzPNRps4/q1ZTAkHad8E2mz?= =?us-ascii?Q?IbskJXydikg3aGoJFlXpARh4efBAapg6iXpg+E80SBXTVxyYkH9XTQCGr7Co?= =?us-ascii?Q?1Vom6+msX3Gpto80+wjgEeIH9pJmYagTE1ihaoHyq10taVcvg6fC0AxIIhpo?= =?us-ascii?Q?Y6B+1Q4EJCu7xk9yYzSLCy/fG1omaDx8G9XqB7EF2+9mAdjSinr3GJyKiCFf?= =?us-ascii?Q?Q6Y+bf+RS3ansz4F3Ty74MxsdD99VOluAOHgWklGPdDrP8bdDaV+7G5x3HiY?= =?us-ascii?Q?bsYdP6pP+6V0S4gbNzJ/nrCaIvlxtcc/QprUq4Ri74rlMOtDBDyRkSq7MXcs?= =?us-ascii?Q?b1CD6b8Lk25jWvlt40MOVigxhYp8lXBT7FeOUFPLuX2or8tQCeqkQcg4qEin?= =?us-ascii?Q?yZkmp+nmSltBc4LpSI08fS/GQ090GSMSqLt5iVu/tWOt4ggDSbWq4LE1jpMJ?= =?us-ascii?Q?XXQs/dSD3clpy4G+1dY9F/vIbrHEKqTBXRXV3xHcNZQZTjNz4nm1oXjfn0xP?= =?us-ascii?Q?fJQvyCWd6VBGN8dVwfdQ8vkPu4rkpf+e6k1RKSHqszigk2MuurjOgffqLZe8?= =?us-ascii?Q?IDyQeIjH8GjWypftKRYPOR3UaggDlZR5dRs/tFr/jhisvG2Ie0WZcSrVJz5d?= =?us-ascii?Q?zZwtbrglUkmZACVXV5KhkynC7BlnQKfohdcKjZMA292t9uCUhlR6Ma1tlqdK?= =?us-ascii?Q?KAN/0PoIHTrRuMp4MeDsInACKjOkggZ7JdVbLJMmdBNWUYUZ9cexXNjF48el?= =?us-ascii?Q?qwpu3YdZnoSPkcilT0GLOVH8vzh/kgXIn63hn4+5mn1SHYZ7esUvX2Emozb0?= =?us-ascii?Q?m3xaT1kGShPlx+CavqM+51z/Z2wYY2fpPDtcFWNZ08LonkVmQdAJrjyc/a81?= =?us-ascii?Q?bXP9ntHVTbXp3YoDf77X92tFMGZON/k/nDqDXlb4mCYz6I4fjYaeapsnHUC9?= =?us-ascii?Q?GTLgfpY8IEjVc11+cc3tZBllG5mayxQD5E3bk/NZaYyAAy3Qywm8N48dugSk?= =?us-ascii?Q?MtkVUjw9D+1Wz2gd/M9Y++JE6iZUhU78AR5TqE6ZbW4HWS16DQPE/IxRCRU6?= =?us-ascii?Q?/p9N9FSbpwVdknVhdWvNKAFzovQF7IHuGHoEyNmN1kgDEYwnnZa5K42niRkY?= =?us-ascii?Q?fgf5atV09IIchK/ZMSzUqCnKJQu2gJaIqTvXoy/W3Nk1wfEGtw/cxuZb8kUM?= =?us-ascii?Q?nIIp0/D/3Woqx9j4B2mktc1AFwfJ6Kw7dA+9ga/ViXW9dw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3eizxDnOYYoppcNG/vBrFopCEGNd/L+jm8c4squqFVC/2GkXfe+YhqNHPHOk?= =?us-ascii?Q?WcWMIYTXIit7WM4Uw6kwd2ayG9bUr2ZmcDKZNdCaYRFduXAtXxmmc2Xb81+v?= =?us-ascii?Q?F64TuU3S6QdnwlpTTnIyIAmrhKLG9S8f5JZp1DM+MZLxHawFKtvm9APS3i86?= =?us-ascii?Q?oY/LFYcKgM8HKtRPqKaUqiVXhN2R7qaByTE5e6MC/Wy7qE583rLNdD9QwH2U?= =?us-ascii?Q?LRqzGppN+L85N1Wh6+HyDSEyRhGgAgZ4+wtrdA3JtB8BVYOrfuYk47hwHu7i?= =?us-ascii?Q?WFnpGzxFehaV/q4oCPKqlzHOXJiyQpJt6HJIGtPPaj6/omR8zhge3suBF4Nd?= =?us-ascii?Q?p3Fpsqi8Tt3AjKswiBsQXxrct5FCx7t+Jn+2sX1JaNXc/d4NkCorn8rW//Mo?= =?us-ascii?Q?+T9ACQaZh4xTshWs12Hj8nNTdpcQfVVjvsKpjKFSqdUBLrRKk0wCS0u+Z+yt?= =?us-ascii?Q?11uU7irAWSnoAaVQgHZxLq0uwetZ0yXEw+4CoJ+mZ1KGuHXH1ofsX50VZVyD?= =?us-ascii?Q?x3To8XS7HkEBHoQiVP08uKE04AolR1CbtDmsxqYuVgVKK8T94C5IP0+0huTC?= =?us-ascii?Q?OkkgVQcdLqqHvgZv5zp1tX7SBmHR1D4CUp/hqo6UMbfs1qj+80ZTxA5pii+d?= =?us-ascii?Q?y3D8+GPBj2ic93X8/KP31JXEpzZ/dfXRkEfgRhoLHMts0dSZbHZaNdhkhuy5?= =?us-ascii?Q?lcS41Cl5LnVE6ANQYmip/Usy4Y0FpLVGqAg/QqzGVnQt9H1VmskD5172ed0Z?= =?us-ascii?Q?9By/IKU2gSvVx/xLLxegX2qf65LMZobsky01WT99jPCc8guUD1kkEpluOLQL?= =?us-ascii?Q?AMqmdSEjOCOk4FSVg6wEa+lxFaUieDFNMj1cf8qllrD/rvmPvp71cSRY4rLB?= =?us-ascii?Q?2a8RvN0Eg98gzWECV4NlJTGhucReZuPfloM8BPL7f8NgJq7IhBLFOdQ6D9zj?= =?us-ascii?Q?pkbx6h5/2WWKZ8zQNUmCB2aEmSZ5qTSwGhsxsAxdR8+aTX6ug1+7KF3E+M04?= =?us-ascii?Q?0FhejVbRwK+zXYgs0sZuEodpVN/IiefZgzzUolikNIIGPeCwALiNhBb+SNAF?= =?us-ascii?Q?+dIKQSm9GwWo3W2aU7FeFis3BaJcsjetxvOUMDFIp1j6Fdo8x6JYdop3HVP7?= =?us-ascii?Q?U2SVkZmbikgFXmG8mHfjQoSRBNlSntE3RNYoqmLHia+9salgltCljB3Ci7IK?= =?us-ascii?Q?dVkXJU8ZszJS5ItmGNslNfxY4CUaxo4fSXDKugKPzZXioIflqsSP7usPBg7b?= =?us-ascii?Q?wGBcCPu6aqGqLzrF0tiCGwwBjOJ0sTEMe5ydyYnOavtMmxKHEMe06tvJNZaN?= =?us-ascii?Q?Ed1UvtTkQ5ZoLExsDDy/zeS67idPeW4pDxMtFKduoN/AS4uIFIByCEZs3BX2?= =?us-ascii?Q?U0s4Q+vlnWceGXrbCpn+rOZt7u0URejFU6Rs/j4fv5CgCJTq5XMW7OMJyXc2?= =?us-ascii?Q?4rG/Z46y541H3hmf+AleXzBD7r99obIG5EkhE2ep5mcPFZTameJzfEHx6Rct?= =?us-ascii?Q?gwJFhGI9+cdQAC4zN+Y9cxY0XTaTXwkzWwEzPWyN2KKsoYVZNPCDo05SpHvn?= =?us-ascii?Q?eb2whSF/8SdBFAn8OAHHxb6Q/VaWAl8nFQLYD4/aUtxpIk4hGYW1mDkJTDfL?= =?us-ascii?Q?Nw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rhYRglO58dxL1klGcV8VQ1YywnOXgjrCt9Ar0Q92QkAafePBgxIySWrWy0C0YkHCQ6dS8C645NARlsLZP3cgKi2Ki2vW0ENVxERmP9Iz0hh4KeKdKUhmJnUB8iOGZHXU4+SbXXD3axAVfvw7/8mvWfNH3482S517g1VcR7aQJN+IYSJ9KbTqvgXo6EpOwndP5zJtSNk6E1xxv7cEMFoRHMLBQ2yH+UMM/znt8F8PQ+5gW2k7t+lSQSOV32iDiLRQ2C3Kz8rWF22FpTTqA9A93hx4G2qm+/vySV3SESP4zw/c5YtBObQ0BBPZXFV9oy/urtS/I0EN9P9a2MCydlni5JKFEPa1JPdBDCFxxwaAZUZZxgAoyRDC5RN9XodcVzjRF82dDSun91PyhpNndkbntF1MP7p9r2VtNNZPal64oY1w3AJ6GYWXHoNAy1p9/rO11HvJoJSRSQlKbBhRhIyMexZ/7pBWV2F+20PYWej/yimwAHmLarXioQ8RKYIwsAHDYBnja+3gSQADITB8fq6RdkmJtOZm1mQtvMzb1Zedt6xCBHxTQT+4/H0pY75LufkSTuI3WIgz1MZKlbwjzp6AMtn2mU/ETC3/ncMLURxsq/E= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46e1499d-837b-4ddd-b9b2-08dcc2e05c33 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:45.6245 (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: uw+L5/rREj/iQcg90wvYm4ZOEEY62aUYOtYjitVZQsgfEMM2A3Aho3UsudAVkfn5PH6XIIxfJq4U6FpNEgFK9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=878 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-GUID: rE9GjZmo35itfnvAhGFVqcBnA_aCbUwk X-Proofpoint-ORIG-GUID: rE9GjZmo35itfnvAhGFVqcBnA_aCbUwk 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 51ab0bdb856c..5937607f6949 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); @@ -1409,6 +1398,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 91b027eb9a38..61d51677eaaf 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1645,27 +1645,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 8ca32d7cb846..7047fedce459 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -315,9 +315,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 Sun Feb 8 02:21:16 2026 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 9F6B51D2F48 for ; Thu, 22 Aug 2024 19:27:07 +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=1724354830; cv=fail; b=bixEZia+jp2u8A/cmDZ1C8ke0dQ8FUowELDCbsS0jo7dOW92krWsugpdZ3FW5VMPHG5AlIh+Mx30JIi6lqAmsPJWy9LY0cFZn2/p7IT2g6LqUM8XAg4Odp/YLc1Qz6sVggifHyVTPbCQjZDHMz1aumkhIQ+9m6NFOpqyynjxkKc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354830; c=relaxed/simple; bh=y5unJ2WZv1HzwhVZq7cQkKkDfbivjADNirD0OwgKqlE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=k7d9m6StdsVHCzeEVGSli+vDLzoB18SxGZr1/MFJV0xiLAj9qAhq+3fEdJqVjVBwsQgqYy6Uk19F3Y2QkW9i3r//X1hfVjF037+sbkbynmovxZ4ER6886pXCVxBSoHl9+AvWBSN2rOepHwdAzRQrwcDOlhQP1hVnkzuHXocRPj0= 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=h3wPgmnh; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=p6xB+NzT; 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="h3wPgmnh"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="p6xB+NzT" 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 47MIMXpp026397; Thu, 22 Aug 2024 19:26: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=XvkWhZ3Ci2y0PBk1VQBRW3jFIo7qKLe3EqSRA7vVjkY=; b= h3wPgmnhYpqvv2I3MRo/8HL2TcuGwCQ4xCW8ASM3OEiLRVVxH0KMnqGjbk77JeZq fTVa6rO14UXX7HUjcW4MAmvraA0vKH5H18OiM9gLnaZzWPpCmwuk69yMfBY9XVPk vxHvn3O+4wLMEH2s4+JDJMI3+GEQ4GA1lnFBT3cuokLbhthDNAam8YyBWppjByuv wL+febQJW1RTd6+ImnpOlBmZJk9uIptsFvIU8IJtE/pArVoboX4Hs3XSnudgvfnO e3M/X3H8zJHnTzvuSxQxkizQjgQ7dpzIIEGmCUHHKFV4B6bbYGVHEqJxOxnIhg9i 3KbNV/zZ+KsBNkjmDmGBfg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2wae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +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 47MJJOnW005646; Thu, 22 Aug 2024 19:26:53 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 416bcu08bq-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZuK+A1jjEVC1ZEo8ps8rQOtRapu6G3DVhkiJMbJPyZsNme5BAetys7anlH9NJtySQYwS1Bn/UgCBxzykZLIa0z1sSv1vyvIPD+UgenqalkdnLcWUp4Pif4EW8ASk4+sXyrTiQPekt2BR36l+7K++OAzEKYn6YtyWJyyxdHGFAiql+JfHQY97RLIhbGd5lDpaKy+FwsCJu757haAh05LmMMemeg9IfyHxDp+bJWl3hp1lgwHJchnwXgblHqEmQGXjvs7afmabiXEefoJhmESTayAg/WIg6mGdE3x3g0QmXF8oQZEK/9J1W6QRyXrlkMDJ/JzIW/OGbbLmO1cc3qj5tw== 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=XvkWhZ3Ci2y0PBk1VQBRW3jFIo7qKLe3EqSRA7vVjkY=; b=WEQbwQ4an2bVEgNdgRoZwVWI3ysFQ8OFd2juciDLcjXUp3A2l/j8u9OKmcMx5ZZHLJPQIH8e9MCybAwyvBiqHs0lsKNmjIJ/mOxr8DnpOEL1hMZgPHBtndC48JcTsV0YDo9e5/SfquckFYwCcZntOqHm0ilW+gLmn0cWGTknlv/93eith91OV1sEA0Qdo/6wabuPgDnmez8K2QavlZ3aGSUcxAgsjCfx8oezHlEJgxzotkuZUEAO9ZvzV+VG79DENqcQR/3w1ODaN6QZE7IdAsvaazqfHI2ruJiBOOUYaeJAftA8SlRRQLGCE8VihY6eZHL8obH6NTpU6vXzuqzQ7A== 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=XvkWhZ3Ci2y0PBk1VQBRW3jFIo7qKLe3EqSRA7vVjkY=; b=p6xB+NzT11868sh2srf1IGUx2gskvDrDvCISCzAuFsw3vHYD+z4Pn76EsJOUvN6a1xHN4IP0FpFiMHJUFsNrtCDTUZOMxM4t5Ing76qsbYTTJfNEB7DkkO47fif9dn827jwf2WTb+yYzf53qxOcKe8ZsWmHG/CBvXJ8Ugmga4ME= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26: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.7897.014; Thu, 22 Aug 2024 19:26: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" , "Liam R. Howlett" Subject: [PATCH v7 20/21] mm/vma: Drop incorrect comment from vms_gather_munmap_vmas() Date: Thu, 22 Aug 2024 15:25:42 -0400 Message-ID: <20240822192543.3359552-21-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT3PR01CA0113.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:85::16) To DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR10MB7933:EE_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: d58c1627-1fe7-40fe-a2db-08dcc2e05d24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XsuE6mpobJfU7ReJ5/FqxnzVCXvNdTDqAujXlIVC/t61LcEnkIXQ4rtPsya/?= =?us-ascii?Q?PdFUp5wDe/LQhnKd0nBkfa1m0XJtSPCHv/+Uc6twygxL/mfP2tqL+vgBF+nT?= =?us-ascii?Q?xOXu6dgmfq6SlhapVRwrV4YYBqBTtF8CGqrVyw/EVy6y3KqfXtXlpX/PaeU7?= =?us-ascii?Q?iFgazfOBY57RhC2MnjbJgHBrjBOl8x+CcnbBoeErPnCftmTI+9lAiNRrThdI?= =?us-ascii?Q?GLqVGMTu4VC0HgjRR2WT9V5ZJq3TIZ9de1LWlB5LrYiE8/pjm5Ki5KmZKzq2?= =?us-ascii?Q?F+9LjIjYgN+tCODIPTB0ebuFD5OZL9gHI1L9B0EiKkDwQaR0/GtO9Ej+84OR?= =?us-ascii?Q?gpLpfI5fcxhER6LHoRwLmIqd1IYNZApnqU4npkvassLvRJrIEW3NMbVo2KEC?= =?us-ascii?Q?busNKkpUnc1MMEhXJ01auibvUxbndQDRaZdRYNXXZetllljhb5QuPFHAtuFc?= =?us-ascii?Q?WFr9aHGrvvOx3XbymNtxcCImYOIW8VLO5+tpUcGproAqlhIEQnsCHEii60JW?= =?us-ascii?Q?4XmTNADPGeQ93p6sxnhv3gIbHtbPPrubF5b1IMeh7rCHbuAyNdDJ+RaSI6SK?= =?us-ascii?Q?bHt1B8Ni0sNcI+mEem6xL+jN2y42FfOkXmoEotBPuyZbRMf/fmQSBqvwK5F/?= =?us-ascii?Q?wAKHpSjqOahBsZjSAgGNg0/CvDpr92eRKqzu0/1Q4c+Z/syWBVX5yxoo+WVf?= =?us-ascii?Q?GMRjbFlHZzBrSFPbv6k3vpwzOQPfhTIttxd8jNL2+rAVhnq5DqZl2Wa8z1zd?= =?us-ascii?Q?6swASkbdMWtU8qVpTplk+3XT2Ck/oaSeiAR798a2XQt3rtLMrmX63UHWX24c?= =?us-ascii?Q?u77ykNXr8u7DrEx6FLPS8xYGt4/DWX7A76u6+jRA33pGUJ9CacUK5NpiIQAW?= =?us-ascii?Q?JASkDNGwTGCVilyVp2N375CDc/++cqaxroOkWhYFGYMyLZmbfrQ6fsKCMLfG?= =?us-ascii?Q?IeJGT8195VDbazgSHOeo3qQGG0LVGEmcUOCp/ZNZmVbtZXWzFAQF12PxF1Ln?= =?us-ascii?Q?q10oLqcL5mHDRP//Ws/pJnJ7KHBmzlp26eFVNtcoEyncX77WrO4at6PFrnEk?= =?us-ascii?Q?zy0alLW95pcZDIy4Zuo6Cz7XvFLuXp1l8lX1N9Mo48ahAnzGFyVENgjRZXOX?= =?us-ascii?Q?aW0d4pr/jP5YC7xgEowR7nBw/EQDbGRT5z+TkOuDWDJkOfe3DASRW9hHhuXn?= =?us-ascii?Q?2sjacs1vpSnpxyAQsOPyn+wIaue0AsD9bOElLpUiT/wUZOghnF7xaE0gKgS7?= =?us-ascii?Q?/zpLtnlwTNfKp/3idtxoi3IxIkDN5oiu+WWHkZRt4luWVEajeejNg8gNJ7Lp?= =?us-ascii?Q?8m+H2888j0HQO1mHcBPc+UbYHybuIXbqOZa9RhEGko8DLA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?naQEV/gr5plRHl0FmA58j9IVqL5e492vKqfNeX7qCirMA9JZhXmHUwDGEvaQ?= =?us-ascii?Q?2q3dMhSqaMvHfmGH/YgnYvh/OvPNezzM95q/guJsMGQzennQmFr3gMXnzoEc?= =?us-ascii?Q?fMRMVhKB7P+dDycnxZuGivDKTHDCmFMlk+m/ELtiyzPsorP5PK1avZkFGGsr?= =?us-ascii?Q?wHYak7+Pn2rowjAy7TDh6zOySHs3JoXYPrV/8g24NgeJEWbINckNq54ZHgec?= =?us-ascii?Q?B4g4lN6Q8WxJdx3HI8z5YsvfcNtNBVboyWvZtydccAebXxvAtomRZsbRY2sz?= =?us-ascii?Q?S3IeK6qtgvy21cHOz1G15zyImsLMIfXU21R0gueHJ1h1YjAovW+y9ilH4q3/?= =?us-ascii?Q?7ohJcYrm1Nlnbn1mlre+sjIb0Z4ZS4rJk1uU4ROaEySTIunLAr34RY9wrrRY?= =?us-ascii?Q?3yg/ZumrtbJeWZrUzWT/uX6la7psdGeSxH1HsOc5fIN9rgwNN4KG0CQ2Y/i2?= =?us-ascii?Q?O7VhWRvDPAdAER++9PdgTUChXGiBHqshjyVN0wxC6CEwMB4IrHW23eyTGn2R?= =?us-ascii?Q?8Ej3imDEcXYXzZ1hYEF/23FYLTljW+um8g4iSRdGRRneGoKtFgvGf2JXPyy+?= =?us-ascii?Q?2jhMnr/+pYooV+aHkVtLJSsBjrCtiWCzdnp0GdGs4iLV63YSZ3p3hwYMPKMj?= =?us-ascii?Q?m54JOtlsMImmnqA/3Gid3z+hmTa4fGCUoZOipr1o6wuQmx5rczO1Ceu6w9ab?= =?us-ascii?Q?Md63WiL3+N34uZViXC88/TOr7nRT0UjYAWxHdzIEOQ8j7i1LMaxywtl5p5AL?= =?us-ascii?Q?HXLOuj2kb+/nHSOlenS3xN0LWMI6iWthSb/tOtMrmtnNk52Kg/wnb5xp695E?= =?us-ascii?Q?CSILuu7pGn1s6Pi9Rj5C6mBBmuFLZgwgBb0iDgU49rdBkfZu1zQxqvTf5cbs?= =?us-ascii?Q?XIHDQ60J1nS+H8WYw2jylAyzXPJmiX8vrWmZBLu1gBd943L2ABNsFygFF3as?= =?us-ascii?Q?6Lv5pR6QWXB2uukx5v9XJe6lNBWnA2nV+XpoKrOD2u6JeqgDShkC6HSjBtUj?= =?us-ascii?Q?3ZVheqeiLHcHNAM+jB4r9pO1SJo6CXFTp+/rJAVeXgolR5OC+hE8DByMwinP?= =?us-ascii?Q?Js6FS7BkH2DNMLRncTcNk4qZMOXX7mHawbMePizq0oMMeTPmGv3y1mPttOYv?= =?us-ascii?Q?oS4PjlNB5GJc3R78nzvrGDuEF4DWv+fSSlbEPJY6v83iI0Qti1QBlc1xAvK5?= =?us-ascii?Q?gQkoX3PUcipXb5VQlN0CxM5ECh6MV4szX2lVDhaaqmmXjRf81JjzZ8P4Cg9u?= =?us-ascii?Q?K80ZbGFjUbJg0i1yzNp0bQhAKYhnJf+rtUO0v70hIA0yZ2HZarktQgSL1mPy?= =?us-ascii?Q?UJSOIVRxctcGSCH+K3bU2IIBWbQpN4O7eUtk0mIqOsCUEAYHB5fCTn8IG9Qd?= =?us-ascii?Q?9fI8rrwZI3XaCk1mEwNVwK9t+s82aixAqV4fbPGkrSJshEnN9VRwPnnib1g8?= =?us-ascii?Q?WLMr1pwY1dQQxeGBI6IyHfYmoKIzE5g64hUBnSL2TuSVwlV5YToffc7QOdEB?= =?us-ascii?Q?4LfJ/czcwzTezfXx4+VGkw3j4mwX2FMG+L40cGPddcPlzI/Y6VfGHekqXOR1?= =?us-ascii?Q?JtFE475HhgKzJwwPXKM6E7FDEulMfPuYvcxan9EzieJNSTylQv/q7yGxo/w+?= =?us-ascii?Q?Pw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NqjYet9jI+kxgULBYQKtJ9+vHvPe573ww9JmI+jyEeOODYio5H9+YEfqIARFt1VNcsCnmYUwjoSvUNv5EzURhKT+j3snV47y1+Ia6hSVi1BUj7UhQ1S+WNgRorW2hHLJx/C1B8ye0H/OZfuaYAAsRkUk1mnC+LUN98vag8TDdt1ODhBvcZfkkA512r1updAojoMaDCkNYvw51ko43tMOM5SdyYmD71TmcAd/OCFU8FMv7EmZlTEUBuvcELxZ/7qm1bOyWUZ/7mTr4Ekpgv86qUardBRVT9yub0H49ieI0PLWT8eKzAIcc9t5f3wllkCGTagWtD3nllHIVJkJG1Dr+dWsjv1ynNlo25/q36wJhNcJaq8KQ+CRjurjS3zPVNZu97JfaSBtJRnV0xkzj4B+EkQafBJdWB4lj6ExlroNUNpcATTN+HFln9A4GJjnAncz8JNPgX7wtezgtVXdwRO7UoFgFoCh//6HUJLpcPjelW0LKQlX98qGsJWEgO+iHoCFuBI0H9boiCl+SRcm7w4c6uVUll6Ct43zE2pYYbNoKafPKtOaoEXUkEdkoEjuZyDj1Kgmm/k0WXmDkAcG0j4EqOL10H6WB0HTqowEfptQLQc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d58c1627-1fe7-40fe-a2db-08dcc2e05d24 X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:47.2346 (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: GjYeX4GdnQTqSA5SDw4Wk315cgQxJnC4hY2s9ZgfMxm8Lyd+x6zJchtx02W2AuLWrNhD8Q9pobQOIMx7kIiodw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: HPylIhYx-W_f_VHHc4f9KI7XwUhkI9cI X-Proofpoint-GUID: HPylIhYx-W_f_VHHc4f9KI7XwUhkI9cI 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 61d51677eaaf..ca87d30cb185 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 Sun Feb 8 02:21:16 2026 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 BF8691D2F50 for ; Thu, 22 Aug 2024 19:27:08 +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=1724354830; cv=fail; b=eqx8eHfqCKy9Q/m4RuL+ykj0az8MPA/tyTPt2lRQwiUddl3rYYaUD85z9mpi4pHLsqfW7AMHTavkXi/x8mXL4hfGZdmBIYwnPll47rRfxzuy/pbK1RcsHXFdwtQEiXjjtDTSkqlOnUktWP/fw/S2+21arT5BTnC9/Qe7HaJgrtA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724354830; c=relaxed/simple; bh=6kYI599eHO3W0vCC0M8rfPf2vwxqSBojefIeFr9Gz1g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=U4nDJB4m6e+A2wcA9aUieOGApkG9jp5K62uIHzK0QAqVwHK0Rhi087AKhZJNRRg4hf8QnOLfgC7wjMUiumVtQtegOAwPbDjfKZ6PZCiATouxwyNCdgXlCdv+KUGC7RiVOkTc4FsifWm9B7rB93884nr+f1Q4bL2RSdD1ughzxqc= 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=AUBtDl+n; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=A2pirFbv; 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="AUBtDl+n"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="A2pirFbv" 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 47MIMVP3026316; Thu, 22 Aug 2024 19:26: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=IvG2WpdeI5OiqGGcNid8Tye85YyH/LiFaaeLo2szEDY=; b= AUBtDl+nWAWwEhybSpDl4S7j9Wbu/MBGEuywQE0pp1QTkX4n6XGU64q1n8UPbWDW j3+GIJ/1gqsnJolFfcbN5gHhyPAqXEVwdRnC405FHS034KzNbGldSx91UfX4Q8xm DWsZxQGmVfc37ZopE5aINSEHpTUfiCnUWpzXeeVOD4d4dMPhdUOlL6tjGlxX6Mzm w5Hqnu6ltWxOYEiUPKzKTM0G1BL96vV15RRsZIUsYrfXyiA78XFpQ5qf/nSM9SpY /V/Vh9CdZcL1udUmnHvvk+Ca78y9YpkWvyQ63uSToEcRMitGAa2uoDqtdknTAthi SN/HRyQI5mnPdBmk7XJyaQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 412m4v2waf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:54 +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 47MJJOnX005646; Thu, 22 Aug 2024 19:26:53 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 416bcu08bq-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Aug 2024 19:26:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YHGbQx7x5ax9Rakl7c43PBXX2MTdZGzZ5K1dcRHnVjcVyQTk2WmrOfqEgxGf5SURjGZNc6egARHcH98rS++qlw1XMFIwKkqDsdR3UIX2HAfmgBAz8r0W5GMRfiRClffK385KtAko3gZn+nnf5LKHNfDH5j1YEd7lGzLeGMPbZqVQkWhQoVZapbzXS1T6ERtuHZ8tYZTwGWx1SNt5gDd409X/9zWno05ngeF8e5lS6a1WYQsZA/FqW8znJrt8MQJ90CeIlim1wjejglZtTkUaXUVkAsXp9+QX8cfLtUbH8cUvH7HuJXLgtfxYd3bdZ6iPe4BsNj52lEn4Yd5YzzXsjw== 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=IvG2WpdeI5OiqGGcNid8Tye85YyH/LiFaaeLo2szEDY=; b=Jj6oL7uNxfwjwkNxGkq0aJqGdawyIMXef1bW6xtkmUejTgKkvXoXJn0Xj/ijSRT75Ot/ANoFAe+ypTHc9NOWp0H3ybaVf2rirzrSQo+0Tob085OGbN4fNcneNp3c7lMQp3KB7xK5gIQs1RkLZc2MvWxSHPmrILneQ8G2y/WQR0GzSz2rJSJ3kK7YozhhRugZep61gCi+dO/Mc4Ve3WPuHH1QwR8LFY+JGluzAhmmDwgskz5rQ7Z6vf+fcWEHmkv8283QU+Ma13iq8jQ/k0QV3BTH7zrObV0aty1S5IgA04gv7qAasAPgFJKrqfhUfbkdE+DhKQbGBoRB0c9tX4v7QA== 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=IvG2WpdeI5OiqGGcNid8Tye85YyH/LiFaaeLo2szEDY=; b=A2pirFbvmtoidQpCrtV7vW6r3qZZr2FoxZOi7ep1ITr9ILvVhl9TcGt09CZH1Y6f8hmrWA5E4EfefUCac2wBvmDf21fAL2YFrQjsJVug0BWUP12q7GxGK/FtQFGEKBkcIpebOzwWcuf3asAM1LOQ7Xb50RmRxKxJJ27f1LrFWcU= Received: from DS0PR10MB7933.namprd10.prod.outlook.com (2603:10b6:8:1b8::15) by CH3PR10MB7761.namprd10.prod.outlook.com (2603:10b6:610:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Thu, 22 Aug 2024 19:26:51 +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.7897.014; Thu, 22 Aug 2024 19:26:48 +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" , "Liam R. Howlett" Subject: [PATCH v7 21/21] mm/vma.h: Optimise vma_munmap_struct Date: Thu, 22 Aug 2024 15:25:43 -0400 Message-ID: <20240822192543.3359552-22-Liam.Howlett@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240822192543.3359552-1-Liam.Howlett@oracle.com> References: <20240822192543.3359552-1-Liam.Howlett@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: YT4P288CA0009.CANP288.PROD.OUTLOOK.COM (2603:10b6:b01:d4::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_|CH3PR10MB7761:EE_ X-MS-Office365-Filtering-Correlation-Id: da18d156-3e84-49d6-1845-08dcc2e05e0b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BO/B3KMEOczcox1nqCUmH+QP2OQiW/NrFfy/9GJBFM42MzSo5WoNxVz7YgV2?= =?us-ascii?Q?KXFk3TgiwXBRUhPyDxrHlgOW1F4dGmXqvWC9SnnNkX31zZNi9eS1h/ntpbaz?= =?us-ascii?Q?e9xsf/Q8belfcucrLhpCnyZDA1d4bC3Kxg1w4TdMfhCrQFblQSBZFbXQQFZx?= =?us-ascii?Q?YtmvSdTLGrD0Lt8DLmS0BleflkYjhdxg6HVXRJfPPxn7qwvXem8nGS63HGfn?= =?us-ascii?Q?kajuvP+4pLqT81DG9EtQ4CdJl3EMV7Mg7UpMPnkC2l1ZmIEVFWrr1OoBzX/x?= =?us-ascii?Q?CUZe39AynTCoOAr/utXZGM/oNPHBivxn4fK0EZPg+Z+Vu0ASfwWewZ/EApij?= =?us-ascii?Q?AquV4xuXujqupIMfcyzVRoe0L5YJRDp1Q5z6v8H/i6Q1CcV8KcJHNLhWEjz0?= =?us-ascii?Q?d5Ef9rJ+A2i6aiEB6JGGJ9RpR0fGDZ1dSv1KHymT8qa41RXH6ZprEObPnh71?= =?us-ascii?Q?MEt4ky2n82yNhD+/lj2MKovdq1ZTMV7o7UqnRdJq6KM51uKjcnh/ET7/lMD/?= =?us-ascii?Q?lGoWCMAOVvIjD+j2NmqxBdXtOgsTiIcqq0/s0ALd1D331a4vcV5PKba5ZwcK?= =?us-ascii?Q?Sxr2AVUoTn/KVf701+CQXslH7n/um6kaVkn2MJJ1P/DUZdFujr4mYXesqx6l?= =?us-ascii?Q?i/ca+koIKLYJbnI2Izwxgp7EQzBdgdzmYvflZI1cU0mf0V0UTCQI1L6hF0Wd?= =?us-ascii?Q?6HkJ5D3nZKxh9TsxG/0gZGWe9wdtTNk9CFTyzickeRBwfQDgx/wPHbgXwz56?= =?us-ascii?Q?VkijE2/w1fst9P/nBQFAazsasS2OZw9kkdIHy7nMJPtjqO75M4XzxtFUfl13?= =?us-ascii?Q?6OWN4sLBzYFbAEmM6kEX8L8sJdXXz5m2sxZ/FUgNe/5jyQdfJjTeqCs+j7+7?= =?us-ascii?Q?OH0uUmo1/gOvqZN/HtaIoBW5pR6rDveE2licUKwypEu8IaMTe/sHHHr0pwgU?= =?us-ascii?Q?HBl4Vq9W/Bj04AXgvNci0gicU9SuRPw3ikl2LJbU7S7G+zmurJmyisk8VkQA?= =?us-ascii?Q?4sF0ZX7RVtrX+TB8Z15QflxW4HI6lTZpzKIashh/FDiepsSQLZ4f69FooHHr?= =?us-ascii?Q?PE/g3DSTs48KwytikML0YraPPj86n94gXg4PsiQNwlK9IC6XiaCi/ON0SKXQ?= =?us-ascii?Q?iu0YEJ1QKOtyjDR2JbtOj+UnoaaOTqGsAQwnBWh8yyY5828tbxgs6HL2gEen?= =?us-ascii?Q?CSMVuqdddTWRrH3jok2a8U2zkKzRvUXW/azAPuCGtK9bqB+8GFopc0G7YXgj?= =?us-ascii?Q?pVdcBvt6cTe3zxmrG63JlRSc3UV9o7+l+n9bSkX9Sh5UT5Tclw8O7LHIHX5T?= =?us-ascii?Q?Z8TXheW/JpRmkDUMOgkPhsd8YKgSKECU9nxj3p34RBu+sw=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR10MB7933.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6PdcHEXQaf6UR+Hi0262fGWC3w0gNzU9CRbbsHSE4KL9Y2P9PMp98WnhjfZ4?= =?us-ascii?Q?6Kv1b2VUWc5Eli87HSEQZhbLjulL5SFW8IM8gEZD6yJWUh6rcyu12Fcgf/nX?= =?us-ascii?Q?IHQ7QK/AwehkI0zOfoHbnpcTKYGeawwkeog1tiXSFXXTXsGE3Vd6sE8zmKbE?= =?us-ascii?Q?44Rrzbdte8IJF6LITa1EDEU0QN7fhjk1vsAvyYUuVyqWSMBtgAMMJoHAUH1y?= =?us-ascii?Q?BdYEt1im/zl/HAvZh6B5TBtCgAmrwoi/VdbufaXP8s7oEfaVVzFjf6TDW0dM?= =?us-ascii?Q?ayntnTrwIY02hIsfoAsnfaK7m6CmR6+1x/mV4iibFzfs1ovoMlQ59q5ikSxM?= =?us-ascii?Q?vGg+uQvC9xnvBCdAaX8BOsMYMoDXwxwJIl0xPEBjlvok5uBISKPJOZc1NMw5?= =?us-ascii?Q?zoxYKuNPxqcVwkXTn/8CuGA58YQQ1cFeX8zyXX3fwjwf1almo1oYRlYl6p1T?= =?us-ascii?Q?alGkRJ4aRsts7vegrso+FLvbtw4t4S6VWYbWnvt+kmXlTAsrBLh5TY9b2CuV?= =?us-ascii?Q?oczWmX4pMnQPbZyl6qAfi3IbsOH2aO4LV3XAi1KrODqzB9nYpf3mZg3K7g3Z?= =?us-ascii?Q?badjxg7CrUe8yHMX9y58sEC6J+uxEOoulKo9DexI1AGAlmO7Oh9CdhcAI5n+?= =?us-ascii?Q?o4MHItrwuTNC4IjcqPDT1N46I2sR10KPkYGJbfuAc4e5zxCJcySMvry0jJvI?= =?us-ascii?Q?KPuU9D6yqB/NLwomxiHMdMbdWcLM0NtOm8eR8cE+b8Yrq11+sjIi7LiiQy38?= =?us-ascii?Q?u1xNdDluOVfJcbAexvicRygy17jWf0MZJZC43KHdSqxxNAltGdmUKdkhLrJW?= =?us-ascii?Q?afkHq2h9KMPf9PlDPOWH/zhLeh/5epimZKzGbuywjjv/jxzQ8jwaTlOlFLQd?= =?us-ascii?Q?njvHnI6WjjNg0IBj6/bwo+vqbw5a6HnXccGpwP5OuR5VaZKyTDbYnsCG/b/E?= =?us-ascii?Q?IBfO4o9hrbMxxzUGD4l3Jssp4geqLYwvdFKsSRoL64EBCcMYFAftjzL8GCik?= =?us-ascii?Q?Z4aedoPHi3K3FHwJi8hYlLcBVkTqqO4WK7xMAZEbqZbtZHIFmxxOTI6oKZXB?= =?us-ascii?Q?K3VkpBiSN0u0u9XogFv7hGrq4wKVAWQknVf2ScMnwCaU0s4/pcgu8ndJuDIu?= =?us-ascii?Q?kNbBy5ONhu2+vz6X4aX36wuPuNcnr0XrGGCcX7fpGEd+r63Y6oRJ0yYLtY9q?= =?us-ascii?Q?0avwKM/rO2hxf6WANNJh16LzaD8ydBJsAro9zzlT8cPPN+saNLoDDAXJP5hp?= =?us-ascii?Q?zlEcesNMN2QJIXCTDtcYoTecrOIgAO4sz6yC18r7FOn75tB1GQfhrAbs2YMk?= =?us-ascii?Q?RROkHU/Aw6BlncVMJgIoAYNqeWU7fa/4FlnkauhTbONP/eC60zbjT8d0n/L1?= =?us-ascii?Q?GXYBJjYzWm2/lVGcxrhuD6Dedlx57i/VvjsT5FELVdU/H/jtxUlF3xEpd5ls?= =?us-ascii?Q?E3CA+4IPyxNEsFgu66N4En5evlPGiykLLtzg0dF4jLifB9OoJiE3v7PsELjV?= =?us-ascii?Q?ullLS8LZfNH/n2p60CE3PgiuNqnqcHYIxyn7Xp7AWoXxHWxT0y2D4WB1h/5T?= =?us-ascii?Q?kEGiUpbhzNuPWW76X0xWNNSD7wzEBayhGVRTrSaQeSkcBSnNbRVF+hqmtSU2?= =?us-ascii?Q?nw=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DOWifhDm3kU29gBxuAFGLwoGMZOfPaANFKVLszuqFnHHgEy9aOM3yuPjKywmMRuQGSXaj/WUitshHD8IPLkhUl0OqQJmgdG9TtzxjIQMVxuW+6iKuMY9FBzIZ2/c+H50TRGQ9n+L6SsonpT69mKqSPS+spSXB9p2aP/e/js44SqzfZ0edDRysDBMEjQ8xL6CZ3aQTpRh35Q6VH/162DQDluEA6dIsyFWD78SH/uVhBoQ2lcwHSLgCMLwQ07ZMAjS/gcavhtX+CmvG55G5V7MH8yyTOgv9Wj4M3NuyaRbZ3eSPC2iu7oI52Npxvmp/jucaLWS9X+i3devu3LO6R1JuFkAquSvQspRWlxyqRLdDR1dKg+SATorBUWTEypnOl65+OfzmUkM0y/aZAZMwFhKzFdXnjgiV1scKBFzxP0cY/bulQgIEswtP3wC4Zl/tTrfsBhIYe9pRNQ2wAhSxpW3VsbByhdbvUevOeMa0Uxk9X6UdmyQugf4qWnRgEW1ZYrGjRDE/Xj7NPM7BUX6zRbPN+s4ZRv1Pg/d9zd6nC5LVnqFs8ooPtHu6NqZPW7hqH4+jljpznBu0iU92srxbNKjeAVmcaNE5blFsPBO4OWNf3g= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: da18d156-3e84-49d6-1845-08dcc2e05e0b X-MS-Exchange-CrossTenant-AuthSource: DS0PR10MB7933.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2024 19:26:48.7121 (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: Lb9kyWt/ku+l1zy0J7UoUnwPKm70khfSMLNjb2Y0PVxLK9dgr5BwSnxCYYoFHrs8abmAW/wOHJ/0KQRrpo5g6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB7761 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-22_12,2024-08-22_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2408220146 X-Proofpoint-ORIG-GUID: iE_tOlJvDGblwnownrLBgZo3KNfdEmuG X-Proofpoint-GUID: iE_tOlJvDGblwnownrLBgZo3KNfdEmuG 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 7047fedce459..c774642697a0 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