From patchwork Fri Oct 25 12:26:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 13850606 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EE5FD0C601 for ; Fri, 25 Oct 2024 12:27:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F2D26B0096; Fri, 25 Oct 2024 08:27:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9556B6B0098; Fri, 25 Oct 2024 08:27:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 782206B0099; Fri, 25 Oct 2024 08:27:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 54A966B0096 for ; Fri, 25 Oct 2024 08:27:14 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A4C0EA0981 for ; Fri, 25 Oct 2024 12:26:38 +0000 (UTC) X-FDA: 82712048286.20.E5DE854 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf20.hostedemail.com (Postfix) with ESMTP id 8C5021C001F for ; Fri, 25 Oct 2024 12:26:46 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="NU6k//XM"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=d+nTQH8n; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf20.hostedemail.com: domain of lorenzo.stoakes@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=lorenzo.stoakes@oracle.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1729859178; a=rsa-sha256; cv=pass; b=6GVYsjXjkawf/NTDoeYWZgvCBfIerx3Fq4W0PpCbuCEbUUe3deuVWYKqsFdtcAmINM/DPz EYUEgzS8QiaF3SuAe9jd5d3gVqkz2TpvyKFNWYlNxP/wmeedNLMziyn/1BfC2undR5/boM hBgd0KW2oZ9Nu4oivHL4gD4Yp/K/d9w= ARC-Authentication-Results: i=2; imf20.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2023-11-20 header.b="NU6k//XM"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=d+nTQH8n; dmarc=pass (policy=reject) header.from=oracle.com; spf=pass (imf20.hostedemail.com: domain of lorenzo.stoakes@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=lorenzo.stoakes@oracle.com; arc=pass ("microsoft.com:s=arcselector10001:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729859178; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=rzah8PtqmSFAEkrgx3+NN4GKeumy7rZse5pxRqGcMM4=; b=fgXlzSiN/CD6DrZX1vnkGxNLAwzC8JRQmns9b0J3IA96R2rG0aIN1g7ezUhmTg62/3lyrz veZXIipBxQLIahnwaS8ml6WR7andg/QNQrjpWM+X6tlB58Lshuwb8tVVQbMBG5pdmfv/v0 Q2pOifeIqmnD7/PJLW8eazZqrlvgUu0= Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49P8BZgo026805; Fri, 25 Oct 2024 12:27:08 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=rzah8PtqmSFAEkrgx3+NN4GKeumy7rZse5pxRqGcMM4=; b= NU6k//XMb+TkwpLqE9l4ORvz7oc7dhH3bAjyRGPv3vkABROj6uuEc5FOm+bCVL+Q BjAL0ZtqqSmMAvC/RaX+jrbasy4W43/4saqpAInPOtDIg+5c3lM+S565yHkUG/Dq aNi0Iu6ahUQvYC8m9QuaUxFJzYXJ5Jflid494/zQIpfFuPAdnnmHS+wUsepmNHu4 jqEYRyy/S1R2vL4G3rs1wsAJcadseIDKYsWc5pr3gcB9k8kGvILPvKr7EnhydHKf SqMmAuviir44DaeAvqmjMEEj6x02mdfHQGM2oHdsrh6JmrtmJci/mOYQ2riAVPPm DiqeTNOeRJrX6+wrtpqCPA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 42c55v4u6e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 25 Oct 2024 12:27:07 +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 49PC7U62015833; Fri, 25 Oct 2024 12:27:07 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 42emhc7tsq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 25 Oct 2024 12:27:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vuN4Kvecfo0MJjCubI5yCv+oQUhA0uNs8rSng/QWq2n9dxlvU9Y6vOhTlN9ysAUmh1a0ep35JIZU1PxlQeneb8wBLzsvk3TH0LrXdsmTXU6UsB/O9/eSXKJs9kpkxunP7ZOnYgUjiPGgLDrLiBK23QCN6GbwQ8K8ZW94xO9Zwqjmb3xMOpxAqRa6ILpS5fSL4GfSoJqPDURZWvLV7V81+J5dcabitzuoUe8SLPye0KzIb/fuBTHtFS4pxkRMfsQ4LmF+cFWv3XTMvZM78Q7uTw1apCC1rKd2M/gqGTqdMZXqTIYHQOvE+n4acEQ49cKTdsLMtTdTcJda5grbIk6uBg== 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=rzah8PtqmSFAEkrgx3+NN4GKeumy7rZse5pxRqGcMM4=; b=D6oKmgNf/UXzpL/dXz+9f7KWHoxZYgb2JutVdRM6s/N20GNqwRZlNbSL9ns4TYsWRRxG+WIjXXhIOCsst4/dBl97adfdXL8eVidv+tV36kQPuC2Gh5nDdHA8JXFIikklgHDpYTu8K7BzmL2JOljvMbn0gLQTH0HQnbdk+gwNKdmydwjikV5uv+/flMDY0M7FfPIo4UTWljvAK+Y36tDexMzz2sg1oEi+T/jSAyZ/gMXUDTdN5nppmjLdwlqNF84mzEmWX2JZpEs+665TA2lKMRVBlz31aFpzPt0Z2/6f7LKE+VVfpK7MrDTIxpEITlMF/6FU9eULXUhsjaI96TCi4A== 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=rzah8PtqmSFAEkrgx3+NN4GKeumy7rZse5pxRqGcMM4=; b=d+nTQH8n3jY/vlBTBqStNRSTTmeuMf1NZfjX/CTB+Jf/SJNr4ZxQW1d7xV+xNsabH0t7wGa1lA0o8J1NQ2j0EMAXv7b6w3YH1Yhjle96Xhx80Js4gDOLE1SXHDFBf+2V+fZZFlrMjdMgVnqyorh4iuQuag7N6fjOBS7A+moWOqg= Received: from BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) by CO1PR10MB4484.namprd10.prod.outlook.com (2603:10b6:303:90::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8093.23; Fri, 25 Oct 2024 12:27:04 +0000 Received: from BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9]) by BYAPR10MB3366.namprd10.prod.outlook.com ([fe80::baf2:dff1:d471:1c9%6]) with mapi id 15.20.8093.014; Fri, 25 Oct 2024 12:27:04 +0000 From: Lorenzo Stoakes To: Andrew Morton Cc: "Liam R . Howlett" , Vlastimil Babka , Jann Horn , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Peter Xu Subject: [PATCH v3 5/5] mm: defer second attempt at merge on mmap() Date: Fri, 25 Oct 2024 13:26:27 +0100 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: X-ClientProxiedBy: LO4P265CA0175.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:312::14) To BYAPR10MB3366.namprd10.prod.outlook.com (2603:10b6:a03:14f::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB3366:EE_|CO1PR10MB4484:EE_ X-MS-Office365-Filtering-Correlation-Id: 8dfb44ee-6443-4906-9909-08dcf4f05532 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: qYJuqreerQF9eUS63UnHKlkXtcJOCi7u7FFhi0Fretog8trb9ejn+9RZi3rcs3ebrojTEX698SSIuxzXJ4bMC7XzvyLr02xg77mEVYjmGohgyrNAijFovBExYdiXVTWg3cDi11OVVj96q40Ib/uagCgwaUjmL5V/ajFJDBC8oT26XL/rf/+KdLpA3ekKjyONPSk2IZsEw445LoS3iMyEdnm+Og/mX/h2p4E5DAnQpLLKMl+RGtFrPsug5nY5Tqr4tkKKFDKt7ifUtn/jkIx+Z4dFY7Ndn+KHfK1cE+wrakhzERIXAOfq1e70Kx/PIbbZFeFZoxJhNw9M2s3k7WAHY52bpsvI9rkoR7d3MXkKuFZoIGax+weg6c/eEDT+f7s/bxxI1Y1FArAmNXMw7RhC0d4zNr2tu/Ore7qZBB7Vw1kd6hUjbULMwqdil8POo+R6fgNITU+aOcNM35LutC6uk5gzkZ5T1Ne7SiZc2/oL9zVL0469Hj6LnhCBR3Zys2lVH3sj0ysdWFcGUgLQ3MW4Et9ZTkIS6v5Fa0prkwqTeq2CovyA7a7mDrY5IZpcgj3nWDzNroE67bPxm9d0Gk9OD+Jftwg5OwIV40OK4y26TgGTTJogo2UWwS6vwypwyiNomZOy6iAHKnTvKEnEiwK0tvMzei63HmwbtSg4w3TMgkBQRwU5GMa+rHOo1OqQogCPrx2TtScbWKsfczZRCl0+3ijgc98Hc6os0XKEAcLNG4phXB4MrrQJLhtXsFDKMH4vorFG1/+LCvZbxjGhGXucILYb3Y+DAbYXOzV2sYur69B6c4BqA5pcByyq8dpgDXHhhfkPWJSJ1I1YE4PM3Bg/GQQrgapfV6KK2DAI9FXftN3sbhWTpou1w7NVptndhwj1KotW83bblAMBFsohOY1Y5kpKHjtgb06MRBgPmLs2QQhUkjqnar2oJaXdgQscbHA5Ub7hLAMgeqT+kGQAluGT0eV+ckFKZJt0A3TDaKtV9JpXapspcXzKFcxTSLvKPEHnM5zFJkIw2/R9VpR6evCli/lhRrmOWPgkF8rt+Ltmd+IPRGD0ocE51UNfIeQ0hR1rUGg5+OFJj8uq92Wc6VxWD0A/QzwgxU0X61PO/c4pbGMqhA2TDjWMe2IUf+qZYAsdKKsDoBTR76air6Mt5MlbdYzpSS6j71tfGfit1JlrC6vvuE8RfVwgQJVg6fEcoMV89VvqLdjRxdQbV9lYZdt/O43uqq6HUf4I78W7XoDPAMyAtHmhnETFMwaOqhX03Ok5seOhQJL2QxwybAoE/JMH9lJ4Hv8iJjHSf6F//Sq2Je0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3366.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +3uyN8lVUn8n+fz75PQhfHl7jSyB3C5kZoHB+3RdtHTZ/J7yLROjn8AJ9Qikf4J4KVVHeABFXE8bYEuPPC0XpI8jW9IrQXaeeYV2/I8MFRnzpYUCWa3n3et+C3Lzk6OIHzMhLjBwz/KS9ZhBqC/wqzUjQsKEQ4BlsATMz3aDE0FvGg4UQn2aZVLPoxKKI1PnWXGw66DGvYycwBcTIkzot76AvrHZ4cxq9AVZMVD82/tadtfDqFxcGH9VeSzOq8G3/GeUz7kyEAJkvNRICq00vjnG82XMpkM3ArGVvw8OgeD0d2RU9peIBNPA0RESnXoKWXkbVZhl5YBfYOGIP8OaBa7rX9u/5x0dwmL/C27CpW/6JGxe5P3PWP5oiNRmXUn0snNCArAc58PmTyK4IeKZQH7zyXKP2IpmgONZz8m+DRpVRB7zpw5PsVSRydR0O1pFTY2GOENHLdtV4SyGlOCmU7HI5ypgosswxAA+sjBE1RdN1/v2kUmGqV+Gci4X7GKRFoC5JHe/6FvKBr60aBOQ3Q4B79+8Sq7xIzoalKgUFrHFkR6qf1QmP/uLXRIty+oFN6eap1u70otqmV9dMxsolXCfjSgHaSluY73EFkxqs6jZ3QMKg7XPVuFl11zVtCqkRxrCKddLcsw9viQ3XqeMoiG6q7ukym8Kr3pXxP+pl3YP5+Wc/2nYSgW+IwuprsdU/E/SniQwneK/Rl6kxkGEvoSdBUYZbC4hm/KjaKUJ02dQgmM+pmKv3emjF2LPIIOwBuMPS3YZ9WyMt1NUVZiBDjgbRjAkhDrouMgFWsxKLTsdMp9PoUyAICuUp3E9Hzko4yTmRLzp6Z6U9yXixG5xs6ujP0KypKpbRiJc7yK1oDgQybj+2k/9pAY6bhYDHShTpIo0qD2Rq8tY9PKy7KWyN0D+tMHFnrNkRewEQRJO5DAOyrhlAEDOYBFuc1rRcSi7pTUxc639M8X1/tPS/d6YKOvQTNjSgHuBgRV/g8Tl30rzEHvhWVZn3kvITpA2cFH5XAwMBH3dZMaHaNbSwW+393qPNrz3KKRYtKFKN+7gUdI8prlM3n6tqpRA5GzVDYopR1fI4JtFeXynOj4Z5XTris0FkRfDpf4xX6hZkEdT6h+B5PU8cDgkxoTtZpeQmV5iwVB3oRq6LE9LiHGL+4ZCv7TYh+jyOCHHtzV6b5B/QI9ufn0WRb//TdhXtr3wdCmTBNI5WpQ9ylf58RNc4hXmNCT9PLfJm4b/OZSesi37vIu0v2QZpy2X0squutTqoW2du/odpLyloU33vo2SWMWioh3cXtdHjIv/zXInr5tapB8W7UCSaOAcVJD+WEkcyC0X8Ei8oLpEMHT7VCepXFDyvG+FwrOPiPpFJKzs7YWjLvTaFKprgWcngCJMqeCQE03h7o5EdSSyUXRjiMNiAF7WvuBFTA/fiS05Buo5T4PgSR3NJZqIpEs+JjmBZ6JPEzHVtsQHpAS/fZm7kd77hLp6GCjCZ3Q9pAPffGgTqpOLoudDFJ7W3DLmA9CZzOX/rCbPaFDnXqaEAN5p1h0q6MtxuyaRaaKQGy1Emepk6QIYLzPqVFtGW0Mf3/gOgDOpkuZ2VU77ahxEAfcQuL1JGT58Sz9EwkuRbNIQQWHCsa4yfB/t4WL1gPO1T89tf7aFFks7n5O9NqttqpRXwcDEZfQCfQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: lJiofi6nJtiajkXLDa0h3aGGlb+B5ShIJtcwI4UZes4KDXME9RLlwv5IXgVuXWH1FPFMx1KNs/bIO7E5zpsYajEbImvnJegmDGlImaIxvQArkv91EY6i3n5cTm1BSwOH3uFiewVMBT6XLm1YeU20cPnYFzkIUR1lPYp/Q4eNomAJMPQJQBvD10v3AuWsS1xGhkB8VIBZg2TDw7qnirOLqyC3qkiwfFh0r3rMAVTiJK2Hd2pE4/EbMFCCn6Cwou9KFlch5F7Dvq4cZb4hHzVO5Y0yB/XA7Q7bIbeg15riugzsCAskFB3muLYi/o7Y3jUi1eEb2PRD/7HBE4QjBE4WX4hGinuqnF1zzbwE74rBMRFIeFe5qhmJmWS34lh2gbbyE9jGXrzLFdp1ojo3QHQSm4rR31VmcItl9SGujJ975KiiY2HXj6h3Fa1CiievieAvyguKnojhNF5LPzZj4EG6MCc450Jk6LhAJ2WGQiLnE78vV4U7QSNqGkIarsPP91S7G3k5Eji9b4TsVWVCo420RwTIl9iLU+SEzcqUbS3vjJEIDAUtpaYD9T7KzMpttIytad7TIokqo11yqu2CygB6Z+vStonB2mgqgJQ3a+2DFoY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dfb44ee-6443-4906-9909-08dcf4f05532 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3366.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2024 12:27:04.0639 (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: Qnhg7qMjYjckbdbujNUcTYaZxDF9TdxeEieuYAb6NZNm74nj0sdSFbeUk0EUoSxrEu5+uEkGPUiCk0SkCoWUO8nMk+djPbYfJ3VDThCVrXo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4484 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-25_12,2024-10-25_02,2024-09-30_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 adultscore=0 suspectscore=0 mlxscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2409260000 definitions=main-2410250095 X-Proofpoint-GUID: 4846HGWgGTtz7mQcL5vJE8pt_jl0mp-L X-Proofpoint-ORIG-GUID: 4846HGWgGTtz7mQcL5vJE8pt_jl0mp-L X-Rspam-User: X-Rspamd-Queue-Id: 8C5021C001F X-Rspamd-Server: rspam01 X-Stat-Signature: cz3uc1ik4335dj9wcx1wg5qhkfuakg5x X-HE-Tag: 1729859206-983771 X-HE-Meta: U2FsdGVkX197UMQsgTJ4yyRQGv3iRkabAIAHjkWKk//EyBX1zywIzBXFiOoS3yFjbeoJXOltVWjC8B/FMisxMAQhZ5+H9GMJq0hbZMrqN4igKzA4iT44cHNEvWOUflvFfU9EtywDLwujDzkE2INghRdVC8w0NTSDztkowyTm+AoBlYgpnQv0eCMHwXU37jjR5Hmub8iF70d2TNCclspOuqH6ZcuaJix3/I56qLqmgrcXLtvupNGOtjX6xKNeu8OzRj625o1Zsui4DEvIRpJ6RvciuWfNOouw85466XOj8ojuae4nn2coI91J0vnj6rsbOyAxAgM72QGYjdtLUMXdPs1vYzai0uWuVrd45TbCkKiMCMgVHRnH378Gd5TNuMiEeBa0kXBJrc/O49hzwkRfaaRa4DFOoO3LUTgbKTltXqCDvpR95F+grBcJqQjMxY0nAckmJgOmsPCAPzZyoaok1GB8nv7i/hO3HEe5zjKWq28ehZEXExLrr2YhXlinugCKxkAahRT2R5ZMiVKHCo4PNiD9v+rMU7mGkuym17v51BpY921M0Ffqdvg4Pe1MeoR7rS1byWVy3709gA0pBYUxrdDT4MrAi7gcjVrecFT4d3OvOjmKsSf791FYPoDYhdUSNIp3Ys3OcKNiKkWq93YY+SAaoe0XsCoseo52ePui8A987gk4ZmTczijMgUY5cn+sT6cE77/W3rPYhQRrYZcjzUpAgClCYup8QY3HKaa2PNNCMkUZ+wA+lIIVHHDUTj9HMJnLiL9KWAV178G/4Bh9HCBrMNDW7TucUToxG90vdFjUBtPl6q5WU+xvbNYPj5Kw0F/0gDNzAU1guIyZMD1+77OytAWKCMoAvqBKadj43e0xdkzGza/TnCNXh0uU3wJm14Nx48726ycNRUvWdmUfxH+YQMQsjtFUgDGcJGbTCBMgRuZo1Z23+EP7JAw7dHY2pN/8nM3oqi1PPuu4/Wh PzKROzVP /m/2E5aREPs029l02pj5i+9npnp8aW8Cy12fAHaaiXV1++YPKgKZkQYo0qfRBTyBFuCe7ExB8ZXjy7XeeSLeqscRicHMns1akrShcCTWI6NKQlwcDGbj5jir+DDib3B4DLwxQ1nDHSrzQIhUVdjECBKrcTfLIXYAu/M+fqN0ptu9uxchnv4rgMj+nDh6s1KP/rQFUcdbe2xiz4wWyu65O4Nz0m3R7PaKBTjyCpIMddJsO5kS0PL9UwLY/OmI46TYhcmdUEQu8Ve7koTv6XKSl/BvpauAWlm0QfZtydxZPSuHdgwiHergAl5jVJLw7AulGh3S3n6XIZ6PWNYtiAWu9OB3Tm9FJJWdiTVbUSoCchRdkaTI4WMJKaKSV6FuSxh57CWs3Z4uWKmfBud/h9SKuslkowQkwAgH3IgeuToDo/OO0OqgKi/j/aqpLgYh/2yr4S6i/EuAU6rR/CSWUjrTp8IQrXG48b+w8wcbTvgwe3f+MAjULCsXZ3EphOtgXz96eQk9iETiS95sbbPI= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Rather than trying to merge again when ostensibly allocating a new VMA, instead defer until the VMA is added and attempt to merge the existing range. This way we have no complicated unwinding logic midway through the process of mapping the VMA. In addition this removes limitations on the VMA not being able to be the first in the virtual memory address space which was previously implicitly required. In theory, for this very same reason, we should unconditionally attempt merge here, however this is likely to have a performance impact so it is better to avoid this given the unlikely outcome of a merge. Reviewed-by: Vlastimil Babka Signed-off-by: Lorenzo Stoakes --- mm/vma.c | 55 ++++++++++++++----------------------------------------- 1 file changed, 14 insertions(+), 41 deletions(-) -- 2.47.0 diff --git a/mm/vma.c b/mm/vma.c index 7c690be67910..7194f9449c60 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -19,6 +19,7 @@ struct mmap_state { struct file *file; unsigned long charged; + bool retry_merge; struct vm_area_struct *prev; struct vm_area_struct *next; @@ -2278,8 +2279,9 @@ static int __mmap_prepare(struct mmap_state *map, struct list_head *uf) return 0; } + static int __mmap_new_file_vma(struct mmap_state *map, - struct vm_area_struct **vmap, bool *mergedp) + struct vm_area_struct **vmap) { struct vma_iterator *vmi = map->vmi; struct vm_area_struct *vma = *vmap; @@ -2308,37 +2310,10 @@ static int __mmap_new_file_vma(struct mmap_state *map, !(map->flags & VM_MAYWRITE) && (vma->vm_flags & VM_MAYWRITE)); - /* mmap_file() might have changed VMA flags. */ + /* If the flags change (and are mergeable), let's retry later. */ + map->retry_merge = vma->vm_flags != map->flags && !(vma->vm_flags & VM_SPECIAL); map->flags = vma->vm_flags; - vma_iter_config(vmi, map->addr, map->end); - /* - * If flags changed after mmap_file(), we should try merge - * vma again as we may succeed this time. - */ - if (unlikely(map->flags != vma->vm_flags && map->prev)) { - struct vm_area_struct *merge; - VMG_MMAP_STATE(vmg, map, /* vma = */ NULL); - - merge = vma_merge_new_range(&vmg); - if (merge) { - /* - * ->mmap() can change vma->vm_file and fput - * the original file. So fput the vma->vm_file - * here or we would add an extra fput for file - * and cause general protection fault - * ultimately. - */ - fput(vma->vm_file); - vm_area_free(vma); - vma = merge; - *mergedp = true; - } else { - vma_iter_config(vmi, map->addr, map->end); - } - } - - *vmap = vma; return 0; } @@ -2346,10 +2321,6 @@ static int __mmap_new_file_vma(struct mmap_state *map, * __mmap_new_vma() - Allocate a new VMA for the region, as merging was not * possible. * - * An exception to this is if the mapping is file-backed, and the underlying - * driver changes the VMA flags, permitting a subsequent merge of the VMA, in - * which case the returned VMA is one that was merged on a second attempt. - * * @map: Mapping state. * @vmap: Output pointer for the new VMA. * @@ -2359,7 +2330,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap) { struct vma_iterator *vmi = map->vmi; int error = 0; - bool merged = false; struct vm_area_struct *vma; /* @@ -2382,7 +2352,7 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap) } if (map->file) - error = __mmap_new_file_vma(map, &vma, &merged); + error = __mmap_new_file_vma(map, &vma); else if (map->flags & VM_SHARED) error = shmem_zero_setup(vma); else @@ -2391,9 +2361,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap) if (error) goto free_iter_vma; - if (merged) - goto file_expanded; - #ifdef CONFIG_SPARC64 /* TODO: Fix SPARC ADI! */ WARN_ON_ONCE(!arch_validate_flags(map->flags)); @@ -2410,8 +2377,6 @@ static int __mmap_new_vma(struct mmap_state *map, struct vm_area_struct **vmap) * call covers the non-merge case. */ khugepaged_enter_vma(vma, map->flags); - -file_expanded: ksm_add_vma(vma); *vmap = vma; return 0; @@ -2493,6 +2458,14 @@ unsigned long __mmap_region(struct file *file, unsigned long addr, goto unacct_error; } + /* If flags changed, we might be able to merge, so try again. */ + if (map.retry_merge) { + VMG_MMAP_STATE(vmg, &map, vma); + + vma_iter_config(map.vmi, map.addr, map.end); + vma_merge_existing_range(&vmg); + } + __mmap_complete(&map, vma); return addr;