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>
Subject: [PATCH v9 58/69] mm/mprotect: use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v9 58/69] mm/mprotect: use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYX1Q+0TbYZ4y0a0uy09szJ+SEGg==
Date:   Wed, 4 May 2022 01:14:04 +0000
Message-ID: <20220504011345.662299-43-Liam.Howlett@oracle.com>
References: <20220504002554.654642-1-Liam.Howlett@oracle.com>
 <20220504011345.662299-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220504011345.662299-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?IOFgQmccKZC5JWCYWcok2eSI3k+QmP2bMGFoanr6fRZ2rLNUGNdC/I5d+9?=
 =?iso-8859-1?Q?oV+1slamvnnr9WKzBmZUnldWFmb2aVuGTJO4Zo89LJgucB0QOgRHFOAkkK?=
 =?iso-8859-1?Q?C7UqFHNJ0XFby4G1XQJUwMaYOHU//KGsrpamA2hVjj2FRlv3JhH27YCK2n?=
 =?iso-8859-1?Q?Sj2enMpNqd7q2LdCsZfjLA2Z3lFeq0rhY2oV9PFgrj/Lk25PnAiWuDniQZ?=
 =?iso-8859-1?Q?66co9t3za89GEwO3Xhqm9Blbl39QrJPBF10840eG36LO2HU0JP3cb523kN?=
 =?iso-8859-1?Q?Vzj09Z0ktFg5ZPcOZZf8E4DvKo/bS7NFP775GX5tWAdCynEBmZHtDSAzDU?=
 =?iso-8859-1?Q?6L6PctoUToed2XQKqZfQah37yM38msVKdjW/GxjCOpAmU/sUAqZuAbDpuT?=
 =?iso-8859-1?Q?tVoXQPHku6gT8o5ZtVOJJeS/pRGzRH+S9lqd7gThtEXpI8uQBdFwkGUM0v?=
 =?iso-8859-1?Q?fqhTc/d/STUSrVNkfYsUltt6DbaIBqL0cxlzsuhAgCIyEpJCoCcFZoJWdD?=
 =?iso-8859-1?Q?LcMQjKopG7eo4NFDSVriZxcJWoXItVu6L+ODb+Aqh+DmzcykRh+vqwsvIN?=
 =?iso-8859-1?Q?KTnsM+Zc+FuGO6BZtQWXryCxanFGtvOfSNU0U9DCuVZPCd2EhK0xXx/+wp?=
 =?iso-8859-1?Q?9sPTxhmBWmLzN5FiiidE9zGNXr0p0ZIbnaqFWgp3+lUNuob1+K62+WL75f?=
 =?iso-8859-1?Q?hKz4yg58CPGUEfosAuTqIwysl8UXPIzbitlLKTNNj7ICPt5GM0fZnsWIwn?=
 =?iso-8859-1?Q?JQKOsY7tiPqmkRD/OF+lEBBHlXb14pPHbojZn++UmrSSyIxrGuKTg567X7?=
 =?iso-8859-1?Q?hkHXBwvHLkTXHvqjGExuifjodjjv5xQ/OWZ7w5ot7Rf4X7MVOXeHH619XO?=
 =?iso-8859-1?Q?ymmI0xk/5dq6T25c6yx4y2QbwqQWVcJRif/fF7ceo1/GNsDWBitkhlLPoP?=
 =?iso-8859-1?Q?0AjdT93jh8ywy4Q4nDa3JpVX7KRsjteff7AOnQW0w2HyjYDU9BFVCs8ARC?=
 =?iso-8859-1?Q?7piNP5sEmMxP9M6YbYeVhL9XJ4qUMOCjGtWDvJ+JCEIjd+EmgBmGUrup3q?=
 =?iso-8859-1?Q?EAxNdAb0SUL8jXgggspDu5inoXcc/4Mv3BqTJW3z4PsMzG+ljLpn8QrlIl?=
 =?iso-8859-1?Q?LTsVkberIxJcyl0g6+Bkjd/F7W+VhzJB7Lt7KAKQcy4NU/Ffzi+w5yYX1w?=
 =?iso-8859-1?Q?Cftj4rMmW5P5wYmdLMfQstjb7ULpP4yY11TAtVu7RvmHveJaEzYSv/Q/7k?=
 =?iso-8859-1?Q?DSDqxszwJ6xs2cFi3BuHi1jRMtregVk8wJs4bKJnuRLc5ifaYg+dzFuxy5?=
 =?iso-8859-1?Q?8pf/D6QBs7HGsnrxSK6wglvAW0Us67m6Qydw4JEMWacjP1K5CFOQxXIZmG?=
 =?iso-8859-1?Q?LW1SgM7PsW7Qq7ThlCIpUAmNVpkpoKSQjGDdb4hcmWcYBqWXKEnzdlMFpu?=
 =?iso-8859-1?Q?cUZRKO2tds96DtgNUE82deAbFLPOLB0wMV9tSZDA9KjzpwBirSZaeccD6G?=
 =?iso-8859-1?Q?cgI2AN4dA3aAUaQDyhiXGxIJEr1lqYF9OqppVXgApvyAUsp0Pw/u7GvcLk?=
 =?iso-8859-1?Q?2PPqVVQ2rDxUQZnLUkB2CY+ToR9UJ1OZb+wxfuQ1VulGbFj6KT7brtgBko?=
 =?iso-8859-1?Q?RdnUxWD7/4vK0U1+1Am+W98bCJgEA3UZyUJHzbJyXuQHeWMYNopojf4h3F?=
 =?iso-8859-1?Q?+IEVzOvdXO2+60Y4EyqQa1UTxAhjh/yXCvyLSo74chO+drHDGQdQkb/tNB?=
 =?iso-8859-1?Q?m2j7zcjtHLvoEYQ4g3Go+9jUsneYDppLfJ3Mgo4xFp72DalTsAREe6Ey39?=
 =?iso-8859-1?Q?kubCw6rpIL7BHYsXV1aC/ZXr5kHnpM0=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: ac958bcb-e722-4bcc-c83d-08da2d6b763f
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 May 2022 01:14:04.4386
 (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: CyL1300DZUuoCGSETAV6/wRDWQ+9qXE85uWx27hMOjJN/VmePoI1iZTpKNLSCO/z4sjLGfWU0SkIhXuLRmbgZA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2688
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-03_10:2022-05-02,2022-05-03 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 spamscore=0
 malwarescore=0 adultscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205040006
X-Proofpoint-GUID: YuohclX5hn5m_gsNyX-bTMbXSeNlKZQr
X-Proofpoint-ORIG-GUID: YuohclX5hn5m_gsNyX-bTMbXSeNlKZQr
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,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 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 =3D prot & (PROT_GROWSDOWN|PROT_GROWSUP);
 	const bool rier =3D (current->personality & READ_IMPLIES_EXEC) &&
 				(prot & PROT_READ);
+	MA_STATE(mas, &current->mm->mm_mt, start, start);
=20
 	start =3D untagged_addr(start);
=20
@@ -570,7 +571,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;
@@ -596,7 +597,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
 	for (nstart =3D start ; ; ) {
 		unsigned long mask_off_old_flags;
@@ -658,7 +659,7 @@ static int do_mprotect_pkey(unsigned long start, size_t=
 len,
 		if (nstart >=3D end)
 			goto out;
=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;
 			goto out;
--=20
2.35.1