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>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 58/69] mm/mprotect: use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v11 58/69] mm/mprotect: use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYmYd6Zh4lJdNBfkGCPs0zCpVKdw==
Date:   Sun, 17 Jul 2022 02:46:56 +0000
Message-ID: <20220717024615.2106835-59-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-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?Z3t8QkFdZldzl4exMRZKBVgmTjYgLcx//JNZNu81l2dU+spWlVh3MzvZTI?=
 =?iso-8859-1?Q?7s2qSEf3ClsqzGxAcle4VXhImnriOs/ChMGKQSowEQPfc5bXdIAQT5JpyD?=
 =?iso-8859-1?Q?2TQeBzGbotiPfO8w3i+/R28NAYYrXawpUPfMXYHd1HMOLm8mNbEV0sqWyH?=
 =?iso-8859-1?Q?SzXvTbYWvTnnXXxBSKl8ZKyyMwMNo+Jf2q1fyZ/ON820ElW50ah/Cs9o6/?=
 =?iso-8859-1?Q?dcjh4VGvU/0U6CLgCxAe78JGkDY6UiAmUQOx1IhI3yrfK2FDCuXDQ5diW4?=
 =?iso-8859-1?Q?SpfePhHLbA7yVwQYALOO2hkXam2tfbtOWVyQeyQNWOWaWJKNSm9dRlCoym?=
 =?iso-8859-1?Q?ZtO/Eo3VfWu0HqCd9w39mgsS3Jf1nJC2wsrzaqDg5FZSjrRAyTxY5WsIbg?=
 =?iso-8859-1?Q?KyS/gX9sQ77Zm3ywX2MmTdAt1ithXzAzrA4ue4Q6euhcLDtaUvgdZ9wcDx?=
 =?iso-8859-1?Q?h6CZXWlRJfkWBi1vIRSEHdcksjqEXC1gKEg9yUianNk2oH8j2N2w05At3M?=
 =?iso-8859-1?Q?5Zny5w5Q4Wo+Q7tuVHVJEuMpQ3nVyD8U9NIghs27wz+hucsJl9vjg1cVIs?=
 =?iso-8859-1?Q?8EowdETsu4jAdoGLRjwXOXxMUArcAoCaDZwMDHPLvgv0L7PJRcB+Fc8MGS?=
 =?iso-8859-1?Q?Ln0mHwREiLElphUi3rDvYeglVfTswR8j/UOgJRYEffqdZaK7xyduLdJiVY?=
 =?iso-8859-1?Q?I0M91tJjNXBMBbie3ELu1K7D69vFAZK07ZPmPIq5SJqx8mMFCySB6Hfajg?=
 =?iso-8859-1?Q?ysuThEtBKxVODbufu5MKZ/I+anWMsTkbMDpdRCgiXKqN61W8oihEkqhUxy?=
 =?iso-8859-1?Q?MQPnGBf71SXz4atSFdOjnNUbRoiZ7qW42GFvfwoK0DjJK64RiuBiCY+vYq?=
 =?iso-8859-1?Q?AA+cQpRRhPJ624PRUSyZgzhwXkrHfR8XJ5aoVNQpP50sZLeMg15C01CgGG?=
 =?iso-8859-1?Q?Se2Z6Gz+u3fNivXQ8xv7HvX9gGJWlQaZpCklMWWv76oZFbnyQ6LuzSWeoZ?=
 =?iso-8859-1?Q?3Oabaqn+N12QH/l+qIMWFDxcPV4vwi2cHuJI/g9aPW+IKF4/CNCj0PfCk/?=
 =?iso-8859-1?Q?NCvMshlU6wBetiePSgpHTg4pss1e4JPJfjnMTjuCILXj0EG1zcil+gcGjH?=
 =?iso-8859-1?Q?v+bMQMjkSTCAjZiSjOgAkZx2hCXhc4Yql+YuBkGfouPDgE10afMDFnUzzv?=
 =?iso-8859-1?Q?IYLyNWZxMeOadSwsZaGYIWO0WVDg4xhR44LIvmb+TtbcGD2wPjTXJYpX1v?=
 =?iso-8859-1?Q?SfAgrAXSDdoz9aNLh6UfW9vPNUW0ZW7pW9wWjhhJ/ciJmhjI3sFxon7Jm4?=
 =?iso-8859-1?Q?qxqanfL1Mxk9xvT9DRMMpnBVUP255Y0NgWv1IS0H//r6ZV7+4n+l9hxhQy?=
 =?iso-8859-1?Q?n/n6wFSbTti1f6LSa1gCxCtqj8Ql5GqLO9+WHNTwSYXBlo5FeeEWIDR8vE?=
 =?iso-8859-1?Q?jCFlH9HgM9VTx4vEK8GyzMKrdEMDYabVsSoheXZqEDd1HJGxrEBFw6azDM?=
 =?iso-8859-1?Q?N7w2OdyDYDktu8eCqFR0gEvqyGgNGYLTAgEmNCGmL11VY87JsH6jw6nWcK?=
 =?iso-8859-1?Q?5MFfLNrdLpVNm0N2cpRK7W25ioj4Zq9+37zyTPL4iT7EI9yrgfSMuY1czY?=
 =?iso-8859-1?Q?httDNI4HU/ZPTDTYoJMOSK/LWng5l+c2stU2Zmke5u7VSZdSyn22n+Mw?=
 =?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: caeb191f-4ee3-4cc3-cb8b-08da679eb30f
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:56.0678
 (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: dwH7boXDDLMMRON4sVAX1csntaHojZdPSio6/cna1nm6XBkSc4KPuEJ4+G4hKoAaR264CxbRdXviIOU/JCpgkg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4504
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=999
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: qDTlLvvxTPd8-R4HB6u9fqRJEzKQD1ik
X-Proofpoint-ORIG-GUID: qDTlLvvxTPd8-R4HB6u9fqRJEzKQD1ik
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 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>

Link: https://lkml.kernel.org/r/20220504011345.662299-43-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-59-Liam.Howlett@orac=
le.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: SeongJae Park <sj@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/mprotect.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index ba5592655ee3..27fb652151e4 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -621,6 +621,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
@@ -652,7 +653,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;
@@ -678,7 +679,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 ; ; ) {
@@ -741,7 +742,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