Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
CC:     Liam Howlett <liam.howlett@oracle.com>,
        Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v13 58/70] mm/mprotect: use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v13 58/70] mm/mprotect: use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYtjjCkqw9gd/s70yV945B+ch+Rg==
Date:   Mon, 22 Aug 2022 15:06:30 +0000
Message-ID: <20220822150128.1562046-59-Liam.Howlett@oracle.com>
References: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220822150128.1562046-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?lZs5AnrkgFt0pEemIBEoN1D7xZ4yKeWbM+TWY61xcYI3jr63ExoYuACepJ?=
 =?iso-8859-1?Q?UUfbmzt5rihvjeaOgWubNmz9iSy/T7qnbKiyOSP85E+JROai92P2IjfuBX?=
 =?iso-8859-1?Q?P3bzgrSqe8uHVJjW8yZFKIzDaNnvAKYIPsjjwauwNV80C8438yoqOJhhn3?=
 =?iso-8859-1?Q?x7DuFIPXsWjI9ZMqedum7UhAnL7C5rI/OfMk7sBX9vZ5riMkHh/IQOXq4q?=
 =?iso-8859-1?Q?BC9CanasMa+Z9kPFL+dNmQpokb8MhzLENKrx9gkqL3uaOuhyzFajVGfrUf?=
 =?iso-8859-1?Q?YKzxDj27yW+TsRQna5xWz6fFNv5d9mBWo9GK1s3fXU6daUBNsjrXGihEYf?=
 =?iso-8859-1?Q?5K5fKrBTcLJhlbWv06kjMhtCfI2RiUY1aolpt6ImmrQjOt2dOjUuyrvK9j?=
 =?iso-8859-1?Q?NrdOGmEcKHH/ageQJdYva5G7unQ3TPnisZEDQvo30ML1romlGCSRdrf5Io?=
 =?iso-8859-1?Q?pEG5AaTFm+ramlOiVwpQGigPxg2iPIbIRzmidrczHraqrks3jZ2gPLCL/e?=
 =?iso-8859-1?Q?EKxJLR6T/ccYGn0hUwH6UE2ofTMeonK6+ItxZLb3OiZWaDJOIk6rhd+w8r?=
 =?iso-8859-1?Q?N6y80ED34o+NpNURFgb/BawppL8RbCp4zWoRT+/vczqpXelFAjOfaBu2I8?=
 =?iso-8859-1?Q?6epcElgQsPAcZa6i31Nwkw5tP0f1Xuf5czHOHJsRaJQxGjKpwxApr7DC3a?=
 =?iso-8859-1?Q?UCD2v9UZlEkqRmg+XZFETB/1RITMr/+0uK6C2zwrrbr7kUu11oGEmbFZx8?=
 =?iso-8859-1?Q?OxKW9z3Se8LWu7mcZbApSzNa+1FseSB6XpkoBywXSYZjQVSPeZER4p1pwb?=
 =?iso-8859-1?Q?+nmOc/a0GzcAqKhFZvS7dvAwbFLplFz9FUCi55wuv5lTcTM6aA8StwGki8?=
 =?iso-8859-1?Q?7qYHSjqSnuBo+omFwO4MACquvZDd7ITNgxwuuWM/KbchMpq6zc6PyRM3NI?=
 =?iso-8859-1?Q?UmIx477N+Ox4Gbk7D/j2CUtd9chSt43373FlEjqHRAI/Ym4K8U1JLGF4/u?=
 =?iso-8859-1?Q?x6ceRWTbyJOPCsSVak3qWt0YXFVz35axZ0Z3jYmcVyKXv1fExJHBjGi/xi?=
 =?iso-8859-1?Q?dBmuf62cLmzvLurxv8u9+sqqFTBPaMPdzH2+44yykPls+Ci+pMOBwQhRwd?=
 =?iso-8859-1?Q?C768xqzHKFywCTDJ5eO4OgVjtssdFeuwqO9RLge/n9aiuz3ndX6fcQOnBi?=
 =?iso-8859-1?Q?qm2GkAnnFo3K9q0AMIXFvQr2DvNiTVKJAqH9tzEMgoSrvfbeRx0nw6uYJo?=
 =?iso-8859-1?Q?UKCeNTSTtVNqmygLa/Uk5tdn5YmuvBVsQCPDxm65hIkgTtIlzBP3q8mlPP?=
 =?iso-8859-1?Q?VZO6UMx0UI3PmcfHV0Su0KC8Myur+GFY6G0urGc8QaD1dbCTBnbRKY4+ZK?=
 =?iso-8859-1?Q?uuNTEhna6mjNIF280OfbmzEMO8ayjOW8c9cdRcNLKm5G9VTA06OaY4q4Bw?=
 =?iso-8859-1?Q?IlVJ4DHFReP3BL1O2Wmmcorw2aZyoJkvQKpLYvclKOH5lAkIqnj0WwA19R?=
 =?iso-8859-1?Q?9oryO+ad16EI1Huk1yetvSHPbT1EcZ2uBvdz3FkBaouQnf4uTCcUyVRowC?=
 =?iso-8859-1?Q?moCg0v2q8nSqGTialYkCafdTD6uou0wO+F8vv4QIs4ssEa3uGZL5SY5RWv?=
 =?iso-8859-1?Q?/O4Zvwpnow+Cbhok07PrF52xHc0e61PLmcIqvx16vM75WQQ1cdUmoiVw?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
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: 213d2e44-0a30-486f-5e73-08da844fe752
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:06:30.8472
 (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: dzmq0SW1Lkb1E+qeWFg8GLhzrZc9X++11Xesp0Xy9tU2N9dJer9ENH1GSiHfmmcJIQLhgRd8e22507iNzooEdg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1433
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 bulkscore=0
 mlxlogscore=999 spamscore=0 phishscore=0 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2208220065
X-Proofpoint-GUID: 8216mKPr939Dhy9jtSPO0hnmKe3vBF9t
X-Proofpoint-ORIG-GUID: 8216mKPr939Dhy9jtSPO0hnmKe3vBF9t
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
---
 mm/mprotect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 3a4de77161e9..5bb37e639bfa 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -674,6 +674,7 @@ static int do_mprotect_pkey(unsigned long start, size_t=
 len,
 	const bool rier =3D (current->personality & READ_IMPLIES_EXEC) &&
 				(prot & PROT_READ);
 	struct mmu_gather tlb;
+	MA_STATE(mas, &current->mm->mm_mt, start, start);
=20
 	start =3D untagged_addr(start);
=20
@@ -705,7 +706,7 @@ static int do_mprotect_pkey(unsigned long start, size_t=
 len,
 	if ((pkey !=3D -1) && !mm_pkey_is_allocated(current->mm, pkey))
 		goto out;
=20
-	vma =3D find_vma(current->mm, start);
+	vma =3D mas_find(&mas, ULONG_MAX);
 	error =3D -ENOMEM;
 	if (!vma)
 		goto out;
@@ -731,7 +732,7 @@ static int do_mprotect_pkey(unsigned long start, size_t=
 len,
 	if (start > vma->vm_start)
 		prev =3D vma;
 	else
-		prev =3D vma->vm_prev;
+		prev =3D mas_prev(&mas, 0);
=20
 	tlb_gather_mmu(&tlb, current->mm);
 	for (nstart =3D start ; ; ) {
@@ -794,7 +795,7 @@ static int do_mprotect_pkey(unsigned long start, size_t=
 len,
 		if (nstart >=3D end)
 			break;
=20
-		vma =3D prev->vm_next;
+		vma =3D find_vma(current->mm, prev->vm_end);
 		if (!vma || vma->vm_start !=3D nstart) {
 			error =3D -ENOMEM;
 			break;
--=20
2.35.1