From nobody Mon Feb 9 10:24:18 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 B7B59231CA5 for ; Fri, 21 Mar 2025 21:55:02 +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=1742594105; cv=fail; b=ubU6kJnsbSmxVg9Xj/4v9MjvWU8pZju3VjbiX4S2Tf7hy/BiiEzqfNEYlodv39KTGmkYeaDZh3opfEhC0QlxX7oC7uVyNqsUCyOhUe4k0Et2UUPN29ECd3mpKt+T0zocBUfeveM1Nz27IA49YbO11AfcWG6gsIWt4eHhRL6+2AM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594105; c=relaxed/simple; bh=V3nQZpLX7jAnZojXftggsaAd6TGcUzO0g3O6x+O41iY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=a0f8tr1a8U40Jyd5wAQ6FOhMaffRRacOv5/sQWVeb+BISVSgeJSjCE3qdukf2ariUPJwrpO6h3+yjHs3rgrlzlTc1hHjNo/qvUK86kkA9i2GFzhgUaNCiw9mkFiTRcJy2w8sPddFnG/j7vjzNd3vPzXtgl/dkvr9j2a1eFLuy7s= 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=AGaLxbzk; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=rYvna223; 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="AGaLxbzk"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="rYvna223" 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 52LKg7IO002478; Fri, 21 Mar 2025 21:54:49 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=UK3N7z9rS5OUy1NsR+1LhyzbuT9Y2t80AOpNHR8/GLY=; b= AGaLxbzkYCCjCsmGjSqHyQtOU9td7AmC2vjFh0sTWkFz106njqKMZbqYh1YFqimc zwfRBnZ0leyjf3e56clHC3ZsQi0YfPZC2AqMNhLW91XO8ZLTE+WPGuWici2bVced NWc6xB5EN6lmeYfd2seQ6JRqXI5oqAJG7AuswiV1L4vtR2+BsF75875ZDBEGr8fu kBtmSlq3ZskSPObMm8v87pEqnZQWM2VN6gVrwii/nsgoN7yVu4IlaVPcDWctgWd7 RGGs6qDCpSMOdMif1gvDQTTaY12NABaHIx0kxvb7+XjyPnxOGSTeUbItyt2o0kCQ VoOLP321vRDhILz2kV1UoQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1m19qq9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:48 +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 52LJjRlX004553; Fri, 21 Mar 2025 21:54:47 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 45ftn014px-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JGrE0qwI9HlCMOPmAuntz6wRrJZEd2LUf+9Gwy4BpAMlnNvQgG0BHYtRv3mJi99/snrnlNP0qt9MblJ/X2yGOi7FnoI/rwWFqJvG3D8soz3PAILFrL9w0VwI8V2FHvlSn7kqkASaJaLh0zZtBF9Jr2rXeU4ZC02zo0Sgh1Rkukry+vFlBOirgQEq635Rly91ovYBGr9dbhunk6Vf/fp0taaDfgo9CUlMtYnoU33faGNxmujzi6/j8qEW7XYy96y36JKYtWQAsajT3+pn6P+1gQx4PG7yq9aFKmxtgXfMlHCun7vwQXXYlDNFseSbeZf1TWjtsJqmOmxEtmy6QiFT6A== 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=UK3N7z9rS5OUy1NsR+1LhyzbuT9Y2t80AOpNHR8/GLY=; b=WJMOLpJkF35R2nbsgUfPux51z1Ye3PCVSRJh5K5H8ulbpRw4/FbAKgmsifGkvrKDkU/wJF/FlrXIzXD6+Psa1DSn1MLWVk3Tn/ac3fA/w/mI0ShnK5366LI9L5CdMdzqM2H/UBtHhqHeUa9YduPm/yG3g/3VtOnGSUj/U8D723jEI7aWeDkuu1O+YQhQLwQiCXFfs5lqjN37ll83S8q/OKVVcJrvxwdyLo+u+RLLw/lYeVDE9tOZ/t2ET9c3tASiXLOsvnhXO9QIj9hP+QlyIs8N0l7ebj8CpYO83ieGf3GwRSeItrIAqmqF9aOran80/ok+M+2TnplRK94oMKWOtg== 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=UK3N7z9rS5OUy1NsR+1LhyzbuT9Y2t80AOpNHR8/GLY=; b=rYvna223JvmE0b4DIzXFuQo1qTM53Dq1C5CxiYm6hhv/lta0qVGbHXhgjEAaHeTVnWMkuSz7YW6CbLf2H0QXY9u+1Dk5ktguOZRURAfp6l0ViX7JS4VktcRxGZxLv9o68D8leJCXW4z1FFU0WfwuZadY6PRtnAvx5eCJqQuXDIc= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:45 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:45 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/7] mm/mremap: introduce more mergeable mremap via MREMAP_RELOCATE_ANON Date: Fri, 21 Mar 2025 21:54:30 +0000 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0344.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18d::7) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 7176d18d-1bca-46e2-0246-08dd68c2fdf1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DfNEdLfPST5K4/kA5GnGAyf4yxopBkVtQFsmbtt7ou0DZMb1Zpcqv1e7ZBjy?= =?us-ascii?Q?qruCcq/RY2qxK1ZU98AAM9geIjE1FwDCvDbuW9e+fxoSHPIsWda1wNl1uClN?= =?us-ascii?Q?VvzuqAyszbgGJ7a5qFm8pExYjWwkSuCr84XcyhCCxjYTGkQr3ziWXwhuU0d4?= =?us-ascii?Q?Ue9S4dgW6oa6PNYWhqz3zjt3iNgLxJnbd8RcPtIhKu7mgMGOdS3678k1J4Ub?= =?us-ascii?Q?c5LK2VvprDHqqLsYDWsPa3wobK9LI5SjUGGQVOyOGxU5PMmBJKCAJjaRcek+?= =?us-ascii?Q?YG+CAAQTF0uYniSd4lo5n237ixzqHF6vlPz7oPSPif2cupx5yMCm1qpPjvkX?= =?us-ascii?Q?FmBfznSJ5GoixJ5EcM/CbeOYBjIL3sNmgX+pFZJW3lDWcliWwKcokJ9z4yim?= =?us-ascii?Q?l8oUDc3JiDlmPba7gZJBNMc3iSBYLHyFYre17d4PX8DVlY2nW8ZniDelYDnd?= =?us-ascii?Q?3zKpc6/B7xwI4/GSaPdvrgLTK1DCgfiK1sjK8cwOydeBvw+IEMROPMU2mPt2?= =?us-ascii?Q?6UkEy9WMpLBOHysMvHq6fTnuLh5rdLSd+EcPTUvCHk1pdnwf/UXDLL1CjxQq?= =?us-ascii?Q?w/LJQP3lhrh+FTG9B5C3SshdugznpCTRWataFAr5U6E+iQ0w/Z/zHd4c2mNZ?= =?us-ascii?Q?uWGhr/1N33K+AVPRMQ0QCxc4lDuHm+rOFPe/d4s7AYZvzZFY5WdnoBxR5ho8?= =?us-ascii?Q?v/Bzx3ifGZVT12z4oWG6ceuqk32xX0pd1HjGCkg53LJG/01iYv8XdJcKNcuS?= =?us-ascii?Q?TKDAjnW6LC8e45Q5VCn9o3Y4HV4S6UoDo/7ZZL865Ea13o2aziSsISWCQ3zj?= =?us-ascii?Q?gZdqk+Qd3ANXutKfGou+Jt59/3NHc7afJGVOe3ldl4+3f2zxrEVg3D3TY/pk?= =?us-ascii?Q?Gi4HWoRK5/+FPQ8EyejxF8edfEUYL9SJbiVWAicfVwj3ClniVfIs9BZII1In?= =?us-ascii?Q?KUPzndKKy6gZs/+TZwxcPOQHN8Ml9Dz4HnpbhhZZTURgWtz7MUuZ+YWu0fYF?= =?us-ascii?Q?NpkMM2X+r0nBJtsIvq/mtEG5tw7CvsS2ZSyxScIFMx6GR/LsHr0M+wUbwCWH?= =?us-ascii?Q?6SMH3KVrV9bAGl7SocW4W/MNCfclingOuAQXbPMm34lQWNnv6Oh9I8aW/oD+?= =?us-ascii?Q?r/lYgrdRNTRZW3jxqU2GnTiUj73mj5Ee6KpoP28a9nuR8MKNaOSD6jv2/CR3?= =?us-ascii?Q?9l8Aun8dm9IpqrNxGCZyoaz2W8KtdYSeM36aw2E+zwMBn+LvCSyHZiq00O//?= =?us-ascii?Q?TyFo9eddA+bsMXZcT58MwUt8ZfxpVx1TmiyyT52USwAmUrPhlrQSummVhho9?= =?us-ascii?Q?wY4YxeZ+cwzXCLkqLxNJcNR5Nekh2z5mfP0Bl6q8MqFhoi4JqB+uWxYRxvi0?= =?us-ascii?Q?nmbBCBah4lFqK3O1fEsxd0LIJ8gc?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?MuzzvHtR/Dtoiv3oTQVbG7Vs4d1PsGvJNcAor70/5o1p5EWZiwkqRBNcaE8y?= =?us-ascii?Q?YMuGolDuS9yL0YiP8kOOrYeJBvXJJRrqJ/0G+KkPSG1ai5Tz8TjL02qUkE9A?= =?us-ascii?Q?eZv8duSH377wd0eDXGBnqQ/AudFIf4EhIdOubPzxQ5BqD26a34UTjnj4+APn?= =?us-ascii?Q?rFCokMORicvKI21TNIugJ/t8bNWDTTRCOu9jpsaXrv/KyfJkgchBX27qPM9S?= =?us-ascii?Q?12xRQvYer/xtXj8UzOqoEFyBdyukSEmaSIQSGco1B5+pfHn8w/fLAx7dVj4C?= =?us-ascii?Q?0mRTqjzkKR2trJaAi9WdV0uLq0UxpGrZGU19gj1Xbhba1fv3+mRE/ED3ng8V?= =?us-ascii?Q?fdpdF+AwbzROGlNhgcGxMNoVNLXgubG2ayPEx6Yp6WCBPA/ybARxJJM90Hn+?= =?us-ascii?Q?H+zwunwiZpNYcCkxFT88XD8E9d9omHsJzuQhakWmpaF3Vn7kYYTfl2jiNCQh?= =?us-ascii?Q?OHCOvzZG820urpOFJycx7+8DCkCgqkBnCgKygHpOHrjHx2Es1HyHksP8TQD2?= =?us-ascii?Q?cqun9qRpk8N3XreM7wtbQcJ4SnyjkD6+S2DWB8HJqNc5UA5/YwYJ7/d6P0JC?= =?us-ascii?Q?2KE5VfJKJwN4+ID7x7Ss/P7KK1e0e7QRpBgBAjk+YRv5dNRvYz2UUWcPTznD?= =?us-ascii?Q?q1tuZ6U+1KIlAQNHJu7jXROOqObWnQ/+RHC1XXCoDEY8DOLvFlbuvSRiDcep?= =?us-ascii?Q?xwfQWXtrKBGwETckBNCPEKz7/uaky+irbk/ApmWHxqBoJNQcaw6GVwqPuBWM?= =?us-ascii?Q?F6o+T7y9WRYSOhgIC5HhysBkIRE/YJAokEHq5UKo3ocTqr38toslUamQ+3QD?= =?us-ascii?Q?xb9pmGfRb9kg9f3b/ubttfSKGWNrJIRxDDZG306V89ycnPpwykoLOnBtD3Gn?= =?us-ascii?Q?vuCJ+gPONIsAflFQIRVPj9u8moLPYA+onEjzvBVeM9Dv5COOFpfuGPbZuHbU?= =?us-ascii?Q?u9ZmKgj9d2/C/j2sIIvR/JC8l0Yjc5fJSOncrJS8wAnI/2AOLpWTT93irWE9?= =?us-ascii?Q?DuAX+Q40r96gZt/Rthipr5Iwnd3jHme7LkIqtuc4F0BPXcrgs7IFfdBrfBqn?= =?us-ascii?Q?pUDF0ppY+AQZFYZDx54J8hF/Uj1RCYm++9u/WVmPe3NzMwmsVxgOkW05sR2/?= =?us-ascii?Q?vHmhHRFoyZMpsk1fcJwry84VL9gBatqeQHsWF+p89fvDaeZiTfPCtb9eAjlj?= =?us-ascii?Q?U9TwpfuMLo1/FmIM3mhnR00wAO/qICbBE9tV7Bn9bvkE+p9yTh5FetyQDNC1?= =?us-ascii?Q?SIfIn9ungT4yAD6E/ZOQjyyyoTAB6jxtPi1HHEOYdetMuI+kY16zmVMoJ2kN?= =?us-ascii?Q?Jr624SLoHZugJ/HqX6KhbXoh16IpsQ6DN9wMysTK2qheM+MST9bR5I5ilZn1?= =?us-ascii?Q?+pKeidRsQ8/616AhCG8gCJuvm7JIkTLSzRvZk/gM5SWhIMdj1jVa2XBMzh0j?= =?us-ascii?Q?Ruxj965lIiXuH+YH0M7j8JS2Sq7UKG5R6hdULdwyzomQ03C311hw62hwKm4J?= =?us-ascii?Q?KGK5EVoj0D8Na7EF8bXDYJ2rH25jGj+BppNedBTS9EDUExVSnoYyLah43INw?= =?us-ascii?Q?iXFlxgB2+r4DNWqgMKHCBBDq4Oz1vqtxhKTaLiUxBz+QkfTA4KhcShr4gjyq?= =?us-ascii?Q?/Q=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: UtdsmovZunmHnwMXzNZiABChcURXq0M7ngzLBWzb85jMdEsna97H56D80TaDzdI2QE7JoWeGhG3jeztCCWCvspDAa/EjzpB024sMulf6pWwvF2wAhRrbULYvdA7opR1urBx+V01dgq5i6KgeghrtILukWTh3UxFlYoaXzfEXSAD9fuptWtXZ1QtaFQlrXGCKdykvhAhAdgC4lTl6lw40EVVW18+Ld6hGDjoe3SFCqFMOictE5uJpjLg4JwNhXQGFvIHUzWaNzJ0KjKaWprujiW3dDxZ0dUX1v1YhneU2n5jtwHDmVRUqhEuqAM+LGqJRSvMinXsNAy6GGryDn7NxsCdMQiFpX2cPSpNr83mHT/D9cIsI+MR6wsLBU3I2cZONvgu30Mtnm8GUpEw6cyNPhBrbblLJQ0PrGbZ6Li+X5cT32DAh1gBTgmJJZSGuyg5KpRL+314ls9eJtXlYkEsp4kZFLEj/w+AwuIt5PvxDBYHGTFHXHR38QWpLpoS3AF5+uj4dDD4yMaSbl5ip55w+DzmBUxSJfPGtBcwtS9sMpz79DxY52NGXUcs8TfYphsW3KPPy9+jw4XpbNWg+MSYu8LuxHXUSFLk2b2Zh8yEv6sk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7176d18d-1bca-46e2-0246-08dd68c2fdf1 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:45.2495 (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: JAQVfwsGkkLZWGOgILSc0+eOHrbj3FqqrWWW2sVEaNOrzHILbi6qhPzfo3kL9c+21ZnI6pTus3svcL1bxJxRF3xeFMbOn5NBs/PcGRSel4k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-GUID: 2dgXcV98jOr72PT695mSlOtlXD4TXQ7f X-Proofpoint-ORIG-GUID: 2dgXcV98jOr72PT695mSlOtlXD4TXQ7f Content-Type: text/plain; charset="utf-8" When mremap() moves a mapping around in memory, it goes to great lengths to avoid having to walk page tables as this is expensive and time-consuming. Rather, if the VMA was faulted (that is vma->anon_vma !=3D NULL), the virtu= al page offset stored in the VMA at vma->vm_pgoff will remain the same, as well all the folio indexes pointed at the associated anon_vma object. This means the VMA and page tables can simply be moved and this affects the change (and if we can move page tables at a higher page table level, this is even faster). While this is efficient, it does lead to big problems with VMA merging - in essence it causes faulted anonymous VMAs to not be mergeable under many circumstances once moved. This is limiting and leads to both a proliferation of unreclaimable, unmovable kernel metadata (VMAs, anon_vma's, anon_vma_chain's) and has an impact on further use of mremap(), which has a requirement that the VMA moved (which can also be a partial range within a VMA) may span only a single VMA. This makes the mergeability or not of VMAs in effect a uAPI concern. In some use cases, users may wish to accept the overhead of actually going to the trouble of updating VMAs and folios to affect mremap() moves. Let's provide them with the choice. This patch add a new MREMAP_RELOCATE_ANON flag to do just that, which attempts to perform such an operation. If it is unable to do so, it cleanly falls back to the usual method. It carefully takes the rmap locks such that at no time will a racing rmap user encounter incorrect or missing VMAs. It is also designed to interact cleanly with the existing mremap() error fallback mechanism (inverting the remap should the page table move fail). Also, if we could merge cleanly without such a change, we do so, avoiding the overhead of the operation if it is not required. In the instance that no merge may occur when the move is performed, we still perform the folio and VMA updates to ensure that future mremap() or mprotect() calls will result in merges. In this implementation, we simply give up if we encounter large folios. A subsequent commit will extend the functionality to allow for these cases. We restrict this flag to purely anonymous memory only. Signed-off-by: Lorenzo Stoakes --- include/uapi/linux/mman.h | 1 + mm/internal.h | 1 + mm/mremap.c | 354 +++++++++++++++++++++++++++++++++++--- mm/vma.c | 29 +++- mm/vma.h | 5 +- tools/testing/vma/vma.c | 5 +- 6 files changed, 367 insertions(+), 28 deletions(-) diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index e89d00528f2f..d0542f872e0c 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -9,6 +9,7 @@ #define MREMAP_MAYMOVE 1 #define MREMAP_FIXED 2 #define MREMAP_DONTUNMAP 4 +#define MREMAP_RELOCATE_ANON 8 =20 #define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_ALWAYS 1 diff --git a/mm/internal.h b/mm/internal.h index 286520a424fe..7c120a6b0018 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -46,6 +46,7 @@ struct folio_batch; struct pagetable_move_control { struct vm_area_struct *old; /* Source VMA. */ struct vm_area_struct *new; /* Destination VMA. */ + struct vm_area_struct *relocate_locked; /* VMA which is rmap locked. */ unsigned long old_addr; /* Address from which the move begins. */ unsigned long old_end; /* Exclusive address at which old range ends. */ unsigned long new_addr; /* Address to move page tables to. */ diff --git a/mm/mremap.c b/mm/mremap.c index 0865387531ed..bb67562a0114 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -71,6 +71,14 @@ struct vma_remap_struct { unsigned long charged; /* If VM_ACCOUNT, # pages to account. */ }; =20 +/* Represents local PTE state. */ +struct pte_state { + unsigned long old_addr; + unsigned long new_addr; + unsigned long old_end; + pte_t *ptep; +}; + static pud_t *get_old_pud(struct mm_struct *mm, unsigned long addr) { pgd_t *pgd; @@ -139,18 +147,42 @@ static pmd_t *alloc_new_pmd(struct mm_struct *mm, uns= igned long addr) return pmd; } =20 -static void take_rmap_locks(struct vm_area_struct *vma) +static void maybe_take_rmap_locks(struct pagetable_move_control *pmc) { + struct vm_area_struct *vma; + struct anon_vma *anon_vma; + + if (!pmc->need_rmap_locks) + return; + + vma =3D pmc->old; + anon_vma =3D vma->anon_vma; if (vma->vm_file) i_mmap_lock_write(vma->vm_file->f_mapping); - if (vma->anon_vma) - anon_vma_lock_write(vma->anon_vma); + if (anon_vma) { + struct vm_area_struct *relocate_vma =3D pmc->relocate_locked; + + if (!relocate_vma || relocate_vma->anon_vma !=3D anon_vma) + anon_vma_lock_write(anon_vma); + } } =20 -static void drop_rmap_locks(struct vm_area_struct *vma) +static void maybe_drop_rmap_locks(struct pagetable_move_control *pmc) { - if (vma->anon_vma) - anon_vma_unlock_write(vma->anon_vma); + struct vm_area_struct *vma; + struct anon_vma *anon_vma; + + if (!pmc->need_rmap_locks) + return; + + vma =3D pmc->old; + anon_vma =3D vma->anon_vma; + if (anon_vma) { + struct vm_area_struct *relocate_vma =3D pmc->relocate_locked; + + if (!relocate_vma || relocate_vma->anon_vma !=3D anon_vma) + anon_vma_unlock_write(anon_vma); + } if (vma->vm_file) i_mmap_unlock_write(vma->vm_file->f_mapping); } @@ -204,8 +236,7 @@ static int move_ptes(struct pagetable_move_control *pmc, * serialize access to individual ptes, but only rmap traversal * order guarantees that we won't miss both the old and new ptes). */ - if (pmc->need_rmap_locks) - take_rmap_locks(vma); + maybe_take_rmap_locks(pmc); =20 /* * We don't have to worry about the ordering of src and dst @@ -254,6 +285,7 @@ static int move_ptes(struct pagetable_move_control *pmc, */ if (pte_present(pte)) force_flush =3D true; + pte =3D move_pte(pte, old_addr, new_addr); pte =3D move_soft_dirty_pte(pte); =20 @@ -278,8 +310,7 @@ static int move_ptes(struct pagetable_move_control *pmc, pte_unmap(new_pte - 1); pte_unmap_unlock(old_pte - 1, old_ptl); out: - if (pmc->need_rmap_locks) - drop_rmap_locks(vma); + maybe_drop_rmap_locks(pmc); return err; } =20 @@ -537,15 +568,14 @@ static __always_inline unsigned long get_extent(enum = pgt_entry entry, * Should move_pgt_entry() acquire the rmap locks? This is either expresse= d in * the PMC, or overridden in the case of normal, larger page tables. */ -static bool should_take_rmap_locks(struct pagetable_move_control *pmc, - enum pgt_entry entry) +static bool should_take_rmap_locks(enum pgt_entry entry) { switch (entry) { case NORMAL_PMD: case NORMAL_PUD: return true; default: - return pmc->need_rmap_locks; + return false; } } =20 @@ -557,11 +587,15 @@ static bool move_pgt_entry(struct pagetable_move_cont= rol *pmc, enum pgt_entry entry, void *old_entry, void *new_entry) { bool moved =3D false; - bool need_rmap_locks =3D should_take_rmap_locks(pmc, entry); + bool override_locks =3D false; =20 - /* See comment in move_ptes() */ - if (need_rmap_locks) - take_rmap_locks(pmc->old); + if (!pmc->need_rmap_locks && should_take_rmap_locks(entry)) { + override_locks =3D true; + + pmc->need_rmap_locks =3D true; + /* See comment in move_ptes() */ + maybe_take_rmap_locks(pmc); + } =20 switch (entry) { case NORMAL_PMD: @@ -585,8 +619,9 @@ static bool move_pgt_entry(struct pagetable_move_contro= l *pmc, break; } =20 - if (need_rmap_locks) - drop_rmap_locks(pmc->old); + maybe_drop_rmap_locks(pmc); + if (override_locks) + pmc->need_rmap_locks =3D false; =20 return moved; } @@ -752,6 +787,186 @@ static unsigned long pmc_progress(struct pagetable_mo= ve_control *pmc) return old_addr < orig_old_addr ? 0 : old_addr - orig_old_addr; } =20 +/* + * If the folio mapped at the specified pte entry can have its index and m= apping + * relocated, then do so. + * + * Returns the number of pages we have traversed, or 0 if the operation fa= iled. + */ +static unsigned long relocate_anon(struct pagetable_move_control *pmc, + unsigned long old_addr, unsigned long new_addr, pte_t pte, + bool undo) +{ + struct page *page; + struct folio *folio; + struct vm_area_struct *old, *new; + pgoff_t new_index; + unsigned long ret =3D 1; + + old =3D pmc->old; + new =3D pmc->new; + + /* Ensure we have truly got an anon folio. */ + page =3D vm_normal_page(old, old_addr, pte); + if (!page) + return ret; + + folio =3D page_folio(page); + folio_lock(folio); + + /* no-op. */ + if (!folio_test_anon(folio) || folio_test_ksm(folio)) + goto out; + + /* + * This should not happen as we explicitly disallow this, but check + * anyway. + */ + if (folio_test_large(folio)) { + ret =3D 0; + goto out; + } + + if (!undo) + new_index =3D linear_page_index(new, new_addr); + else + new_index =3D linear_page_index(old, old_addr); + + /* + * The PTL should keep us safe from unmapping, and the fact the folio is + * a PTE keeps the folio referenced. + * + * The mmap/VMA locks should keep us safe from fork and other processes. + * + * The rmap locks should keep us safe from anything happening to the + * VMA/anon_vma. + * + * The folio lock should keep us safe from reclaim, migration, etc. + */ + folio_move_anon_rmap(folio, undo ? old : new); + WRITE_ONCE(folio->index, new_index); + +out: + folio_unlock(folio); + return ret; +} + +static bool pte_done(struct pte_state *state) +{ + return state->old_addr >=3D state->old_end; +} + +static void pte_next(struct pte_state *state, unsigned long nr_pages) +{ + state->old_addr +=3D nr_pages * PAGE_SIZE; + state->new_addr +=3D nr_pages * PAGE_SIZE; + state->ptep +=3D nr_pages; +} + +static bool relocate_anon_ptes(struct pagetable_move_control *pmc, + unsigned long extent, pmd_t *pmd, bool undo) +{ + struct mm_struct *mm =3D current->mm; + struct pte_state state =3D { + .old_addr =3D pmc->old_addr, + .new_addr =3D pmc->new_addr, + .old_end =3D pmc->old_addr + extent, + }; + spinlock_t *ptl; + pte_t *ptep_start; + bool ret; + unsigned long nr_pages; + + ptep_start =3D pte_offset_map_lock(mm, pmd, pmc->old_addr, &ptl); + /* + * We prevent faults with mmap write lock, hold the rmap lock and should + * not fail to obtain this lock. Just give up if we can't. + */ + if (!ptep_start) + return false; + + state.ptep =3D ptep_start; + + for (; !pte_done(&state); pte_next(&state, nr_pages)) { + pte_t pte =3D ptep_get(state.ptep); + + if (pte_none(pte) || !pte_present(pte)) { + nr_pages =3D 1; + continue; + } + + nr_pages =3D relocate_anon(pmc, state.old_addr, state.new_addr, pte, und= o); + if (!nr_pages) { + ret =3D false; + goto out; + } + } + + ret =3D true; +out: + pte_unmap_unlock(ptep_start, ptl); + return ret; +} + +static bool __relocate_anon_folios(struct pagetable_move_control *pmc, boo= l undo) +{ + pud_t *pudp; + pmd_t *pmdp; + unsigned long extent; + struct mm_struct *mm =3D current->mm; + + if (!pmc->len_in) + return true; + + for (; !pmc_done(pmc); pmc_next(pmc, extent)) { + pmd_t pmd; + pud_t pud; + + extent =3D get_extent(NORMAL_PUD, pmc); + + pudp =3D get_old_pud(mm, pmc->old_addr); + if (!pudp) + continue; + pud =3D pudp_get(pudp); + + if (pud_trans_huge(pud) || pud_devmap(pud)) + return false; + + extent =3D get_extent(NORMAL_PMD, pmc); + pmdp =3D get_old_pmd(mm, pmc->old_addr); + if (!pmdp) + continue; + pmd =3D pmdp_get(pmdp); + + if (is_swap_pmd(pmd) || pmd_trans_huge(pmd) || + pmd_devmap(pmd)) + return false; + + if (pmd_none(pmd)) + continue; + + if (!relocate_anon_ptes(pmc, extent, pmdp, undo)) + return false; + } + + return true; +} + +static bool relocate_anon_folios(struct pagetable_move_control *pmc, bool = undo) +{ + unsigned long old_addr =3D pmc->old_addr; + unsigned long new_addr =3D pmc->new_addr; + bool ret; + + ret =3D __relocate_anon_folios(pmc, undo); + + /* Reset state ready for retry. */ + pmc->old_addr =3D old_addr; + pmc->new_addr =3D new_addr; + + return ret; +} + unsigned long move_page_tables(struct pagetable_move_control *pmc) { unsigned long extent; @@ -1132,6 +1347,42 @@ static void unmap_source_vma(struct vma_remap_struct= *vrm) } } =20 +/* + * Should we attempt to relocate anonymous folios to the location that the= VMA + * is being moved to by updating index and mapping fields accordingly? + */ +static bool should_relocate_anon(struct vma_remap_struct *vrm, + struct pagetable_move_control *pmc) +{ + struct vm_area_struct *old =3D vrm->vma; + + /* Currently we only do this if requested. */ + if (!(vrm->flags & MREMAP_RELOCATE_ANON)) + return false; + + /* We can't deal with special or hugetlb mappings. */ + if (old->vm_flags & (VM_SPECIAL | VM_HUGETLB)) + return false; + + /* We only support anonymous mappings. */ + if (!vma_is_anonymous(old)) + return false; + + /* If no folios are mapped, then no need to attempt this. */ + if (!old->anon_vma) + return false; + + /* + * If the old VMA is a child (i.e. has been forked), then the index + * references multiple VMAs, we have to bail. + */ + if (!list_is_singular(&old->anon_vma_chain)) + return false; + + /* Otherwise, we're good to go! */ + return true; +} + /* * Copy vrm->vma over to vrm->new_addr possibly adjusting size as part of = the * process. Additionally handle an error occurring on moving of page table= s, @@ -1151,9 +1402,11 @@ static int copy_vma_and_data(struct vma_remap_struct= *vrm, struct vm_area_struct *new_vma; int err =3D 0; PAGETABLE_MOVE(pmc, NULL, NULL, vrm->addr, vrm->new_addr, vrm->old_len); + bool relocate_anon =3D should_relocate_anon(vrm, &pmc); =20 +again: new_vma =3D copy_vma(&vma, vrm->new_addr, vrm->new_len, new_pgoff, - &pmc.need_rmap_locks); + &pmc.need_rmap_locks, &relocate_anon); if (!new_vma) { vrm_uncharge(vrm); *new_vma_ptr =3D NULL; @@ -1163,12 +1416,66 @@ static int copy_vma_and_data(struct vma_remap_struc= t *vrm, pmc.old =3D vma; pmc.new =3D new_vma; =20 + if (relocate_anon) { + /* + * We have a new VMA to reassign folios to. We take a lock on + * its anon_vma so reclaim doesn't fail to unmap mappings. + * + * We have acquired a VMA write lock by now (in vma_link()), so + * we do not have to worry about racing faults. + */ + anon_vma_lock_write(new_vma->anon_vma); + pmc.relocate_locked =3D new_vma; + + if (!relocate_anon_folios(&pmc, /* undo=3D */false)) { + unsigned long start =3D new_vma->vm_start; + unsigned long size =3D new_vma->vm_end - start; + + /* Undo if fails. */ + relocate_anon_folios(&pmc, /* undo=3D */true); + vrm_stat_account(vrm, vrm->new_len); + + anon_vma_unlock_write(new_vma->anon_vma); + pmc.relocate_locked =3D NULL; + + do_munmap(current->mm, start, size, NULL); + relocate_anon =3D false; + goto again; + } + } + moved_len =3D move_page_tables(&pmc); if (moved_len < vrm->old_len) err =3D -ENOMEM; else if (vma->vm_ops && vma->vm_ops->mremap) err =3D vma->vm_ops->mremap(new_vma); =20 + if (unlikely(err && relocate_anon)) { + relocate_anon_folios(&pmc, /* undo=3D */true); + anon_vma_unlock_write(new_vma->anon_vma); + pmc.relocate_locked =3D NULL; + } else if (relocate_anon /* && !err */) { + unsigned long addr =3D vrm->new_addr; + unsigned long end =3D addr + vrm->new_len; + VMA_ITERATOR(vmi, vma->vm_mm, addr); + VMG_VMA_STATE(vmg, &vmi, NULL, new_vma, addr, end); + struct vm_area_struct *merged; + + /* + * Now we have successfully copied page tables and set up + * folios, we can safely drop the anon_vma lock. + */ + anon_vma_unlock_write(new_vma->anon_vma); + pmc.relocate_locked =3D NULL; + + /* Let's try merge again... */ + vmg.prev =3D vma_prev(&vmi); + vma_next(&vmi); + merged =3D vma_merge_existing_range(&vmg); + if (merged) + new_vma =3D merged; + } + if (unlikely(err)) { PAGETABLE_MOVE(pmc_revert, new_vma, vma, vrm->new_addr, vrm->addr, moved_len); @@ -1486,7 +1793,8 @@ static unsigned long check_mremap_params(struct vma_r= emap_struct *vrm) unsigned long flags =3D vrm->flags; =20 /* Ensure no unexpected flag values. */ - if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP)) + if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP | + MREMAP_RELOCATE_ANON)) return -EINVAL; =20 /* Start address must be page-aligned. */ @@ -1501,6 +1809,10 @@ static unsigned long check_mremap_params(struct vma_= remap_struct *vrm) if (!PAGE_ALIGN(vrm->new_len)) return -EINVAL; =20 + /* We can't relocate without allowing a move. */ + if ((flags & MREMAP_RELOCATE_ANON) && !(flags & MREMAP_MAYMOVE)) + return -EINVAL; + /* Remainder of checks are for cases with specific new_addr. */ if (!vrm_implies_new_addr(vrm)) return 0; diff --git a/mm/vma.c b/mm/vma.c index 5418eef3a852..09027448753f 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -774,8 +774,7 @@ static bool can_merge_remove_vma(struct vm_area_struct = *vma) * - The caller must hold a WRITE lock on the mm_struct->mmap_lock. * - vmi must be positioned within [@vmg->middle->vm_start, @vmg->middle->= vm_end). */ -static __must_check struct vm_area_struct *vma_merge_existing_range( - struct vma_merge_struct *vmg) +struct vm_area_struct *vma_merge_existing_range(struct vma_merge_struct *v= mg) { struct vm_area_struct *middle =3D vmg->middle; struct vm_area_struct *prev =3D vmg->prev; @@ -1756,7 +1755,7 @@ int vma_link(struct mm_struct *mm, struct vm_area_str= uct *vma) */ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, unsigned long addr, unsigned long len, pgoff_t pgoff, - bool *need_rmap_locks) + bool *need_rmap_locks, bool *relocate_anon) { struct vm_area_struct *vma =3D *vmap; unsigned long vma_start =3D vma->vm_start; @@ -1782,7 +1781,19 @@ struct vm_area_struct *copy_vma(struct vm_area_struc= t **vmap, vmg.middle =3D NULL; /* New VMA range. */ vmg.pgoff =3D pgoff; vmg.next =3D vma_iter_next_rewind(&vmi, NULL); + new_vma =3D vma_merge_new_range(&vmg); + if (*relocate_anon) { + /* + * If merge succeeds, no need to relocate. Otherwise, reset + * pgoff for newly established VMA which we will relocate folios + * to. + */ + if (new_vma) + *relocate_anon =3D false; + else + pgoff =3D addr >> PAGE_SHIFT; + } =20 if (new_vma) { /* @@ -1813,7 +1824,9 @@ struct vm_area_struct *copy_vma(struct vm_area_struct= **vmap, vma_set_range(new_vma, addr, addr + len, pgoff); if (vma_dup_policy(vma, new_vma)) goto out_free_vma; - if (anon_vma_clone(new_vma, vma)) + if (*relocate_anon) + new_vma->anon_vma =3D NULL; + else if (anon_vma_clone(new_vma, vma)) goto out_free_mempol; if (new_vma->vm_file) get_file(new_vma->vm_file); @@ -1821,6 +1834,14 @@ struct vm_area_struct *copy_vma(struct vm_area_struc= t **vmap, new_vma->vm_ops->open(new_vma); if (vma_link(mm, new_vma)) goto out_vma_link; + /* + * If we're attempting to relocate anonymous VMAs, we + * don't want to reuse an anon_vma as set by + * vm_area_dup(), or copy anon_vma_chain or anything + * like this. + */ + if (*relocate_anon && __anon_vma_prepare(new_vma)) + goto out_vma_link; *need_rmap_locks =3D false; } return new_vma; diff --git a/mm/vma.h b/mm/vma.h index 7356ca5a22d3..fc4f8352ec6f 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -260,6 +260,9 @@ __must_check struct vm_area_struct __must_check struct vm_area_struct *vma_merge_new_range(struct vma_merge_struct *vmg); =20 +__must_check struct vm_area_struct +*vma_merge_existing_range(struct vma_merge_struct *vmg); + __must_check struct vm_area_struct *vma_merge_extend(struct vma_iterator *vmi, struct vm_area_struct *vma, @@ -280,7 +283,7 @@ int vma_link(struct mm_struct *mm, struct vm_area_struc= t *vma); =20 struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, unsigned long addr, unsigned long len, pgoff_t pgoff, - bool *need_rmap_locks); + bool *need_rmap_locks, bool *relocate_anon); =20 struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *vma); =20 diff --git a/tools/testing/vma/vma.c b/tools/testing/vma/vma.c index 7cfd6e31db10..3d19df8fa17b 100644 --- a/tools/testing/vma/vma.c +++ b/tools/testing/vma/vma.c @@ -1543,13 +1543,14 @@ static bool test_copy_vma(void) unsigned long flags =3D VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE; struct mm_struct mm =3D {}; bool need_locks =3D false; + bool relocate_anon =3D false; VMA_ITERATOR(vmi, &mm, 0); struct vm_area_struct *vma, *vma_new, *vma_next; =20 /* Move backwards and do not merge. */ =20 vma =3D alloc_and_link_vma(&mm, 0x3000, 0x5000, 3, flags); - vma_new =3D copy_vma(&vma, 0, 0x2000, 0, &need_locks); + vma_new =3D copy_vma(&vma, 0, 0x2000, 0, &need_locks, &relocate_anon); ASSERT_NE(vma_new, vma); ASSERT_EQ(vma_new->vm_start, 0); ASSERT_EQ(vma_new->vm_end, 0x2000); @@ -1562,7 +1563,7 @@ static bool test_copy_vma(void) =20 vma =3D alloc_and_link_vma(&mm, 0, 0x2000, 0, flags); vma_next =3D alloc_and_link_vma(&mm, 0x6000, 0x8000, 6, flags); - vma_new =3D copy_vma(&vma, 0x4000, 0x2000, 4, &need_locks); + vma_new =3D copy_vma(&vma, 0x4000, 0x2000, 4, &need_locks, &relocate_anon= ); vma_assert_attached(vma_new); =20 ASSERT_EQ(vma_new, vma_next); --=20 2.48.1 From nobody Mon Feb 9 10:24:18 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 6B51328E7 for ; Fri, 21 Mar 2025 21:55:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594104; cv=fail; b=PPcUP1QcLVty6p9fKPjulj1+uhTiWvelajeDFrEfwh4IuhNcPU0t1dS+QpLlCrhTcuU3cI2W+rwcauwVijhIdqOMTLEjz025Qav5tpv30Vn38RQj7k8QaxvsiaxIFZro7E7eDwVBBz62E+cHGPlr8aLq+5M8scjy7clSKQKOTRQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594104; c=relaxed/simple; bh=SvsK9jXx51YzlmVHsffWn3ePjDmYtnjfrQCdKBnWjRQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=hdPBB8ngRZj3BBTU3jhlvhFWcrQVnIB2yxRT2OsRxP4JP8tCvzpKv0Kyi8ZzlYHAcgbka+MRjgLjnql1HlocXZb9NNIwBZJHnLOYELbcqRtlat4c7v+RQ4KwIcFqMQGT02pgMqDdhp2w9JjeqEp3J5pQ74Kr/+EhgsmEQPEVO64= 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=hGkME+YT; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=bxg1OKT8; 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="hGkME+YT"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="bxg1OKT8" 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 52LKft5R021308; Fri, 21 Mar 2025 21:54:50 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=hRydbeF3nYCukYj+F9/cqUlF7bgOKq+6Z2gmhd3ndeg=; b= hGkME+YTbBxyu/VIl+mWlBk5CHRsJh25Pv6R+5RPS+RM/CzkIRouDGS0QCrPF9hm WjBGwEQLV5qvn75OYH/5CTNGgxTB35U8dUROFCt8dqbpyoYRc8+uDjrMXTZXHLDa +sfQE3KT/6YFs2Gho7iGdJbc53Gu+FJYE8CFkHEdUc8cVbGrE0PA2h7alxmDga3L 0BRoo00OttMo/KpSxbUQ2fpa5tsQWxZwcYuT3t619F6nTfIDxR51bZUkxqmx5+zt TEwM4wQWXwV4SfpxlXq7zhwBiwq7fDFdHTgsr+qfSGhVZHjqjufC79o7Bz9+JuZ4 OV2Z1TbSWsTO7qGZZ9k/eQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1n8sgaw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:50 +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 52LKr66b022339; Fri, 21 Mar 2025 21:54:49 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2171.outbound.protection.outlook.com [104.47.57.171]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45dxcah0ns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ypVs+zS/CA2361awVjyuLtM4vd+JeitaZTQTs+Ke7KE5dDjT9vbq1lsWdvtAkFWyTnDEdcXtry6bwM4l7AswDSNw3auNcTupjq6RuZzud3MD8hdUv1SOLmi9/xsav1/8uDTi6xs5FRGOBauAOAmY/GDukE8jxNh4EVy5RP+dQy43gd+9r09eRB/8ilPF7BBZL/KnFh7Dh6LMoiiyA1xXq2tM8ViADZkih7s0vjbgayXvY826UvX3siFDHicT+d5/YLaLI5geG5ZxmXi85yPLN68pIrEFMYx7b1wtzRyvV9Ff8d/t79lPYdqx37RM0EJEIDV1sbklli5E6g9VekRy2Q== 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=hRydbeF3nYCukYj+F9/cqUlF7bgOKq+6Z2gmhd3ndeg=; b=c1GSEHvJGjp8BDwXr110TDeh9VnnXhrQCYI6R+P/2U+w2Ccgr7tW9WAxEv23K5IkStqvE6S9XBZ8UmJW9eqmnlYbCQ59XooLevGomM2DO3Ai+UH8AM8DfpzzO3zfo7PLGjAmcGoZ2uqAH3KO+yYpdf6SHl4jwg89xcO/1Qa9x+Dk0ErUL+J6tDZr+kMFeUpuv2gzDYJWjew9TGhkGQHn9PLTj6ZutBdvMFoOwDNXiBGwc7V9C3PO11PD7PSh3E9UV25XsAgdH1kRjJH/flRKILihmeqRjGozV5tsJWOsTxky8pvNNytQIadYRg72OyJrwrbK16E3rmD9fb+SKJFnbQ== 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=hRydbeF3nYCukYj+F9/cqUlF7bgOKq+6Z2gmhd3ndeg=; b=bxg1OKT8IRjlcvdOtPomXkAyE7bN7c9uvbExIY4n0o05X5teKN+TmoNmFyEdNhoraJjuji0Phye7kSEjnRPh/Mnnm7qe8pgDCoUnSEs01qawhMkMlHymctQXFYp83EM/2sF4RNTc9OUdm8+l+HiUbXvqp+5XSbDVNehPALdw/0k= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:47 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:47 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/7] mm/mremap: add MREMAP_MUST_RELOCATE_ANON Date: Fri, 21 Mar 2025 21:54:31 +0000 Message-ID: <48f1d8a43f58069f697a2daba285a1e3f02e2cbf.1742478846.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0296.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:38f::10) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 14f82601-c580-43dd-29a0-08dd68c2ff5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NGZX1uOk2aITBduPe6bBJwhHK/gqEoZKj1mWFuNaYP81KuwjJk2B4F/lCIj3?= =?us-ascii?Q?BN8bZPAQmpuAl8wSvlqHHZMdLpXR00ovjHmAdI5Q02vieKWw2ais1RNcY47E?= =?us-ascii?Q?0GEwlWXfeWbnf9piwyh+LdPePfJUI6nuabiRxJ0ZTyuf4IAJ1CboTZrBh6Ae?= =?us-ascii?Q?9sHBHe5LnqrwcLtLnavCLFRgR4kiX0sXOQdxPREzfDsmNCHUVKgOJFW8P2Ag?= =?us-ascii?Q?kQet3KRBzIByEPOm0rQq3biIdEp9+bae8f91JVgV0xXifuubbCJ46iBMbTFc?= =?us-ascii?Q?0/uGoYQpnDPFrPtHuRwrEfd+XsG45wV7pPgb31KyfZn2EW9KlQFMl6mkcUp+?= =?us-ascii?Q?Cqw2nFhsrmsPF+1ktZi5TOSjq0f2qnOvAJ0H5m8bqukAvteZFjAdoKL2GEYf?= =?us-ascii?Q?dnlbrXrizwpFb3UJRjdxINeM0RyWFN34PIlOT/v9WcAU/Pt+BQFBGf7F/4Mr?= =?us-ascii?Q?ADOAuMT0X6Jmt/zRIr5zQMI8C02x2bPrlEXkiagV6CMOWdHk36yJbLX3Ybg7?= =?us-ascii?Q?rNsG7HLn0wHOU/69Lkn1YWq32/063ZQpvbAXWKh3Aq1fbmJzajwelYg8Mx7B?= =?us-ascii?Q?99DCAcjrDWZFwfVHHmxhoBkuqldh2F/OTEHPRJ/H7jIBL0kYqOxbLiJuzRU9?= =?us-ascii?Q?ey9qve8MIeSwt0NdGGFTEKyoGPkHn5LLAyuvlXx0VvETd5oOK071GKAHRMR3?= =?us-ascii?Q?hH7RZPhcU8i6UVsQah0NWLsobSOs9BJq7lBLjsa+4bSAffx0a1xWJ6MU+jRp?= =?us-ascii?Q?uDl9vFHeWeQL++O/KDzXWfLTciPgL+BfYHnnlGVOglylxad26M0lv5aArQYr?= =?us-ascii?Q?Rwqw2l2kD164Xa9Ks+dFHimBm4Q48Dlm6ISxFO3UKHwOrLKnWTBBZojQx6oe?= =?us-ascii?Q?n/esIR9h49yCWbftQuwILQQL08fvLgSdM4hQD1F+hgy8JQwc4a/JSdTY3xXu?= =?us-ascii?Q?QrgkQbcFwMTpQM2NUfVyrjcmtjBKr07sLLnonja3/ScGeBLYqzCjSwhsLnlJ?= =?us-ascii?Q?/3XAIxQ2EZP4a7WN2+/nvHK47Csv+tuvK6Qzjn9cq1jVy5v8bDks81tKAbhr?= =?us-ascii?Q?AG8cZQMw1xqlynxNKZdA9TYjDCf0hFNv3yY3+xsk0a2wlbM1ahwJ9AxJZWIa?= =?us-ascii?Q?uwrmKjHtOyUNL1ZK/vchbAr8iWUCEs/pPbMOqADkulyC1Nl+rWNJPEQBHJs7?= =?us-ascii?Q?X2Ws+Kx761X04Jg5RhqeLw5VYUJP2HNMuT59iPZYXSSx2he5QkIWEjZQtcbw?= =?us-ascii?Q?v5CqKI/+dZ810Piyc1r9DZQaImyw+hZLE9hkXPKT4t8S+Jmkz/mHtsYl58Xm?= =?us-ascii?Q?FbkjhLZrWJ4UWgoqs4NQKawNmgELjp567UUEftLFWoOJEZtyLaohOtCOoqMl?= =?us-ascii?Q?xbxZapUeqWMbDKvNRProH6OOAapW?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ruKplwiE1XDa9JNAZp/WBHsnxpguI/vnQNS1LvLJiG22ReR2Yu1jq0i/FNq0?= =?us-ascii?Q?6R2yzH/wvDEt00MDWq6npnJKCwabLhuHcWRcI8kpZV5vxq1QDVWZARovsiTS?= =?us-ascii?Q?kM46HQXBKfVuphn8ihCssoHohDLs2zcLJe2to4iPXSfITBZ/KxgpKfHfRda9?= =?us-ascii?Q?hIu+FSYbifXDVZ5zbYIYUdd8qzXQxZzWULJy32C3KqYTKN44q++w3pQj4pcO?= =?us-ascii?Q?ttxsK3eS7OnKj1X52XaGnh6UCp/8leFwGIXDYK0+Vg1mQJ2ZV55o2LPZ4xkg?= =?us-ascii?Q?W+iYcSGhSkg9zMIiLamQh4PhsmgO4lyRJOJv2RbjIN8uNz3hlhYXdxhH/ncU?= =?us-ascii?Q?xofcy4EpgkgAgfAn87ewUlLviEOlhNxbwUZqaAUnieybjiaoxXhuxAz6d7Bz?= =?us-ascii?Q?Z8/FhhSb+FlJAS2C5BcIdjgxZ0K2mSIVJNWhbbw8dztc4g9qezQSjn7ig7Rl?= =?us-ascii?Q?BszeqiaHUulpZjj0PfahbtLj/C8ASCO0FAVOlp7i/t22rjKjyPwTYYwJYtFG?= =?us-ascii?Q?imwqtkl2JPDSdIWFPjNRX3ouORwcsgZgZwTsQhWH4CsJwvnGTB+K40jqj6Iu?= =?us-ascii?Q?u1UK/fIsTAmC7ujj+1UogfYcnu8Op/HlC/37IeHLEikJ7OnoXMR9mcYlipLT?= =?us-ascii?Q?Ee/zCM81sQhDFKO8ds1KvVj3t5/eJiF1Q51Y7J5TbC4KLpfRo1nb3wp5e3zr?= =?us-ascii?Q?3kVWwCsQXhX0O268llz0BA5sLtCUKy0IOJ6hB51pS9l9nXQyUca1P2xDV1zT?= =?us-ascii?Q?o8LPCP2jfy/zS/yDKn6x0GE3ctzu0zSEzlLXK/geC876YMV2m/PfOmrbvXyF?= =?us-ascii?Q?NGuGCjZRa6Bi96hjgML0s1siegN3T/xMb0dq0dml8pjKGZMuDAIHVkJ4r5Q0?= =?us-ascii?Q?QEAFijjAwTfTgDi4BgTe++Xu1iBtb6+PS9hc9K/x+SBmMkhdNwCosTeGw6oX?= =?us-ascii?Q?xtD7QMqRkpruVT3cHS6ssMNYdg6Pn4K7WsDe4UG+yPVq/CKKPW1ZNxiKxiQs?= =?us-ascii?Q?Vbdegn9vqQy3gRAAqSC5+wZFXd8r/xKKSAWNeko9Ddqpwe1goYlRj5/F3YKp?= =?us-ascii?Q?yshNLThR3xSPy0zULoFNWG4GhMlWe6JE/+N4iVYfjMnKEEu+gCpnI1uHCsFm?= =?us-ascii?Q?f8khAUR8DId8UAokd0a5UgFPbsjitlXeT0fQirJHi+Ywjb3n/dlkFbCLi7Ts?= =?us-ascii?Q?NBKb5Ui7l1e+8oJ2MOk7Blx5TbjRO/2MLhe+nWCMFhsvqyxwmu+TI+4eRBW5?= =?us-ascii?Q?oc5NXES3teufXjNbqaU2Fvgi7AKD1NOf0Dr3yNfpeMPHmxFvT5UyBUZ/Zi66?= =?us-ascii?Q?9VoDkZSj8EbQ7CCPYilI3kcV80DkFgarE0L9H8ajV0GYhOtGlok4QOuMo7zQ?= =?us-ascii?Q?bcNGWkDM9N4KKNsYgFPJQQL9IN1X/1EosJzOp94DQash5H3thMM0QKQ8oEpc?= =?us-ascii?Q?T427cRRkpYF8kfYbPvCvWi3eK4Qxi2CRQjd7UKUew+1pIbOBU5I/JrPtn2ML?= =?us-ascii?Q?ng3SLRL1539xu1m2riNgMzKT6t91xVMGF7umD+NIOm3P/e5tKQrH+pfxLZxH?= =?us-ascii?Q?p/1SBZL4xJErfvXZlYa63Z5LuodacRuNDO0yxcApUvTadsFEOIfqebSeLrux?= =?us-ascii?Q?4w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xi3MlH9Jf7p9Naw8wm2Vd8UMstK2lJwzySFtA2l7/mRgRzb0m+cl1AN2X3EW4RrD4cjk+rbc7udhjz0oCuvvZFVMDc4ga4tfqB3ex+/aA5iCefTPkqEE/iNvYkOULA2M+1YZKEtUFWyLP+026gDWim/XCCYlfD18jQYqWWKJSV8RfJ2kU4mKAbdJ0/Jbd+IDXnEDE1unZX2wn8esVP9JfS7qrx0MHkmewkHT6HFJdFM9siLkHGY/mbe6uuOx2Z4Hc8rhCU5G38MhyVZAqOplx/1Xynq9aFPW6Opt5KcZEctr+xbs6Qoq+kdg8s6rhYJBriNrsxxp2HpDwkpgi8iNd7MiH48qukLQ5tBO+/uAeelqWcF7arH9IaBzTTxzyzmm02lSxyNhCZWfBw1B/YPndNmu7AUY8PeoJQumrteeNCIYSL//aILzriosyw9KlBH4PMpoIVBnJpEX0KEj1FjvZgL+9/33tgmzk7XeK+M2r5K/4tILNC6GV1mU+DbHYj1NzDuIqcvRJ/DC9IBEY2Dw/krDc/WLeIrsOSQ+VeOIED319NwCiDT6HiQua+NLxCtqXXuEHxooj/H+rgAjdFZy8GrIke7DQp0LP4ZdIAHJCnA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14f82601-c580-43dd-29a0-08dd68c2ff5a X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:47.4401 (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: nf/icU61oFxyOHnVhdqYvSZ2q/1yuTC3aR2CX4s2H03gI7G5eHwbLsAW7AsIsPVnsPhiOMz1RVi76og8op4Sp67e/+uMw/fd1eOMi2vxAbY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-ORIG-GUID: F8RsljcggIrvs4X4mvsjYgLHrKyG0T5n X-Proofpoint-GUID: F8RsljcggIrvs4X4mvsjYgLHrKyG0T5n Content-Type: text/plain; charset="utf-8" This flag is the same as MREMAP_RELOCATE_ANON, however it returns an -EFAULT error should folios not be able to be relocated. The operation is undone when this occurs so the user can choose to proceed without setting this flag at this stage. This is useful for cases where a use case absolutely requires mergeability, or moreover a user needs to know whether it succeeded or not for internal bookkeeping purposes. If the move would be a no-op (could be merged, or folios in range are unmapped), then the operation proceeds normally. It is only in instances where we would have fallen back to the usual mremap() logic if we were using MREMAP_RELOCATE_ANON that we return -EFAULT for MREMAP_MUST_RELOCATE_ANON. Signed-off-by: Lorenzo Stoakes --- include/uapi/linux/mman.h | 9 +++++---- mm/mremap.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/include/uapi/linux/mman.h b/include/uapi/linux/mman.h index d0542f872e0c..a61dbe1e8b2b 100644 --- a/include/uapi/linux/mman.h +++ b/include/uapi/linux/mman.h @@ -6,10 +6,11 @@ #include #include =20 -#define MREMAP_MAYMOVE 1 -#define MREMAP_FIXED 2 -#define MREMAP_DONTUNMAP 4 -#define MREMAP_RELOCATE_ANON 8 +#define MREMAP_MAYMOVE 1 +#define MREMAP_FIXED 2 +#define MREMAP_DONTUNMAP 4 +#define MREMAP_RELOCATE_ANON 8 +#define MREMAP_MUST_RELOCATE_ANON 16 =20 #define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_ALWAYS 1 diff --git a/mm/mremap.c b/mm/mremap.c index bb67562a0114..f104147cd66d 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1352,14 +1352,18 @@ static void unmap_source_vma(struct vma_remap_struc= t *vrm) * is being moved to by updating index and mapping fields accordingly? */ static bool should_relocate_anon(struct vma_remap_struct *vrm, - struct pagetable_move_control *pmc) + struct pagetable_move_control *pmc, int *errp) { struct vm_area_struct *old =3D vrm->vma; =20 /* Currently we only do this if requested. */ - if (!(vrm->flags & MREMAP_RELOCATE_ANON)) + if (!(vrm->flags & (MREMAP_RELOCATE_ANON | MREMAP_MUST_RELOCATE_ANON))) return false; =20 + /* Failures are fatal in the 'must' case. */ + if (vrm->flags & MREMAP_MUST_RELOCATE_ANON) + *errp =3D -EFAULT; + /* We can't deal with special or hugetlb mappings. */ if (old->vm_flags & (VM_SPECIAL | VM_HUGETLB)) return false; @@ -1368,10 +1372,6 @@ static bool should_relocate_anon(struct vma_remap_st= ruct *vrm, if (!vma_is_anonymous(old)) return false; =20 - /* If no folios are mapped, then no need to attempt this. */ - if (!old->anon_vma) - return false; - /* * If the old VMA is a child (i.e. has been forked), then the index * references multiple VMAs, we have to bail. @@ -1379,6 +1379,13 @@ static bool should_relocate_anon(struct vma_remap_st= ruct *vrm, if (!list_is_singular(&old->anon_vma_chain)) return false; =20 + /* Below issues are non-fatal in 'must' case. */ + *errp =3D 0; + + /* If no folios are mapped, then no need to attempt this. */ + if (!old->anon_vma) + return false; + /* Otherwise, we're good to go! */ return true; } @@ -1402,7 +1409,10 @@ static int copy_vma_and_data(struct vma_remap_struct= *vrm, struct vm_area_struct *new_vma; int err =3D 0; PAGETABLE_MOVE(pmc, NULL, NULL, vrm->addr, vrm->new_addr, vrm->old_len); - bool relocate_anon =3D should_relocate_anon(vrm, &pmc); + bool relocate_anon =3D should_relocate_anon(vrm, &pmc, &err); + + if (err) + return err; =20 again: new_vma =3D copy_vma(&vma, vrm->new_addr, vrm->new_len, new_pgoff, @@ -1440,6 +1450,12 @@ static int copy_vma_and_data(struct vma_remap_struct= *vrm, =20 do_munmap(current->mm, start, size, NULL); relocate_anon =3D false; + if (vrm->flags & MREMAP_MUST_RELOCATE_ANON) { + vrm_uncharge(vrm); + *new_vma_ptr =3D NULL; + return -EFAULT; + } + goto again; } } @@ -1794,7 +1810,7 @@ static unsigned long check_mremap_params(struct vma_r= emap_struct *vrm) =20 /* Ensure no unexpected flag values. */ if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE | MREMAP_DONTUNMAP | - MREMAP_RELOCATE_ANON)) + MREMAP_RELOCATE_ANON | MREMAP_MUST_RELOCATE_ANON)) return -EINVAL; =20 /* Start address must be page-aligned. */ @@ -1810,7 +1826,8 @@ static unsigned long check_mremap_params(struct vma_r= emap_struct *vrm) return -EINVAL; =20 /* We can't relocate without allowing a move. */ - if ((flags & MREMAP_RELOCATE_ANON) && !(flags & MREMAP_MAYMOVE)) + if ((flags & (MREMAP_RELOCATE_ANON | MREMAP_MUST_RELOCATE_ANON)) && + !(flags & MREMAP_MAYMOVE)) return -EINVAL; =20 /* Remainder of checks are for cases with specific new_addr. */ --=20 2.48.1 From nobody Mon Feb 9 10:24:18 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 66B67232395 for ; Fri, 21 Mar 2025 21:55:04 +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=1742594107; cv=fail; b=XXgrE2ijq31bxDQ976VXyBmLVu4DRJ6irsACvpkqPwY3OQMxSCRPUr7EyL/fh+t878S1XVPOTqUUuiz9D3Y9Ijlo08TcKhIShcfV3wNP2Lny/LaRb+iHxBVeA/6+x39N/dtwr3ZxmdSaSALx4/q/64VrUBEeWBMWjav1cVQAkI4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594107; c=relaxed/simple; bh=oihNkfJQWcgGNmEt2DJf9ZX8XhEwmCcHUmdHvAJk2jo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=uvOnT5e6p/cs72NRfwO5kxS3TqURBSI8fkqgetvb+HeCN2O3JHhnbOqNeNub5N9YDkj1CKarIsETVE/QuwDGhJ9BGGccmnPjMXD1+G5luf5BLfIkIDzVpzNxXvsYZxVShMzatHGm//rcsiYrtNER5JiLKKL8P0Cw1SmwNDaBvUs= 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=a1kqZ+H8; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=YFAPK+8b; 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="a1kqZ+H8"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="YFAPK+8b" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52LKfwkN005492; Fri, 21 Mar 2025 21:54:54 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=1kvm3UDHamn645oOdYhnc+vjXMc0M/KQa2SlxBwaiuI=; b= a1kqZ+H8/+LQaIaLnq0CVh7u+5AEtXy4bEYgqnG2pwFMlB81Xo37CN5FJec/pE6n ZQ0tOVV7Z7dBRYYzwhYIT39zqpJWtAn4gD5whmisYU+zHGvvmMO9VMK6GRAI9OtG eTPv9tgJj1Qbd8g70mGyPd2CV7qCJnzq4NSIFahh3XtY/W8THCe8kJoICtZNPhsB WprXMujBUhZSQmj5SJSlAcdWVjHdfKZthlb34WjcWL7/2Ib9U9rtHIGBcioGWaum sJi90JveMgmt3vcRB9zXGxzX6YK2moEEDkjSB9g0uXL6vxp+aQk4oW5aNhGsA4m1 qdzOFi5vMLahqirtq6DZBg== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1m41dnk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:53 +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 52LK2WRM022409; Fri, 21 Mar 2025 21:54:52 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2045.outbound.protection.outlook.com [104.47.58.45]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45dxcah0qk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gKXfR3MUbha+4jdZZ+iNpNP9q1Plb7N0Gq8GuupM57J8A+ulq9TLsysFIJD6ZOsjEYmqcMxWThKuklQRC9/5o1Q793BJE8iJy+HWWL67g/QdCPQmliq6valg1jMszDz7O0sw2b6+w5fr3vb7OUyQcpI20g7esUq0tDIGe52be/7fo/0kB+261LqlQyrbbKZbUMzo6I4lt/tETzZb/QN7X7aCNmrQHxIzP/lRDWf0aYUey37oq2UkvYTRoBRmWb9ERlmPBWVOt2c1pXEoKFdUq3g+oVbLkTkN5zebPkfa8GiwihigFNd1oPsQdSPYcesVA7O9rfSf7B6PQkHVwLeIRg== 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=1kvm3UDHamn645oOdYhnc+vjXMc0M/KQa2SlxBwaiuI=; b=px02bUtwC1/10T6fSyZ3K9pB6sahyUJvrnCI2DivLWwIH8jY4T7XkoSXi5Fvw6Cvm7QwhBnfrsCOCEtCzG8JDBegK0Y4XcUemh+Ry3TdLOmmnGPKbxDTWq5j0utCUXWddOe2KkQ3S9067xVOMMdcMv/zvp3PXUi6fNbXYuJ5ulmuZsom7dRjDxogk9DLMFo2XRNYkKFX1f4ZxcvG09PuLe+kDuPwJGFAnGa4u0mdXNHa2yMIvWc79c/DAbPSEDLmJJCUKExz2/whzq2O4zTJI4pfzRmr3ockKE5WcnRgfYkgd4rTxqZs+dOGt635UVAE0kzlgHWSvmZ9a++sBlzPyw== 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=1kvm3UDHamn645oOdYhnc+vjXMc0M/KQa2SlxBwaiuI=; b=YFAPK+8bPVT6vmuv4wViTZ9mKLlpKqixymt/0yCx4JGit0563N8SM9LBiQozRO//ZuNdam4B/b75hLCEymPtI0f0/RSwAo+WMhh9PSD+FWECB2ghXVHdssXsqK9jW6z/OX1pJDhW70KjBpnhH25i4NufNpQKd+pwYNjICE6tBLs= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:50 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:50 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/7] mm/mremap: add MREMAP[_MUST]_RELOCATE_ANON support for THP folios Date: Fri, 21 Mar 2025 21:54:32 +0000 Message-ID: <5b9f21d3a0b5df610877633127f975c2d79ae46a.1742478846.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO6P265CA0005.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:339::13) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 017b8123-99dd-4157-da6b-08dd68c300e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DhUjxCTlkiU53QatdbgFmTbJun4e8vvhWasWbGb0qXZLzRysudRLE/aK3eBH?= =?us-ascii?Q?JxYDlqd7pXnyRFu8ynhDtjjl9quzayE75wWX8S0DM3Loclt/SO76DpGt05GS?= =?us-ascii?Q?leaQdkqTre0zNrRLXkSgm5R0uxyECpNwRE7a9Z+tRIE4h3+njYe48l5MjslO?= =?us-ascii?Q?BVyy+MVpy0UlFdwOli2BMbF5YcapklUtooepLvCiHF9DCcTMCIh6Y5kDgX36?= =?us-ascii?Q?buLL/2LjQmHM1Ik7IS6dAjTsWMmx0WHzbwROpO8ZsiT02mocwhghj97SyaHD?= =?us-ascii?Q?wZh+blLcbbbwVgHF5SWRuJzDomDljovcwxbLfZHWUCuUgkxh+Y/GzY+xytGS?= =?us-ascii?Q?/u+gCHirqYFax0OakQD0OA0Qn3343rTTyg+B7nXdf9lTeXbA1aZDairJGHuq?= =?us-ascii?Q?VQ16Q4x6cK7x3tSCfmB6kcAkwttB0dDWILJn0is/Gx7udoRw8PIHO9fC6r28?= =?us-ascii?Q?JtfJmgUlbnsxDtNudG34nqLnuckmx9fsT10wSALYMUS9CNgfVCYs7KNz8gtd?= =?us-ascii?Q?AU4WOxCoEta/PuxI84v6FARkr9BvGUOEEwF9+PxDmHokrvYODCiEKXClW5Xa?= =?us-ascii?Q?Nd1ptyZlueCx63GFCQiZkFj3T5WVo30S0HMsfQT3lHktc4u+avurpafgBOpN?= =?us-ascii?Q?yToBHkhvlofvss5oHi+CxusCNu09EQQCPp+IHmCJdqJhMFYaWoUDh2UNHF3L?= =?us-ascii?Q?+Ykx7Agn82V9oBsPIwFyn9nV9ipdmQExXSl3wR8RcVuwfI8AFF6tI1Eyx+8V?= =?us-ascii?Q?SwD91Qkxsi3MqOOHGygmE/YuLXW3NU6TIj70mobLAxivCdISKBxcGQUVaaYq?= =?us-ascii?Q?jFdwTjDplwHC8dF1fajvxgOUQuMNsg5skizAmWFSvh3Dlbm158HzaxqY+Z/k?= =?us-ascii?Q?YDezBjhyPa8TiGwA9JS3tGW1Fri+1UP9Nr8HOgPaKQUY/15EjLzJFpn+TzSE?= =?us-ascii?Q?FGzbhiog1Ly4BYbAvGxeWFowQ6hyZKb+B+XGd55RV43T7Av9RRajZ2AYfoje?= =?us-ascii?Q?s7h0XX/tWxRI+Xib2txj0b7bNNc4jj6uLsLAWDkIWGWC9ZXhjmis6twmnfre?= =?us-ascii?Q?nZ1dvQPOb81Y6/nfLldy6W7FqGbaeiJLfoFZ2NIUD9G1MCQEHefo0cxq8fbC?= =?us-ascii?Q?lEBN9cdivOmb0Q7BaextIMP3n2+Vw0GhGQtLsgMflf5U7YimaV4M1Udk8ngj?= =?us-ascii?Q?pdidqQb3aonUKD0gOuvuha+CPavnKzXf21Yka2JXhOvLcTLNEhhjg7ckBQ4A?= =?us-ascii?Q?AiOmkRTDMusRgLP8QIEs4qZhWmaWL8upOYZ0YTUOOk5CHhkHGgY5jlaORTZx?= =?us-ascii?Q?7v0ezSWrJX6a30yY6lHDGJf9jSnz7jm+YqH/13MGDgVGM9xFuChZaVfBJMGg?= =?us-ascii?Q?Do++cPoFzQFIV1iSk4TJxEEynZcA?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?P9GO821tCOM9Y/rDgq6HefV42rn432ol4xPx9VD9iINZ6leFUcDRTRNoZ/9g?= =?us-ascii?Q?DvN8yg+/mvd67iuvmTa9mel7zgLowz/nQvDwv9I3xt6VoqzhkRGoSDQZ+FGu?= =?us-ascii?Q?ZX8+kHlV0toGlTnxt4V+6UIlU4eaPqj6L31lNDLj0N1/XSq+FAbTi9wGc/EU?= =?us-ascii?Q?SZQBV3TQ8s60mlMLXdx+JwaMSbPdxoAfhyDWpsvwzcCq8QG4GSYrJYfiaSqn?= =?us-ascii?Q?f/acpQM5R3+Ku1uSUJiO1jq7zX7XDpsj9OqvqG+k7BLICkFRX/EyZiiAell/?= =?us-ascii?Q?S6yhRUc6CZFoVlsBu5UpR3Bo/cSS/UG8ekivWZ9DRISSAqqX2ttNiuftVVOH?= =?us-ascii?Q?mJPU4YhqnavRYKi59GI84/yEWsEheStiEU0GRKOSvMeEfhHeABgtOTZXPx6c?= =?us-ascii?Q?DOIv10n1AK3Vfl+OOTamGk3Fj9KxatGQUhk9rTxcBJWsroS+wmcpFdwYrKBe?= =?us-ascii?Q?Y20sARIpYYThQG4bwh4NG/PGbllDNtw5d2V02VuBuQtiM94/BvGGKPAddTKo?= =?us-ascii?Q?HiBKKE26ZKHdAB4cHqON+t7znMFdKtHhwmVcukKICMZq/K48G3JuI8thuh3x?= =?us-ascii?Q?dIEupix3x2tn4eihYJhUli7CS5tTtyiM7AEzrk60sJJO8yP8Rr6lH2cswbnT?= =?us-ascii?Q?4BRUF8a8jx/rEH3ZSE+mCabi4plJ0aoyRRQac93VmwH8DB/JklxroX01zjav?= =?us-ascii?Q?f1bW8ijg1k0Qgku9I3FHVIPIjFu4WXHNT4rH47+we7eWqq0pWhRB2kDH/3CM?= =?us-ascii?Q?8C8a8nwkz3m+rPRdIq+QLUfA7XjkuPoo4YkcNBciKyApfU/6oTC/IBBt7Jxq?= =?us-ascii?Q?GamBGAQcOuiFhq30FhOpIXapP7FFLQ8tL7lA1D4eSFZgrNJJo7iS5vPU7WmH?= =?us-ascii?Q?JWhRSXo2gNxjtcxyF/GeQzLQQhWJvruetxkSd09x7G69JjhY+H3p7WO4+D2D?= =?us-ascii?Q?7vt2kUrino7fwEV6W2IXU7VSb3zaGn0oMQXhYY0eyhj10cUbaFkU2lYlzOjw?= =?us-ascii?Q?bGkrvIRibVMxuQzoVgGENaMjZnOjXWHwLGIuzHRWX7H+ztIYofy6L6PIoLTT?= =?us-ascii?Q?5d6iz9RKxXPh+K5tbKaqtwyECrWt2+n+kEV/At+ZjKgju2OYq6oSc7qENrj2?= =?us-ascii?Q?gqbmZ/jRlu3/WQdg5mJFCA60tMiDNk39aVYs92t9wcjt4ArnjmKdioiI+O6t?= =?us-ascii?Q?oje21AzPbfP7KDLl2FVrOrk8HYDBRTuiBkvmEhbm03PWZulXGzubW90tGDsD?= =?us-ascii?Q?ScrGFG/2lvmfKOV/1xViyP+dyjGfGeKv0PMZ2mau3iRAnsh1iHlhoqvav4fl?= =?us-ascii?Q?7C2yQMos0l/rkqIcH5LyJCg7MjuaVPtvFKeR1H2IUQ9lRSVhyZ7Uzd0DS87a?= =?us-ascii?Q?w2pB3zCJP4kUG6PIUjOR9IE7hx36REAY5kGE7KERusWSqak+Hv5+arAextSP?= =?us-ascii?Q?AqXb7UGa3xO7125x9x5jFHXAfEJbqKt6I+0QzZVhqc3kZKFiaddTEw3Keiic?= =?us-ascii?Q?wJzgjqh3nVr+UgXbZepa3Jf0y9Pko5ssx88NqzJ5dPev7cumpgoKiBU/4HmL?= =?us-ascii?Q?IdV4c3zpb0cq4b9j/J0PgkKaCF8PUlxUTE8cv3UEmkEYFZYmvy0NnRA7l3cl?= =?us-ascii?Q?6g=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: kL8H4g9sDfn5ZYN+2ngL6NWomUz/gR6ypdZzojwI5PZuY0gsvopUvFY8Czt+AmFJcfc4tPE3S9H2GnjBbh0ZgdyTRUYlPjHlYCwhrTCCUxQivE0WJty648SgZ6O8Y3Nby97pylyaiH5g+SrUN8IQKAgp7Xz2EOx8BTX8/5DHjfFTc8okFPvO77zx1U2v2HPe0P40GuR31pPupfdzVZVmT3ipn4SuIECnQR36amrKcOiO0fTYFzSVJQYY4yIq9C3+DXDhzAfzBCc/9iZm6oGSjtyMiW0A1NQs4xwZG0SudrBdLrrr+F9+EU7DlJJgaKHidYKHNrR+cWKtLDlPwdViJkYdWyXzghRMItx1jIQNc+VPq72BG1ik2XTZXFtuGmT9BHsPEzStZN7MhZTORGqtCZEJrl2qXYk+WBlv9ZiYlToG0AugOMWasa+8mmO5H9qureNU1UftswAqaUhvPXYKhX24g07Y6Vckc3bEqTC3eRqsDWF7VjUJtJGiX0mTlV6npSV6ElQLnyMLesOJItRdyWSgPhQCth40Q7Y8nSizp+HA9O6l/x3aoK6mVgaBHqsVwqo5p6gmQEUi18ByoQTeHSfuQ1hKQZM1+gg+7ETZ81g= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 017b8123-99dd-4157-da6b-08dd68c300e8 X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:50.1613 (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: Hxc72cyjiE9eOoHxkaqm/mcHv6xSMxfHbS0JGiaiaL5GC4LZPAs+SbyHfla1HMdMDNYPfI4cQNT08ILM5a+SiEJ2KZNYnSkeBPpHP1qPbjU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-ORIG-GUID: Dba4zAsvbblfnp_KqTPChuBh73EGqp3Y X-Proofpoint-GUID: Dba4zAsvbblfnp_KqTPChuBh73EGqp3Y Content-Type: text/plain; charset="utf-8" Transparent Huge Pages (THP) represent a problem for the existing implementation, as we don't know if a large folio is fully spanned or not. If not, then we have a folio that straddles different anon_vma's and thus which cannot be relocated. We could split the folios, but it seems unlikely that a user would prefer such a heavy handed operation (which eliminates the THP performance improvement) to simply disallowing anonymous relocation. Introduce the ability to both relocate huge PMD and PUDs if wholly contained by the new VMAs and, if the PMD or PUD has been split, to do so at the PTE level also. In the case that an ordinary mremap() call would split the THP (that is, at the page table level) then we preempt and do so during the relocate anonymous folio step. We are able to handle large folios of variable size correctly at PTE level generally. Signed-off-by: Lorenzo Stoakes --- mm/mremap.c | 275 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 241 insertions(+), 34 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index f104147cd66d..2f8853d1f2e7 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -524,40 +524,67 @@ enum pgt_entry { HPAGE_PUD, }; =20 -/* - * Returns an extent of the corresponding size for the pgt_entry specified= if - * valid. Else returns a smaller extent bounded by the end of the source a= nd - * destination pgt_entry. - */ -static __always_inline unsigned long get_extent(enum pgt_entry entry, - struct pagetable_move_control *pmc) +static void __get_mask_size(enum pgt_entry entry, + unsigned long *mask, unsigned long *size) { - unsigned long next, extent, mask, size; - unsigned long old_addr =3D pmc->old_addr; - unsigned long old_end =3D pmc->old_end; - unsigned long new_addr =3D pmc->new_addr; - switch (entry) { case HPAGE_PMD: case NORMAL_PMD: - mask =3D PMD_MASK; - size =3D PMD_SIZE; + *mask =3D PMD_MASK; + *size =3D PMD_SIZE; break; case HPAGE_PUD: case NORMAL_PUD: - mask =3D PUD_MASK; - size =3D PUD_SIZE; + *mask =3D PUD_MASK; + *size =3D PUD_SIZE; break; default: BUILD_BUG(); break; } +} + +/* Same as get extent, only ignores new address. */ +static unsigned long __get_old_extent(struct pagetable_move_control *pmc, + unsigned long mask, unsigned long size) +{ + unsigned long next, extent; + unsigned long old_addr =3D pmc->old_addr; + unsigned long old_end =3D pmc->old_end; =20 next =3D (old_addr + size) & mask; /* even if next overflowed, extent below will be ok */ extent =3D next - old_addr; if (extent > old_end - old_addr) extent =3D old_end - old_addr; + + return extent; +} + +static unsigned long get_old_extent(enum pgt_entry entry, + struct pagetable_move_control *pmc) +{ + unsigned long mask, size; + + __get_mask_size(entry, &mask, &size); + return __get_old_extent(pmc, mask, size); +} + +/* + * Returns an extent of the corresponding size for the pgt_entry specified= if + * valid. Else returns a smaller extent bounded by the end of the source a= nd + * destination pgt_entry. + */ +static __always_inline unsigned long get_extent(enum pgt_entry entry, + struct pagetable_move_control *pmc) +{ + unsigned long next, extent, mask, size; + unsigned long new_addr =3D pmc->new_addr; + + __get_mask_size(entry, &mask, &size); + + extent =3D __get_old_extent(pmc, mask, size); + next =3D (new_addr + size) & mask; if (extent > next - new_addr) extent =3D next - new_addr; @@ -787,15 +814,153 @@ static unsigned long pmc_progress(struct pagetable_m= ove_control *pmc) return old_addr < orig_old_addr ? 0 : old_addr - orig_old_addr; } =20 +/* Assumes folio lock is held. */ +static bool relocate_large_folio(struct pagetable_move_control *pmc, + unsigned long old_addr, unsigned long new_addr, + struct folio *folio, bool undo) +{ + pgoff_t new_index; + struct vm_area_struct *old =3D pmc->old; + struct vm_area_struct *new =3D pmc->new; + + VM_WARN_ON_ONCE(!folio_test_locked(folio)); + + /* Impermissible. */ + if (!folio_test_large(folio) || folio_test_ksm(folio) || + folio_test_large_maybe_mapped_shared(folio)) + return false; + + /* no-op. */ + if (!folio_test_anon(folio)) + return true; + + if (!undo) + new_index =3D linear_page_index(new, new_addr); + else + new_index =3D linear_page_index(old, old_addr); + + /* See comment in relocate_anon_pte(). */ + folio_move_anon_rmap(folio, undo ? old : new); + WRITE_ONCE(folio->index, new_index); + return true; +} + +static bool relocate_anon_pud(struct pagetable_move_control *pmc, + pud_t *pudp, bool undo) +{ + spinlock_t *ptl; + pud_t pud; + struct folio *folio; + struct page *page; + bool ret; + unsigned long old_addr =3D pmc->old_addr; + unsigned long new_addr =3D pmc->new_addr; + + VM_WARN_ON(old_addr & ~HPAGE_PUD_MASK); + VM_WARN_ON(new_addr & ~HPAGE_PUD_MASK); + + ptl =3D pud_trans_huge_lock(pudp, pmc->old); + if (!ptl) + return false; + + pud =3D pudp_get(pudp); + if (!pud_present(pud)) { + ret =3D true; + goto out; + } + if (!pud_leaf(pud)) { + ret =3D false; + goto out; + } + + page =3D pud_page(pud); + if (!page) { + ret =3D true; + goto out; + } + + folio =3D page_folio(page); + folio_lock(folio); + ret =3D relocate_large_folio(pmc, old_addr, new_addr, folio, undo); + folio_unlock(folio); + +out: + spin_unlock(ptl); + return ret; +} + +static bool relocate_anon_pmd(struct pagetable_move_control *pmc, + pmd_t *pmdp, bool undo) +{ + spinlock_t *ptl; + pmd_t pmd; + struct folio *folio; + bool ret; + unsigned long old_addr =3D pmc->old_addr; + unsigned long new_addr =3D pmc->new_addr; + + VM_WARN_ON(old_addr & ~HPAGE_PMD_MASK); + VM_WARN_ON(new_addr & ~HPAGE_PMD_MASK); + + ptl =3D pmd_trans_huge_lock(pmdp, pmc->old); + if (!ptl) + return false; + + pmd =3D pmdp_get(pmdp); + if (!pmd_present(pmd)) { + ret =3D true; + goto out; + } + if (is_huge_zero_pmd(pmd)) { + ret =3D true; + goto out; + } + if (!pmd_leaf(pmd)) { + ret =3D false; + goto out; + } + + folio =3D pmd_folio(pmd); + if (!folio) { + ret =3D true; + goto out; + } + + folio_lock(folio); + ret =3D relocate_large_folio(pmc, old_addr, new_addr, folio, undo); + folio_unlock(folio); +out: + spin_unlock(ptl); + return ret; +} + +/* + * Is the THP discovered at old_addr fully spanned at both the old and new= VMAs? + */ +static bool is_thp_fully_spanned(struct pagetable_move_control *pmc, + unsigned long old_addr, + size_t thp_size) +{ + unsigned long old_end =3D pmc->old_end; + unsigned long orig_old_addr =3D old_end - pmc->len_in; + unsigned long aligned_start =3D old_addr & ~(thp_size - 1); + unsigned long aligned_end =3D aligned_start + thp_size; + + if (aligned_start < orig_old_addr || aligned_end > old_end) + return false; + + return true; +} + /* * If the folio mapped at the specified pte entry can have its index and m= apping * relocated, then do so. * * Returns the number of pages we have traversed, or 0 if the operation fa= iled. */ -static unsigned long relocate_anon(struct pagetable_move_control *pmc, - unsigned long old_addr, unsigned long new_addr, pte_t pte, - bool undo) +static unsigned long relocate_anon_pte(struct pagetable_move_control *pmc, + unsigned long old_addr, unsigned long new_addr, + pte_t pte, bool undo) { struct page *page; struct folio *folio; @@ -818,12 +983,18 @@ static unsigned long relocate_anon(struct pagetable_m= ove_control *pmc, if (!folio_test_anon(folio) || folio_test_ksm(folio)) goto out; =20 - /* - * This should not happen as we explicitly disallow this, but check - * anyway. - */ + /* If a split huge PMD, try to relocate all at once. */ if (folio_test_large(folio)) { - ret =3D 0; + size_t size =3D folio_size(folio); + + if (is_thp_fully_spanned(pmc, old_addr, size) && + relocate_large_folio(pmc, old_addr, new_addr, folio, undo)) { + VM_WARN_ON_ONCE(old_addr & (size - 1)); + ret =3D folio_nr_pages(folio); + } else { + ret =3D 0; + } + goto out; } =20 @@ -886,7 +1057,6 @@ static bool relocate_anon_ptes(struct pagetable_move_c= ontrol *pmc, return false; =20 state.ptep =3D ptep_start; - for (; !pte_done(&state); pte_next(&state, nr_pages)) { pte_t pte =3D ptep_get(state.ptep); =20 @@ -895,7 +1065,8 @@ static bool relocate_anon_ptes(struct pagetable_move_c= ontrol *pmc, continue; } =20 - nr_pages =3D relocate_anon(pmc, state.old_addr, state.new_addr, pte, und= o); + nr_pages =3D relocate_anon_pte(pmc, state.old_addr, + state.new_addr, pte, undo); if (!nr_pages) { ret =3D false; goto out; @@ -922,29 +1093,65 @@ static bool __relocate_anon_folios(struct pagetable_= move_control *pmc, bool undo pmd_t pmd; pud_t pud; =20 - extent =3D get_extent(NORMAL_PUD, pmc); + extent =3D get_old_extent(NORMAL_PUD, pmc); =20 pudp =3D get_old_pud(mm, pmc->old_addr); if (!pudp) continue; pud =3D pudp_get(pudp); + if (pud_trans_huge(pud)) { + unsigned long old_addr =3D pmc->old_addr; + + if (extent !=3D HPAGE_PUD_SIZE || + !is_thp_fully_spanned(pmc, old_addr, HPAGE_PUD_SIZE)) + return false; + + VM_WARN_ON_ONCE(old_addr & ~HPAGE_PUD_MASK); =20 - if (pud_trans_huge(pud) || pud_devmap(pud)) + /* We may relocate iff the new address is aligned. */ + if (!(pmc->new_addr & ~HPAGE_PUD_MASK)) { + if (!relocate_anon_pud(pmc, pudp, undo)) + return false; + continue; + } + + /* Otherwise, we split so we can do this with PTEs. */ + split_huge_pud(pmc->old, pudp, old_addr); + } + + if (pud_devmap(pud)) return false; =20 - extent =3D get_extent(NORMAL_PMD, pmc); + extent =3D get_old_extent(NORMAL_PMD, pmc); pmdp =3D get_old_pmd(mm, pmc->old_addr); if (!pmdp) continue; pmd =3D pmdp_get(pmdp); - - if (is_swap_pmd(pmd) || pmd_trans_huge(pmd) || - pmd_devmap(pmd)) - return false; - if (pmd_none(pmd)) continue; =20 + if (pmd_trans_huge(pmd)) { + unsigned long old_addr =3D pmc->old_addr; + + if (extent !=3D HPAGE_PMD_SIZE || + !is_thp_fully_spanned(pmc, old_addr, HPAGE_PMD_SIZE)) + return false; + + VM_WARN_ON_ONCE(old_addr & ~HPAGE_PMD_MASK); + + /* We may relocate iff the new address is aligned. */ + if (!(pmc->new_addr & ~HPAGE_PMD_MASK)) { + if (!relocate_anon_pmd(pmc, pmdp, undo)) + return false; + continue; + } + + /* Otherwise, we split so we can do this with PTEs. */ + split_huge_pmd(pmc->old, pmdp, old_addr); + } else if (is_swap_pmd(pmd) || pmd_devmap(pmd)) { + return false; + } + if (!relocate_anon_ptes(pmc, extent, pmdp, undo)) return false; } --=20 2.48.1 From nobody Mon Feb 9 10:24:18 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 465E3233707 for ; Fri, 21 Mar 2025 21:55: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=1742594109; cv=fail; b=jxewgmEiTqpPmTQcnPBtXEQWW7to6Nb3MOt4vg4x7++kh3hOqApqNO33beltl1jPBGLxTOCVBaRdOGMQ86RloaeQYs8Ha4US6vs3ulv8txgCKu1t5esuUFfgX6Mp3l3hT+uvYsJG2jtbe7QtHp2SOY+q5UUr5ui1yO+itB5xEoo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594109; c=relaxed/simple; bh=ZzePpFFZvljzriaKnLkKvBYk+PZaVpqwD/RrcHYv1CU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=byrqueaCL/vuU9HpLp8jojvjREeBcN/fsE/WrM0fGjbFxjkJHJAcrqPTH5NXD//kGltU0ySHTORma1v01dKpzXkA3nwP1etGH+pQSQHW6UzyEHWiEoePXu7tJ4rt7ihJldHWP8jq/NO8DHHEfLW7Oaf9H/1y24dBsP7U7Djefj4= 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=GtP0DPel; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=xM7mvX/r; 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="GtP0DPel"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="xM7mvX/r" 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 52LKgAZk002756; Fri, 21 Mar 2025 21:54:55 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=tmP0Uk2iQ/RhVqGJpNWxQVOhjFWRkq0HRksYixUrgDg=; b= GtP0DPelaGwzH2LyT+VSIL3332spxUe0l+/njiMxFL9nkaIlw3ZdLyyNS+IauzQl XqoMdLzKoD6NEdL0gqzYdL8MRJkljeLAJNzOVhI/4VkTv+DMBHQJE8hGUs1gKltA vVysP5A1XKiCxzkonhJq6h40p0rOV4RaAdrHTQJg/YX5o3lvK92jI6vcCPTI/Wu4 ECzvCLt72xeaKV8mwltZ/iH8hF93vcah1bTGwUHpdsmzsHJiiRgAV6Jqx1lHk18J kYolFEEDTg2niptRwnjsqOZhYaqxsHYzDIKKbb3PrFlJftes9w2/eel1bLlKBtmY 8uI592RGFVUFmvJEiIiKHQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1m19qqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54: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 52LKVKAT018502; Fri, 21 Mar 2025 21:54:54 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2043.outbound.protection.outlook.com [104.47.58.43]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45dxdr1876-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vOArgzf7nn9xK3Bababozrh2WJTccYL5k4hTtKWCpuzdWHMdIkKaxcfF3/r7k+6WfrFsYmAKvMPFBcyEWfBepV72MUyRgUxDt9SiMlJ+BB82cYBarwQJWxAwRB1VJ9mQN+7T4ArI9pKZwgscDUy4bU7IY2qwuN2JBG5zqTyKdiUysYoP0L9uBXzAJuFecuifcjOZY0L3H1a3sMd7o6ZuCyL8vqG3hslqz+O3XQXpl9EgEp8leCRmk0+4rSl24nKcDdmzKJ4yz+deeaVniGS3ZjjRJUV3N1GyL3D0Yqos/0SYqZsArikw0hbcXyFmtmmLdGxvzsxLbzGQbEtaMw4WgQ== 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=tmP0Uk2iQ/RhVqGJpNWxQVOhjFWRkq0HRksYixUrgDg=; b=gzn+LHfP3P5UUn1Uqz5MfVnM9FGzPkZ8xVD48RYR9sTQsv2VdNt59HYAI5ZKFvwEwvM3XjKKXH81wptYMLfYFToW59Xrp5PIBB81Vwab/wvtE+FYBYa+cN87/HT2aBmdU9tVG1HKkqK9D8oqbrVpVU8Bn3PhRBx9V3NVdQVOOCsd9xLnINcKfJw8l/ccEQd9BZ6MmSOzIy497olLXnGqGh5spq+53T5p5UHbaR0bV4g5Q6rYvLsVUhqG08LNmeyS0rtxioYbQAo5/SE5CfJV1xklemSjMxBxmId3oVXc1WXlFU9LpdTQhWQet5XA0OKdlPDihHkeUoBaR7mmwQLAFg== 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=tmP0Uk2iQ/RhVqGJpNWxQVOhjFWRkq0HRksYixUrgDg=; b=xM7mvX/rbt1rXzDTP4qvUMkoyRS5Z5iLVYVLDjOzsGEAoUUOI4g3SKMgJqcbvBDSViVNKXXnVQ28KZ8xW/PGzum7XU2cXox/jwz/39JivSeQUoh8xinFwkUrT2yNJBJofmbo8y181YMF7jS7duzRkkmAX4QqOVcsgqkVBMTdvRo= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:52 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:52 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 4/7] tools UAPI: Update copy of linux/mman.h from the kernel sources Date: Fri, 21 Mar 2025 21:54:33 +0000 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P265CA0094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2bc::9) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f3ecaf1-4cc5-498e-64d0-08dd68c3023d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IZBoCxWiRNbfZ7ghuuVkIdmjgi5BLDt0rwNZfP1JG5DzeX270WvWWBnrIiwD?= =?us-ascii?Q?YA+TbHT2rmIX0rw17MZgB9FXcmbIfEFgRfvkN5Eqd7U5LE7E8gGe9RWATbxV?= =?us-ascii?Q?qs8PWr7qxFAzpAT3J+GpbsXSL80gHFicE8keJvVN6VrzLL0rRuIWjdBjA/9i?= =?us-ascii?Q?yaw/PK4xHVuR0NOrwyCZJvkgHYHdCKcCfsWYtodrxSBGARhBD53DZynXApAt?= =?us-ascii?Q?0J9DNdWeZ/CvmbmHYCkz70ejjyl8p3NvxuJihXJgsGbL2nLTB0uifIUSLMxt?= =?us-ascii?Q?U/ZCsA3vdrFzvJW6y/7Gs5y4xkfBDQB9m22vPMjegvKSk3HFtY1vD31yXYbl?= =?us-ascii?Q?UuYS3fhkMw0n/ix50YoiZ5BIoNvJ5wgJSf7RI+0BsZz83NMk/ktg15+X983u?= =?us-ascii?Q?Rm8Js2/p1HW/QcLqe7VUG53lJor0to3p5nPMwgbKWrd1eHDhc7pNCls1OJz/?= =?us-ascii?Q?EuFnIgwccc/kfPMCyfonBqhbnSXam0KPEyQOa11VFNAAtET4eUFyZW1phT1T?= =?us-ascii?Q?T5dFCw0L9htMA4/vp0pIjkfo2HgdckNI3czS5Qiq9vAmflV3auSpz63ioBV+?= =?us-ascii?Q?wPqNfEcoVhe1r2SlEo0Jsa95OeygDN/aZffe+q040Qcu0v02He8ofGKV/fVQ?= =?us-ascii?Q?tVKADI+xpTLoHaTK3iwKwVNwRqRwP0aTfFPYN71fKMqfr/dzHXvhZv2urBR7?= =?us-ascii?Q?Pm0AhKi1/srE7be188HNWFsVhUFsdBPNjfEz1ziB8jbw3u2RPSiVQUU0oUuh?= =?us-ascii?Q?yIcfaUmQEACdFtQ4scMNWiINYXUmA6N3ShP9/x+CmRASwJIvWYagtO13Tmbs?= =?us-ascii?Q?CmMkOZyzROCBVk/SpXtfeLokSCrpBdSbJh1WkDEbFIYQGAcFAtV85ovHy+z/?= =?us-ascii?Q?/1dDoTnir2I0ToPsUZY1Uoq0I2HP0cg9llWEeLLfVsDmuhvtbYJxpCO7dMms?= =?us-ascii?Q?OO6WXhxVJ1x/wWTemHm4oaLs/OFxTTkmUQaUKx9gJnWifMRhamw2i99pwgLp?= =?us-ascii?Q?fespBqtfMIE2ESOKdUxuvLLBmqGRcZZPP0uWHdQFCxX1kTF/01ehPtLansIy?= =?us-ascii?Q?ovzdcRv9QiC00sVMF3+WRG88Hqv1NAYbgLaWxWAMqt7pLNpjCBX0yaYXSeEu?= =?us-ascii?Q?o9nMg/nnwVrrWWuUnuCGqRGM7NdV4LHMO1kcUVxxNzR/q3mv8h0XOBJuUKiy?= =?us-ascii?Q?47vtqnZYNCzXm3nt/1h0N1M/LWMNwtw2RSvTt6eWQGMh0jvdfreIM50SRTPH?= =?us-ascii?Q?8RrsInf1U8iwW3+HkIOVQjmCuyd/VkTYGMIiava9589OFVT8ypp0P3HuQh+G?= =?us-ascii?Q?vap0+KciGtkeaHr9C5X8LbvBm75p94lNdI+VHDKlA9ADjqzzHkdEAg2uH7UK?= =?us-ascii?Q?96j8kKvjcP89TiEEecDW43dM6Iyr?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3y1JznIvANWMArJHem72tiylTiMmua6f3Ho9mso67fqVGmB2/S4i9h7kWXVS?= =?us-ascii?Q?JS1MMgQPF+QuyDmtNEkFroYSG//VRSy1fWgDIZitOsEmvBjGfxrysEaBLHCa?= =?us-ascii?Q?4VVJBOd2+4mAQxtcgvvPsROsXNtC0wD5gU80KYC7DNzkOQxsf8BhPeARVDfv?= =?us-ascii?Q?SSQQecry+vc016w3zLvm5YPVBge9AgsoTCcDdWhp+nPHwu9vrgenzV83mInL?= =?us-ascii?Q?AwH7pE9uQescZAhymZrijmQDZprIja8fo08zwL7Mn1ccF1baCSwFND0Sphgo?= =?us-ascii?Q?BzQuH3pbLvpe+dTMYgyt159IXbwuWhh9LltN08vMTHid+KCvFlpQk1OBRRZi?= =?us-ascii?Q?5fgSWXEtVgw0PpWZzXiMJKdAIPTsuLyfAnf1QQJw1YgDPSOYhJplJtp4r9MU?= =?us-ascii?Q?olvqVrl4G5BtIQ+5OYeuZJoF/96QW9JQaDaLc7wK2tkwiMBl9LW3VVsFzLHl?= =?us-ascii?Q?ro9zm5gTZMIHUqRFLh2KQVEWdda6v4Q4pqJaiMjnni2Pge0XxrvltMieMGIs?= =?us-ascii?Q?Ch3bPY9cU9iaTS7OodPP/98lqsRASCD908DHd3NZFmutLBajigJ2iQxhRTzX?= =?us-ascii?Q?kXaNh8UIs4GCNQy0PoLfOSmBE47rv7cp+gMREb/yL8hSLK6nPUBY+ZEYoHrh?= =?us-ascii?Q?KbrmjfA+ij6QF9YuK7UvIzgAtJwNPVHNbhRIi+ayiiseoqe0+t0qubWmfBHt?= =?us-ascii?Q?NPLRLOKQuGjUD82BXod8iqw5FMhQauHC4in7tWXPB3D8ms59Yw+Jpr/xYctx?= =?us-ascii?Q?4/AQVFzHnaVViBuskzmX+egTXbygvzRJ9hNgkl4m6gkA5vwSP/9hJVdj04WZ?= =?us-ascii?Q?aUuD9wJ8JJdMhYIppRh8pEe0o34G60GL3/cTOnMcRYd0JaxKlZ8iONvWWeUQ?= =?us-ascii?Q?GZb2xdBRZ5OsLyKFaqAL+KXCNqAYwSGRjKKhbJ1sMJ/2RhQchNDzd633s/8Q?= =?us-ascii?Q?AjM0XVNqiaq5RxIz8URdZp6IrrChVk9SFlIOX2ihA7tHagT8cX3GZRnhGu0Q?= =?us-ascii?Q?mQmyrN9AaUs9qCo2q4ABueCJ/py5swWMYxv9/BGvYlhyPwXfD2EeTqnVJodO?= =?us-ascii?Q?vcpmaGhFGRKpI6w/oQvnajxY4HErQ5q4x/n0uTzjY7YA5rQ/hGJTQPCRVUhc?= =?us-ascii?Q?TqL4BOXph4IM8HwPJlgducTiQjQ454CmKmmzEwE/J4ohXtwIMWOAcxCUvVnS?= =?us-ascii?Q?MFF9rxh7NLN9Zx1uTTdH7kAkClfiElMvxQT8KQhXJEipHOQVl07hL12ZDovR?= =?us-ascii?Q?3q9Bug941ImShDLSUnUZJPys892O3a2DQmzFwZLAkuOE4uZae7PT0X9pRE17?= =?us-ascii?Q?DVLpVFYN56Or+z0RpvQ7LLVIxT9BG5v2+IKwAZLCN7yiVrZciaFoYqB5UFan?= =?us-ascii?Q?6uN30ffxNC5c4R/uMEMF5T9kJvay3xz2dKXb3B/1tEtMbyQx7d+52OIwE2s9?= =?us-ascii?Q?CqAQYgxLL9gaYoQ48z9g0+a2uNieNKyAwyBsZU7PApPheNJluF3WN9BWRMFc?= =?us-ascii?Q?psttMViP4jIs1pBdV6xNHDqlDTg66FeUZ8asiHHp4f+yy3yumeZK/30Ueqhs?= =?us-ascii?Q?uf6y0rZ8a9DlDlrH2t1yxv2mXg/CenvS0DdjjOYpUZ3Iq096YNYYFmXs9iW6?= =?us-ascii?Q?+w=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: KI1VcwJgtqIcjLbwA781xFIYMG7zr1xQWPoGz6rnMfIrUoYdJw8mKXtiRenY9mmR6+4Bzr6BVpA/ynWmDCBju7Un5uaa1jLV8ElzBq8hyuURF+9aq8v6lEJMZsOtTk4yKHCZR8y+XA3SkNsM/sFxtLy6rqWPgJEy2OskEW0trAozh7WhtcNsdV7dmML9TuHnKNCwGWS0mipwqN+6+yG54z/Ai84ZlHaBsL2BQccaLw1NyP8qSm3FIVrH0nD9Zh8X2PX1mbO/4Rvy8Mc7rZDIQWASHH56cJ0Trhx3xPod/XpR3/RRa8ycN7ZmUoXaWE4O+3f9JsKD4xwTJ/OVkc2g2YDq+SSkWSVxNSCqMfQWruZHSDrbsAEaecR5PPOIcKWMij/sU0Sq1NVTUM4te5WoNRR+mjVCtNG3bOlhLOCXoMTrbxUf8ytCamzqFy6yybN7RmoMiI0PUY2bmC3kip3qkCyT5EVczS+/N8p9JJJr4VRuoX1EV1a2rd+gQuNmtsTEMYCwyiSpa3XMJ7yfvP9BgHb2W1Mtikn8glIqch4BiyeTCYSUg2ATgfjVmhaUe7Vo4I6oktGb/u/egVmc8p1QRB4p7cbrDBh2RCYn3e1pQAw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f3ecaf1-4cc5-498e-64d0-08dd68c3023d X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:52.2885 (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: QDsbnOo3BDqnUTOM2RyExzxbfx2C5z5f2Wg0Rw+oZ7x9xtKNWZjmIH7nQ6vLTcAal87Xktuuql8aJJKtSCRj3+RY4feXGMgdeIU0Oh3mqiU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 spamscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-GUID: EiTMXTjRYeNsTXVLfofbJXzCDRuXyKEd X-Proofpoint-ORIG-GUID: EiTMXTjRYeNsTXVLfofbJXzCDRuXyKEd Content-Type: text/plain; charset="utf-8" Import newly introduced MREMAP_RELOCATE_ANON_* defines. Signed-off-by: Lorenzo Stoakes --- tools/include/uapi/linux/mman.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/include/uapi/linux/mman.h b/tools/include/uapi/linux/mma= n.h index e89d00528f2f..a61dbe1e8b2b 100644 --- a/tools/include/uapi/linux/mman.h +++ b/tools/include/uapi/linux/mman.h @@ -6,9 +6,11 @@ #include #include =20 -#define MREMAP_MAYMOVE 1 -#define MREMAP_FIXED 2 -#define MREMAP_DONTUNMAP 4 +#define MREMAP_MAYMOVE 1 +#define MREMAP_FIXED 2 +#define MREMAP_DONTUNMAP 4 +#define MREMAP_RELOCATE_ANON 8 +#define MREMAP_MUST_RELOCATE_ANON 16 =20 #define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_ALWAYS 1 --=20 2.48.1 From nobody Mon Feb 9 10:24:18 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 DFF6F23237A for ; Fri, 21 Mar 2025 21:55: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=1742594114; cv=fail; b=cbVws16VHN2V0i9ZaiY9ygsweuKLVzlOQMwRlRhJdeiwtYVTfCVFeVBX+pyRogUdxaw9BTduwg7nF2MYKPGi0lUKM/sjj9CO8UAz/Nibmdb+XpgIOsrvD8qpNyMbtb+onRy33lCAD/tQSYOrQoLXDzHnBOQ1BOFFldnPe+9V61A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594114; c=relaxed/simple; bh=GDw6pzFv8XryG9pr5fJLFIJGhKJdKbjcsXDjGqXfu0c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=UsLthu8nteVz8sIlHyFW94HcM8j05kPna6QovpP19ntpijN7bBCAkeiXz6XpWoTTRMijmeufQ4SteoxI2veoEo/h08oe+VAeSwOb2Ghed7B070VsKBoJXiXMPoSx/DN3A3oz/jO8olL7fRKnMHmrvgbOsu9VMkeG1gBa9dHy/zQ= 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/7YFU3z; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=GT84Osnx; 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/7YFU3z"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="GT84Osnx" 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 52LKftPW019295; Fri, 21 Mar 2025 21:54: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=9zNYJgFUqjiDIj+JrZEMeZN29l5x52LP4nrUTRgqIIo=; b= O/7YFU3zwboWdWTiV+5Sm7/7aIJHLEc9PG6ZbSm6ckqpXEJ/oWGTGV1ow8ryqCwv f3WWc5lFAdkNsQ3a8xEKamcWwYz5bIl+x94OG3YQPuAJC8nsVpwpcdtPWd3JI/u7 ANY3m9GtW67SwsoX6FM/HkCLf+cXMCrUsFGsRs7XP5JYMXHj+4TpqJQwQVX2sUpr aX+dJVt4JLN62IHPuatctyNyPhZ0kQOXy2VrE6c/g1WyCvYxpJ6gti6csXulrSwK JYj5ADpjvTIV9bvVUMD4KMW+RM9Z69lTm+AIrejfs5r9ohj62M6T2RhGKa6WYV1T ymciK+XYz4zzSGz/PJQr6g== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d23sa1t6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:57 +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 52LLU8PN008920; Fri, 21 Mar 2025 21:54:56 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2049.outbound.protection.outlook.com [104.47.58.49]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 45dxm4ns1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iksubTIGfAUyVwSVibrNA/4PKBDI6wECvXlV5rDsR0P+qF35tLutt6pPfc3eZWkcSvp9o6AYFvWabe65Dcj6JMMrTORJcBIjm1msFwfJ+WUP83fS5TWejBZ1RDXqB6lyyUTWrsYVcFHiD3QKilSHrrR2jQ4+lmkd5jwNFf77W5QeRGVcWtLAk+W1ptlD8aAKZhUGePNv+0qaw2IGXzkfpN4sVVXrRVUKt1i4UTx+mCNxQt7qgXeixwcmvkHMjNe4I1RGCrNr2okQVu0Ye+nbWj9wWRT7XgpvA56Adj/hRveQInPYQvIkBtpwdNEDleSjJYiY+P64JgcKlUshr0ec/w== 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=9zNYJgFUqjiDIj+JrZEMeZN29l5x52LP4nrUTRgqIIo=; b=jd3lMw+lXOrhjO39QdBxrYNP5XoADUbE5q/9UHNc8rjctrItH/MYNnu+0TjwwM/MTKuXp6Tkd3w/sJ8tLCbZhAZfG6U2Jj48kllOsjN40uGzLkF9XYBLZnjXdQ3CuCQJ4UIU9GYyAlEnWqje7CNrx1oLQ4zdyImkHsCYGFwSC2dOYz3AotAIaIsyyAtnE00BRc8u9TF79L6vdlfFeWI5Bs+N9ASoWA0vDC37RLb99BcRB6Ehm8n9qADHyKMVmI4asZnqXe/odBoPIPZmgMEQ0GTu5xohShAbGlziFfDgRLO3NvXfhywyV+Zbwwv1kpPPZ8OyA4U5yTFnz4GUiobobA== 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=9zNYJgFUqjiDIj+JrZEMeZN29l5x52LP4nrUTRgqIIo=; b=GT84OsnxU8OXzCGb7EpeB1YtM/Ir4lNrbXqiH8OuxpJMPE9cx0JEI8pSjunhycoJL+ys/qFgEsQWUm5vxHXyyy3wQq1GIIeJrkNefdhL8Zp1bXO4EzwSu6qgK23Zt+4WT5Z7gm466t9yHwfZO4sr3tHHIINA38Mebs2G3yz5o5M= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:54 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:54 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 5/7] tools/testing/selftests: add mremap() cases that merge normally Date: Fri, 21 Mar 2025 21:54:34 +0000 Message-ID: <641ba4f558ab671f67267343ae6411a4ea9bec26.1742478846.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO6P265CA0015.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:339::8) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 374c0461-1a60-4c75-ddf0-08dd68c3038b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2pino0XX9qmYYuYoqEzqddafFvEgYlHJqrtx2HhM7kgUH6S5ulnqqrmkDVnc?= =?us-ascii?Q?darxNMOdjWMtkoAIi+d3TM2VEySIgOpru+zM/oco9Qoo8j3+7+OqiPRhupeP?= =?us-ascii?Q?y8hpSpN7MvQ7pUrm0Q8mM0gR1RWHTKuLM6vf2O53fq6GFRNzaEM8uJrkw7cM?= =?us-ascii?Q?/JQLgXcKlUsC31B0iNmFuB2ebL3Z5NdfaPV8CtWrnB+rd7B4Gtogy0T4T19z?= =?us-ascii?Q?nmnPOEAZ46FKsBO3w0YImNtYLPYIb+284VnjqYnQEubMbp89AzIti9EOBT1m?= =?us-ascii?Q?jww8jvD+NjNvulZ+0ahAQS3KyjS+P9VFHmD+2LlUs10ScNVZDbkBM7B6E2B8?= =?us-ascii?Q?wgTth4ruaCmwLjEalZn20pFZS2DjttIDHJ4aY0O+SbJJHsNVnBnPjSN5gZBR?= =?us-ascii?Q?v7kwlYZbWJysxTK3nyv4i6YWm1lxbbVcI67l5Pq5VHx10N+OkO6kE6z0tyb8?= =?us-ascii?Q?NUFMA4uAT/Rw+bGWKGIYN8fGoCVPIMEJTLmTpaDyrOUxix0RuJGjLSsggDkG?= =?us-ascii?Q?96D9HMeDJOFbNuwKCR8YAo1u7JsrLPaaQnSOd8IGYyV9Gbevdu2cK9iGUp+0?= =?us-ascii?Q?uFffijS2wam9D6awrQFXXJXJ/ccTQFLFFgVmBLqtkpPz9+zmJ6u/9I0wFU45?= =?us-ascii?Q?g2NS1jsz58xMaha1Fi9iVYVSMI78USfu20Zj12FxgKf9KsW7Pppj51ECe0it?= =?us-ascii?Q?YVfmFMxgD2o5PSJQ+5PDgRMijRKVDNOw6p8TB9GPctfaIv8nqZXuv+kPptJA?= =?us-ascii?Q?6jg5GLMORMJTVgij4w5AvA3Yd3QemWhFXuZCPWE2Psn/nnqHXxiyq4/oAusw?= =?us-ascii?Q?ymbOaEran23iD57POWyUKytwu5kX45GBJMKwvK0H8WcgGg0cJi2NrsUo2TNw?= =?us-ascii?Q?gr2UySzhEnT+5R4iuKSrA9iibQz+H1XuMlxhnKZWdhIFx20O1IR50sVQHyf5?= =?us-ascii?Q?Fi+Kh4L3BjVO6jUE87K0Opk8SyIEClNRaslXdO+LnSfdZ0m66O+SrZolnTGt?= =?us-ascii?Q?O9eR0voUkQTHzUt7DF3b0qQqrxUvFekS1tWRuxQ8tfn/xuvX9oZuA1Qn5FPX?= =?us-ascii?Q?jT2SusTtVAYpwv/edVZnK6qAuv1Ie3oJHxfebbM2XHltpaO/3cqhpiB2+avI?= =?us-ascii?Q?Hbfe8ihIVqlqe82w/bg7b6yyvhlfr5I3tVPlvvyXGjgOd8LZV2zWsASNqTbg?= =?us-ascii?Q?+9mxLa5G6/kvlJoyJMH9eAB/WJNo4Guc50o7iBpI0HXLLKo2cKBTF5Y4QxWd?= =?us-ascii?Q?B/myciT9pVbT6GVDz9/M0AhaDXnXbvlTUf3IuAUzYSYl0aKhjf9UsEkP64FX?= =?us-ascii?Q?ZHWlCi3sd5P17Qh0Q09d6yQPqjCWxLMnyp5i2Z4yrvHj+GcW49/FWwKu3dNU?= =?us-ascii?Q?CPRM0l+MofHg/o1qljytYqSN8g8Z?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bJDnfP7t718KUaYZLp5+4XaNH4gary9tjpKyXFX/wVNQfDaZtJUEX4OKWvgl?= =?us-ascii?Q?bwQPWxssArm8cH+UXFQRSK6bgP8sjOzDRdOkV0uBCLRGQNQ+smZ/oc8l+Ds8?= =?us-ascii?Q?UrPELk3WLJ5UyKmm8IUMuOAWHjMJuZELaXyu8aSjjSMxJNDbZ+7g2lU+xccT?= =?us-ascii?Q?wUJYS9vQ0zEF6201DoUAMAR83y3BkxxRoZ/7K1pUYCmyIf8UHrxyqLVVbYWQ?= =?us-ascii?Q?c7UKkeLZ9riofei001/UntmYa44J+NZjXf1aj/eqosTEeKbBXLT4T1n1bFbm?= =?us-ascii?Q?DT3/c+ZV80InDKvp4zoD6rYTrVkmzWKALQMCed20r8w57NaXLnJ9QlBKYFQG?= =?us-ascii?Q?XL7908uMDakGynYvprCWjbxHOIaEKA4URVloRS8YJAvJXAWUJ/1Z/qNAwStu?= =?us-ascii?Q?2xrBAWE3mJno5+3DaQ6Y9Omhvlk4BppMorzrtyPHrTWSF9VuHVo9BLMbM0j2?= =?us-ascii?Q?6EGjxWOaaeP/6pqCd4Ju3dTwE2VaR8kLel40vrC4pvsyTd3vL9tLGKG5AEeu?= =?us-ascii?Q?sLj8rZqMEORa1lE8N/RwI/omxYHzpEUcjodp1i0SRr8es3U6H5Lcvj+fiowA?= =?us-ascii?Q?23NXUot6cJ7u9ptHZ34Afaj8nFuAIMcBgvvaJ6md74qoZOOgpx6b4Vesm6RN?= =?us-ascii?Q?ZPqTLWQAS2bIxzsS/dqTq+sXh1tCsmHHkyguDfltRvUpyfzByoT5sc82UrH/?= =?us-ascii?Q?3hGv4vtFzPRlrEnqNuT8SH2LZz1x1mv9s92z0CwpJrotptgaMrRx4yDqCULA?= =?us-ascii?Q?cs4WzbWmlpHwoaucjP1hZkMuo2157NcXFWODov79g7MveqNecoo4/v7ihy39?= =?us-ascii?Q?1QiqmhdMHJvGlctDZs4+nacEKIyRzQ3TUqxC2tuoTDxjU6EveJr2VVwr86x+?= =?us-ascii?Q?ZfOnCEUQ0l4iid9+kgsTKjZdcR4TDKZMt7ukvtq0InZ/Rie3sSCIQYs1NN8f?= =?us-ascii?Q?zYXRcic4r0/VW1oUfBljzSnAWZo93iIzUHqgKyV4P3ML1E7pHSc0JVtpP9UH?= =?us-ascii?Q?YTgknhVFOxVYQFCFKEviTtxbdvrEABV5HfH+lARmRoDOKStaAZje2z6EJZtM?= =?us-ascii?Q?51BUD+dd1pEZyxhghLGhB81VhjNukVKU0xH8db++X6nCoZDfaQi3n4bt4LDZ?= =?us-ascii?Q?apS/Kc3Ufi+gLz+AFU8Q6RCEhPyhEoK5V9bCSUiLBc0Cze6306P9Hv6U4hlE?= =?us-ascii?Q?HGSI6CGlhz7b82rIauIAl5+DIdThjPG4zmmffPYOGiYFlICkYTSOc1gIHIJv?= =?us-ascii?Q?nNDnLFOK8s/yWim/CgtngyX9hraDwMvROTKoA6IhLUNi0MtcI1VOwvbsW0/g?= =?us-ascii?Q?OoY0zHjkEg+X4PbzUE1b/+VK8yxth5i19ySaqmmw8hzw1qLbTB+3Cj7P32pZ?= =?us-ascii?Q?Ym++r2BL6h59yLa56m8+/FjQAkc2zwPR1duW4HieAmfAmnqgDvFhoG12/hyf?= =?us-ascii?Q?X24q1qg56CDRhezf4C6eOn//W4KnrYCWzkV9W/tW64ZsrvvgY+MViByGFzcv?= =?us-ascii?Q?6VvlCj3muNDOd7+/WzyMzMVfQWghlVbcoPhrD0UT1DJGCBTEJ2Pp2y8lYh3X?= =?us-ascii?Q?+HEHl2F0u9SYCyKPmpXVk1lSzQ0LRwNq2WUjoVFIuRXd2ZElZBbJPMv6JZsY?= =?us-ascii?Q?tA=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: tlcn8V1uQHl4+wiwNr2QvwsYj1u+dfcG47ijLfqdTIp9TPWIkPY54RkWw9HqGb8rHQmZTitH9ZacrvlsW9ijqgDb/fsEBncK9Oc5pDD0WvQ1M+/NOIgHF1oDUQRQVdmVpvZChNbCLG4Z0AE0UVCXEN5d4CS//ynn16JGk9IDDoI/d3dMf+oWxVLvjR8YZTvmkK/XrurnmbWLHsbxa8mqGSfAJN64GyMTnM3kUKoa0EZY6FrdORuAFqkd44r2uFqHxas5KH9Z0knzcV/0Yd+v+TJSi9UFnZYYpPF1IikiV1GnPoo59Ooi3PnzIjvwanAaNVq0NX/0/EyjNjBbi62Vc02DsU/bGOiILqe0XiMcBzoF0LWC6zz1aD53HReGUZnNyh8kjLGGEEre749j1gC4ocr+l5Z5v/vjjKQxhyNA8MP8y6ovVOnK64+FJIVw3vOM2/8FzzNppSOSvve4gN7Y7FZmYna97jtJbnkxIE7RDm+0YSHSV9xM5HTZZ6X1LDYASHtH8ULg7QW4abRF1qvXQS5tjJaz/K2ZJhcE1pNH+5EpIRe0rvsDzokSGNSS07pbXAxdOZdZ704qJOXBEGljp7fmQy8UUNtY5tIrjWck5rY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 374c0461-1a60-4c75-ddf0-08dd68c3038b X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:54.5924 (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: XXyVSL/hDN9SER300PqRMnMeyYib0Y+Ue1dJCoEIbW2/+//dLRWyzFyHUk8R+86sMJXAH6KfF3NyHPxSJRya0293dBg+msqRUVa3a7qXHL0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=968 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-GUID: xeNBrisSgKjB2iIVZJpnrOKRGsr_RaBR X-Proofpoint-ORIG-GUID: xeNBrisSgKjB2iIVZJpnrOKRGsr_RaBR Content-Type: text/plain; charset="utf-8" Use a direct system call version of mremap() as, when we move to using MREMAP_[MUST_]RELOCATE_ANON, the glibc wrapper will disallow this. Also import linux/mman.h (which will amount to the local tools cache of mman.h) to enusre these header values are available when later added. Then, add tests asserting all the mremap() merge cases that function correctly without MREMAP_[MUST_]RELOCATE_ANON. This constitutes moving around unfaulted VMAs and moving around faulted VMAs back into position immediately adjacent to VMAs also faulted in with that moved VMA. By doing so we provide a baseline set of expectations on mremap() operations and VMA merge which we can expand upon for MREMAP_[MUST_]RELOCATE_ANON cases in a subsequent commit. Signed-off-by: Lorenzo Stoakes --- tools/testing/selftests/mm/merge.c | 608 ++++++++++++++++++++++++++++- 1 file changed, 606 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/m= m/merge.c index 9cc61bdbfba8..7c4f3f93c30d 100644 --- a/tools/testing/selftests/mm/merge.c +++ b/tools/testing/selftests/mm/merge.c @@ -8,6 +8,16 @@ #include #include #include "vm_util.h" +#include +#include + +static void *sys_mremap(void *old_address, unsigned long old_size, + unsigned long new_size, int flags, void *new_address) +{ + return (void *)syscall(__NR_mremap, (unsigned long)old_address, + old_size, new_size, flags, + (unsigned long)new_address); +} =20 FIXTURE(merge) { @@ -20,7 +30,7 @@ FIXTURE_SETUP(merge) { self->page_size =3D psize(); /* Carve out PROT_NONE region to map over. */ - self->carveout =3D mmap(NULL, 12 * self->page_size, PROT_NONE, + self->carveout =3D mmap(NULL, 30 * self->page_size, PROT_NONE, MAP_ANON | MAP_PRIVATE, -1, 0); ASSERT_NE(self->carveout, MAP_FAILED); /* Setup PROCMAP_QUERY interface. */ @@ -29,7 +39,7 @@ FIXTURE_SETUP(merge) =20 FIXTURE_TEARDOWN(merge) { - ASSERT_EQ(munmap(self->carveout, 12 * self->page_size), 0); + ASSERT_EQ(munmap(self->carveout, 30 * self->page_size), 0); ASSERT_EQ(close_procmap(&self->procmap), 0); } =20 @@ -451,4 +461,598 @@ TEST_F(merge, forked_source_vma) ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 5 * page_size); } =20 +TEST_F(merge, mremap_unfaulted_to_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* Offset ptr2 further away. */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault in ptr: + * \ + * |-----------| / |-----------| + * | faulted | \ | unfaulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr[0] =3D 'x'; + + /* + * Now move ptr2 adjacent to ptr: + * + * |-----------|-----------| + * | faulted | unfaulted | + * |-----------|-----------| + * ptr ptr2 + * + * It should merge: + * + * |----------------------| + * | faulted | + * |----------------------| + * ptr + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); +} + +TEST_F(merge, mremap_unfaulted_behind_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[6 * page_size], 5 * page_size, PROT_READ | PROT_WR= ITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* Offset ptr2 further away. */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault in ptr: + * \ + * |-----------| / |-----------| + * | faulted | \ | unfaulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr[0] =3D 'x'; + + /* + * Now move ptr2 adjacent, but behind, ptr: + * + * |-----------|-----------| + * | unfaulted | faulted | + * |-----------|-----------| + * ptr2 ptr + * + * It should merge: + * + * |----------------------| + * | faulted | + * |----------------------| + * ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &carveout[page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr2)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr2); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 10 * page_size); +} + +TEST_F(merge, mremap_unfaulted_between_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* Offset ptr3 further away. */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + + /* Offset ptr2 further away. */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault in ptr, ptr3: + * \ \ + * |-----------| / |-----------| / |-----------| + * | faulted | \ | unfaulted | \ | faulted | + * |-----------| / |-----------| / |-----------| + * ptr \ ptr2 \ ptr3 + */ + ptr[0] =3D 'x'; + ptr3[0] =3D 'x'; + + /* + * Move ptr3 back into place, leaving a place for ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Finally, move ptr2 into place: + * + * |-----------|-----------|-----------| + * | faulted | unfaulted | faulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge, but only ptr, ptr2: + * + * |-----------------------|-----------| + * | faulted | unfaulted | + * |-----------------------|-----------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr3)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr3); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr3 + 5 * page_size); +} + +TEST_F(merge, mremap_unfaulted_between_faulted_unfaulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* Offset ptr3 further away. */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + + + /* Offset ptr2 further away. */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault in ptr: + * \ \ + * |-----------| / |-----------| / |-----------| + * | faulted | \ | unfaulted | \ | unfaulted | + * |-----------| / |-----------| / |-----------| + * ptr \ ptr2 \ ptr3 + */ + ptr[0] =3D 'x'; + + /* + * Move ptr3 back into place, leaving a place for ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | unfaulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Finally, move ptr2 into place: + * + * |-----------|-----------|-----------| + * | faulted | unfaulted | unfaulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_unfaulted_between_correctly_placed_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map one larger area: + * + * |-----------------------------------| + * | unfaulted | + * |-----------------------------------| + */ + ptr =3D mmap(&carveout[page_size], 15 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + + /* + * Fault in ptr: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr[0] =3D 'x'; + + /* + * Unmap middle: + * + * |-----------| |-----------| + * | faulted | | faulted | + * |-----------| |-----------| + * + * Now the faulted areas are compatible with each other (anon_vma the + * same, vma->vm_pgoff equal to virtual page offset). + */ + ASSERT_EQ(munmap(&ptr[5 * page_size], 5 * page_size), 0); + + /* + * Map a new area, ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr2 =3D mmap(&carveout[20 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Finally, move ptr2 into place: + * + * |-----------|-----------|-----------| + * | faulted | unfaulted | faulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_correct_placed_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map one larger area: + * + * |-----------------------------------| + * | unfaulted | + * |-----------------------------------| + */ + ptr =3D mmap(&carveout[page_size], 15 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + + /* + * Fault in ptr: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr[0] =3D 'x'; + + /* + * Offset the final and middle 5 pages further away: + * \ \ + * |-----------| / |-----------| / |-----------| + * | faulted | \ | faulted | \ | faulted | + * |-----------| / |-----------| / |-----------| + * ptr \ ptr2 \ ptr3 + */ + ptr3 =3D &ptr[10 * page_size]; + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + ptr2 =3D &ptr[5 * page_size]; + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Move ptr2 into its correct place: + * \ + * |-----------|-----------| / |-----------| + * | faulted | faulted | \ | faulted | + * |-----------|-----------| / |-----------| + * ptr ptr2 \ ptr3 + * + * It should merge: + * \ + * |-----------------------| / |-----------| + * | faulted | \ | faulted | + * |-----------------------| / |-----------| + * ptr \ ptr3 + */ + + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); + + /* + * Now move ptr out of place: + * \ \ + * |-----------| / |-----------| / |-----------| + * | faulted | \ | faulted | \ | faulted | + * |-----------| / |-----------| / |-----------| + * ptr2 \ ptr \ ptr3 + */ + ptr =3D sys_mremap(ptr, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr + page_size * 1000); + ASSERT_NE(ptr, MAP_FAILED); + + /* + * Now move ptr back into place: + * \ + * |-----------|-----------| / |-----------| + * | faulted | faulted | \ | faulted | + * |-----------|-----------| / |-----------| + * ptr ptr2 \ ptr3 + * + * It should merge: + * \ + * |-----------------------| / |-----------| + * | faulted | \ | faulted | + * |-----------------------| / |-----------| + * ptr \ ptr3 + */ + ptr =3D sys_mremap(ptr, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &carveout[page_size]); + ASSERT_NE(ptr, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); + + /* + * Now move ptr out of place again: + * \ \ + * |-----------| / |-----------| / |-----------| + * | faulted | \ | faulted | \ | faulted | + * |-----------| / |-----------| / |-----------| + * ptr2 \ ptr \ ptr3 + */ + ptr =3D sys_mremap(ptr, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr + page_size * 1000); + ASSERT_NE(ptr, MAP_FAILED); + + /* + * Now move ptr3 back into place: + * \ + * |-----------|-----------| / |-----------| + * | faulted | faulted | \ | faulted | + * |-----------|-----------| / |-----------| + * ptr2 ptr3 \ ptr + * + * It should merge: + * \ + * |-----------------------| / |-----------| + * | faulted | \ | faulted | + * |-----------------------| / |-----------| + * ptr2 \ ptr + */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr2[5 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr2)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr2); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 10 * page_size); + + /* + * Now move ptr back into place: + * + * |-----------|-----------------------| + * | faulted | faulted | + * |-----------|-----------------------| + * ptr ptr2 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + * ptr + */ + ptr =3D sys_mremap(ptr, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &carveout[page_size]); + ASSERT_NE(ptr, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); + + /* + * Now move ptr2 out of the way: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Now move it back: + * + * |-----------|-----------|-----------| + * | faulted | faulted | faulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + * ptr + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); + + /* + * Move ptr3 out of place: + * \ + * |-----------------------| / |-----------| + * | faulted | \ | faulted | + * |-----------------------| / |-----------| + * ptr \ ptr3 + */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 1000); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Now move it back: + * + * |-----------|-----------|-----------| + * | faulted | faulted | faulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + * ptr + */ + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + TEST_HARNESS_MAIN --=20 2.48.1 From nobody Mon Feb 9 10:24:19 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 65094233D91 for ; Fri, 21 Mar 2025 21:55:12 +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=1742594115; cv=fail; b=P7fgqAN81YhbkmgYBefvKkVOe3BqE7pNjQU0TitZOJjPa7WGa6TAfE3zxX6Qxp1h5JPQvfTEsnFknD8CH2WzKu53evK90MLZf92uLKId9tSVHE568mRrmWuvc1QFfgU3cvE8uu3+7MVhf28UE/irAUa5YgaYQS3MMDg6iNtohrk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594115; c=relaxed/simple; bh=sDGqOgNERH9zwularw4OMKRjmyp+m9EbMfoZjwqIKPE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Vm1jmiQmELu4dc7Jzh5bZkzjGbEV45QmxOw7kBkwhVoZx+RLi/TXfiCh8rd7RMC6OfDQ4uIn/T8DN8fYGm6qcY8pnnVDvuYhpAAAxGDQ2EqkQ8DPM+72M1VaD3OSQJD/f3vYEWNAifAwAJCBhgK+FX67HRX0B95vAmSfNhuyYbM= 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=EiP4urQ4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Rm/Q/J96; 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="EiP4urQ4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Rm/Q/J96" 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 52LKft0G021302; Fri, 21 Mar 2025 21:55:00 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=R3VQ2JKT075yM5Mu8/gj6ahdUavobj6twKvRFNDdQMQ=; b= EiP4urQ4ji/nvHR9OSshYivsMEsXLej90114NV9q0EjGY5HkeXgUdmBHGAp2oh2+ 85hqTjirH9OI4WjCeIbnn/UpQ+ufm6AXkac5srSb6rSAS0/qeWagmr2+Mf+tifOv fdJeQYuMyhXWlulAIriBJp2nsWcGc1f97faxjb9WlJRBXVsj7CSsHaYkIgNiyhie AtxIiO8E9mBNFwdB0aZZECI3r9DFypg/KWUZSEGHBQkx0Dwm2WcWn5KGZgDCKD+/ LZGOBy8k70jeVWv8CR1uHM8PVUNcLA0suZrDYjJba6Bqmh9zGcF1bj3mDsz6ecrI CaFkJRiDzAVqAzKyq/HCgQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1n8sgb0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:55:00 +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 52LKZM4R022350; Fri, 21 Mar 2025 21:54:59 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2174.outbound.protection.outlook.com [104.47.57.174]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45dxem9n0k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:54:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mHHgGA3t73IirT1GXWXC9x4ALCxR8p2lyzQrhqZJJP6VND2hmXDvQG0WtwbPyM1WBY7RntXWvvQ7z+bhAgD1s47kSNrt/MZjBCNsYq4SE4VL0IUxUQyoGc179bveWL7CZiU/eNX+lquisbmShMQdBBSx0ff8QN9WLIhGIUZrNSWNFZl5XRBpNIihapk6yisfH0ExttlNYFsjQAAv1yuDBMj2B8Nb8umnxYJMK+OCX6DiELwlbB4HJ4s6tHPFD+NZ9wCNs8eTS+82/28fxHFNcrItreH6KO7WmPwdZ1AeXvWc+AoGYy0W16hyLM2wEohbNdVQTIwwni/KZnTuKK24fA== 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=R3VQ2JKT075yM5Mu8/gj6ahdUavobj6twKvRFNDdQMQ=; b=AFSd+pJVod0P50B8uCS600AdkA14/gjdsXzBkhlJJBLFfoyG7bz3wjGhG03HnNp7PzAi+ofiNYVsa+uCzNGrWdCuotR0qoGWV122AeIyH/3kPVEKUWioyToA5OJca6QWbyp52jDcQf3uW4CNhlnlCvbtLf+7oyYs83XPY23nUe4YgLQonU1xyM+D9OazcmGQV9y6+cQL5nuidvbnaNhg/qGf6sbl4W7ANvVBfjw9/MjKaHtSadqM4Yiei6jfKlX0Zpi+0atG1wN0MzEiJ0KJ6Lmt6QQlCmJdcZUYvTjuF81hiZl1q8iwGnA4V1N82yMX8bM/8MRszCR0rRB5EfBmxg== 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=R3VQ2JKT075yM5Mu8/gj6ahdUavobj6twKvRFNDdQMQ=; b=Rm/Q/J96gxfCfeC13e4E+akdDEgnS9PY+Afdt9ei8wXK37+K1YzWlM3Md+CvjPtrIuS97ZXHzQchFXB8RXLX+S3mnkyS0xXUtVVgBi7X3mUHyVhlczaNXTdT5qziTZildJo5+ysh4gXbDN+yM5vjpPsSj/XxPz8wGaV1QP11i5M= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:57 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:57 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 6/7] tools/testing/selftests: add MREMAP_RELOCATE_ANON merge test cases Date: Fri, 21 Mar 2025 21:54:35 +0000 Message-ID: <8b82838696e93d97161af4f62f9f01dc9981ec7f.1742478846.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0296.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::20) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: d82af179-a55f-4735-273f-08dd68c304ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cR7QUkOC5O12EGrlgvkCXn6lXhydVkAif5YKX9MKD2gu+E+gI3aRAifrgx1b?= =?us-ascii?Q?wmaNqVlr2u/b2vxDrQSovrZcllncdXM/SQYv8ioWmbbiXpGxha/OwXUj6+MB?= =?us-ascii?Q?e7LrO5kgaUmzJU3aQgRVPUgTrMZdzU7GxZNwc24W70icM3cCttkcfiFYySwO?= =?us-ascii?Q?tTyDiHWd3z+0PhOpeoE5DsGhS+lw1VprTzqBN7nbbO0sbaM0nK50tOubZcU6?= =?us-ascii?Q?DuTtmK/I3ZQLjGEHyMR9VSIsiz0GLqItmSutNC2iLpDul0l3aumsMBdlSl6w?= =?us-ascii?Q?E1N02nTfLCjFUongtnpieJdkFMHGdM2gmh9nyiYcN5ogVAKzzclQ7vPu5aTo?= =?us-ascii?Q?4Xey0Cxs8q2TtrguHkSGJUBDiOW73GcnwjpjlmE8GgHjKX6FIlERs+QwFQo3?= =?us-ascii?Q?9Ei9xKlhGPBCx7OrBNfpHjkU8Iv/fzYHE1Lzb0KPlndpzAOYJzii6+0Pthnt?= =?us-ascii?Q?zEn5kF7cHUsGc8vyhVfMZDnzp67WqHzAbuZplRriVXL6ORAOLWaDpoVx9rzU?= =?us-ascii?Q?0+SLYLvdCCSjPvivez2b+Kvpz0H9g55rD6OP+3OT6rEqEuZOAlqvWUDC/NaR?= =?us-ascii?Q?O7C9H6fFhL8SJ9fNfblklUzUnx/s64Wt0bVkHYKmWvzVd0GnjKZAvWuwRdsj?= =?us-ascii?Q?CqKeGJBkeYmUK2Ca9jsvGvCt9OYO8Qe+4RGFYm2aH/XGtZSoCnMgxptdpMwK?= =?us-ascii?Q?crC7rY079oFAr2lgxbjWUkNhHJAYamFFRk2mQSohGjOYGPEU7YMz9b25Jk/O?= =?us-ascii?Q?Y3BPnj+cCge1idckl+o70AzLbdbJwmZJsdnl+R998gZvXfUZ2N72nZvQV0Q4?= =?us-ascii?Q?PyRHrUeUqhCgbgLU6vpZEIb/PsPk0mfe5/e7PnMYe9JRp4kjAOvPaxCLDOci?= =?us-ascii?Q?b/QNHHFh5x3RikQE6mVIJ/NUbug0SwRIQRCFsT6KRsrkjnU6mdhXBjEp5pSi?= =?us-ascii?Q?ATMOqAYDGbGBbimaruUQZV0WNDCjpqLVd9JBoGWlQyfbjzzbYanr/Bi4Z2PZ?= =?us-ascii?Q?2ERxL9PVzMPkuaoTQZqOGm0U7mLOz2ZGDMsnuFIajvwUUmEjTp+Hphj40P86?= =?us-ascii?Q?EdyY8kCIQr6BZwN/CbWAVDRaVo0zNYxEobKuGson+LS/kin0k27s4S1B+4J5?= =?us-ascii?Q?V75m9jkMAy0XyyUFzKnkIDF961j76um36dZSzV7mrPy1vctbFLNOXXDTDAC6?= =?us-ascii?Q?oF570GYBlDgve8VB6hYItScaCXlcyyp43ZyOpm6Hv02XW661n9P/Ho/EW1m4?= =?us-ascii?Q?z//kyCva301Hs+CZnCCo/vR2TYos0C5hoDWf4NFuQzxX6nrTCmVuQBWNjHTt?= =?us-ascii?Q?EpksjV91DMT3fPaUnGJkAdZBtN4YHp9CRjumt9R5Mtp7F9TCel3v7/bUGEeL?= =?us-ascii?Q?EkOjQS0nkbN7Eyv8FJNSw8kvRAQ5?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ox2Ak00aE9SCo5vqyV5nHHMsQm5XIQCQF4AN8BN0u7zddr8QI0QJ0th78MJG?= =?us-ascii?Q?AhpF5fjJwkPhZcHG57tAwJuz8LLqRgbjy3xpMiF4AMx1cqhRQc9HHpQIab55?= =?us-ascii?Q?fqYRDj4TVyE/25eV9SuFoHmLZ+sQ3aANyKxKYcz3yHojWhWsiUuhiyQGGYTE?= =?us-ascii?Q?CXx475Jm5v41SlmsrvCaBcmdt2DxYkT+B3PIvW45DBJeupd6lg6woTEjVcP3?= =?us-ascii?Q?0IZwxGOb8PCYMxVPkR2N7lpD6cznPzq19T/ud9k6Q/BFUcVQw8MAJY2GJ8QI?= =?us-ascii?Q?oXOL9+uXBBCHQQ/6b7P8Dqkoa4dUOTlAYWcTJ1E70oCDLeCsVHmKu/kX/SRz?= =?us-ascii?Q?tGU3CgUSniirkbJDOe9gSvIQgyIaYgHaep1YmvK2TyPe34s9dWSmB2sI7T0j?= =?us-ascii?Q?u8TN8+60Yo80RyQZCoM58Q0VEhURS/w+y8xBYY2ThxYEgFd3WkS9tYTGxPZj?= =?us-ascii?Q?15Lxf6TW3NH03DLWLcuozFj/75z0C3g29/TxF85njDC9+Fm+IWO3uV4i+9Kr?= =?us-ascii?Q?NzPC1U1Q0WuLU4IwLNd/aVNoWM9/cHS4n+4in3ZGHXQZYwUg4vSuLR4TkV1e?= =?us-ascii?Q?47UpRGt9jt2yEvDk/IllHHRynxYt+pEhfBIQLCKo7GDCAaIL4rb9bKJEnFLP?= =?us-ascii?Q?JFK3yJdYSRnv4oYVN8pfZf6TUgUZWXw2JJKoj1pUvHx0WU05KoWX/u+inSfj?= =?us-ascii?Q?WvctJ6L0O6yRDvY4hQ+n8FzazOw+Ut2iiotDCSz5ZSuF9bvDM4CxmWxqfrSW?= =?us-ascii?Q?UypHOULsaYP0opb32nIxNM04qZoGIS1dL4Bdw/T/gKXMdF4d3SQtVakVHNFz?= =?us-ascii?Q?HDJNvoj984SeEBpkyejDiuYpk+L/TTA0lL43BNUBqDNIVS1nEBLj4K5TgEzQ?= =?us-ascii?Q?jmvKhbHWEyhnN5DuDYpmyA2ykWNHsZnoxA+CNMlFTCCYewkwp+chZOhWsrUq?= =?us-ascii?Q?sfp2DIV45u6fn9i7iQrAv5wjzjFhqKP82kHz3nN9IIpFYPr+oyBwADCjyv1k?= =?us-ascii?Q?Prlhw8Thc4e4dfcRlw34ehciyMYSCtKHrYsYzQ6/7tw1HE6NIHuYBiz6Rfyu?= =?us-ascii?Q?avFZC3mRpYn2LjkUgexGUxlpdO9VVOhUw+HUq17qpH+DolhXxmZEQm0iAk1y?= =?us-ascii?Q?SmSsG67txpHOlTrqMVuO8cFtC92TEmN8+tIi5TlcmAzPA8NF5p4dBM9vmn6l?= =?us-ascii?Q?FKqv0OMppEh3Oz8LmtunF+rv/QaXyFcJz7d/rtQmwPilWLQYF8jURULJIsTX?= =?us-ascii?Q?HLvYpGKKLd0ikSfKMM45RRPOeBGU9YnViOsJs2yG2xvep1/u9IK5Nq3nrvuu?= =?us-ascii?Q?7S9nkf3mAX4zpwCFX77OP3QxwtlsvUyTex9/meVk0ZNS6Z8UYcEFaIZ8hynK?= =?us-ascii?Q?U9hkCnLKslzrv2Bmt3wnDoQPHAIOEc2OXWcbWTlaYyOZjVfrh3NB+/VH2GtB?= =?us-ascii?Q?PaG7ifhfKQNVDiyQJTRRH4IyXdYbp2Fivw5+6YOZK6J4nD5v5gCnmaorcbtL?= =?us-ascii?Q?k5Ija2f5cPGVZDMldqZrVGcNle9Ag7ENXa+t7C0LKFUl7hU+riAX/V98NGIC?= =?us-ascii?Q?qyPTd7kWHzmR3lQktPrphzk+fF6PbA/a4O+YFKuNcdkA8X36EV4HKF300U3f?= =?us-ascii?Q?WQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AWhWbLDdoZ4+c4BEgK+qTzSfwTS1RUOUHcv/T2FZQsPhSq6ANuc21RuRVZNPad5pFbJW2lXfO3HnFyoLSE3PfIkLNYcEfjVWDEmmNNtuazsJqR9x4KaG8dATqfMmA65bt/spHMQRfKaJwizNcBudQZ59+n1hN+XdNu/WCqsObkmybXjLGHedmxbMQE1Ejt4hww8jG/aegB+ccZF++HllGWiiXed5+AURjKUKHR35dDYDCGYKudxN2O/vFjqxUybj4+YoGvg+xSDkFjzMEmv2BsAMgNkcewnBFavbn6Re3C635jlnX98giG7xfEPFoeSlY1OvhsE/Am+vXbjTxKgaWaAJcexdNRJ6U1XRpwhR8+cFAUTZwgagefwCZ+Arae+deT8VlcZUyUqINEaDIJ/QqtBSEmRpiq0FuVZRl9642Log+p0JgDUQ1iSzNiAtCvKAA6Jw37ISSkhcWObewqOAKpYkuPw5PsT82gxUyAFNL1iuTkLJuh2y4UWPyyKT4uKWbi/CFv4rSCVMDU8b6fJLwa9+H+eC6xbS+azzOPYPL8eKX1UxZ9fCFcs6JRk12wI/YljLaB+uZFgXBbsblbrqjT11h+XdDnCvTKtKnTtKRsM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d82af179-a55f-4735-273f-08dd68c304ed X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:56.9252 (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: di4QFTdiJApTXj8Ct0I0E1v5LpGRVxPA2GOR35F4F7rsiRmi2xsjWWVeW0CroCIZxP8ivDTnH7Xw3pdKkYp5YeVtqAo46KL3P3DdaBKAbYU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-ORIG-GUID: kUoJPsbaZm0xmfxgQN2jzPH2HhbEZvQi X-Proofpoint-GUID: kUoJPsbaZm0xmfxgQN2jzPH2HhbEZvQi Content-Type: text/plain; charset="utf-8" Add test cases to the mm self test asserting that the merge cases which the newly introduced MREMAP[_MUST]_RELOCATE_ANON results in merges occurring as expected, which otherwise without it would not succeed. This extends the newly introduced VMA merge self tests for these cases and exhaustively attempts each merge case, asserting expected behaviour. We use the MREMAP_MUST_RELOCATE_ANON variant to ensure that, should the anon relocate fail, we observe an error, as quietly demoting the move to non-relocate anon would cause unusual test failures. We carefully document each case to make clear what we are testing. Signed-off-by: Lorenzo Stoakes --- tools/testing/selftests/mm/merge.c | 730 +++++++++++++++++++++++++++++ 1 file changed, 730 insertions(+) diff --git a/tools/testing/selftests/mm/merge.c b/tools/testing/selftests/m= m/merge.c index 7c4f3f93c30d..bd1b82665348 100644 --- a/tools/testing/selftests/mm/merge.c +++ b/tools/testing/selftests/mm/merge.c @@ -1055,4 +1055,734 @@ TEST_F(merge, mremap_correct_placed_faulted) ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); } =20 +TEST_F(merge, mremap_relocate_anon_faulted_after_unfaulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Offset ptr2 further away. Note we don't have to use + * MREMAP_RELOCATE_ANON yet. + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault ptr2 in: + * \ + * |-----------| / |-----------| + * | unfaulted | \ | faulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr2[0] =3D 'x'; + + /* + * Move ptr2 after ptr, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------| + * | unfaulted | faulted | + * |-----------|-----------| + * ptr ptr2 + * + * It should merge: + * + * |-----------------------| + * | faulted | + * |-----------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_before_unfaulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[6 * page_size], 5 * page_size, PROT_READ | PROT_WR= ITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[12 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Offset ptr2 further away. Note we don't have to use + * MREMAP_RELOCATE_ANON yet. + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault ptr2 in: + * \ + * |-----------| / |-----------| + * | unfaulted | \ | faulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr2[0] =3D 'x'; + + /* + * Move ptr2 before ptr, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------| + * | faulted | unfaulted | + * |-----------|-----------| + * ptr2 ptr + * + * It should merge: + * + * |-----------------------| + * | faulted | + * |-----------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &carveout[page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr2)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr2); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 10 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_between_unfaulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Offset ptr2 further away, and move ptr3 into position: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | unfaulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Fault in ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | unfaulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2[0] =3D 'x'; + + /* + * Move ptr2 between ptr, ptr3, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------|-----------| + * | unfaulted | faulted | unfaulted | + * |-----------|-----------|-----------| + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_after_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Offset ptr2 further away. Note we don't have to use + * MREMAP_RELOCATE_ANON yet. + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault ptr and ptr2 in: + * \ + * |-----------| / |-----------| + * | faulted | \ | faulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr[0] =3D 'x'; + ptr2[0] =3D 'x'; + + /* + * Move ptr2 after ptr, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------| + * | faulted | faulted | + * |-----------|-----------| + * ptr ptr2 + * + * It should merge: + * + * |-----------------------| + * | faulted | + * |-----------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_before_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[6 * page_size], 5 * page_size, PROT_READ | PROT_WR= ITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[12 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Offset ptr2 further away. Note we don't have to use + * MREMAP_RELOCATE_ANON yet. + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault ptr, ptr2 in: + * \ + * |-----------| / |-----------| + * | faulted | \ | faulted | + * |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr[0] =3D 'x'; + ptr2[0] =3D 'x'; + + /* + * Move ptr2 before ptr, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------| + * | faulted | faulted | + * |-----------|-----------| + * ptr2 ptr + * + * It should merge: + * + * |-----------------------| + * | faulted | + * |-----------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &carveout[page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr2)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr2); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 10 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_between_faulted_unfaulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Offset ptr2 further away, and move ptr3 into position: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | unfaulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Fault in ptr, ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | unfaulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr[0] =3D 'x'; + ptr2[0] =3D 'x'; + + /* + * Move ptr2 between ptr, ptr3, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------|-----------| + * | faulted | faulted | unfaulted | + * |-----------|-----------|-----------| + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_between_unfaulted_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Offset ptr2 further away, and move ptr3 into position: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | unfaulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Fault in ptr2, ptr3: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | faulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2[0] =3D 'x'; + ptr3[0] =3D 'x'; + + /* + * Move ptr2 between ptr, ptr3, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------|-----------| + * | unfaulted | faulted | faulted | + * |-----------|-----------|-----------| + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_between_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2, *ptr3; + + /* + * Map three distinct areas: + * + * |-----------| |-----------| |-----------| + * | unfaulted | | unfaulted | | unfaulted | + * |-----------| |-----------| |-----------| + * ptr ptr2 ptr3 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[7 * page_size], 5 * page_size, PROT_READ | PROT_W= RITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D mmap(&carveout[14 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Offset ptr2 further away, and move ptr3 into position: + * \ + * |-----------| |-----------| / |-----------| + * | unfaulted | | unfaulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr2 + page_size * 1000); + ASSERT_NE(ptr2, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, ptr3 + page_size * 2000); + ASSERT_NE(ptr3, MAP_FAILED); + ptr3 =3D sys_mremap(ptr3, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED, &ptr[10 * page_size]); + ASSERT_NE(ptr3, MAP_FAILED); + + /* + * Fault in ptr, ptr2, ptr3: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr ptr3 \ ptr2 + */ + ptr[0] =3D 'x'; + ptr2[0] =3D 'x'; + ptr3[0] =3D 'x'; + + /* + * Move ptr2 between ptr, ptr3, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------|-----------| + * | faulted | faulted | faulted | + * |-----------|-----------|-----------| + * + * It should merge, but only the latter two VMAs: + * + * |-----------|-----------------------| + * | faulted | faulted | + * |-----------|-----------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr2)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr2); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr2 + 10 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_faulted_between_correctly_placed_faulte= d) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + /* + * Map one larger area: + * + * |-----------------------------------| + * | unfaulted | + * |-----------------------------------| + */ + ptr =3D mmap(&carveout[page_size], 15 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + + /* + * Fault in ptr: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr[0] =3D 'x'; + + /* + * Unmap middle: + * + * |-----------| |-----------| + * | faulted | | faulted | + * |-----------| |-----------| + * + * Now the faulted areas are compatible with each other (anon_vma the + * same, vma->vm_pgoff equal to virtual page offset). + */ + ASSERT_EQ(munmap(&ptr[5 * page_size], 5 * page_size), 0); + + /* + * Map a new area, ptr2: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | unfaulted | + * |-----------| |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr2 =3D mmap(&carveout[20 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault it in: + * \ + * |-----------| |-----------| / |-----------| + * | faulted | | faulted | \ | faulted | + * |-----------| |-----------| / |-----------| + * ptr \ ptr2 + */ + ptr2[0] =3D 'x'; + + /* + * Finally, move ptr2 into place, using MREMAP_MUST_RELOCATE_ANON: + * + * |-----------|-----------|-----------| + * | faulted | faulted | faulted | + * |-----------|-----------|-----------| + * ptr ptr2 ptr3 + * + * It should merge: + * + * |-----------------------------------| + * | faulted | + * |-----------------------------------| + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 15 * page_size); +} + +TEST_F(merge, mremap_relocate_anon_mprotect_faulted_faulted) +{ + unsigned int page_size =3D self->page_size; + char *carveout =3D self->carveout; + struct procmap_fd *procmap =3D &self->procmap; + char *ptr, *ptr2; + + + /* + * Map two distinct areas: + * + * |-----------| |-----------| + * | unfaulted | | unfaulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr =3D mmap(&carveout[page_size], 5 * page_size, PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr, MAP_FAILED); + ptr2 =3D mmap(&carveout[12 * page_size], 5 * page_size, PROT_READ | PROT_= WRITE, + MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0); + ASSERT_NE(ptr2, MAP_FAILED); + + /* + * Fault in ptr, ptr2, mprotect() ptr2 read-only: + * + * RW RO + * |-----------| |-----------| + * | faulted | | faulted | + * |-----------| |-----------| + * ptr ptr2 + */ + ptr[0] =3D 'x'; + ptr2[0] =3D 'x'; + ASSERT_EQ(mprotect(ptr2, 5 * page_size, PROT_READ), 0); + + /* + * Move ptr2 next to ptr: + * + * RW RO + * |-----------|-----------| + * | faulted | faulted | + * |-----------|-----------| + * ptr ptr2 + */ + ptr2 =3D sys_mremap(ptr2, 5 * page_size, 5 * page_size, + MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_MUST_RELOCATE_ANON, + &ptr[5 * page_size]); + ASSERT_NE(ptr2, MAP_FAILED); + + /* No merge should happen. */ + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 5 * page_size); + + /* + * Now mremap ptr2 RW: + * + * RW RW + * |-----------|-----------| + * | faulted | faulted | + * |-----------|-----------| + * ptr ptr2 + * + * This should result in a merge: + * + * RW + * |-----------------------| + * | faulted | + * |-----------------------| + * ptr + */ + ASSERT_EQ(mprotect(ptr2, 5 * page_size, PROT_READ | PROT_WRITE), 0); + + ASSERT_TRUE(find_vma_procmap(procmap, ptr)); + ASSERT_EQ(procmap->query.vma_start, (unsigned long)ptr); + ASSERT_EQ(procmap->query.vma_end, (unsigned long)ptr + 10 * page_size); +} + TEST_HARNESS_MAIN --=20 2.48.1 From nobody Mon Feb 9 10:24:19 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 4B5D2233129 for ; Fri, 21 Mar 2025 21:55:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594117; cv=fail; b=t8agMRYUDsBLjFMH1B0NAETQT37PN3yZx1SE+EvwvydAyEt3ndAltTUIYtRoeTlGDB6yjANKYWJI5gswwQ/1G8xUBh+5HJvWSNP764HNqjb2fAi+1HwQ06cWjy4/zMwPtVyQ/O9jGT0B/l7eytGApgfevmGQ1WzziFl+rDvge2I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742594117; c=relaxed/simple; bh=Xv6JJkA0DZgH3UaoRs8o70eroh/DpJJrHdwERX3eJUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=YYRcdjGp5nbBzuM6CHPu4AXj9l6PQk6scTt9ZLtCL1SdnP63ste8K+hE/pRANYT+zyigpDKgjVdSjdOQK9nQ5LkO3Kg3NQ9Rx0lkofaUei3lK0HM6pNfo/rw3CRVWvJ4eAAh9Sfw9d0VY23TMzxd9tMOe34GFS+bePrsmsKFAOc= 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=ajg+Lr72; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=zUvQxknq; 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="ajg+Lr72"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="zUvQxknq" 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 52LKft0H021302; Fri, 21 Mar 2025 21:55:03 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=egGtESki8KL5HAPZex5IRhZqtYZyfYRDstcRYfPi7TU=; b= ajg+Lr72kEVLGWtd6rvmjS7zc7qu1Y+TPGIKtjjVJGR1R7DPDlJ0Jqb9iHWNUwlW E8ttJau8oBDeBduFI3t/zsjg7z415GGq4bkqMMffY8neJgxZ7pHURcRIfy/HZB9K /cF/ItgRg+W2mvdmSMNwbM1PD8euGaIhPrKO/9E5app4OHYkiR+HMp88zDzT5j7S VqY/aOnR+ND+wIfmW8Bj/QtBfySRYI5XiLN2EHDpu/O6tKrfyn9T2Ibb8hq6L1uA 3WwnPlkkqNGQ0FNtyu9HXuW1OFm/zDZ4lvCxthn5X2cy2zrGEhdasmmb96dDNwaA Nap0ZsYazpDJpTBiu/kkGA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 45d1n8sgb4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:55:03 +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 52LL3Bxs022365; Fri, 21 Mar 2025 21:55:02 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2047.outbound.protection.outlook.com [104.47.58.47]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 45dxem9n1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 21 Mar 2025 21:55:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=d+/HlfYdM4x/LDKC9R4LQjcpFxqKJ4iBycd1hAbe0uF4xabcR+V29uYwEkq8YSD5pwrCFDYi7lW8QmTTKZlAXICwYu5s/3c2Q8vMpmMmPnH+zFQNISBHuIT42W0FOLHQN8K7i/BjHLvw04kA/00lqHRJ/ZmGwZXtz2QQgUqEWwiIggvViNBFEIy1EpRjBiaqU5mCQvVvRpYaXwaQdP+/R6z3kXTSoEGO3f2RyhxlV9hyF7+1Ko4edCD9YzMgwXVVZbNMGlkO+iAN0Tc2eY/ctw8WPeNcDSbJqyS1jFOHLKKycGdzi2bY14CIyWeKeQoKrwhf6UieF+FPhDNBOlVXBQ== 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=egGtESki8KL5HAPZex5IRhZqtYZyfYRDstcRYfPi7TU=; b=aWGz/LPlATQqTpgWdZTzJSBmDGuugEZFXm7B+++1Cs1kzQukxKNGfxuqPbezr+d4kn9RMDZ9u9p99et+M2T6RlnRh3V7C2pWJdjBHGiPqS+fyZbT0kk5ZPEWLufqjli1zq2IHxag4tC8+ZgundctRkHT8BqR5b24y/JrjfuTuDfEJDCnU7TF9ZZtL3R5ccZOieY6X07XvVbskFKcFH4Qjive1IVwbuD7LcJfPbL+8BZ7E0VpQjVANna0HnMhuN5vtrHtmXEiJZ5BTuvD7YXgoj+eLA6qFM1zF5EXqow6INSQQaGLTPL5PTVTovxsz7SzqxtfGDYC5AQ9mk+ePlViOw== 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=egGtESki8KL5HAPZex5IRhZqtYZyfYRDstcRYfPi7TU=; b=zUvQxknqzQGDhWgUw36+Wr8PCdcCCoipL9/KyI1OJLJDBZtRbuIDBXL5H9D1l4Hm25T9kTG4F6kse4M+VwkrDCvwdsDyZDaGijm5L1dvq3F/MK8CUYMpS0vhUGnIcQx/L/wAmQIMu/HwhKIe4aBswTH1DnHQHFP/u5GUW0MHv4g= Received: from DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) by CY5PR10MB6144.namprd10.prod.outlook.com (2603:10b6:930:34::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.34; Fri, 21 Mar 2025 21:54:59 +0000 Received: from DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2]) by DM4PR10MB8218.namprd10.prod.outlook.com ([fe80::2650:55cf:2816:5f2%7]) with mapi id 15.20.8534.036; Fri, 21 Mar 2025 21:54:59 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: Vlastimil Babka , Jann Horn , "Liam R . Howlett" , Suren Baghdasaryan , Matthew Wilcox , David Hildenbrand , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 7/7] tools/testing/selftests: expand mremap() tests for MREMAP_RELOCATE_ANON Date: Fri, 21 Mar 2025 21:54:36 +0000 Message-ID: <82fc24b357b76f6f8475425f9fc99d0d15d9078a.1742478846.git.lorenzo.stoakes@oracle.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO2P265CA0326.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a4::26) To DM4PR10MB8218.namprd10.prod.outlook.com (2603:10b6:8:1cc::16) 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: DM4PR10MB8218:EE_|CY5PR10MB6144:EE_ X-MS-Office365-Filtering-Correlation-Id: 64e994ea-3c1c-40a0-c161-08dd68c306ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BcAYMJSFC5yGVRccCkZx9yDIWkYE5HmyXo1k0GaNyCqiTpdaBNSxCwOZaxN3?= =?us-ascii?Q?BCIx/lkbUmjSS42zdIL11EmvcA2NI6AyMGDHL68F3CUTfV7qzhkPwORI+CAx?= =?us-ascii?Q?j663mBCYSGjr1rbN8mqkCsQzXArVaBmWIliTjRpC5U2mTSoqHbZFXIG1HJju?= =?us-ascii?Q?nw9hYk8VemwVzf4Gg8tpMn+LKv8jV3LuUuFDzFCU773nKSX+GmOewuOH+G5K?= =?us-ascii?Q?pKsUQbEnw6tS06SErtOYgRxDedikCZwzUoSNV0oZ67c9PkSmaSgEfvm2VoaS?= =?us-ascii?Q?HdYxdKlx+C0+bf9V2JSDzLeUC9ZQm5chijdkP7ryJpKmaYzYxtKzSQj1EwBB?= =?us-ascii?Q?Vnp+PG26GpMVHSnslcO7B4CsWmkFi5gigoWZYdfKbd8sUoAcPbbQ3hr8BN5a?= =?us-ascii?Q?wEwnEW/+ClJkXn7DtA23ZxUPnigd9EIgr+cO7Y47lPUbMFunZyurCZANiTdp?= =?us-ascii?Q?ydTBuy/hkMFyw75/UoP8WulC8VaMbiaZlnNWUKvnGfhhvTGpq7yWrCJTdvjl?= =?us-ascii?Q?+4KbdPyIncNkemcqOAEX+h2CziwOWyGsBt83+crxC1f03VlQcBEOtZgtNKgz?= =?us-ascii?Q?zRrNAoBXd1ITC7dZ/Pmvi28aSo3ODlnAJYqStQS9S+H6QMMz+xEpbgEkfO/F?= =?us-ascii?Q?8vwNCDDh7PcbAsy/2ztqseR/OG75PKL73Rm8xpmGtf2dfcp5a6NUninXv8Ka?= =?us-ascii?Q?i2Dqnn03mILE6CXCzCh74hc4ApQbqB8eWuQnwQUMI/pCM7KCSv6ynLhDCSzZ?= =?us-ascii?Q?s1meLDJXMn3GYAxzQLe+Qfr60vRmZfqc/UTahHdFszkjJxY5TTA8kZ92J2s1?= =?us-ascii?Q?/5JDHQh8dcWOkE4yzJiQM3HTyGSEJJrMQChevcLnkAZfCEbQSKTbbAtL6nNk?= =?us-ascii?Q?UxcybLdWTZf8XltKWi5c7yN5/2WOc/5i/EOGsHUPiP4L0M+BA5yDoikchtia?= =?us-ascii?Q?BH50Lxu4JnGRu5OOrOnvrY851w5mHuNYBTUN8hzMCYklShr6AGNltHBjDN4H?= =?us-ascii?Q?7VquSOyQ72aOv+SQH8QmZpqBXYRc1G0vphKttx75mgDHlSNZFGO4N27kejtE?= =?us-ascii?Q?7/62VYs8lG5ddGDfN2FmIlmW1Eo/eHKd9fSqN4yvYGjHpROCUm86ITYFuhxT?= =?us-ascii?Q?KNc9X1f6yQ9KDVApTWCUcMocZnQofTbnTR9ATX84XDCP4R/BddFkbHrCZmLx?= =?us-ascii?Q?hAYy/krwfNx+5e3avZrABDazDGMoEpC+1h3f8Rk5+SPaoWkKAJm7EBaHYjVX?= =?us-ascii?Q?kTo8lXoMABno/p6fdM0PIGnfZMXp6frqbNaVGSpmzrZ4E0CtN9+bWWql/gQG?= =?us-ascii?Q?hPXLHfs1eBfO5dTLnQcER+gPEqpfjFQfCZHaUAst0UYlgM7rRoAcJ8NItDvj?= =?us-ascii?Q?opQldTpCr5iQMst4wwkOBWi3MSqI?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR10MB8218.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DaBm2je/lRI0YckcIkCifSvglKe0HldMe/+N9ZVdFU/R+E8iPUqhEKM2/3jy?= =?us-ascii?Q?r8tMCdX4NGVOc0J3UAP1eWGWq7sUzcxH6LLlRJYzFQh2CA191hhtzvOKIQOV?= =?us-ascii?Q?QE/KyPkSCcPCc99tWzo/qocVpZ5AxkEWc3dADkFDkHXiV4b9P3JAGkwh+WNx?= =?us-ascii?Q?dKhiITT4pSK0gbYI3h5oyWlOgcdl0DA5tVxaAI+hcNwvXHRsio9uEJ14jc6D?= =?us-ascii?Q?TtUq0LPjk8rbTSq4EKwrBdY8wRpfPLWHM1Kbdcr+c4fdJcvy/wQSM7SpSWqp?= =?us-ascii?Q?5R0KM+TmYA2aF8CSl1NDYtFwdIpBFe44YJm7Ui58yQKU5/sMIaHhB0iIKQQV?= =?us-ascii?Q?vxBKI2/3lVGFvHHwQ6Aw7/SHaII05dt2aP5fgTKLq3WIlj52XYRnA7VpllQQ?= =?us-ascii?Q?aXbs0FPZ6sxO1HUE6Y3rfhp3PpheqJF5g4oeL+VKsJQgEEozejU9iSDqCFMd?= =?us-ascii?Q?fplExi/YZtLTIuvJaa6NF0s2kiAihasUynxr7F100H+3+ka/im5Z/8H3zZw/?= =?us-ascii?Q?OTaJbkUiOdg8tLM1/ik+PQW5wQLrNHjLvU0IWHisevTdc+KRTF0UIv2PJw4u?= =?us-ascii?Q?B8ZdvNJOnDXE4sMK+lSBLFHUkQ00ujzzRQ6wzEbSJgSvvkbUplken3CG3nFJ?= =?us-ascii?Q?We3FZy2DQQ6CYJ+cVlhbX4Osrh+40NvmoEI3DNwIeSNDpFgWjGFKq55sv5h6?= =?us-ascii?Q?31kzCFsvRyVj5p60s7BOcooVS5mCHowRWf6pN135IWYUKa+H9PQ/CDPjzagj?= =?us-ascii?Q?0q/CPxapio88gxKMf/tyXr/VJth50+UfmMs3EKcHg3s+1DGDQzJyUUeyKghg?= =?us-ascii?Q?rpDCTf/bxLw0iwdLFvl4VqDmljRqPZ06MSb4HVgbys3J3RyCYjcPopSe9CtT?= =?us-ascii?Q?l6GUC1U26wAxxg58DPGID2PR4x2Ey1mP7mRtQ2HwlaG/b7L+MFEAJLhTWAo7?= =?us-ascii?Q?GIElTv/d6Uo11tb3gjtSli5pkOMyfr9xjeFjA0WrCb9OFk6WwA9b5SpJ5/Eo?= =?us-ascii?Q?C5PKQ85UYcIMxDfMt4yGyFze7Vcxk+2I1XdVR/jMmptb/1TdC1WkCmCWhI7S?= =?us-ascii?Q?AjXH+x27xOKaMm7vEUY8Ft0DYDtXAwfyqsZsTRGN+hgjELTt1bn6qRHqshGQ?= =?us-ascii?Q?65F+C1paeowcMVor8W/4Vr1gfIv/AdQeLHFZLDmX4gg0AkLsYG+n+nMlqnBp?= =?us-ascii?Q?tYdqfPpgL1XcPvBR9kaPblahHub5qWvVWd8J62WRSGbid/CadTUMbilAVuRZ?= =?us-ascii?Q?KdAEqKVb2gQV1FaOU8mh6bmYJQVtmDDZmCFHlNpX6brL/r+Z1IbIhIAQJiqE?= =?us-ascii?Q?CWc7U1viWG8Fqugj3qJNhzwOQ+OZ99ZiBDCLyjGdN1x/XS6WAwrRHDZvDX2K?= =?us-ascii?Q?yIXI/7X8FPjidUx4GTFwCAe6xE+tcg7lvLqIn+Q6Mti1P7ovOmciKL+Hy//B?= =?us-ascii?Q?pUuwC6yF2MIf9ofbCMN4hCYa/8/7z+zEWmRcVRXMP6P+8eMHctK1vDHZIssy?= =?us-ascii?Q?qc1FGH18B7OGlsQGkBvqRwd7ZYptUp/Ka+dZfPIqAYJfbovm7vp/Lrw6g28E?= =?us-ascii?Q?HlBbDfRhCXFlEukEz+oP7VK1vLamEiMfHHkqMmI0qm/ltC6+OeO8W5acRwoL?= =?us-ascii?Q?fQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: doL9wY4ohkW3UTlU4nmIhnfdLLTauVjBiqJnskkqUiwUCoBlK2soe8TmrABJYcPLB2B1rCvFuZ9iS5TVsmMDxDgnedvqh+U6YuP1AoOyxUGORoFbRNVOrDM4hTdvzWIW5ASLKL59CX6CHxqGbWJO9oqijcyXNRTv8lfJAwGGJRer0HRhbcGjO96AiTVo7cUIx+IDVJa8wsNN2hIMoFUjtZ2DYv+y+KTwXxQns0rQLu7IIS6Wo0mhO0XCTqbTwuQcOJIgrkAELSYq3E63jMkyM1Fz/a1LBA3VVay8XRYzAOuXDMCzPmrI/hLkLS47QJtHYSO3UadFOCE8IRXQS5kcIPyyt+qfwjZtAmRKiw4nhdiuOHBn/1RUM0i3KfsGFgr11SETWC/+KOM4aS9HtQcem7iD7ZrvzFhcRB9C2U1c85fJn4a7o9uewJ7xZ0td11zGa6FeRar3EaV+mvnlRyi6laJLItb7XwPnDeHRK/eLWFXSqd7o9TW4Qh9kz/9kJm0MoNeKzKgnxN5S1dCNzXujvMSIE9sgBrKFFC/lJTcuTd6Jo/Ro6jiqJwz0huwQcXNcbYaSu0c+S70qIt2Skaw0POEjbLk9QPPHnWZu7BsqzyY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64e994ea-3c1c-40a0-c161-08dd68c306ae X-MS-Exchange-CrossTenant-AuthSource: DM4PR10MB8218.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2025 21:54:59.8551 (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: 41oqi6QXuXXrrcSGYMRyq9UWMIvxvlKxgWdVEUATq+U72opqNNly8NIuorx8zgQCeYBnM2IISUBRdTHMERkS45AkiznxBUM3N0zAt9K/Mvw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB6144 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-21_07,2025-03-21_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 spamscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2502280000 definitions=main-2503210160 X-Proofpoint-ORIG-GUID: Ron0i1Eeolkg__5vTMM1kB6_QDIiL2OS X-Proofpoint-GUID: Ron0i1Eeolkg__5vTMM1kB6_QDIiL2OS Content-Type: text/plain; charset="utf-8" Adjust every relevant test (that is, one that moves memory) to also perform the same test using MREMAP_MUST_RELOCATE_ANON to assert that it is behaving as expected. In order to avoid glibc not being up-to-date, also move to using the mremap() system call direct, and import the linux/mman.h header, which will use the tool linux header wrappers, to get the latest mremap defines. Also take careful precaution in the instance where we might unexpectedly fail the 'mremap move within range' test due to large folios mapped outside of the range we are relocating. In these instances, if we test with MREMAP_MUST_RELOCATE_ANON, we ensure the folios in question are not huge. If testing with MREMAP_RELOCATE_ANON we do not - this asserts that this correctly falls back to non-relocate anon behaviour. In cases where MREMAP_MUST_RELOCATE_ANON is used, we attempt to immediately trigger reclaim to also assert that the rmap state is uncorrupted. Signed-off-by: Lorenzo Stoakes --- tools/testing/selftests/mm/mremap_test.c | 270 +++++++++++++++-------- 1 file changed, 176 insertions(+), 94 deletions(-) diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selft= ests/mm/mremap_test.c index bb84476a177f..2d155f2ac1ba 100644 --- a/tools/testing/selftests/mm/mremap_test.c +++ b/tools/testing/selftests/mm/mremap_test.c @@ -8,9 +8,11 @@ #include #include #include +#include #include #include #include +#include =20 #include "../kselftest.h" =20 @@ -29,11 +31,20 @@ #define SIZE_MB(m) ((size_t)m * (1024 * 1024)) #define SIZE_KB(k) ((size_t)k * 1024) =20 +static void *sys_mremap(void *old_address, unsigned long old_size, + unsigned long new_size, int flags, void *new_address) +{ + return (void *)syscall(__NR_mremap, (unsigned long)old_address, + old_size, new_size, flags, + (unsigned long)new_address); +} + struct config { unsigned long long src_alignment; unsigned long long dest_alignment; unsigned long long region_size; int overlapping; + bool use_relocate_anon; unsigned int dest_preamble_size; }; =20 @@ -60,7 +71,8 @@ enum { #define PTE page_size =20 #define MAKE_TEST(source_align, destination_align, size, \ - overlaps, should_fail, test_name) \ + overlaps, use_relocate_anon, should_fail, \ + test_name) \ (struct test){ \ .name =3D test_name, \ .config =3D { \ @@ -68,6 +80,7 @@ enum { .dest_alignment =3D destination_align, \ .region_size =3D size, \ .overlapping =3D overlaps, \ + .use_relocate_anon =3D use_relocate_anon, \ }, \ .expect_failure =3D should_fail \ } @@ -184,6 +197,12 @@ static void *get_source_mapping(struct config c) unsigned long long addr =3D 0ULL; void *src_addr =3D NULL; unsigned long long mmap_min_addr; + int mmap_flags =3D MAP_FIXED_NOREPLACE | MAP_ANONYMOUS; + + if (c.use_relocate_anon) + mmap_flags |=3D MAP_PRIVATE; + else + mmap_flags |=3D MAP_SHARED; =20 mmap_min_addr =3D get_mmap_min_addr(); /* @@ -198,8 +217,7 @@ static void *get_source_mapping(struct config c) goto retry; =20 src_addr =3D mmap((void *) addr, c.region_size, PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); + mmap_flags, -1, 0); if (src_addr =3D=3D MAP_FAILED) { if (errno =3D=3D EPERM || errno =3D=3D EEXIST) goto retry; @@ -251,7 +269,7 @@ static void mremap_expand_merge(FILE *maps_fp, unsigned= long page_size) } =20 munmap(start + page_size, page_size); - remap =3D mremap(start, page_size, 2 * page_size, 0); + remap =3D sys_mremap(start, page_size, 2 * page_size, 0, 0); if (remap =3D=3D MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); munmap(start, page_size); @@ -292,7 +310,8 @@ static void mremap_expand_merge_offset(FILE *maps_fp, u= nsigned long page_size) =20 /* Unmap final page to ensure we have space to expand. */ munmap(start + 2 * page_size, page_size); - remap =3D mremap(start + page_size, page_size, 2 * page_size, 0); + + remap =3D sys_mremap(start + page_size, page_size, 2 * page_size, 0, 0); if (remap =3D=3D MAP_FAILED) { ksft_print_msg("mremap failed: %s\n", strerror(errno)); munmap(start, 2 * page_size); @@ -324,20 +343,35 @@ static void mremap_expand_merge_offset(FILE *maps_fp,= unsigned long page_size) * * |DDDDddddSSSSssss| */ -static void mremap_move_within_range(unsigned int pattern_seed, char *rand= _addr) +static void mremap_move_within_range(unsigned int pattern_seed, char *rand= _addr, + char *test_suffix, int extra_flags) { char *test_name =3D "mremap mremap move within range"; void *src, *dest; unsigned int i, success =3D 1; - size_t size =3D SIZE_MB(20); void *ptr =3D mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + int mremap_flags =3D MREMAP_MAYMOVE | MREMAP_FIXED; + if (ptr =3D=3D MAP_FAILED) { perror("mmap"); success =3D 0; goto out; } + + /* + * If THP is enabled, we may end up spanning a range which has large + * folios not enclosed within the mapping, which will disallow the + * relocate. + * + * In this case, disallow huge pages in the range. + */ + if (extra_flags & MREMAP_MUST_RELOCATE_ANON) + madvise(ptr, size, MADV_NOHUGEPAGE); + + mremap_flags |=3D extra_flags; + memset(ptr, 0, size); =20 src =3D ptr + SIZE_MB(6); @@ -348,8 +382,8 @@ static void mremap_move_within_range(unsigned int patte= rn_seed, char *rand_addr) =20 dest =3D src - SIZE_MB(2); =20 - void *new_ptr =3D mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), - MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + void *new_ptr =3D sys_mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + mremap_flags, dest + SIZE_MB(1)); if (new_ptr =3D=3D MAP_FAILED) { perror("mremap"); success =3D 0; @@ -375,9 +409,9 @@ static void mremap_move_within_range(unsigned int patte= rn_seed, char *rand_addr) perror("munmap"); =20 if (success) - ksft_test_result_pass("%s\n", test_name); + ksft_test_result_pass("%s%s\n", test_name, test_suffix); else - ksft_test_result_fail("%s\n", test_name); + ksft_test_result_fail("%s%s\n", test_name, test_suffix); } =20 /* Returns the time taken for the remap on success else returns -1. */ @@ -390,6 +424,10 @@ static long long remap_region(struct config c, unsigne= d int threshold_mb, long long start_ns, end_ns, align_mask, ret, offset; unsigned long long threshold; unsigned long num_chunks; + int mremap_flags =3D MREMAP_MAYMOVE | MREMAP_FIXED; + + if (c.use_relocate_anon) + mremap_flags |=3D MREMAP_MUST_RELOCATE_ANON; =20 if (threshold_mb =3D=3D VALIDATION_NO_THRESHOLD) threshold =3D c.region_size; @@ -431,10 +469,15 @@ static long long remap_region(struct config c, unsign= ed int threshold_mb, } =20 if (c.dest_preamble_size) { + int mmap_flags =3D MAP_FIXED_NOREPLACE | MAP_ANONYMOUS; + + if (c.use_relocate_anon) + mmap_flags |=3D MAP_PRIVATE; + else + mmap_flags |=3D MAP_SHARED; + dest_preamble_addr =3D mmap((void *) addr - c.dest_preamble_size, c.dest= _preamble_size, - PROT_READ | PROT_WRITE, - MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED, - -1, 0); + PROT_READ | PROT_WRITE, mmap_flags, -1, 0); if (dest_preamble_addr =3D=3D MAP_FAILED) { ksft_print_msg("Failed to map dest preamble region: %s\n", strerror(errno)); @@ -447,8 +490,8 @@ static long long remap_region(struct config c, unsigned= int threshold_mb, } =20 clock_gettime(CLOCK_MONOTONIC, &t_start); - dest_addr =3D mremap(src_addr, c.region_size, c.region_size, - MREMAP_MAYMOVE|MREMAP_FIXED, (char *) addr); + dest_addr =3D sys_mremap(src_addr, c.region_size, c.region_size, + mremap_flags, (char *) addr); clock_gettime(CLOCK_MONOTONIC, &t_end); =20 if (dest_addr =3D=3D MAP_FAILED) { @@ -549,6 +592,10 @@ static long long remap_region(struct config c, unsigne= d int threshold_mb, * subsequent tests. So we clean up mappings after each test. */ clean_up_dest: + /* Trigger reclaim to assert that adjusted rmap state is valid. */ + if (c.use_relocate_anon) + madvise(dest_addr, c.region_size, MADV_PAGEOUT); + munmap(dest_addr, c.region_size); clean_up_dest_preamble: if (c.dest_preamble_size && dest_preamble_addr) @@ -565,16 +612,19 @@ static long long remap_region(struct config c, unsign= ed int threshold_mb, * down address landed on a mapping that maybe does not exist. */ static void mremap_move_1mb_from_start(unsigned int pattern_seed, - char *rand_addr) + char *rand_addr, char *test_suffix, + int extra_flags) { char *test_name =3D "mremap move 1mb from start at 1MB+256KB aligned src"; void *src =3D NULL, *dest =3D NULL; unsigned int i, success =3D 1; - + int mremap_flags =3D MREMAP_MAYMOVE | MREMAP_FIXED; /* Config to reuse get_source_mapping() to do an aligned mmap. */ struct config c =3D { .src_alignment =3D SIZE_MB(1) + SIZE_KB(256), - .region_size =3D SIZE_MB(6) + .region_size =3D SIZE_MB(6), + .use_relocate_anon =3D extra_flags & (MREMAP_RELOCATE_ANON | + MREMAP_MUST_RELOCATE_ANON), }; =20 src =3D get_source_mapping(c); @@ -583,6 +633,12 @@ static void mremap_move_1mb_from_start(unsigned int pa= ttern_seed, goto out; } =20 + /* See comment in mremap_move_within_range(). */ + if (extra_flags & MREMAP_MUST_RELOCATE_ANON) + madvise(src, c.region_size, MADV_NOHUGEPAGE); + + mremap_flags |=3D extra_flags; + c.src_alignment =3D SIZE_MB(1) + SIZE_KB(256); dest =3D get_source_mapping(c); if (!dest) { @@ -599,8 +655,8 @@ static void mremap_move_1mb_from_start(unsigned int pat= tern_seed, */ munmap(dest, SIZE_MB(1)); =20 - void *new_ptr =3D mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), - MREMAP_MAYMOVE | MREMAP_FIXED, dest + SIZE_MB(1)); + void *new_ptr =3D sys_mremap(src + SIZE_MB(1), SIZE_MB(1), SIZE_MB(1), + mremap_flags, dest + SIZE_MB(1)); if (new_ptr =3D=3D MAP_FAILED) { perror("mremap"); success =3D 0; @@ -629,9 +685,10 @@ static void mremap_move_1mb_from_start(unsigned int pa= ttern_seed, perror("munmap dest"); =20 if (success) - ksft_test_result_pass("%s\n", test_name); + ksft_test_result_pass("%s%s\n", test_name, test_suffix); + else - ksft_test_result_fail("%s\n", test_name); + ksft_test_result_fail("%s%s\n", test_name, test_suffix); } =20 static void run_mremap_test_case(struct test test_case, int *failures, @@ -640,13 +697,17 @@ static void run_mremap_test_case(struct test test_cas= e, int *failures, { long long remap_time =3D remap_region(test_case.config, threshold_mb, rand_addr); + char *relocate_anon_suffix =3D " [MREMAP_MUST_RELOCATE_ANON]"; + struct config *c =3D &test_case.config; =20 if (remap_time < 0) { if (test_case.expect_failure) - ksft_test_result_xfail("%s\n\tExpected mremap failure\n", - test_case.name); + ksft_test_result_xfail("%s%s\n\tExpected mremap failure\n", + test_case.name, + c->use_relocate_anon ? relocate_anon_suffix : ""); else { - ksft_test_result_fail("%s\n", test_case.name); + ksft_test_result_fail("%s%s\n", test_case.name, + c->use_relocate_anon ? relocate_anon_suffix : ""); *failures +=3D 1; } } else { @@ -656,10 +717,13 @@ static void run_mremap_test_case(struct test test_cas= e, int *failures, */ if (threshold_mb =3D=3D VALIDATION_NO_THRESHOLD || test_case.config.region_size <=3D threshold_mb * _1MB) - ksft_test_result_pass("%s\n\tmremap time: %12lldns\n", - test_case.name, remap_time); + ksft_test_result_pass("%s%s\n\tmremap time: %12lldns\n", + test_case.name, + c->use_relocate_anon ? relocate_anon_suffix : "", + remap_time); else - ksft_test_result_pass("%s\n", test_case.name); + ksft_test_result_pass("%s%s\n", test_case.name, + c->use_relocate_anon ? relocate_anon_suffix : ""); } } =20 @@ -703,8 +767,8 @@ static int parse_args(int argc, char **argv, unsigned i= nt *threshold_mb, return 0; } =20 -#define MAX_TEST 15 -#define MAX_PERF_TEST 3 +#define MAX_TEST 30 +#define MAX_PERF_TEST 6 int main(int argc, char **argv) { int failures =3D 0; @@ -721,12 +785,15 @@ int main(int argc, char **argv) char *rand_addr; size_t rand_size; int num_expand_tests =3D 2; - int num_misc_tests =3D 2; + int num_misc_tests =3D 6; struct test test_cases[MAX_TEST] =3D {}; struct test perf_test_cases[MAX_PERF_TEST]; int page_size; time_t t; FILE *maps_fp; + bool use_relocate_anon =3D false; + struct test *test_case =3D test_cases; + struct test *perf_test_case =3D perf_test_cases; =20 pattern_seed =3D (unsigned int) time(&t); =20 @@ -763,66 +830,71 @@ int main(int argc, char **argv) =20 page_size =3D sysconf(_SC_PAGESIZE); =20 - /* Expected mremap failures */ - test_cases[0] =3D MAKE_TEST(page_size, page_size, page_size, - OVERLAPPING, EXPECT_FAILURE, - "mremap - Source and Destination Regions Overlapping"); - - test_cases[1] =3D MAKE_TEST(page_size, page_size/4, page_size, - NON_OVERLAPPING, EXPECT_FAILURE, - "mremap - Destination Address Misaligned (1KB-aligned)"); - test_cases[2] =3D MAKE_TEST(page_size/4, page_size, page_size, - NON_OVERLAPPING, EXPECT_FAILURE, - "mremap - Source Address Misaligned (1KB-aligned)"); - - /* Src addr PTE aligned */ - test_cases[3] =3D MAKE_TEST(PTE, PTE, PTE * 2, - NON_OVERLAPPING, EXPECT_SUCCESS, - "8KB mremap - Source PTE-aligned, Destination PTE-aligned"); - - /* Src addr 1MB aligned */ - test_cases[4] =3D MAKE_TEST(_1MB, PTE, _2MB, NON_OVERLAPPING, EXPECT_SUCC= ESS, - "2MB mremap - Source 1MB-aligned, Destination PTE-aligned"); - test_cases[5] =3D MAKE_TEST(_1MB, _1MB, _2MB, NON_OVERLAPPING, EXPECT_SUC= CESS, - "2MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); - - /* Src addr PMD aligned */ - test_cases[6] =3D MAKE_TEST(PMD, PTE, _4MB, NON_OVERLAPPING, EXPECT_SUCCE= SS, - "4MB mremap - Source PMD-aligned, Destination PTE-aligned"); - test_cases[7] =3D MAKE_TEST(PMD, _1MB, _4MB, NON_OVERLAPPING, EXPECT_SUCC= ESS, - "4MB mremap - Source PMD-aligned, Destination 1MB-aligned"); - test_cases[8] =3D MAKE_TEST(PMD, PMD, _4MB, NON_OVERLAPPING, EXPECT_SUCCE= SS, - "4MB mremap - Source PMD-aligned, Destination PMD-aligned"); - - /* Src addr PUD aligned */ - test_cases[9] =3D MAKE_TEST(PUD, PTE, _2GB, NON_OVERLAPPING, EXPECT_SUCCE= SS, - "2GB mremap - Source PUD-aligned, Destination PTE-aligned"); - test_cases[10] =3D MAKE_TEST(PUD, _1MB, _2GB, NON_OVERLAPPING, EXPECT_SUC= CESS, - "2GB mremap - Source PUD-aligned, Destination 1MB-aligned"); - test_cases[11] =3D MAKE_TEST(PUD, PMD, _2GB, NON_OVERLAPPING, EXPECT_SUCC= ESS, - "2GB mremap - Source PUD-aligned, Destination PMD-aligned"); - test_cases[12] =3D MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, EXPECT_SUCC= ESS, - "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); - - /* Src and Dest addr 1MB aligned. 5MB mremap. */ - test_cases[13] =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SU= CCESS, - "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); - - /* Src and Dest addr 1MB aligned. 5MB mremap. */ - test_cases[14] =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, EXPECT_SU= CCESS, - "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Preambl= e"); - test_cases[14].config.dest_preamble_size =3D 10 * _4MB; - - perf_test_cases[0] =3D MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAP= PING, EXPECT_SUCCESS, - "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); - /* - * mremap 1GB region - Page table level aligned time - * comparison. - */ - perf_test_cases[1] =3D MAKE_TEST(PMD, PMD, _1GB, NON_OVERLAPPING, EXPECT_= SUCCESS, - "1GB mremap - Source PMD-aligned, Destination PMD-aligned"); - perf_test_cases[2] =3D MAKE_TEST(PUD, PUD, _1GB, NON_OVERLAPPING, EXPECT_= SUCCESS, - "1GB mremap - Source PUD-aligned, Destination PUD-aligned"); + do { + /* Expected mremap failures */ + *test_case++ =3D MAKE_TEST(page_size, page_size, page_size, + OVERLAPPING, use_relocate_anon, EXPECT_FAILURE, + "mremap - Source and Destination Regions Overlapping"); + + *test_case++ =3D MAKE_TEST(page_size, page_size/4, page_size, + NON_OVERLAPPING, use_relocate_anon, EXPECT_FAILURE, + "mremap - Destination Address Misaligned (1KB-aligned)"); + *test_case++ =3D MAKE_TEST(page_size/4, page_size, page_size, + NON_OVERLAPPING, use_relocate_anon, EXPECT_FAILURE, + "mremap - Source Address Misaligned (1KB-aligned)"); + + /* Src addr PTE aligned */ + *test_case++ =3D MAKE_TEST(PTE, PTE, PTE * 2, + NON_OVERLAPPING, use_relocate_anon, EXPECT_SUCCESS, + "8KB mremap - Source PTE-aligned, Destination PTE-aligned"); + + /* Src addr 1MB aligned */ + *test_case++ =3D MAKE_TEST(_1MB, PTE, _2MB, NON_OVERLAPPING, use_relocat= e_anon, EXPECT_SUCCESS, + "2MB mremap - Source 1MB-aligned, Destination PTE-aligned"); + *test_case++ =3D MAKE_TEST(_1MB, _1MB, _2MB, NON_OVERLAPPING, use_reloca= te_anon, EXPECT_SUCCESS, + "2MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + + /* Src addr PMD aligned */ + *test_case++ =3D MAKE_TEST(PMD, PTE, _4MB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "4MB mremap - Source PMD-aligned, Destination PTE-aligned"); + *test_case++ =3D MAKE_TEST(PMD, _1MB, _4MB, NON_OVERLAPPING, use_relocat= e_anon, EXPECT_SUCCESS, + "4MB mremap - Source PMD-aligned, Destination 1MB-aligned"); + *test_case++ =3D MAKE_TEST(PMD, PMD, _4MB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "4MB mremap - Source PMD-aligned, Destination PMD-aligned"); + + /* Src addr PUD aligned */ + *test_case++ =3D MAKE_TEST(PUD, PTE, _2GB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "2GB mremap - Source PUD-aligned, Destination PTE-aligned"); + *test_case++ =3D MAKE_TEST(PUD, _1MB, _2GB, NON_OVERLAPPING, use_relocat= e_anon, EXPECT_SUCCESS, + "2GB mremap - Source PUD-aligned, Destination 1MB-aligned"); + *test_case++ =3D MAKE_TEST(PUD, PMD, _2GB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "2GB mremap - Source PUD-aligned, Destination PMD-aligned"); + *test_case++ =3D MAKE_TEST(PUD, PUD, _2GB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "2GB mremap - Source PUD-aligned, Destination PUD-aligned"); + + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + *test_case++ =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, use_reloca= te_anon, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Destination 1MB-aligned"); + + /* Src and Dest addr 1MB aligned. 5MB mremap. */ + *test_case =3D MAKE_TEST(_1MB, _1MB, _5MB, NON_OVERLAPPING, use_relocate= _anon, EXPECT_SUCCESS, + "5MB mremap - Source 1MB-aligned, Dest 1MB-aligned with 40MB Pream= ble"); + test_case++->config.dest_preamble_size =3D 10 * _4MB; + + *perf_test_case++ =3D MAKE_TEST(page_size, page_size, _1GB, NON_OVERLAP= PING, + use_relocate_anon, EXPECT_SUCCESS, + "1GB mremap - Source PTE-aligned, Destination PTE-aligned"); + /* + * mremap 1GB region - Page table level aligned time + * comparison. + */ + *perf_test_case++ =3D MAKE_TEST(PMD, PMD, _1GB, NON_OVERLAPPING, use_rel= ocate_anon, EXPECT_SUCCESS, + "1GB mremap - Source PMD-aligned, Destination PMD-aligned"); + *perf_test_case++ =3D MAKE_TEST(PUD, PUD, _1GB, NON_OVERLAPPING, use_rel= ocate_anon, EXPECT_SUCCESS, + "1GB mremap - Source PUD-aligned, Destination PUD-aligned"); + + use_relocate_anon =3D !use_relocate_anon; + } while (use_relocate_anon); =20 run_perf_tests =3D (threshold_mb =3D=3D VALIDATION_NO_THRESHOLD) || (threshold_mb * _1MB >=3D _1GB); @@ -846,8 +918,18 @@ int main(int argc, char **argv) =20 fclose(maps_fp); =20 - mremap_move_within_range(pattern_seed, rand_addr); - mremap_move_1mb_from_start(pattern_seed, rand_addr); + mremap_move_within_range(pattern_seed, rand_addr, + "", 0); + mremap_move_within_range(pattern_seed, rand_addr, + "[MREMAP_RELOCATE_ANON]", MREMAP_RELOCATE_ANON); + mremap_move_within_range(pattern_seed, rand_addr, + "[MREMAP_MUST_RELOCATE_ANON]", MREMAP_MUST_RELOCATE_ANON); + mremap_move_1mb_from_start(pattern_seed, rand_addr, + "", 0); + mremap_move_1mb_from_start(pattern_seed, rand_addr, + "[MREMAP_RELOCATE_ANON]", MREMAP_RELOCATE_ANON); + mremap_move_1mb_from_start(pattern_seed, rand_addr, + "[MREMAP_MUST_RELOCATE_ANON]", MREMAP_MUST_RELOCATE_ANON); =20 if (run_perf_tests) { ksft_print_msg("\n%s\n", --=20 2.48.1