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>,
        Hugh Dickins <hughd@google.com>
CC:     Yu Zhao <yuzhao@google.com>
Subject: [PATCH v12 58/69] mm/mprotect: use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v12 58/69] mm/mprotect: use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYm97vcKMT3LMXdUqRjBMnEXHULQ==
Date:   Wed, 20 Jul 2022 02:18:01 +0000
Message-ID: <20220720021727.17018-59-Liam.Howlett@oracle.com>
References: <20220720021727.17018-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220720021727.17018-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?fXHlQQwyZ1x97xYmvrQ3XF2nEsNfsRwXlulVmKuzdiciXa2NvkyJBXmGhe?=
 =?iso-8859-1?Q?tpGavb6cVV8pA1lHHMc9uZoUcDbyiBlfTas1iBSRD8EvgSmqgnW+U17/4P?=
 =?iso-8859-1?Q?cgKn23yonsHO0aDfpQFipbxTtumnF4ymXEHxABu1P3tuRpnKP4kO4fbVSa?=
 =?iso-8859-1?Q?a1g5U+bcxWwpTRUf1dE9ikFZxl+1Z5RVHX69EwnhcTEP2rMJzeoOg+mOIz?=
 =?iso-8859-1?Q?Z2HFkFE2TPc9xifWfBty08nHajbDoDI1amFCgKMCelbMY4M1Wx6PW8eMhb?=
 =?iso-8859-1?Q?jdFs/KajSIApyXqz+15qh1HJPWzFqb/Dj7ojpLkwg3LQ4uZu6gyeXYw6sk?=
 =?iso-8859-1?Q?rrghKE2kDikubKOlgrLwQQGGfv0kQQVTFvqJqAUiyHOBNmfUPbaGwCuKop?=
 =?iso-8859-1?Q?tMo4BNYTXweLymq0I5Z38sQy2PjLPpDFyuuauTy5Hkc1s/71R1bOVuwpp1?=
 =?iso-8859-1?Q?I0Ged64zxZfDkp/M1pP5TDPtlPrE4vxs5p30lFkx79dxAN/92U2RTaC+CT?=
 =?iso-8859-1?Q?tItfUeGa6iTq4FKxPgatJE1bym6DbMl3wuEbopLqpe+lI9uuBxIOBCQJtX?=
 =?iso-8859-1?Q?C5o14F2MwW+ak30Fmch+f/YEXns7g7IVHTLT2mGwa2KQajvzFKETY9i9GO?=
 =?iso-8859-1?Q?HZuP3BnqZhCUUgTziUg3SF4rljC6kZhGfa/X4RSzuoyf32qbOuOgH3IL/3?=
 =?iso-8859-1?Q?wnB+04YcDi/J9/tRSp048xMvkqF2B2gyLnrpa98CDrbVdVQEybm+2QGqhd?=
 =?iso-8859-1?Q?X8s27kofhgDI4u5ssXwn4rLGMHdxhbvjnZ0NaHWujDc57I+apjM89hto4t?=
 =?iso-8859-1?Q?lT+JlalauEpvtq+12wh/xiEeaE3DM3c+3UfxVlJKOmCo6rVW0EOpGtGqhx?=
 =?iso-8859-1?Q?eJPuTmZmczScOCNkeF0mPwIXe5QCM2QbuHDV/6jwxdfwFAp1O1rZH1vf2L?=
 =?iso-8859-1?Q?WKzHLVWwM3Jd9VNciGyzWvHSsvD09JO9jsuJvHCWojfBSAJrXsIENBIoSZ?=
 =?iso-8859-1?Q?yf4RCwvdFMRYmuMOtFHmBWpCY8iPNFE8zQ3x6tGYizPoPV2T9TXYh6aevR?=
 =?iso-8859-1?Q?RmdIHHAe+FfRwnuKxMjmfNr0WAuozNJ2d0kpv/268hlOaRUu5H/UXHpBrj?=
 =?iso-8859-1?Q?Fg7x/6nbNJYfPBq0lp475FKxpF6Kq4IN2yPNsjNtGl9MXE+yqxaHRMeR33?=
 =?iso-8859-1?Q?OiOjTo33xN8P9QvQ+tgxHzu+rsbGLf6twsiZ6PdTvnH4GILFvY1x1j5Lz3?=
 =?iso-8859-1?Q?apRva5Sj/2cF6zKmKPWwNSLZQuhTgs9GNsjM98MwTiRK90905sev1S5ooR?=
 =?iso-8859-1?Q?frZEECghYRaCzI3hv0bFyJOC9ICeeMATa/v/tQDi2M3ZSm80AJxLl6Bnaq?=
 =?iso-8859-1?Q?WWV1jMIcvd8AAOOUBGSPx4ESzD6c+UYRCgRR8JrENK1mxVYgrbMFitJwQS?=
 =?iso-8859-1?Q?K52Fj3Y2+3466YvDNip1GxbTSw5lUrEOAw1QG2BrXVlrKxCmWIii3+lqOg?=
 =?iso-8859-1?Q?MV/LwyLmqlvymSPnKj79q8sZJOc/N5poqoGiC2jM8zenLAyejAVUoXHvio?=
 =?iso-8859-1?Q?eJ9peZ7yHonpgQAtdnKYfUuqi5LcljCqAzj59TPS6CGDRyWmgGWaUAUL9Y?=
 =?iso-8859-1?Q?tQZyMQZ8K0JF2ydExnZ+h6TCQPRQMj3/85uVEKk11R3tOnyj8K6Zh6lg?=
 =?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: 13eb9195-3f62-49af-abb4-08da69f62b77
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:18:01.8518
 (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: OVNT6suH6xkyXRf4O7iF0MvQVfMUpIEORXLTr+kuoXiifzVsBxbVWySCWvW9CVcZJQYbnTQqB2uZ3RwdvnNe0g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6233
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-19_10,2022-07-19_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207200008
X-Proofpoint-GUID: Z1HI7NOZRm-hD5gH3vHE021wT-ptT0Ir
X-Proofpoint-ORIG-GUID: Z1HI7NOZRm-hD5gH3vHE021wT-ptT0Ir
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