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 v5 59/70] mm/mprotect: Use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v5 59/70] mm/mprotect: Use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYF96BtW8qA5EqFE2UUmumM09sCQ==
Date:   Wed, 2 Feb 2022 02:42:22 +0000
Message-ID: <20220202024137.2516438-60-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?oAojUqbRHgUIsQYOos9THyuMGETfTKCqHVGiAjqKzjz7btyFYaA1GJ2qsp?=
 =?iso-8859-1?Q?ZBozVBofe+M9eS8cgMC29PnvE9W8Pb8OqyHgngPlwk18bN492M3Rqqv5eK?=
 =?iso-8859-1?Q?s1xOpnsKS/4PBk1sElnPi8S/ENE6A2wcEa0ncKX+xhcimZu1b/B0QJVO0o?=
 =?iso-8859-1?Q?VkMT6MRSJyY0UMtpySNjkkb9y4SXW3xhpyCL9mZeVmTvj1poLwgR0oDXgy?=
 =?iso-8859-1?Q?ra8QOIcFd8OWrrbcoN0VYVSCLpoyjlzQw8rumP52q2AH2zs5q34+cAfs8p?=
 =?iso-8859-1?Q?S3Ekr5XSRgWIhNPVpO1unK/Fz8Riduha/JTCZaXG5lFbpbyv0ngnb3456v?=
 =?iso-8859-1?Q?JkXYF1jMYyJjxmcbwtKrLP1mskQO6W9T7CCe4Edr47/eLfbKJIzUlEQeAg?=
 =?iso-8859-1?Q?bzJLHaAjeXjlZbOUqm0SYtrbe7BzJ2kCP568rB0Xiuz4NtSKg9q4TJVRVf?=
 =?iso-8859-1?Q?iYre7lqjS0fEiB422kr26I4SBL8IUiBwKcpneL0vjxyzL1v72VHgY5vnXy?=
 =?iso-8859-1?Q?6ymWw2ViNqAm6AfsTroDin8kOh1Qfldy1uUjZztuYmAlg8l5T2BbM3b11S?=
 =?iso-8859-1?Q?1+YWVbiyYCRQdbG66032PbfZI1vqGnh0sZjUCIEAh1+e/E71gHnrprrRvf?=
 =?iso-8859-1?Q?pfpreah3IDkUhfKX7IKhwz14TRvuWQerqk5htVwvQjq5XBfqWIMCjx4h13?=
 =?iso-8859-1?Q?SFVb88eQ0/TsocQU1TyqfAFSNTluCLFUq6IIQip27tRGbwahyVb41GJZUU?=
 =?iso-8859-1?Q?4fX3n4vSYiy7nDxkCGLqYitRN/UWR/QtGspO4+aFxguRWVz55+ay81t/Yu?=
 =?iso-8859-1?Q?zbBLgJ9RtRzbSluSF8ujt5JkFoSGaIMoM56vCM7GQgTIs3sIbyIPdIJgwg?=
 =?iso-8859-1?Q?WDtdyBBb8y5ZruZhuzbt9eYR2Mu8A5a7ESSBLNNvS93ilhgvGIJDPoyhSa?=
 =?iso-8859-1?Q?gfIY7vts1pcyL1eftbwiuP3tA0lUnomWgUadN3n+8Db1FFJ9OQs+UB4TGn?=
 =?iso-8859-1?Q?BikErU8v6Fa/bbDAb6Xiyl3GHWG+ppLZlGM3q8mzBdLFozs+3ATiAOkL6B?=
 =?iso-8859-1?Q?JmDWmQ8O5NmSXjbfof1xx2T2jwps29EBFhXmv4vbe8SX8XSHmEJMKNsgI4?=
 =?iso-8859-1?Q?sVN6nvSdgUAM6/dyUrTL1vmCQ6OLzN/cHNuLWv9HYVPa2xaANReN+aHlli?=
 =?iso-8859-1?Q?hPO4fY0AfWT56Qk+WoUoVm2zR9kNkRKcLHCTteOy3tljCLLMhhdi2Xag9N?=
 =?iso-8859-1?Q?qFT5gJnKzALjsjqhSPlio2/ELazTPcF7m9yNOcKnVozVTC4HsyA4juzeVK?=
 =?iso-8859-1?Q?mXUC661eyGoxxMRMp3nV/+1LMgzDrmc/sPBwk/qE3JhlI/Hi5R6ZCpEvQ4?=
 =?iso-8859-1?Q?uhbhwrlji0NH5xlZAr/6eWfI4m1YG8E8CVNNfNib3TAL+QQrbCp54ypuvQ?=
 =?iso-8859-1?Q?6VNvpjMGhODYV1VW/HpdWR2MsIcl4r1X8VzfFACYIhWvqzcw++FSUQxqHa?=
 =?iso-8859-1?Q?dwfsn/WsKleNX/NBrBjUj/iCP5pINdAk+q+cIzaYwL39JzqgJntIUIk1n+?=
 =?iso-8859-1?Q?EqIqaEFORkWRvzEFqcPBEZ0MvMdKv7HkeYtZyideEbzEK+4nKGaNjeAeJE?=
 =?iso-8859-1?Q?l//x1oE+0/MpfBkGDwL5G5jaCyJke9srwe032SsMJNzTSboNU00LFzAynK?=
 =?iso-8859-1?Q?dF7/Lanca/2a8LBWicw=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: 5d99a472-04e1-4356-9fb5-08d9e5f5b8ca
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:22.5163
 (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: hIVVRbxw2R+EmG0lJUoCrpGKADf6xPaYV42EBQuGc4GjC9ERZAqTYthSqACVkEyD/mHnJY4ehVnoG8lc+xzAsw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5865
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-GUID: ZWsXEtGCH4zLnfXe_vQ8VRU9h-Nu-uiZ
X-Proofpoint-ORIG-GUID: ZWsXEtGCH4zLnfXe_vQ8VRU9h-Nu-uiZ
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 0138dfcdb1d8..51ef845df4c8 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -528,6 +528,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
@@ -559,7 +560,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;
@@ -585,7 +586,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;
@@ -647,7 +648,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.34.1