From patchwork Tue Jan 17 02:34:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13104096 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 A8BF3C67871 for ; Tue, 17 Jan 2023 02:35:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8FA9B6B00A0; Mon, 16 Jan 2023 21:35:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AAED6B00A3; Mon, 16 Jan 2023 21:35:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 662926B00A4; Mon, 16 Jan 2023 21:35:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4EAE46B00A0 for ; Mon, 16 Jan 2023 21:35:05 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3342E1C632D for ; Tue, 17 Jan 2023 02:35:05 +0000 (UTC) X-FDA: 80362723770.06.79F877A Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf26.hostedemail.com (Postfix) with ESMTP id D5B1C14000A for ; Tue, 17 Jan 2023 02:35:01 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=xz6yGpqC; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="MzV/od2B"; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf26.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673922902; 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=E+9ifWADgkFlLD0yETbDnYCr7mlrp9fHkkCv1OWXPaM=; b=rOIYWT/X9eYe8UixLW5bjKLfI0GnQb5ax3Dsn9FecPIc62GJ7POFo+C3DrAF4g0WWh7C8T h8O7AvGKD8057n7XNdf/CXoURRafFZltMgHuGhVchyX1hNW+ASBrBQEKl9crWe2ZbODgNw jtzYmQLhLAsMRoPrGh14LAqupQURdHY= ARC-Authentication-Results: i=2; imf26.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=xz6yGpqC; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="MzV/od2B"; dmarc=pass (policy=none) header.from=oracle.com; spf=pass (imf26.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1673922902; a=rsa-sha256; cv=pass; b=Ziu8BVoQ4Iiypnq3cWjXUqvCmHwYEBNIZyIa7AqhnMcfCK8YE957xpSJwEexWZDpwZ8r5Y AI8htTeoLOS9FUzJ5Z59KWxUqu60QR717XY7vcn76qpALiDektQXJLVnrlJT+PQ4/bPC8n asFcRTQTLgqouWj9rAxHZeRFwY/B54w= Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30H09ZNS011743; Tue, 17 Jan 2023 02:35:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=E+9ifWADgkFlLD0yETbDnYCr7mlrp9fHkkCv1OWXPaM=; b=xz6yGpqCZW4jpx84BnfXfowxiSEHimApoEc0F82hPcKhxIQEgdkB7xtFzQRhymytdrAx Al8sdNiSf+6QGqfGwsnsjn1avih0dpL8HMWjzPwGUob8xv9kHCwGE0V2vo3HX70dk5Xo 6a11/c0IMSTuXSEHDD3mO2EytupfRuyuwavm6z7mL3LMaFCMGQeZEN7+bkthNahlHg+q dU4x9f2dESBdyRcpIfgSZnRawPBAYtNJuMYNTfQLNbVmerMPRUUXofbnYcTGpKycRSW2 6LsLY0JuoyOiEFlqBh0RiH2Hnk+qTM/1i7N3qhYN32cbjCQG1eRuxV4mE1Vg8YZz0la7 Bg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3n3k00urd2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Jan 2023 02:35:00 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 30GNCpCT004918; Tue, 17 Jan 2023 02:34:59 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3n4qyy10ss-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Jan 2023 02:34:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WnIB0ktIbh/uonlFGVhAdWsQckIPS9g2zk8oco1bTMwptKsLWwGJVIAjUDrIr9UBKAKHRdHHK45T/fKd0aKm990ML+VpADCcpLWUaxJtX+iJV6kV3iNaqJcdQjwFSp2jZt628zGvEABD2OuHtPs+ZHmyPVm5JglG542l4rJSSEx5XOWWpwqeWrxlxpXl2FwUurHLcGBAMLP6uFvijv6l5uTxzR+dL5coA+6wAyPvMoyr05ffJcuhiTOyR07mHV/zJFkhcxdriNUBl1mznJEcPnPjgnR4FzW8/zeALStCqzANxco5nPGvTnyk/kEeEy03xO8lgqZAX5po5a1SJJ2FkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=E+9ifWADgkFlLD0yETbDnYCr7mlrp9fHkkCv1OWXPaM=; b=DD95OJD3XeAPmOTaUUf/Pd0xib9BzrxTcN3XBUXKzuL35vcSbe2EV695ajubQ3sDKQ+3QC1Lu18Ar2bALDWtN/za/qiMrRVrkfOJ9tuSKTqRzEd5m1hgqdcQYnrUBwwSEWLSNT3ek0K9Ew+RG7HZ7f6qOltXoJ/fYhkSVrA423JrIjaJ5VFXazurNEOsnGi5W5LIyAnLSEPWE290CAFqxcyD7oTdPw/xAoLm1Rop/Y+HOvzXwkItbGbxus+A98OcxxJO37zSgMkfZnhk5dSo24WL67ZewZekx2/gcGFfgxF/Kv1LHx+cnYDMN1fGs3x2ywom1a4LsRKdsOC27vPoFg== 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=E+9ifWADgkFlLD0yETbDnYCr7mlrp9fHkkCv1OWXPaM=; b=MzV/od2BbWxaSFdEAT5gjVKLYFCyRm3nvdd+9kOSzljZzU4YC8JxMYlhBGuV/8bhWxTZylA4dfTDgUWOiu0UxnC4af/YrHXxXnNLL/AnOPNRGH6W5XracOLjxy06vxnfp/9GVt71DlP5/4H1ZnVtGnDGjIMRBP6OQWq3ZEWZ2Ec= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CO6PR10MB5538.namprd10.prod.outlook.com (2603:10b6:303:135::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6002.9; Tue, 17 Jan 2023 02:34:57 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::a02:2ac8:ee3e:682%4]) with mapi id 15.20.6002.012; Tue, 17 Jan 2023 02:34:57 +0000 From: Liam Howlett To: "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , "maple-tree@lists.infradead.org" CC: Liam Howlett , Liam Howlett Subject: [PATCH v3 35/48] mm: Pass vma iterator through to __vma_adjust() Thread-Topic: [PATCH v3 35/48] mm: Pass vma iterator through to __vma_adjust() Thread-Index: AQHZKhw0ZUT/xsZUUU27bhMB6v5Ehw== Date: Tue, 17 Jan 2023 02:34:20 +0000 Message-ID: <20230117023335.1690727-36-Liam.Howlett@oracle.com> References: <20230117023335.1690727-1-Liam.Howlett@oracle.com> In-Reply-To: <20230117023335.1690727-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.35.1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR10MB3022:EE_|CO6PR10MB5538:EE_ x-ms-office365-filtering-correlation-id: 3253e746-3773-408c-57d5-08daf8336c4e x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rrTKbo5gPZowe1V0q2vQ7nn04UBM9rbei4SwwyVgmRSyK0Md76CFk0XyCHqYRah7QaA26IQMLheY4C8RXh3yp5rcCBPxZI2tOiux+cpl9BqjoHt7RhKJPsOGw+IsqBD0TlIpsqMncrUXI7tqKzaJBDpLjxiTyl4YF6U8l/XOIk179vZpTikT2USD8fM8jpIQjiOszDtLsV9WaDp80WbtynD5z/3rVug8aLkAt1tzxtIK6kCSKHnyxBw/q5BmpzLddA1vlUF4oLoBl30tf/WMHx04g34NJ+hVyUcENwzM/QY8bY8L/rXldEzXeA9UbM9ULsblnurjoLewX/4R11lskL4hoeL6/Y8X+WWN/BAdVjwM4rS1oxz98UQGRLSCF9fSZB5Vbpi+do7JuD67SewRsUvEuKsAgJatXVbHiLSc1OZDCjeYDITkXlMReAUicx+7EamvL6j7LjAF7PCHhyy2h6FXfTgpjiA0nFzaWhwbf/nnAtloDQrfzHkFptMfZdK7mmAQqlyG1cAVZzbFf4n7PvHLxpSFAgamfZVJVxz7noo+4uvOHXIMfgLiW+Ycm2HGcIS5KL5yQOQokn1gyjc4lYY1CQPEuMUNUj+CR3cP84dxemJeXAyGcVq/COOydgfxq738PDXUhN18EHkQnrQ7DLMNEO7vtSpD01RmCQzOrLmdvE3ZQGwZ+PXFPpHjr4nrbagKGUAXOx0K9T2Hy5FuPw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(366004)(346002)(396003)(136003)(376002)(39860400002)(451199015)(36756003)(91956017)(86362001)(8676002)(6512007)(64756008)(4326008)(186003)(76116006)(66946007)(66556008)(41300700001)(2616005)(66446008)(26005)(66476007)(316002)(71200400001)(478600001)(6666004)(38070700005)(6506007)(54906003)(110136005)(107886003)(6486002)(44832011)(122000001)(38100700002)(2906002)(5660300002)(83380400001)(8936002)(1076003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?7Yq63kbOHmQWzlmA4GJyp6w?= =?iso-8859-1?q?kLFBx8IxOgsdAPwrM4kXaOhMQ++8w20m/SR0SFHpaTncE/vULKIORha+MYr9?= =?iso-8859-1?q?90E/8bM2hJ5TbFuDjK6dtFbvgJ2gcI7NJZO91T7uvIVrofhqj1SVHK6/k99i?= =?iso-8859-1?q?42/uO8ViZGZeevGzWbptXJA3lKztkZfZuO8FnsdVNxJnvhDw2vzGU2rHC121?= =?iso-8859-1?q?ub9F2AkhiXhY/dC3NfkAzM+4XwNbWWv73JYyiv2kPzlPgHm77SbEAuGdDhTe?= =?iso-8859-1?q?+7NeNayBDndw1aHdWkXQF0zgEjUDjEFm7kGCHdAwXG7wqfRKd0mJUi99kTWc?= =?iso-8859-1?q?vspbYiCLaFjIKRmac6i6OT+xv8adtdp7PfzPrC+ZjwfGFb0Bjb1YZtrvQWAv?= =?iso-8859-1?q?PBU1lYYXvkdNgAK6ZbmUNF+dxQlTDap2T49G3rsAyK9JhFj13g3kFlOk2WRW?= =?iso-8859-1?q?e/vlbMvHzj2tQJyFKMInJMtw+oxPOyrDg9uYhI8UtCLWYzQMu1WNkBNsJWjg?= =?iso-8859-1?q?Lru4Fu1fJ+UbQIEKCZgFG8eJ7F3P8Si7+mus5U6xrvp8GM1zXDWPtK2FpNY6?= =?iso-8859-1?q?HXHenWsJnavkRjxslcu+PZF/uuO4cpDLmwi7Yu2e7ttvVIj8AePAwOk2ULx3?= =?iso-8859-1?q?Bh391EEvvVou/iR5nZDUC/WGU7Sy+DnF/8QOo+ca3l58BKQdblVGVXd9FA17?= =?iso-8859-1?q?5PqQ0Rlpqfiq22V9wWhNPleG3N7nINtghjYuc683iWq2UiEYjZeei9RixVwj?= =?iso-8859-1?q?QQzIzMMSTJiu9uAads7HN5rTcOFFixZd2YgmnoGxKPMuTYYngZ9BMGlgrdlV?= =?iso-8859-1?q?Wbf5rsPSb9131zreHouw+wGnaehgBrOQTA8E6ZQFx6C7OvC4zuc1H0gzFqlT?= =?iso-8859-1?q?pMBMpeJoGWwqjsIJrf3cqh6m2puQU+h2Ptw+uGGr9k0rOnQbeigilMS+16rP?= =?iso-8859-1?q?P8XaYI3C6ir2TvsEQtnHWwsHej7Q925Gat+p64yJ7x5Hhvq7fCrF++5xFYNi?= =?iso-8859-1?q?TuGYxJ3xoUJc35B5jpbNuysXYqoFKEDZwkU8NOHNsx21vQGdXlxn3aV3tHJb?= =?iso-8859-1?q?RHCJ2/CJR7T07hzw2ubWW0OWgHlvL+yaCuERfrRX25jy2t9FP3hwwt2/T40Q?= =?iso-8859-1?q?NmFLDTCgMlOJOk2aTZAmfsKFLhRrvOHS/zC49JC+4FYyThMf6LRGuJVFSFa4?= =?iso-8859-1?q?IHkE1XRRuGfFnV5jLELOg4zDYnz8HuvovXXdYEmW9ZAiCdiKHEWb8uA4MGN4?= =?iso-8859-1?q?sy6zkLKviWYiEZ/EZJz4OPdCsdjjk35t6+p/aa3EOUr8k8gncnATl8jIHSTt?= =?iso-8859-1?q?Q/MSDsth1eDAq5nj26m+OUU9ztw5knGQwdn8X999fzBWn4MdlMOEA+hpGLBt?= =?iso-8859-1?q?MzbpGyn9sgbx5E5Q0eapFKhd+V5n3zXyXh91PoyYL7Z0RhsiZdwGG0inbnfM?= =?iso-8859-1?q?gF5WaT7uDKMdseKUNqbdbpac+vNhkaZxZ5L+pnfYi2lOFTXOhjiZn2VrwJFa?= =?iso-8859-1?q?InlEjSpPFKSm63e96HykQzXpfYgHb340ywo5+VvL59IW1Nib/pobZELkBNWi?= =?iso-8859-1?q?pnyCBrhQwsqHt03Na4RCx9Zztqkg5i23/BFwMR3Np4/TRFW1GF/7duOYMXVT?= =?iso-8859-1?q?I1+MLekaM9PXLn65AcvI2dlPJ5iH3hPbKd3ePyQ=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: GXWbJejQiAlc+dd6HlPJV/7OkL3QScrJ0bAFX2Z4q0zKLh9lEvp1rvmALDXhE52i5mEshXL0xclwKipWX3ujSF6j930rKBdq9CNBo+Du2RSnFPJJ8NJwFb6KxHw8Ezvv2MgftrsglysM3UcO6uHIuV6h4Esk5oiRqlYIu0bjYdZOxQ9B+klxVKH165/mRQIBomXtc/rqTXd0LZxugQ4N+xW4jcLvGWAWDW9/TN+vXY7LtWU/r8l7KaIXlXCoOTRvyma8CwRoUug9SM2bf1+J+seAJowAz882egB453IikZ1bwUTyhdKY6lhQMdR9BCkULJKbUyJrB7vRuMY5CCCmXY1lduYan7CY4P+9IqZWGk6J6sKoTAd2hddy0qLzWP7KcZyo/vBGegymCd1VfdtZc2qv45EVJaizDb17jHGghIyt/TC3UBAtiYG8tJPu7/va9T0Q8fOWt25rwJKRvNg0P3i3uLzmJbLEfAyr/lA1SrPhOENG3FozMST/ESjFazDwDJ6j1/n0Kp1FcQu1AjtgQ0i7qdlyNEzxjKqcNEmizj6J6LdJO92TJiTrMM3CxclY0pgHdcOuHL+x25AR0/4Nubr6jnnnos0rvF5KpyxDWSLDtZmD+KZzYmjB8ZU5Zbex8Z6v/B9X7/Xe3k95cz8DLVglmcW/Xsb1bFbH2aMHLMQWPDh7tw4uHOnRj1cSA0tcZ8ruFLndCSWERpKzT1AKjMpVAFceCymYduf0j0hBLAJljzBEDgQJQ/RKDiVyW0MR+0KpGTymXeTJZDfWXRwv7z22Wi418bXj1pGmYmU4mUdKBeNNGfifMxQNBgDshSaNmWQeRKt9GHJ5utHYR8YyEy356p0zbGoUkI++Ep/0g4TBoTJwdF7CuxFTtk14BMFZBpheAbx9/RmS/DfvyWsccA== X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3253e746-3773-408c-57d5-08daf8336c4e X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 02:34:20.9840 (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: 3pGz3h4/OOB5pwijfJoTIBnsugDvu8aQs88T8uMcMNtb8fbAIMX6g5rJq5OK76w7quXmIoI0OMN8JO9tjvwe6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5538 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.923,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-16_18,2023-01-13_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0 phishscore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301170017 X-Proofpoint-GUID: 7FTccgzqhtVdvaiAM8EVUKIvdErUjxZ5 X-Proofpoint-ORIG-GUID: 7FTccgzqhtVdvaiAM8EVUKIvdErUjxZ5 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D5B1C14000A X-Stat-Signature: cd3t51b8by6yfx18eqtfx7osd5qftfgo X-HE-Tag: 1673922901-202848 X-HE-Meta: U2FsdGVkX1/RUPsor+zFkOFpgMJ7LytXw+RmC2BcAAST3CX5Mq9/wygG4Fk2xoJ9vCM9+2MAMbiEzUHxgdP/d1asp3aEan5pTOIlKkq3oeAYp31b53t5ouJbvXPHEMH8w/3mhmZd3QBqnikDoW3EMr87nxxDmY5wWfB6ks5DOj+KFodzytZyXVolO/x2noyzSQNs0n/QwcB3xY+KV0B2jE9+WgjF8gdbcWvGY4m/UozBzCnM65JKQxnT/S7kpquO0c+JrbdhUhA9NbTPPwxvvXrUGcALc9P8Rex66kleiOyv7GXPD77Var+F7KhVK3vrdXv+trudIYUaEstJ451F/dEvz8G97cIDJdZQDsVrWw4BB/gMge8qZPmqjh3na+eaebImTzaDI9OLBqi3aiwDg5lEmfOFNPYAUsMJzVJxS4ZZPuqSghL2IGu0psw3L4+JaxyNjE16Xn7BBfeTK6dPGg8qw8VM/CxP1Rhn8BrU2g/XS7t7TDPXbDyTN6Pl8hEX0ku0khPfYDv3ssEyAXpxArgjR8LoHY5pVOdCLA8e6c06bqIuGfN7pu/CvF7rRXeYnagKfi5Bsh3VEIH5arqbX4sCe6VJ3N/qQ2PFc20zJ5tvmwYpYjjMrzHBU2JW/59pXkDNHU9M42EoDnHy+6iBxIrXf3YFZ3rfeBmk2BK8P/fqEucxQgZZANvHSR/7FhO8ftIi40i1fW5LbhD+fclyAGFfh8AStT2DbRgUzWBsuc/EMN0xqPainOJzYcy/5O3byu3qJpUtvOpJ2LKjJl9twK8CBEkT09gHTZzW0U4vvSQQ5fkz3p+RohCQWF6s6o8x2u8hD+IvOb5cr1IX+B1zjv0afulzUQaJOdffuXWfitn87TvT/cdivP/FBZM4JotxImf5nMyrAGTif7DHtev0t/lAM4YPPGMd5FAJ7WNIu1uLZWxQMRqtHC/dUSWE+pzQLMGCYu0mKzNk25gwo5M /oR2lJ9M B7wqXfTZkgNAyL6K1B55Ga8DutqgxfulGuYnln2pB+HUMueOF66Z51EgvVzwshCpBvZUcuyv/YigsrsMhUOp8tBi02JcmewlGeeNZveB/dGscSA/1Jc65dalNBCjqa6g5LxkF7tzbTWc0+xb1wYcGwgCWoA== 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: From: "Liam R. Howlett" Pass the iterator through to be used in __vma_adjust(). The state of the iterator needs to be correct for the operation that will occur so make the adjustments. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index b37206f89e59..a8908280671f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -528,6 +528,10 @@ inline int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma, vma_interval_tree_remove(vma, root); } + /* VMA iterator points to previous, so set to start if necessary */ + if (vma_iter_addr(vmi) != start) + vma_iter_set(vmi, start); + vma->vm_start = start; vma->vm_end = end; vma->vm_pgoff = pgoff; @@ -2163,13 +2167,13 @@ static void unmap_region(struct mm_struct *mm, struct maple_tree *mt, /* * __split_vma() bypasses sysctl_max_map_count checking. We use this where it * has already been checked or doesn't make sense to fail. + * VMA Iterator will point to the end VMA. */ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long addr, int new_below) { struct vm_area_struct *new; int err; - unsigned long end = vma->vm_end; validate_mm_mt(vma->vm_mm); @@ -2205,14 +2209,17 @@ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, new->vm_ops->open(new); if (new_below) - err = vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff + - ((addr - new->vm_start) >> PAGE_SHIFT), new); + err = __vma_adjust(vmi, vma, addr, vma->vm_end, + vma->vm_pgoff + ((addr - new->vm_start) >> PAGE_SHIFT), + new, NULL); else - err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); + err = __vma_adjust(vmi, vma, vma->vm_start, addr, vma->vm_pgoff, + new, NULL); /* Success. */ if (!err) { - vma_iter_set(vmi, end); + if (new_below) + vma_next(vmi); return 0; } @@ -2307,8 +2314,7 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, if (error) goto start_split_failed; - vma_iter_set(vmi, start); - vma = vma_find(vmi, end); + vma = vma_iter_load(vmi); } prev = vma_prev(vmi); @@ -2328,7 +2334,6 @@ do_vmi_align_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, if (error) goto end_split_failed; - vma_iter_set(vmi, end); split = vma_prev(vmi); error = munmap_sidetree(split, &mas_detach); if (error) @@ -2572,6 +2577,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, goto unacct_error; } + vma_iter_set(&vmi, addr); vma->vm_start = addr; vma->vm_end = end; vma->vm_flags = vm_flags;