From patchwork Tue Nov 29 16:44:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 13058818 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 C4880C4167B for ; Tue, 29 Nov 2022 16:44:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26F2D8E0002; Tue, 29 Nov 2022 11:44:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D1E98E0001; Tue, 29 Nov 2022 11:44:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3D348E0002; Tue, 29 Nov 2022 11:44:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E15AC8E0001 for ; Tue, 29 Nov 2022 11:44:27 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id ADA6C1C6265 for ; Tue, 29 Nov 2022 16:44:27 +0000 (UTC) X-FDA: 80187052974.19.EBA111C Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf10.hostedemail.com (Postfix) with ESMTP id 36FDFC0011 for ; Tue, 29 Nov 2022 16:44:27 +0000 (UTC) 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 2ATGPitT017353; Tue, 29 Nov 2022 16:44:26 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=MeWAgNHkqtDGHNJyVDaXVgFTDWgD+IXgAuiuBpJtiEA=; b=2crd6MODmo0wIt7NRa0JXs2csMz5W5gzOHvkbc030KwdUpw+0DsNqvo74GJrhbh5TRNF IOfbHRKIZCaLVIVR6FGoYUzTNZMwsHBXUcWKEfBApwO1HRLVsdK72PzE1kiO1GJaozx7 G68EEPl1GpFAUAQZVdzeLDt75+NiAQagEZQukE6248w4GX3gzjcsgdQeNchLuZ6q1EYj ZdBc6GN+vJAmcuDSqjjzZY4eWig+DL+n1QW7gMvd6Yxhvf1WB+aM8MnAu28AfZa9Loi/ lF4qeox+Pqaa8O/qvCuufotU0nKG8D2Ni2hEozc0fFocA2Jhf0bhpZg3s2IwjD50Uhr9 IQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3m3xht6hm5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2022 16:44:25 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2ATG7rBY030968; Tue, 29 Nov 2022 16:44:25 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2109.outbound.protection.outlook.com [104.47.58.109]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3m398771pv-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 29 Nov 2022 16:44:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jhBK03iYD64DzTBDGNiniEqkPXyU0JlGmsG59bFcqmtVmvhImmJyo4TytJ13NDkl7iXzF3Biz9/ve2JVGWbJeXvKoDGT8TVSDIdzTQkJHBkdDS1ztkWaXJYdozBX6uXrTugQMBxFsv3FMGMuknjVs7HQM0O3nk2K9CnnBIqeTGhhbWq/VJjXW3GTEO5fkBuwHcRylzt63Zj4g5Csadqi4gnalY3En2mlmGPou3r/hZKAJaGHjAEpGf3d4l06nae1RczAit6pMsDom5x/2xHJO2urChIYS/ySbJIw94OIJNJOaN5GlOkRuWbVRocVrNJFE1ni81ASxJuKcJBfrMqafw== 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=MeWAgNHkqtDGHNJyVDaXVgFTDWgD+IXgAuiuBpJtiEA=; b=C0VRugfMEvfKTplWtpeJVwa7AyJR9Gg70YxsKWv27I/U2VozQIh2xVshyhx69mraJGnvkAz8j755KvyZzdXjMnHKqmxxtBFa33gHO58PXoN1znI2MnmTiGbXSedAjNNMERR+s+804axO21n+3T2QxvJ09Ac8qOjaN0/kbCZytx+dhdJB111Ri441yBxnuvIa9K09KlodiyXnk3sck0eToQFlR8pPEdTI5rLwrbAMyKgQwl6hFGmiXJEqxiI/ThdUscS0grHPJtnbFlyO1On1/TVHGQoUk3YT+ZoP3LCX8JckEImVc6z0yQEdaId9ellOGq4yRn4jn1bfmoBvIurWeA== 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=MeWAgNHkqtDGHNJyVDaXVgFTDWgD+IXgAuiuBpJtiEA=; b=bPQ7Xamf0A6cS4yN6VeJ/0IfxqnDiCdRxImlC8lL8M+dczTarI3SI5BaK9x6nVv1FCMa5spMk/7J4AlZwqVZdDrqyZfB3g/EORqjeSrm4irRe4tkdagCoOZi9NdevJQRYcLD6cgaSAgPU1EWkU4faIwyCcr1RTW4nt0vjYJyh8E= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CH0PR10MB5321.namprd10.prod.outlook.com (2603:10b6:610:c9::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Tue, 29 Nov 2022 16:44:22 +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.5857.022; Tue, 29 Nov 2022 16:44:22 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Liam Howlett , Liam Howlett Subject: [PATCH 06/43] mm/mmap: convert brk to use vma iterator Thread-Topic: [PATCH 06/43] mm/mmap: convert brk to use vma iterator Thread-Index: AQHZBBHVFu3dWvklbEa+O/yWENlnqg== Date: Tue, 29 Nov 2022 16:44:21 +0000 Message-ID: <20221129164352.3374638-7-Liam.Howlett@oracle.com> References: <20221129164352.3374638-1-Liam.Howlett@oracle.com> In-Reply-To: <20221129164352.3374638-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_|CH0PR10MB5321:EE_ x-ms-office365-filtering-correlation-id: 6ce2e79b-72c3-4316-230a-08dad228f7ee x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 8XURLunfrUz9TAb/p++Ph5h6UoaPIDBO3DZcZd4xloEWu4zMvXcL1ACyqUpNwefqGx4XcCj98bn2s7oah1VpJlkK9LouSoSPqo9snzVlPcklmHgJhk+pFNEh03CYl4q1TNJh1rlIULVQfYzxphgH67OlEzVWhXvZRcKX3dhsxFr1zSaVIs/CVRrgoLsaZjrZT3RNqy+F701e5eNDlXpc0JFTc1sZBwwQMdCBJg/2GkE8zus9seVwVrotHPtGBCC8TCuL9m9GEtqeEV1vnBVt+0rsGgjzIAUNw0znn4T8uZnRaY5zE/u27deu9yQMsFQVkcODdtuI4c2LAd4XgpRNyK3OVzl9F3v/AFRc4I1HqPS7SnrGTQM8A0BWz/eCpSltSpN5ajt9A3iGFIQRbPCvHshbXs1sRQiDDF/kUMfKRu8mBRD9H1G9+ymPCUPolt/Ihv3AP2N0E0j9SSw8yEPMdZR0bfTnnLN2xnlexBFGw9oTedWauwzfZqrUmpYfiy8PvIrqKKDzj+9ivEML0vSeewF0uMqFoM6QJrorgpKNe41M+zYo5W6N5YImXt5WGlLOGTfOVb4etuHlR0z9oVFOmMmsnGODINcHvyaMKgnQzqoDFumqV2xWboZDUZo+aazhwpqrYXIpaxlfEVB4D+Ng+7bMXQYWxRWzGLMh2iJYvJGpPYMNqfmVPrEALf4wWgWSSHY7NM8otgxu22qfowYNrg== 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)(136003)(39860400002)(346002)(376002)(396003)(366004)(451199015)(83380400001)(54906003)(71200400001)(6506007)(107886003)(110136005)(6486002)(86362001)(36756003)(38070700005)(6512007)(38100700002)(122000001)(2616005)(26005)(1076003)(186003)(8936002)(5660300002)(66446008)(478600001)(44832011)(8676002)(66946007)(66556008)(64756008)(76116006)(66476007)(41300700001)(4326008)(2906002)(91956017)(316002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?pCmVH57N45iy43sy8oQOv5u?= =?iso-8859-1?q?csDYOAgihgp9614grIX6RMOyLPKbOXZHpKPy0OFbIxWfuPkj2vaeHsJh7aTY?= =?iso-8859-1?q?Ti/saC68CBfrJyMNZ+JloNR4DbsYlcZHtM2WM4wNKIhzXNxo81Ep65Gg8U7t?= =?iso-8859-1?q?i7BUxDHPAs1+/IvlcudAzvyfarb98JLgwVl8kGv5OeiqsGDjYzSpBMmuDhFK?= =?iso-8859-1?q?oxs5xezNp9a8NpzIZQEnb+yzMay05+lKVaF9f2zwD8AGt+mtHJ86AbYdxutD?= =?iso-8859-1?q?k6qTIiKZhUxD83IsQO0M3gi+7XgPSDbWUCmjFVyUi2ZxEtadvAezj/QbbO9V?= =?iso-8859-1?q?c8Xi0bffvjmiku6l18wQqUqjCYuu+iZtb5maUxOEPdy9TIbD4LyeLbSgtmEK?= =?iso-8859-1?q?NNg3868eWTk9hS1Ws+W5pbT/HCrLb9eQQ6liFivNK5Co09FkSZRK0kch4l2R?= =?iso-8859-1?q?pJu0QPZYQajXUCOeGesBkFpUYGk9XnmGOSKGRCMe9uN2pWY11Z7O/vpnunHg?= =?iso-8859-1?q?FCN7w3hb0Gzec1aBaN7O1hiD3xwLGcaaN5UrVs2qMA3sIgxXJMZ/dbkyurIc?= =?iso-8859-1?q?Y/jUxXqJk2Vy5LMSccIkbw+2QV8dlLQ+Qg+7Fyp5gVB/RkTLK1WjDPC41XSk?= =?iso-8859-1?q?K7bQwy5XtWPpBUfwB6CYYE2oWDWrrcDHywQOuO4GOkDJt4tiHUe6oBMKm/pt?= =?iso-8859-1?q?BeN45wTvN4uCYjHC3X7wZr3Wq3tV8QREC6+CmnP9can7SQc2CisvaxeLJ5u4?= =?iso-8859-1?q?+dAfiMIujscNqPUqE8HFzxX7TeMJ6W7+6QsFteVbaFLFUdSyoWkIOiELUIm/?= =?iso-8859-1?q?W9vJw3smWHmNxAbeBdydHewhJ4VcVtx86KaXUXp77FfhW2AvKTAvFocHTdQo?= =?iso-8859-1?q?BdLNVrROWGQu+tJ7NH6fWcbXnNvL2RAGbgjpz1sWz5aBzSgw5lYSZ0bJgzal?= =?iso-8859-1?q?YB6ATV05pN+1ccxp8W/Nve0Fye5rscIUU17Ui57JfqX7UCAefRFKZ+h0oqx9?= =?iso-8859-1?q?CsJ1rEEBE2cvlLda2BgrlNk6aL3w9tEJmidCsHH+V1LSDa1/EH0NugjURsQ5?= =?iso-8859-1?q?FPPTOfKzzI3NY69uVgQN5+EUdVC6kX1EcN7ekvQ3uD9qrj6r2JsqFI95r8fn?= =?iso-8859-1?q?kT1PmfhnFjetgZXlZADZOQo/uQq8f8uqtzXdBkpFGKYlA0En1XoguQRB2upd?= =?iso-8859-1?q?QV9HwDeZjF8aZ9rk+bBhd3LZwAxUg++ZsEmj2ol5sqv2lUKE5zUgshm6haMA?= =?iso-8859-1?q?8O6/Pxx251FxVZHCSn90bG9Gi3WCHlozM3a9siHWJtkexVcqzzQOTv347SZ7?= =?iso-8859-1?q?ANdkNcIkrFfZCIV2y895O0rqWR59lKny1I1RR1b9+PeTCNXeTzkxtotEC5eT?= =?iso-8859-1?q?x5EEbLa7Xj/V5Eponuz7rYBpjY51bLVtJJRPmfbGbOTNpEhHjj6pNg3AbaRY?= =?iso-8859-1?q?O91m/U9xwQ8Xa6tmjF9AxqBH7PkA00btademnCMn62BJw9vcRwwNLy0H0KNl?= =?iso-8859-1?q?IRKwPbk8WRRiVG1x3LEGEipPt4wd7dI6tNBu8WxDv/sFaKsw0fcM3/KRNs4V?= =?iso-8859-1?q?Ks4Kh7xLupjUvECoG2Nu13sSEGfP/JeQdv+x7Jivb7OFvLZApWHs6Psydc8R?= =?iso-8859-1?q?lpFElL+H6Irq5ARtFA57hiRuZtJgGYbGx3OpzVw=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: H4aOooYZd7rgR7GnDGckBxxK8Biw0zi1f8ImB9dU6IkgEFfmJVl4l7R+FiH7wQItKL2cS/3mQMGRw7mCu61ietPEhYx1BXYmsjjXL6gIYFDRoHqdW7CdXKo2c8jyCCxq7f/RK1+R9dC6Ju6unMWyX5V004vJt6Z2/rtwyrIosS2K1ZUwc6i64gkv5WxcxI9icTDlu7xov6LvQoIjSw/EvIwBVSrNRfSxQFs0P4A3WdD2O2RWVixn0uJwmn/rGu/Z/EAJUGx9TcHBUQNqcM3u5VCSb27BpUtGOHiLEW3RcZZcNjG5ZDoN1SZQOO3khDlbzGBnyLdtHj1iU3nWv3FwtlyKj96Ko3/5BAyERGww4bYF+atszE+ktygJpiuUBKfuIQlSMrEwEWAO7+YBfUw0g90F/uO/38MkiBajK919XFiBc2PYbXS6aql+m34fH7e/g8SJrkC9AVbU0h2nb61X9F2mVN7qWhhElU/nDNr1wqA4W4TcSZSVoS//4NUSTxHLBgX5Ci/aLos0J5Lm3t7GzdhwvJmDR7+Qz111o/P3UA8JPfxgKkzUE9A1hM7ARYOtDfsClI2eYQVu0Fq36k5C+Zrn8Zu3wjl4cFD3jApNMvt/gWPZPCqyvOHErh1p/Y2HJU66c6s5wA+TxQ3v99yyyFMJQHW/m4qi9E3/F2DIe3O3THFxY2Ey0rbpJmwYhtlHtOV3fMV7qcptLSxMGV4OBFW9qXoltvyAsXTiHjXgmmK1ABgEVvzjbKJJcOgJV+/9js14bhMYePAEu0cNNC9vxqezulCgBR+PFIEq2wkkUm5QKZ5HdjpwjMfxVB2slbKv8tXHDIgSNYQt2rgYSfzqUqE3uJV6zglMCsWgRGsMk/C+GqoEyJ4OxT0EWsjzZMiFW/SFeNdZMuwTHOw16z1r2A== 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: 6ce2e79b-72c3-4316-230a-08dad228f7ee X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2022 16:44:21.9731 (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: GNpQh3du73d3RKlFEI43Dy2Wi9Z6+//fJ0MfmiaVFl1/JNfeZBbERKW1TGdYTb9/Gr608HohNlowv/AaZVRIvQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5321 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-29_11,2022-11-29_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211290093 X-Proofpoint-GUID: ZJOK3fIHbsUjKiuNJxOvZNNUsJC_NrXf X-Proofpoint-ORIG-GUID: ZJOK3fIHbsUjKiuNJxOvZNNUsJC_NrXf ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1669740267; a=rsa-sha256; cv=pass; b=rTL6mVgiyNDAK25NyioXsw7xX21fW7d4KC5swp1slB3n9wNY+UgwP3aeDVW72OxKKR3Nnu 4gFDgCGrkXDYDeoGaYv3UkQIv26O0yO+jRlVhKK4ctNDmIClzGQpbG2CA6WTKiST7dOSgS CgXcrcARUbCn5OhS+kISfD+5049SoJc= ARC-Authentication-Results: i=2; imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=2crd6MOD; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=bPQ7Xamf; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf10.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669740267; 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=MeWAgNHkqtDGHNJyVDaXVgFTDWgD+IXgAuiuBpJtiEA=; b=kPRo4X5iI1lTEFaAWQcPVnxh8VoX0Hr6ylr/mJqWCYxxlKKSWY7Rf8wwECqkPMRdHApSUf GYVske3EXB7NZDvllncoTZqT38+DO4BXxrZKuxap8ZWCG/qag7Ulzgx2QdDGh9dZOpvZDv IW1fvoF5kvlp8DkvTh/9qpHEeQedmnM= X-Rspamd-Queue-Id: 36FDFC0011 X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=2crd6MOD; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=bPQ7Xamf; dmarc=pass (policy=none) header.from=oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf10.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com X-Rspamd-Server: rspam09 X-Stat-Signature: d6zqjmczsp7bytcjeedh3f3pfbob75qq X-HE-Tag: 1669740267-979020 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" Use the vma iterator API for the brk() system call. This will provide type safety at compile time. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 8f24021ef5b5..054dd3e8e1a4 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -236,10 +236,10 @@ static int check_brk_limits(unsigned long addr, unsigned long len) return mlock_future_check(current->mm, current->mm->def_flags, len); } -static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, +static int do_brk_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long newbrk, unsigned long oldbrk, struct list_head *uf); -static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *brkvma, +static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *brkvma, unsigned long addr, unsigned long request, unsigned long flags); SYSCALL_DEFINE1(brk, unsigned long, brk) { @@ -250,7 +250,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) bool populate; bool downgraded = false; LIST_HEAD(uf); - MA_STATE(mas, &mm->mm_mt, 0, 0); + struct vma_iterator vmi; if (mmap_write_lock_killable(mm)) return -EINTR; @@ -298,8 +298,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) int ret; /* Search one past newbrk */ - mas_set(&mas, newbrk); - brkvma = mas_find(&mas, oldbrk); + vma_iter_init(&vmi, mm, newbrk); + brkvma = vma_find(&vmi, oldbrk); BUG_ON(brkvma == NULL); if (brkvma->vm_start >= oldbrk) goto out; /* mapping intersects with an existing non-brk vma. */ @@ -309,7 +309,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) * before calling do_brk_munmap(). */ mm->brk = brk; - ret = do_brk_munmap(&mas, brkvma, newbrk, oldbrk, &uf); + ret = do_brk_munmap(&vmi, brkvma, newbrk, oldbrk, &uf); if (ret == 1) { downgraded = true; goto success; @@ -327,14 +327,14 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) * Only check if the next VMA is within the stack_guard_gap of the * expansion area */ - mas_set(&mas, oldbrk); - next = mas_find(&mas, newbrk - 1 + PAGE_SIZE + stack_guard_gap); + vma_iter_init(&vmi, mm, oldbrk); + next = vma_find(&vmi, newbrk + PAGE_SIZE + stack_guard_gap); if (next && newbrk + PAGE_SIZE > vm_start_gap(next)) goto out; - brkvma = mas_prev(&mas, mm->start_brk); + brkvma = vma_prev_limit(&vmi, mm->start_brk); /* Ok, looks good - let it rip. */ - if (do_brk_flags(&mas, brkvma, oldbrk, newbrk - oldbrk, 0) < 0) + if (do_brk_flags(&vmi, brkvma, oldbrk, newbrk - oldbrk, 0) < 0) goto out; mm->brk = brk; @@ -2964,7 +2964,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, /* * brk_munmap() - Unmap a parital vma. - * @mas: The maple tree state. + * @vmi: The vma iterator * @vma: The vma to be modified * @newbrk: the start of the address to unmap * @oldbrk: The end of the address to unmap @@ -2974,7 +2974,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, * unmaps a partial VMA mapping. Does not handle alignment, downgrades lock if * possible. */ -static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, +static int do_brk_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long newbrk, unsigned long oldbrk, struct list_head *uf) { @@ -2982,14 +2982,14 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, int ret; arch_unmap(mm, newbrk, oldbrk); - ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, true); + ret = do_mas_align_munmap(&vmi->mas, vma, mm, newbrk, oldbrk, uf, true); validate_mm_mt(mm); return ret; } /* * do_brk_flags() - Increase the brk vma if the flags match. - * @mas: The maple tree state. + * @vmi: The vma iterator * @addr: The start address * @len: The length of the increase * @vma: The vma, @@ -2999,7 +2999,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, * do not match then create a new anonymous VMA. Eventually we may be able to * do some brk-specific accounting here. */ -static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, +static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long flags) { struct mm_struct *mm = current->mm; @@ -3026,8 +3026,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, if (vma && (!vma->anon_vma || list_is_singular(&vma->anon_vma_chain)) && ((vma->vm_flags & ~VM_SOFTDIRTY) == flags)) { - mas_set_range(mas, vma->vm_start, addr + len - 1); - if (mas_preallocate(mas, vma, GFP_KERNEL)) + if (vma_iter_prealloc(vmi, vma)) return -ENOMEM; vma_adjust_trans_huge(vma, vma->vm_start, addr + len, 0); @@ -3037,7 +3036,7 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, } vma->vm_end = addr + len; vma->vm_flags |= VM_SOFTDIRTY; - mas_store_prealloc(mas, vma); + vma_iter_store(vmi, vma); if (vma->anon_vma) { anon_vma_interval_tree_post_update_vma(vma); @@ -3058,8 +3057,8 @@ static int do_brk_flags(struct ma_state *mas, struct vm_area_struct *vma, vma->vm_pgoff = addr >> PAGE_SHIFT; vma->vm_flags = flags; vma->vm_page_prot = vm_get_page_prot(flags); - mas_set_range(mas, vma->vm_start, addr + len - 1); - if (mas_store_gfp(mas, vma, GFP_KERNEL)) + mas_set_range(&vmi->mas, vma->vm_start, vma->vm_end - 1); + if (vma_iter_store_gfp(vmi, vma, GFP_KERNEL)) goto mas_store_fail; mm->map_count++; @@ -3088,7 +3087,7 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) int ret; bool populate; LIST_HEAD(uf); - MA_STATE(mas, &mm->mm_mt, addr, addr); + VMA_ITERATOR(vmi, mm, addr); len = PAGE_ALIGN(request); if (len < request) @@ -3107,17 +3106,17 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags) if (ret) goto limits_failed; - ret = do_mas_munmap(&mas, mm, addr, len, &uf, 0); + ret = do_mas_munmap(&vmi.mas, mm, addr, len, &uf, 0); if (ret) goto munmap_failed; - vma = mas_prev(&mas, 0); + vma = vma_prev(&vmi); if (!vma || vma->vm_end != addr || vma_policy(vma) || !can_vma_merge_after(vma, flags, NULL, NULL, addr >> PAGE_SHIFT, NULL_VM_UFFD_CTX, NULL)) vma = NULL; - ret = do_brk_flags(&mas, vma, addr, len, flags); + ret = do_brk_flags(&vmi, vma, addr, len, flags); populate = ((mm->def_flags & VM_LOCKED) != 0); mmap_write_unlock(mm); userfaultfd_unmap_complete(mm, &uf);