From patchwork Mon Apr 4 14:35:55 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: 12800342 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 075F7C433F5 for ; Mon, 4 Apr 2022 14:57:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42C138D002A; Mon, 4 Apr 2022 10:36:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DA788D0021; Mon, 4 Apr 2022 10:36:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 206398D002A; Mon, 4 Apr 2022 10:36:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0164.hostedemail.com [216.40.44.164]) by kanga.kvack.org (Postfix) with ESMTP id 0B7DF8D0021 for ; Mon, 4 Apr 2022 10:36:56 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id C9E59183D88D7 for ; Mon, 4 Apr 2022 14:36:45 +0000 (UTC) X-FDA: 79319447970.21.DD97885 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf30.hostedemail.com (Postfix) with ESMTP id 08D518001D for ; Mon, 4 Apr 2022 14:36:44 +0000 (UTC) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 234Dk3O8014690; Mon, 4 Apr 2022 14:36:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=GN4nSuCffCIRfDym4RFy4RsbprQZBXDZS4ZkAcH8gmY=; b=dKGazqIzv3dhalkKuyKNWQ7+YT7PkUYh34JQNnVDa4zFkHrXu5a17nLZqSt+P4TfLlwP 2mWtq1zE3q9xI2eB9AZD1t+E22sVrSHxwjluYd7LxjCFrY2cglks0SqekmY26Q6HeBpF lt+jgRAMQ5dQPFGJM1NcPfiTZC0JvzmnNSRiGiuJ455E1GVgmhWhVipbuEvC50Q60fZi OJOIXNVl0YCZDrD4g2J+LEex9V7+qOqaGCqR7RnnwfWawicdbwvF9N6qTNiE3d8o/gaq bb4UrpibHu4JEc+KXJRm3E198kzz51Di5dfuogTVYav/SV+5PGUDHZDarvmLTj+H5fdR zw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com with ESMTP id 3f6ec9kbyk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 04 Apr 2022 14:36:42 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 234EaJH6008393; Mon, 4 Apr 2022 14:36:35 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2175.outbound.protection.outlook.com [104.47.56.175]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com with ESMTP id 3f6cx2c9f1-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 04 Apr 2022 14:36:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ER5RJ23jw9skvpIvurTRh/OTNi0m4ZOb7QvbtVBB9Z/dlLR6HNvak2frrcq7cZvMyIL93yJs+cVl20JAypDB9RT7cjx863Ua72MKb7PJfsUirKp4Whhu8EmfVqZ63cNUS59MtRqh5mzpxbJWmcffNp35zu5WetpfS6ee5w9rHZY7FoirBe+8whjLIldhe+7uTqkiAKDTJVFzqPBpKEPYY0zOsOgmF0xx2NqHpKcdk+pPy8J9vAVg/vw73OS43XIbM+/3XrfKI9qSYnrphv1h7lbAqeWMCBrNFiAroLFDuM+JmJnMz9oOUylh6ynypek+C8AFL2idE0sHHrPfbBWG0w== 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=GN4nSuCffCIRfDym4RFy4RsbprQZBXDZS4ZkAcH8gmY=; b=Vwlks6fdB2AvmsJHhOf7t/k2diI/GSu527PfK+Dhr1ge2GONVNJnvmn1GqqdBCWwR9dRxomSV525TNKyxZuio9iDluI6sbJwJIceFJxaH3r2oX8BHY//qNSnIGT7EvWBuY9RxA6X5s+ENGPJL5vhqHn4odwQgJur2NieBiviCPd2C7QfporJTrLoDl3GmwrLIsT93wNt2HFOCQPJq+NRK/VyeUA1bSJW1+FjTiKKwGKKcNZPInlIC5UUxA5fdQwwUwAinCyWGRYxmR4QQwT7wULBDBxHaaJ1ERQiXgkhqnfbOV/TDjbr3bHpDM69sdwFcU33o0TqxJgziOqoLfzDEQ== 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=GN4nSuCffCIRfDym4RFy4RsbprQZBXDZS4ZkAcH8gmY=; b=q5wZVtx+LV9GVoekm8/1JEzW1oE10Wvt+I+mihc60bBm9APsDfw8/6IJCGlnUWACz7wfPIXG7jhX2m1DXmeF2q+HyTtToR/l81esSw/LVfOGS6zSMH2mFcl6AqkUSnH5f05aSYN+qw72UbC8tV9acbSIoK3a5o0CspM0toewgsQ= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SJ0PR10MB5742.namprd10.prod.outlook.com (2603:10b6:a03:3ed::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Mon, 4 Apr 2022 14:36:33 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::74fd:df41:4c93:24a5]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::74fd:df41:4c93:24a5%6]) with mapi id 15.20.5123.031; Mon, 4 Apr 2022 14:36:33 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton Subject: [PATCH v7 59/70] mm/mprotect: Use maple tree navigation instead of vma linked list Thread-Topic: [PATCH v7 59/70] mm/mprotect: Use maple tree navigation instead of vma linked list Thread-Index: AQHYSDFKcivSdfmlb0mJsGOV34m4KA== Date: Mon, 4 Apr 2022 14:35:55 +0000 Message-ID: <20220404143501.2016403-60-Liam.Howlett@oracle.com> References: <20220404143501.2016403-1-Liam.Howlett@oracle.com> In-Reply-To: <20220404143501.2016403-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.34.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a99eff99-bbd7-4f11-d7fd-08da16488438 x-ms-traffictypediagnostic: SJ0PR10MB5742:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: WmlJTZXslbwg2gbNN7+M+KgHTs8NTq4bcasVx9ydOGki4AP887oLlhZqFFwg3AezlE3fOVL2FTnAbNmkL43fK/7ffut0nWGnV4WNXsMPMoembCbEvp93yo6+foCf4yvX1OR4dqlih8FdRUoWO7FJnveZqErk0LrZPFy57na9ZzqptVj3jUyMG9t02OgDBFTvZ5k5l2T8LM62vMwBJlTpJ/QK3lhPqXL3vmKqmf0y2/Dy4dHJLNv8uScA86RUyBsiJJVKzHPw0vaV4cEiLgLowjy10D2EiDued7KdWQv6to+VgCirYaM8UiqhWL7NpCPZS4cwTvZ6HQ9Lmx26hzI65i80D9A7OwHvUDE4EwpRwFUKZUB0iMOx1J2VE9KmqWdXleIpjwvdN0AS6S5KeyZ/WQuJ4E6SSId1rQ3pbtCrPDptgErdB+D5jhx/HjMxE8mZ2jdBnFkmGxVilPxu24HufR1IMqZiIK3ciYHthIx02eK6sfs0qKuBjQgH6amHJtd4PQS7yPPE/iIviYqOmp9PfVFWbwl2Yi5vXpx7WVeRpFyP5Dz8sxwGbfgEoUrlkfxi1FAnBfmNg2ufrslexuwOViBjoY6fNiqRJunF7HF1BqFQ6wF2m0gHn3bVCUGh6KfaQa+a2FyBiOQFS1u/dKTXAIOB4KuUfVeCxz5NsV14RbiYsP8BpM9RGvCNI4f6xGal5ZkxiislJuNI/4RPyhGRXw== 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:(13230001)(366004)(26005)(122000001)(2906002)(44832011)(71200400001)(83380400001)(5660300002)(64756008)(66476007)(186003)(38070700005)(8936002)(316002)(1076003)(38100700002)(36756003)(2616005)(110136005)(66556008)(66446008)(86362001)(6506007)(91956017)(6512007)(508600001)(6486002)(8676002)(66946007)(76116006)(6666004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?8AnnCa0VieIN0wbQXbNt5kc?= =?iso-8859-1?q?v0TyNIFM5hCTw8ue1FaQUBmakISM/FHUc2Ir0Y05zGaZ69cFroTFdm6e5Wd0?= =?iso-8859-1?q?7XCPRJQc8dl15Fgce2skXBWzfi2bz16EyryfQg1bQs/OTCmFKfGhRXuNpQDj?= =?iso-8859-1?q?QbB03bmdUFGPsGQ23UFEeQog+xjjsPqzIRz08DgH3GQY7ScdsbGevXH6KU5n?= =?iso-8859-1?q?CtoXb/hl6T3IFYmG+57pvNA/tiJvFAScaye4B4/XbCGZYrD8fEwN7STPYCKA?= =?iso-8859-1?q?0qA3v/kGz8O1CCCynZSdB+cvVQX19W1xC8HfVGOTpM4GWuY2iTuAOiqKPj2h?= =?iso-8859-1?q?ypnosZ/xZl+m1WB2dIw3L+RL5SrgP9uKYnPRifvFy1gxGmtXfTNN1BZG2wq7?= =?iso-8859-1?q?lioef37e0lrlBKlGZa78dsv3qslWjLSa2lu6IGOVrDobr4jyeAh+HTyntS3d?= =?iso-8859-1?q?UjsIvpjO5HTY/2L/XNvf889J/TaHEaJAF4yaLsJWVdMaOCnV60gTDWGecmgc?= =?iso-8859-1?q?8Tpx0rWKPDFYHZCYWyCci4HGUUlBVF2vrJXSaoa+gcWEzF7XlaIDlNbRoEj9?= =?iso-8859-1?q?H/WHveG6p7nZkshqt4nbO73QDgttFJGHdAK+TChRNGV2gQT+jw9ov0Luuz70?= =?iso-8859-1?q?g7YZ6Z/o99GWSnUcXisthHztwwE+sDmKlxBKOj2krWPFJ1mpajVsKoDUZ6uo?= =?iso-8859-1?q?Vi4MSqBysDi4ZqaIbnbEoj1BqqPdROi/Hmwi69ys9+CqHBvfmVku+TZoYme+?= =?iso-8859-1?q?/nBJsFDTDVQSAl1SSqoqoFsUF9ARwkzCD/OF0Y2GKkms+Hi3+OmI+9OfEQey?= =?iso-8859-1?q?Y5NCG5QLimAA8ScgTjdf81Lmp+FYCS6DluqcPgEhcDFkTkK0QZxQwmFs3O57?= =?iso-8859-1?q?K7sBcZv/u16iItzVhsDYMVSuYNGfZJ0gl0JPszDybPnx0VVRohVNN21MSBbP?= =?iso-8859-1?q?GbXb5HmwaCZIKackIS1mXVGk5ePIETPg3nVK2O+oo4cF8gXs/BMN1g7uwHUm?= =?iso-8859-1?q?/a9J1KknPb8UWxJy8k8JS91m4uJNHRdc4PpjJx0hpOr0jFe4EjwB2OF7KBjk?= =?iso-8859-1?q?Y3BO8pEmgbCpcTnW8HQH5ffMJ6C928E1HMuNbtrgY5b2fayE0Iro3lhM95WX?= =?iso-8859-1?q?/QtxCRKPI496VBIzUQuIZNO+4+17oShERzx6HO2vgN0rN2EvPO3nZuJiUeYO?= =?iso-8859-1?q?j6xGMpLMmf7n6mPwdi+MwVGTvp708nhpN//yB8rbYPpBuFyqNRnHPu4cO+fv?= =?iso-8859-1?q?iUM8n4YwZRL+4tMzp/MS5UJytl9wL/DzMt2msXpfK4hCtnkJhzyMx1AjljYN?= =?iso-8859-1?q?bdxxxtES6xkGS/cDJJ+t8+YElw1oJHXONxrL8+nHGQSz8GeG/0ILgSqBuQvt?= =?iso-8859-1?q?gqd7nFotnD5NniIHgVLGEy4NzcsDKJLRo5PbXFL5tgdlUGnBs8xifF0f/l0E?= =?iso-8859-1?q?4OornidUv1GYb4cROh1M6jfyZOp7Nh2MDZb4Tj+rLOWzd7JQlr3/ium9gpPc?= =?iso-8859-1?q?DTqYPThPCJHeKeENoctDGgKSrxMgriIsbn1vXol5qorez2FmXG5gImE3Lef7?= =?iso-8859-1?q?aYuyvQ73tDxN1MxmRxjuIRWUSrurk5xsypbE14Oei+Rk0mB5FMcqG4eULgqM?= =?iso-8859-1?q?E7DphupE88c6+Hv2pVrofnjuW0X3oScjSc7pfks+VDOof+Q8Nq3pZgcw8YLJ?= =?iso-8859-1?q?XLWdiwLeMWjJytweHoXo/PBQWahU5FeRZxp8x0llw9xzXqhWrSvFrOG3JbGz?= =?iso-8859-1?q?SDUzw6Rw/biDLAqtv+1yeikKUORwFUijYPXZY4xBDwJ4Ptd4hPrOw8hHcwkY?= =?iso-8859-1?q?GDhriAnY=3D?= MIME-Version: 1.0 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: a99eff99-bbd7-4f11-d7fd-08da16488438 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Apr 2022 14:35:55.6271 (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: PSyad1O7cbTZ/WFSkKm3hQ29XQPDv9Wby3IeM3xE8vx3zSIwoLjJoJoL5bcfOvPj7MI/1p6PXxhJgD3QFouejQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5742 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425,18.0.850 definitions=2022-04-04_06:2022-03-30,2022-04-04 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 bulkscore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2204040083 X-Proofpoint-GUID: 4LSMetoEZDGlftbcEySm9z7rmPUm4gMH X-Proofpoint-ORIG-GUID: 4LSMetoEZDGlftbcEySm9z7rmPUm4gMH X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 08D518001D X-Rspam-User: Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=dKGazqIz; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=q5wZVtx+; dmarc=pass (policy=none) header.from=oracle.com; spf=none (imf30.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com X-Stat-Signature: bzr11kjfgom1857dxjis6gwfsc3swr4e X-HE-Tag: 1649083004-56377 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" Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka --- mm/mprotect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/mprotect.c b/mm/mprotect.c index b69ce7a7b2b7..81e5392ab13e 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -539,6 +539,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, const int grows = prot & (PROT_GROWSDOWN|PROT_GROWSUP); const bool rier = (current->personality & READ_IMPLIES_EXEC) && (prot & PROT_READ); + MA_STATE(mas, ¤t->mm->mm_mt, start, start); start = untagged_addr(start); @@ -570,7 +571,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, if ((pkey != -1) && !mm_pkey_is_allocated(current->mm, pkey)) goto out; - vma = find_vma(current->mm, start); + vma = mas_find(&mas, ULONG_MAX); error = -ENOMEM; if (!vma) goto out; @@ -596,7 +597,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, if (start > vma->vm_start) prev = vma; else - prev = vma->vm_prev; + prev = mas_prev(&mas, 0); for (nstart = start ; ; ) { unsigned long mask_off_old_flags; @@ -658,7 +659,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, if (nstart >= end) goto out; - vma = prev->vm_next; + vma = find_vma(current->mm, prev->vm_end); if (!vma || vma->vm_start != nstart) { error = -ENOMEM; goto out;