From nobody Tue Nov 26 13:18:28 2024 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 062721DED63 for ; Thu, 17 Oct 2024 14:32:07 +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=1729175533; cv=fail; b=WJ+whgqtseua8RqIC7QiNbLkiKBr6Py4bsD7P/FOr1RCGA2NTlZs24tTxgMHKO1Ialwp9vfDLC5XetNLVBu1zZ3Jq5eYYI5EdIxDH5zM+6hV0dcZqRYfh9de4hXgrpQZgk2tkkdXOPmwAdyf5TJWijNlSet9hcac9Bh/5VSlD5k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729175533; c=relaxed/simple; bh=/NbR95b6kIYfs47sP9PpX8xBVOOc6Kh5yt+tTqBIufU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ckkdsg+BLTW3RODysLkUAQWUNqV6uPhns5zcQ5RpIJmXtBW7tBwfQ0PP3EV/FPfeWonc5F2yAHA0q4yMEl/z87CL8Njkk0E+thnVtSvaVabDLigyiYrzrzcLDtIlqHXELqy/ZuWA2bgQjqK1J2jQYTzRD0Xk9rTBP0Gbqb0Q/38= 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=XYNv3C3u; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Cu89zcW4; 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="XYNv3C3u"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Cu89zcW4" 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 49HEBejH013076; Thu, 17 Oct 2024 14:31:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=o0Sny/sBRVs8IfCJ/rDpvACzizqPjudQsF2MltKVY2U=; b= XYNv3C3u++t2d4f6UZ/XVDd6lPqEcYCc4rjXULqI6OnBEhYolX+AcSV8VcEUQmWR zkfr15i0RS2xy8rBDBP59W6AbrLYtaDoNaWWC6whr3cmWmJYVt9bDC7ICxZUpDIh M2Gy0b3QZfTwQx2/UXYrwTaI1m5PfVkzdKKkS7DnaKPTeRGj0U15N7QM3NupYHt7 Yue8wyYr06IEYq34yYqJbpE4g9EOubNZ8vEBEPYORRfn4FnoxTbxwxZ1oHt5Xxxi yqzvxsjmByxSvaqryriF2YzPsaXEf4hAhbUf6PRehHh8em5nGhKnK6HqWwmQ5neo kP6yPtf7A3vn13hidmbKFQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 427h5cpyau-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 14:31:58 +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 49HDDD4C013980; Thu, 17 Oct 2024 14:31:57 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2169.outbound.protection.outlook.com [104.47.73.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 427fja9w2p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 14:31:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dTBSVYR76xHzQ69XM1racTt3XjQPlSOGUsUGcYnKMAJr7nL6UNWN0Pdhjtf3NILYqBPh5bt2puNz9N7kOh1VF0W2JEBb7hwRHrEbf1vDWvTFs7DZKAm/3ZrdC5PtK715D+GD78o9YGDBF5/Oay6Rz1kgp39hj5/Z24SDKcDkFW4qyBg3tokPLpNG5hgN7cA44jb/wv8H6J+VzMZRNpOCUv0qCkYMLR/0Y+ty9AZ+Iv7uQEQIb1gnzr2hMPtkkumCV0d2qn9Yzp/DFU/Hgpqk3zKGaT7FlRiGXxli4cDVENw23kj62JEAIaCOGf8qUXRQC5+eKTT5jq70BwjF8SBHvA== 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=o0Sny/sBRVs8IfCJ/rDpvACzizqPjudQsF2MltKVY2U=; b=d0x9hZC9vXzYyxla1w5uMTETHhsxMknSR/edsdfwDWWS5ADDpLBmY2ldSwbdk4CNiI7Pm07CVgaBN7E5yI17QNOMohAbSZ9NWTFUMNeJrAqoO+fmjWxar9ux1aKcL9LIi/a4UfBeOdy0jnvZ6Dg78NW9ZperpWhDkZ7jfVnZrQ6pPqzYwSiy3Relxb/bjFq8OPTs1MDFHCuFhVpvAQNwLkkkPsaQiRKN7Hxlip2VTTn4M19m1baWGpcRG8/hpaTsKQA5pNaQFcTt1nLTEnf5YWFre56QERBHfYsatAiZ6Q0v62s4R7oJjIqgVS40Li5Lrs7Pyr2ciLXV+vVkFY6SmQ== 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=o0Sny/sBRVs8IfCJ/rDpvACzizqPjudQsF2MltKVY2U=; b=Cu89zcW484cIMjPK7TKqo4+ZSDeom3OGxdpBFWkzCT7harTja8st8vXJcC/JckVFatoWqUk1dXi0k76fqk7ZU5GoAsSWGX5+O2eXywbLSmrc6jVSxCEWYXbyvc7lRXZcn4d6o8s8OuTSm8HhyPa6BmCgaxkf1J4wF2Y9COSCARw= Received: from SJ0PR10MB5613.namprd10.prod.outlook.com (2603:10b6:a03:3d0::5) by DM6PR10MB4140.namprd10.prod.outlook.com (2603:10b6:5:21b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.21; Thu, 17 Oct 2024 14:31:54 +0000 Received: from SJ0PR10MB5613.namprd10.prod.outlook.com ([fe80::4239:cf6f:9caa:940e]) by SJ0PR10MB5613.namprd10.prod.outlook.com ([fe80::4239:cf6f:9caa:940e%5]) with mapi id 15.20.8069.016; Thu, 17 Oct 2024 14:31:54 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: "Liam R . Howlett" , Vlastimil Babka , Jann Horn , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oliver Sang Subject: [PATCH hotfix 6.12 1/2] mm/vma: add expand-only VMA merge mode and optimise do_brk_flags() Date: Thu, 17 Oct 2024 15:31:45 +0100 Message-ID: <4e65d4395e5841c5acf8470dbcb714016364fd39.1729174352.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0215.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:33a::15) To SJ0PR10MB5613.namprd10.prod.outlook.com (2603:10b6:a03:3d0::5) 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: SJ0PR10MB5613:EE_|DM6PR10MB4140:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d3bd83f-15ea-4a0e-e3c3-08dceeb8726e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+ZneJuyNL39kPT94ZFk4oV/oY+3n5pIMuoUL265eTDt9tV/GTqcwIzx7NgPe?= =?us-ascii?Q?+9rUd//1HaQzQmOZ6R8slzg3+Tun0S2TT5GTH16ONN5glvL8UIEvMySwBc+x?= =?us-ascii?Q?GkmVUfPJ0Noisk34+Byg41NOqxAbiQGugq/SVjhzF+kxXqcwlGhCqEhsLpDd?= =?us-ascii?Q?yT+kopDxCr1LQokA6fvwRMcoIzrZ9dXC5hj/Q178ku8CgLBp7/+wWFV60E10?= =?us-ascii?Q?pTELnTohcow5XdVAzFNyvCP/vE+AdQkufdd/pOvQFbuAYKlRt6GKRsCfRqGa?= =?us-ascii?Q?NvZe8BO4QvEnrnATN0bDARqbBVkKQeZ0EE23DDtdTO/Pp/7rGckgCS4YBtKh?= =?us-ascii?Q?/zCNG3dN+mtZ6ArcaAaIYXvKAiH2WNX4lew7TM+5K5zZLho+ms69mKh9eWjh?= =?us-ascii?Q?7vGndp6EcYCYkIHYcXV4MGl+rTe1WEIGHLYX5b2cNWdPGad8zrNvK2szqm7z?= =?us-ascii?Q?zkF65QmvIGvSrKL/BUp/kBrTQZlBnP+JWUeig+F1H7LicSiR9Lqrbu5eSoG6?= =?us-ascii?Q?wv8hVasfeXxDpNIa8FtQQPb2cwEafXfHIZ4nFFtvkoWtX6JVuc1iK7Vji6ar?= =?us-ascii?Q?sYIWJY09wLEYuDbmCDsiZ0wHZ9pCQI+yQ5rawP8ZAMnNu8eBOIyM47Lpx4gf?= =?us-ascii?Q?eWA8W26UsoY2AfKTa2H4McgHiRkhgPceS/+o2QomM6x0ou09v3IJ4pvMA8sk?= =?us-ascii?Q?YI4Cx2ik1n4R2HfDUy29tzrcnsQHhh+yRcuHPnIxEVwfKwYpVyrkTX7L3lLx?= =?us-ascii?Q?kzkUYwjjr8/K/3JNDfPJw7m2SRiD3gjrbjoAQ4bZ8UYq9cUzYFZgG59etnBR?= =?us-ascii?Q?ywO7umk0W9WX4YcsvmNwYfsu6xZUOvgq87oeLPVYVU5b/fezb9b63PZ2yRox?= =?us-ascii?Q?aCR8KriOayFX1nTq+75iJ08lNtaPYSk5aqYBxt/aWqk/0RB+bZ0dIJ5mmTIP?= =?us-ascii?Q?KRuFrFvdxnSLxXLJPBpJKNxTmXJ1xzSZ23gwzuwGVXL/xdjyibCg0lyyORoe?= =?us-ascii?Q?2BPRV9mPnzUIv2JEKdoYUlkiH9FYxirT0q+UFfv85zodlRPJ86LyKAdhF6E5?= =?us-ascii?Q?wt43HqeOFEhoCTUdgru64QrsAl8/L6eFIXJLdBqrmtTr8JnykNNMc3vuDghQ?= =?us-ascii?Q?oC/XP+cpogHo8mW0pVCcBJiTr9b8l0HOBuQp6v6+VcuM/tFuLgi9YDebr1uc?= =?us-ascii?Q?rxroo5Je3ykXwuWrPGwYjKuqUG/iEboJlKmWW7cQmuwpFNnI8VOnGEN81TaZ?= =?us-ascii?Q?1lTP2ezCM4OSfFU7V/bNUcWUcLo5M+NEwdr22zcYzGuUK3EorPNjitCE3aW2?= =?us-ascii?Q?iUKjAWhhqAubg2uoC+fIMzhx?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5613.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d1/LtrJqAaALZqqPU8opouKpSW+YsP2JDGGf9qi0M1wOWsN2BQrcIL7IgL9S?= =?us-ascii?Q?Jgf/BiY0UjD61/zz0WDdJHBNqax1FHPeYQXuaaqbX9/2ERxFX612LSnu/1YQ?= =?us-ascii?Q?XYtbBgN+td2au6NrS21gMaZQvLenf2Ajxx6XjsEd7fF0k3DArE2VLwikpQhu?= =?us-ascii?Q?VVaT3SQc+C/cxuClukjSMYjBxVFuFKbiYFJfFtlmRmza+Gq3hhH3wpV1EAiQ?= =?us-ascii?Q?y5X71RR2soJv3e8I6t2iFraxC82484CMO+6OLZMkM5jf9CQzPZZXCQ5FRpeN?= =?us-ascii?Q?XEs+OarRPvZV+BjU7b8/lvWRjrYliuwBYXMche9CDSku8tBz+K+Pm8mtH+T2?= =?us-ascii?Q?JTt/w51zL1bZvqBQzBwCtOc/GUWCMx2v9PoAAbBwt3MeEGf6QjPYxPXBbLSq?= =?us-ascii?Q?BgyV+ML0GKDx6IDlFY/DfNQzehac5/pmJ062f7emrBmaXBGvMxI2UbD1yTo+?= =?us-ascii?Q?J0BEIeB2Fy78iXQ/Gk3D7IiQrdA+2g3n9uq624ntlY6Y5qvaR7ARGxzZ9DtR?= =?us-ascii?Q?d6T/9ux9OU6PSZ6hbG8ELZIFJieQRHu6FXxBDwHFniki348jlruuBmT/1u83?= =?us-ascii?Q?z6aZA7hxn85OLzVQKA6e/2N723CsCHygChaoE/Gp92MQQ1sIBMIxKNos68Da?= =?us-ascii?Q?lcRPJUfVOs0TR1ZU+g3g0jgu6pIiEl1Q4taoF9QUKRfP3gXmihzqQcc6/CtA?= =?us-ascii?Q?XrrO58kdAPLU5V//KGfMSf/0u68M2+CWEpxRF4d9gf3mBlPsPNYCEX/ucWoI?= =?us-ascii?Q?cFYIGWSRiOUPWWEKJ7h8BueHrQpKC4gD97AOUlaAvf6Xqt+ZYwP9DfHISbri?= =?us-ascii?Q?gGXkxIPET+dOJrFcL+dOT+7/WQ+IiidBCJ1Q0N8/fICwddpKctB0o4mgtHY/?= =?us-ascii?Q?3twvP4qkooUyQeKdP2Y2ZprlSxzkVt6/cCFZX5AS791D1gTUmv4tT511GnU7?= =?us-ascii?Q?FsLtOk/9wtUVXEdjpBiybENDdSAgfIz9elASA2UXm8vLIJY/lXqNh/ZudTUz?= =?us-ascii?Q?qAssgU6aEksaSYx1ezdEQQAZy0UANHrz42FeBEv89YGbyhqmxiOU+7OrZT8s?= =?us-ascii?Q?BJkPK0dKmde2HGmciosg3FmGD5zk2cR+Lfkxgf1PQ+ltviYQ+mqt5a1KuTpM?= =?us-ascii?Q?M6Pdo1SS/WlTqqJ7mbCq/r0eIgG2gg3wni+SFbvFVryAbFoOwh+p3qgLgr39?= =?us-ascii?Q?04DPEp3aOkWYQr9/n6giQvJ0kIcBXSExGESRk7FiwAUCdOJwi4aJBn3zs1uP?= =?us-ascii?Q?uB/EW+FS2F9ZOdLFMb6iyxozBwr/HP5Geer9SAQLrt8bj+i8hypOeBH54Qol?= =?us-ascii?Q?L4wqsHC9329KZtKMKHZH94z4nQFHKjv0Y91otJr7GUiYVYtXWGCdWmBxXuQR?= =?us-ascii?Q?nGPUmGBVtMPKwjU3auz3FqsEhxxX3yQTub0hNqtDg/+6Q/OSGz1Gwf7dBTJ1?= =?us-ascii?Q?QxOmN856SI7L1SoYmyZQIg50RRHAyHVauypCipwgD+wDP1CGWewmz0QL588n?= =?us-ascii?Q?PcbXXYcyKo5LOiRqxRKd9p0m/sCUmxY6Offbn5YHdyRLgVVYdJdm0FmSGaes?= =?us-ascii?Q?c7BTTeruSJ7aaOShnvxyYf4pw1iumuZ+rzRS4N94estIDePu7KiHeqfbIWNe?= =?us-ascii?Q?kQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IY7GPiIXKK9A/67wy4CfYMBU3uAG1Ln4u3w6v5jnBrPLjRFXaCljXStvvQZ2uqYpRUAlGO+ggi8IV0xQ9EJVeEGjavmwU4dt24kX1fH6z2M1RL//2TLZWit5Fhf2z3PCzB69utkQQ3DzQqMQDRz6JSt9xx/vyu3daJ8nVSJDBUHVZNclExtbHO8UbsigdgURkxORiWbNl4POG5zlUkYJz1kgHr8iC6fBhTp5Bj4LqEViI0K2p8pO4Qs+0UF+DjBydEGnZpCFNpNaVH3hwREC8L+m8boy7DP1hSIAWnKz0aMPp2nl7qBuVs6RkR1jYFP+RWO+HG8QelpNS9qLavEvRdouiLH2PcVtVbLa95GgBwp4E46Mt2QIzznALsnR0/hq2aQUStlv6ezA07buX5prE2BCwSaZtAKF+hxtrvdYcTOQH63P60QNMOuMueeSJWwHcs2o6uDy1njud/zNa3X58mM7pW8TZpunKe8R1AieyYny2FHDhY2KUljIPIKHWzK01ZCbPe3FYMnFfZ+T+Gl+eMlpZa1DeMird92H/fx3yA7BlFB94N2DZWubxREUi3ZpvBpsr2mWUIKoECTTtXrKMnHzdnC1turmWRovIT7J4mM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d3bd83f-15ea-4a0e-e3c3-08dceeb8726e X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5613.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 14:31:54.3393 (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: TARtuWYx3ogJO0cWsOqN23nC4beLlu+yK4WkziNTw6+abjMcIY2bsI5mJERZyr4AHNDW6Fp7rzOrbNCXJMszMvZIlvJvUIshEijGuC4Tjwk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4140 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-17_16,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 phishscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410170100 X-Proofpoint-ORIG-GUID: eny0VBzDcEIIsEfTlyDRfD6gVkwMAgZq X-Proofpoint-GUID: eny0VBzDcEIIsEfTlyDRfD6gVkwMAgZq Content-Type: text/plain; charset="utf-8" We know in advance that do_brk_flags() wants only to perform a VMA expansion (if the prior VMA is compatible), and that we assume no mergeable VMA follows it. These are the semantics of this function prior to the recent rewrite of the VMA merging logic, however we are now doing more work than necessary - positioning the VMA iterator at the prior VMA and performing tasks that are not required. Add a new field to the vmg struct to permit merge flags and add a new merge flag VMG_FLAG_JUST_EXPAND which implies this behaviour, and have do_brk_flags() use this. This fixes a reported performance regression in a brk() benchmarking suite. Reported-by: kernel test robot Closes: https://lore.kernel.org/linux-mm/202409301043.629bea78-oliver.sang@= intel.com Fixes: cacded5e42b9 ("mm: avoid using vma_merge() for new VMAs") Signed-off-by: Lorenzo Stoakes Reviewed-by: Liam R. Howlett --- mm/mmap.c | 3 ++- mm/vma.c | 23 +++++++++++++++-------- mm/vma.h | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index dd4b35a25aeb..4a13d9f138f6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1744,7 +1744,8 @@ static int do_brk_flags(struct vma_iterator *vmi, str= uct vm_area_struct *vma, VMG_STATE(vmg, mm, vmi, addr, addr + len, flags, PHYS_PFN(addr)); vmg.prev =3D vma; - vma_iter_next_range(vmi); + /* vmi is positioned at prev, which this mode expects. */ + vmg.merge_flags =3D VMG_FLAG_JUST_EXPAND; if (vma_merge_new_range(&vmg)) goto out; diff --git a/mm/vma.c b/mm/vma.c index 4737afcb064c..b21ffec33f8e 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -917,6 +917,7 @@ struct vm_area_struct *vma_merge_new_range(struct vma_m= erge_struct *vmg) pgoff_t pgoff =3D vmg->pgoff; pgoff_t pglen =3D PHYS_PFN(end - start); bool can_merge_left, can_merge_right; + bool just_expand =3D vmg->merge_flags & VMG_FLAG_JUST_EXPAND; mmap_assert_write_locked(vmg->mm); VM_WARN_ON(vmg->vma); @@ -930,7 +931,7 @@ struct vm_area_struct *vma_merge_new_range(struct vma_m= erge_struct *vmg) return NULL; can_merge_left =3D can_vma_merge_left(vmg); - can_merge_right =3D can_vma_merge_right(vmg, can_merge_left); + can_merge_right =3D !just_expand && can_vma_merge_right(vmg, can_merge_le= ft); /* If we can merge with the next VMA, adjust vmg accordingly. */ if (can_merge_right) { @@ -953,7 +954,11 @@ struct vm_area_struct *vma_merge_new_range(struct vma_= merge_struct *vmg) if (can_merge_right && !can_merge_remove_vma(next)) vmg->end =3D end; - vma_prev(vmg->vmi); /* Equivalent to going to the previous range */ + /* In expand-only case we are already positioned at prev. */ + if (!just_expand) { + /* Equivalent to going to the previous range. */ + vma_prev(vmg->vmi); + } } /* @@ -967,12 +972,14 @@ struct vm_area_struct *vma_merge_new_range(struct vma= _merge_struct *vmg) } /* If expansion failed, reset state. Allows us to retry merge later. */ - vmg->vma =3D NULL; - vmg->start =3D start; - vmg->end =3D end; - vmg->pgoff =3D pgoff; - if (vmg->vma =3D=3D prev) - vma_iter_set(vmg->vmi, start); + if (!just_expand) { + vmg->vma =3D NULL; + vmg->start =3D start; + vmg->end =3D end; + vmg->pgoff =3D pgoff; + if (vmg->vma =3D=3D prev) + vma_iter_set(vmg->vmi, start); + } return NULL; } diff --git a/mm/vma.h b/mm/vma.h index 819f994cf727..8c6ecc0dfbf6 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -59,6 +59,17 @@ enum vma_merge_state { VMA_MERGE_SUCCESS, }; +enum vma_merge_flags { + VMG_FLAG_DEFAULT =3D 0, + /* + * If we can expand, simply do so. We know there is nothing to merge to + * the right. Does not reset state upon failure to merge. The VMA + * iterator is assumed to be positioned at the previous VMA, rather than + * at the gap. + */ + VMG_FLAG_JUST_EXPAND =3D 1 << 0, +}; + /* Represents a VMA merge operation. */ struct vma_merge_struct { struct mm_struct *mm; @@ -75,6 +86,7 @@ struct vma_merge_struct { struct mempolicy *policy; struct vm_userfaultfd_ctx uffd_ctx; struct anon_vma_name *anon_name; + enum vma_merge_flags merge_flags; enum vma_merge_state state; }; @@ -99,6 +111,7 @@ static inline pgoff_t vma_pgoff_offset(struct vm_area_st= ruct *vma, .flags =3D flags_, \ .pgoff =3D pgoff_, \ .state =3D VMA_MERGE_START, \ + .merge_flags =3D VMG_FLAG_DEFAULT, \ } #define VMG_VMA_STATE(name, vmi_, prev_, vma_, start_, end_) \ @@ -118,6 +131,7 @@ static inline pgoff_t vma_pgoff_offset(struct vm_area_s= truct *vma, .uffd_ctx =3D vma_->vm_userfaultfd_ctx, \ .anon_name =3D anon_vma_name(vma_), \ .state =3D VMA_MERGE_START, \ + .merge_flags =3D VMG_FLAG_DEFAULT, \ } #ifdef CONFIG_DEBUG_VM_MAPLE_TREE -- 2.46.2 From nobody Tue Nov 26 13:18:28 2024 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 D1A191DED73 for ; Thu, 17 Oct 2024 14:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729175533; cv=fail; b=B0iIZqecMzufNrUHnRGzxst6JUzDBI3cZVvFN7Z55+5EH93oEmFdcy0Pe7ObYjG12HzlpN/7qXPSvZv/tonBLPlg9/r8Tv655F6k3kkvjiV9QHg3lAtIY6htjn+1RgrytFRdh2qfoRfi8zAzZ3UGYTMSuGnzPIRNnCBC+oMqLZw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729175533; c=relaxed/simple; bh=AsVJiqKXa927ZW2CpngTTjKX+8I9k62IX0PxIBSowQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Ux+Nz8AXbldKFAGY+eYZTApZrgN5xTogD5x4a8YhjxEXD5hRb5KItHGQKrzaaxzzHHpNeMw6FYd93RMbLgaJhWHC84QlnFzjG7N5pdefVh7c3DGVWKfAQwTIDbrgcNTEa/xq9fRDnE9fR/udGxfWPKAzgSmWTcf+280OBop3PNo= 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=CPTQCCjn; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ut6uA1cE; 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="CPTQCCjn"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ut6uA1cE" 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 49HEBh6H024154; Thu, 17 Oct 2024 14:32:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s= corp-2023-11-20; bh=1Zdr+8oUZdKWzec5VqzUsqQsiYTNGhLqf5HOxhs17XU=; b= CPTQCCjna0ru/lsgCMOsHe3nVwk/2K71AiVMEAOmxzRUfFw1yJsRc9dfMdGqLM8D 4DtLMmZT+8zwxrI7DMyKc79dNoSJk+Xn/C6ZDFdBDmgnImRqAe+f/6WJnX+l0BNI yJhBtsqJJ3sEBQMxAd382aSj1scNAeCjbPH4XZDwUFOda6cHUK5Lu8u/bbx0O+o5 vh3iIBO3byDcOvHFFzXmOeApWM1Vhjnbby/QaJdwc+fuUCtO4EW6IdfLjfqcrv/s 91ztWFIAvUxqzNT7Mox+ZwKXQg7424u7rJf5SVa9Ev0nUQBklOBvBnTxbkLquo7N 9PFDRQnU8gcK1L7i8nYMHw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 427h09p17r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 14:32:00 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.18.1.2/8.18.1.2) with ESMTP id 49HDC80A026424; Thu, 17 Oct 2024 14:32:00 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2042.outbound.protection.outlook.com [104.47.57.42]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 427fjaak4s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Oct 2024 14:31:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rnWgNMEgcWwWwIj1LbHZS5q1CcvKwSgrDsF2EnrR/K1epZRlm1m9UFcQ0Lsv4/KKlHJ70WDnv6Wvm2wdAZgco9vxc9VS9qCy7gpe9foHcM59HIalibkaiMaFYrb2zmm3Ssm/NUPZsDowis9G5ffD7Y9OPxMINumkuRTzykH4hK9xUmUEACt2CIUTEkrnF1WiSJOAH0yXoFR6agytCOSVX8W2fY8SRFki8GZ4j/SA814d7wA9QxPn3G6+CsX7bvVyQTLdr8z0fGNBHhjXJFJVpUrYSIXIAlfCSM0U556+Zg4hNvgDGYihZWA3wjb7mJUc2mDVYk/lne1vyMm8O7nccg== 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=1Zdr+8oUZdKWzec5VqzUsqQsiYTNGhLqf5HOxhs17XU=; b=aXB1fA4NRmJur7793LBduUuNpNGB/cKM25eNy0CtPmZaRGO232a6a2TWmV+1q7UX8g6ySTuH/sAJRuZa7gl4iJwnFi8Xw6lLGPXTK7EzvqLiRuhcT8nupDkhuOLhVKVos3nSBlwYqv7sxfzzVAYPn1aU8N7hQQGrn69sliRBfn+uRGnB3G7mCvBPsAGtQDOtf8x8G866m5Xu7Od0LOjfEojNaKwAii1mMcU/D9u31dI0BqQ1ykzD9tDyQywvwh3UirnWF+CDySFJAMaPfLotgWbNjvGsZPDw8cgDd2aMvw/hljtakOlAhLyk8OFj9yvF+dT5vFDfPmmGazUsR1/dIQ== 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=1Zdr+8oUZdKWzec5VqzUsqQsiYTNGhLqf5HOxhs17XU=; b=ut6uA1cE8k5JRsUy0ig406MR7jDxemafnOwjsgYuTNJsQ6g9r5OPY337eM+hn2W08GHjRa/ECo02GjYTsZX2SFIuUgkyJn2wObg8R2jOXEUyB3IbK7zxtX/m3xYWlk744OWarX4mCBsj8ighnSN+1KTDkwi57H/+pdzSDHMlQ1w= Received: from SJ0PR10MB5613.namprd10.prod.outlook.com (2603:10b6:a03:3d0::5) by PH7PR10MB7056.namprd10.prod.outlook.com (2603:10b6:510:275::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.17; Thu, 17 Oct 2024 14:31:57 +0000 Received: from SJ0PR10MB5613.namprd10.prod.outlook.com ([fe80::4239:cf6f:9caa:940e]) by SJ0PR10MB5613.namprd10.prod.outlook.com ([fe80::4239:cf6f:9caa:940e%5]) with mapi id 15.20.8069.016; Thu, 17 Oct 2024 14:31:57 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: "Liam R . Howlett" , Vlastimil Babka , Jann Horn , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oliver Sang Subject: [PATCH hotfix 6.12 2/2] tools: testing: add expand-only mode VMA test Date: Thu, 17 Oct 2024 15:31:46 +0100 Message-ID: X-Mailer: git-send-email 2.46.2 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P123CA0083.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:138::16) To SJ0PR10MB5613.namprd10.prod.outlook.com (2603:10b6:a03:3d0::5) 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: SJ0PR10MB5613:EE_|PH7PR10MB7056:EE_ X-MS-Office365-Filtering-Correlation-Id: a4783e4a-2511-4a15-7fcc-08dceeb8744a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VuGIrwMFQUQcku2ya0O7EHgiSBgfCudlJ1X/xUc/bLFDwyj6xFjlIbAuBaMe?= =?us-ascii?Q?SP4zqxUPvz0NREiBVaYY/ZvHsqLB+YX3WTwukBvwwj9ZUV3uHyfL9CsLy1ao?= =?us-ascii?Q?KGxN/lwGESSkJHtoSiWxM4j9bWqvLpmLrP/UWnQ6sXes9N03i9A0CmOft3EH?= =?us-ascii?Q?Y33Rwv4by4Vov4Uc1LRtKfZjYncC5So1aIGNlD65VdFehksVlLORmcGGu2mk?= =?us-ascii?Q?gAbtjNWZXgW44/O3WbnDen0z1hnW4AdHTVddJpzqBS35Hv97KREe7h3+OeE5?= =?us-ascii?Q?bC9bEkhZWMGr5NyKFAVrSv4hvz9tTVlp+pLhCtZC3a8MtbCaAmDjzf0kAQ5V?= =?us-ascii?Q?lbg0UwRz+OatOWY+oVt346ogKeyr+UImCUZhnyLEppCU9WmwwDqzuJIOXw4R?= =?us-ascii?Q?hqU4kQQapQ8zBJQpUYX4JMU7sv0MC1cZs+A5SOEXeevm0m/s6qLTW4XormXT?= =?us-ascii?Q?P08T5lFN5mLQgvY1uX7PwE25IFqtBbv36ByJoanF35BCl58h5TKyXk/VEhmm?= =?us-ascii?Q?ZfAn1LrHsv6Q4fe7TGo9ELGNv7dZ/6x0tRVjQOadR9+VvgbzO3f9Vd626n71?= =?us-ascii?Q?p5+AIoRPIRlFuWKbmyFxhNpBZvg7ECbnzQB/PJXS962meXfw7TpLUOqwCvkN?= =?us-ascii?Q?nKnnz6muD9Rb7n0AaxOkryi+n47fOe45fHQfrvEWsN6/BsKT//Y2aRbTgxCS?= =?us-ascii?Q?5Ld9hcdB1PL6KdSqmuX8aqw6PR6ByWJb240FfD/yh+GUnm4ULkeLK7ZvFsts?= =?us-ascii?Q?FWyZnCzwE1ylJLvrBWhgAl7BDIcaWwqRBlyTGt7DRxiJyKxpnfdSCd9Ic7Mu?= =?us-ascii?Q?PyLCvTs6d8QmIPTMbg64UxB0DawvZfHvvJ5Ad6C4wmqNnCAU9JTgvsqg/dDK?= =?us-ascii?Q?7pLswOs3YLIcNGKK//CXNs/cvxYKAfXswGcXCbVqdhM+ji5rF+XOtcf8CU8m?= =?us-ascii?Q?TwA9h+IrQKVJgc5YBY7YvPO1IudmvcWFHIDarOc+ztNO1Kg/GTyJ5acRBU8C?= =?us-ascii?Q?wXUnbJWN/i38lyw7nqXJYfc/JNnYyZh8YE806PyQeaa+BoyIjM3tTNPAFY9f?= =?us-ascii?Q?V4uePcrua3JV/JWR8Rh8Uj9LZ1fINPfzBIwVQpXfvRzxBxXkrZHVs/gdsrp/?= =?us-ascii?Q?M5VEVJEDc2rYPyUzosslueJ8L5n3kb+AAuvgP1OCt1eE7TbOdxnu9l/w5cJt?= =?us-ascii?Q?Kpd4kaqaoIIf+UxRpzoZHOgLVoTgOkAVjDJJDvetw/vgtq1s0l/KXgfGYDMS?= =?us-ascii?Q?ZJVHEtvDg2S+PeoGTCmDKNPA2V1aPcnrE4rJGT2gWmk9OMZKZWKSXZ4gJ+Yz?= =?us-ascii?Q?u3O0xgJx5ArY92qkZLcBshfT?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR10MB5613.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sWpUY9gxSdR61BK5krgeJceGteiFiF+/JlFYXYb+M7XaH8B7rkcu1ATSmqAS?= =?us-ascii?Q?gkbzuhgp6ktytZB6TadjD+plBGZEovyfg9XC+HtQOlh2+1c16GoNyM/L7cjF?= =?us-ascii?Q?oLtMRHSzUA/nDFe5U6V9+QgoW7x39pIyoSZtL5krWc8iriqTEKHF5X8dwCh9?= =?us-ascii?Q?I4m27UJnZBXqvg4BnV2u93AtM5I+tQsEIGh5OhdKm8Y4MdTQWAlu4EQJX6wS?= =?us-ascii?Q?nt0c3FtrCMkdWtrulOcSQkeiLycomUl9E80FBb//F4SSxn500NyxHJAudgcQ?= =?us-ascii?Q?dCB4nYn1BPjx5m5+0ku/zzBS/qpzY5PbfKF5gGhDIG0sScdpdK8z/t5fbg3T?= =?us-ascii?Q?698rxdK6d5yuAGZPe7pgfSK0YFMgPetBL4ZAvrefkBD658ie1vd3lE/kNwPL?= =?us-ascii?Q?K3FtSqIPf3bwpkHsmlnv+9h4lVsz9moqFedhAcaDoKZ8xefLLdrFW8ZfFqZZ?= =?us-ascii?Q?p4Jj96O7UD4mafV5s28FmAWkSuNgKoLPHJKXEHEOHrEtNnnWbfkhyzNiSWJr?= =?us-ascii?Q?ZR5N83crpNmQbCCR5R9AuLAqi340iZlkCKn3E4o9Ay8wrLFCCLMCD2jmquAy?= =?us-ascii?Q?Z02Sh/yk6f14wWzn8HMRehJjzCJ4McyV1kzYW4zMO9KbdRjfu3HeY8ydZ/we?= =?us-ascii?Q?4aCF7WodEHG/1xXfZF5zZFcLjZkPpQO/8VliUq99PrdC2YHdAz2b06yYMzwb?= =?us-ascii?Q?Lgkxa5DyI+sGUy+YdeyXLlpLuMoTkOd5wIoR3xjoYWs9CGv0jLqYcD5kVv5V?= =?us-ascii?Q?GUmdh+vI7/YrFMfYokH5tcBWFLMQpbtIHPdOakOSO/wZ19Eqrnwk6amyc92O?= =?us-ascii?Q?AU1mKzIMZG1ZAzmRsVwFAMS3nk7FohYnm/ToJCLIKPdNTbGrgm1WiLNcDDgk?= =?us-ascii?Q?u/Bl7lFD65vguo/U9PWr7phDG0ksxn81v6lkYQL1M/ksU74rKlDHZkmWkbtK?= =?us-ascii?Q?YlhhUXuFhOkTVVf6OEpzsQ/XsCy2S0zXM5BZE1Ly8fTiBZZ29M0GAJywXoHA?= =?us-ascii?Q?0Y0VKzMP599oX0IxjAqLX4Y0Vd+13R0S2yXUz14hfORqoHAN3ZgnUhCzZYH0?= =?us-ascii?Q?p7XPCOKG7UsuGd/B9ApkZ3RWhpGvfx4ErHfvLK5wws4EwF9OnDB4sABwP8ak?= =?us-ascii?Q?eUstIfneNxTFkeAuXJe2ZTlObHYIs5eywMSUsUHb/M4n5PNY0MdBpCvrVJik?= =?us-ascii?Q?BIL0V0BH8ux+jkqw9qdp3zoxeEJX5xWRVVCubHhqxf8uNrKYUs1mSkEt9HuC?= =?us-ascii?Q?wRTszWzIf/FZTxks5/QMY70UjgtDuZL6r2A/i7VWfdKM/QGRJVUwhKG7XjHL?= =?us-ascii?Q?p0ePvpcTWjFeQwSssvHwbTuyAwcgFdBsh2YykYZB1QL1UR4hMTGcmZXBkGKy?= =?us-ascii?Q?8sqMZWj8nITdlPLa+uwkc8Y5KlFrS7JA8WubQdIFUgI/1yf7/LZgJy2KNdXS?= =?us-ascii?Q?F+RCQpq0vaG4uAvqFQQLL83K+fG89Z4bDGs1t04iwDgOn3K64JhEnB7GFNZh?= =?us-ascii?Q?v4gxfsfKRI2ay9WEqT30tPf1esmCMAQ8QWH9HFoWcU6S720kP5DhAdet1sFq?= =?us-ascii?Q?tH/PSncjmqAg6ie1WfSqEq5mpCB7A+Q+OAe7rmgKy53jGmIgpWOBIRWTTKFZ?= =?us-ascii?Q?Ag=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: RbpD4/fxSipLq1KQ24bTHV4ghfBoYy8YN6gKWExcv1WaHDxCng+cyIaVe11TAiaoRS2mePmK8GFCL3H09jmphJfsaq8DpG2Xh4+ba29CO8XoZ+hQq7mxeCTiJTF/nJzjp0LdMzQa+FULXRTltnhA2pPXkbP6WKIxkmkEKi/8g+tco8rlBgU2DHOquZqGE3SOUC4RfaO0YvWBAQ7TkYKiKLp0mFaM/OZMzwJxuVfy0QTDTj1/7pTHJBvBVt+rS15NreVt6vwN43Dh3zMqybwMLqpC5cBa+rIctsfK1A/8zxu2jNSbCgAW3N+yeQN+OKU3bjdWl1a1+vpzndp9JFtpKDn+HEerlFHQOjx+TfIMoUxCt2RhTPzkPv7ivJOS2S6KZSnBebQYCgIqNlfq4sWbkVymagcKIICrNAv9j+CQ7QuXapHFMc/GURTzS0SxBGRJL9osqWyxsmZ/xFwGEjBiEh/+PTSWuVLEdCAO2FqNtSnMkXX3Ssc/eJWQAUDtLBqvwJdGb0SSPWcJUdLWwyA6W5qpBQA3sgqRZ78BsCp9sRtZal+Z4FqfYYB+vmhiZZ8yrgeU4ct+7C2UeyzH2VyE/W9e5tXtk8UU4Faz+6aYzes= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4783e4a-2511-4a15-7fcc-08dceeb8744a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB5613.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 14:31:57.3108 (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: vTeSJWU0E3a1geTU4XB2Sel1WMXcSd3sAnI430SXJMS2anauX6E5LLQyfvswIJijk15sb2quEfTc0EGZbyxXVQoK8JNxu2Uu5lclr4yzW4Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB7056 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-17_16,2024-10-17_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 malwarescore=0 adultscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410170100 X-Proofpoint-GUID: tnx4CgAlnBt9qGqGDsV3X5XbYG082ZcW X-Proofpoint-ORIG-GUID: tnx4CgAlnBt9qGqGDsV3X5XbYG082ZcW Content-Type: text/plain; charset="utf-8" Add a test to assert that VMG_FLAG_JUST_EXPAND functions as expected - that is, when the VMA iterator is positioned at the previous VMA and no VMAs proceed it, we observe an expansion with all state as expected. Explicitly place a prior VMA that would otherwise fail this test if the mode were not enabled (as it would traverse to the previous-previous VMA). Signed-off-by: Lorenzo Stoakes --- tools/testing/vma/vma.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tools/testing/vma/vma.c b/tools/testing/vma/vma.c index c53f220eb6cc..b33b47342d41 100644 --- a/tools/testing/vma/vma.c +++ b/tools/testing/vma/vma.c @@ -1522,6 +1522,45 @@ static bool test_copy_vma(void) return true; } +static bool test_expand_only_mode(void) +{ + unsigned long flags =3D VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE; + struct mm_struct mm =3D {}; + VMA_ITERATOR(vmi, &mm, 0); + struct vm_area_struct *vma_prev, *vma; + VMG_STATE(vmg, &mm, &vmi, 0x5000, 0x9000, flags, 5); + + /* + * Place a VMA prior to the one we're expanding so we assert that we do + * not erroneously try to traverse to the previous VMA even though we + * have, through the use of VMG_FLAG_JUST_EXPAND, indicated we do not + * need to do so. + */ + alloc_and_link_vma(&mm, 0, 0x2000, 0, flags); + + /* + * We will be positioned at the prev VMA, but looking to expand to + * 0x9000. + */ + vma_iter_set(&vmi, 0x3000); + vma_prev =3D alloc_and_link_vma(&mm, 0x3000, 0x5000, 3, flags); + vmg.prev =3D vma_prev; + vmg.merge_flags =3D VMG_FLAG_JUST_EXPAND; + + vma =3D vma_merge_new_range(&vmg); + ASSERT_NE(vma, NULL); + ASSERT_EQ(vma, vma_prev); + ASSERT_EQ(vmg.state, VMA_MERGE_SUCCESS); + ASSERT_EQ(vma->vm_start, 0x3000); + ASSERT_EQ(vma->vm_end, 0x9000); + ASSERT_EQ(vma->vm_pgoff, 3); + ASSERT_TRUE(vma_write_started(vma)); + ASSERT_EQ(vma_iter_addr(&vmi), 0x3000); + + cleanup_mm(&mm, &vmi); + return true; +} + int main(void) { int num_tests =3D 0, num_fail =3D 0; @@ -1553,6 +1592,7 @@ int main(void) TEST(vmi_prealloc_fail); TEST(merge_extend); TEST(copy_vma); + TEST(expand_only_mode); #undef TEST -- 2.46.2