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>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 58/69] mm/mprotect: use maple tree navigation instead of
 vma linked list
Thread-Topic: [PATCH v10 58/69] mm/mprotect: use maple tree navigation instead
 of vma linked list
Thread-Index: AQHYhbAUJ6UYnoi7wkKJLv6YWuKK6A==
Date:   Tue, 21 Jun 2022 20:47:11 +0000
Message-ID: <20220621204632.3370049-59-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-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?aGfnBF8gfinFpfdi16GPRZ47iF9Xd8Qcf4KCyJp5H8bdYD6+IV538t4Pc/?=
 =?iso-8859-1?Q?ZmN9uV7xpOinBpLV1krU/eZrM2Mc9RbIFwLw7zSp3L0sjuIQRqq0HHuRyx?=
 =?iso-8859-1?Q?3g2V3MZLQeI5fHKDLatf2zb9OllWha7jK5Q+C8RXO6TVAv7yFRJPKi9Hfv?=
 =?iso-8859-1?Q?KvsLV2OVKh1uk+n/UXUMMwZ8P4EHX1sCO/oA+UsD6+n9d6Et16d+v10UTo?=
 =?iso-8859-1?Q?KAB+P32zQkbXl9KzybGJYqRmrGTDsg81zwQS2bYyrvwyc4WEj92vFT21na?=
 =?iso-8859-1?Q?CkouFUH0JFLdSZzbIU6cA/estCO/AYazJtO73hLZYq1xCjcPTlPILsBhR5?=
 =?iso-8859-1?Q?lwnvdJoStQ4mb2I/+sqFXZrUnKDHZ5wrv8bEXaWOcZSudk0Pf90pARINn6?=
 =?iso-8859-1?Q?vbuknowO3i9lIWue6j4e1KaedhSFUf5w+fwYyduMEODaWYEiGZwc8+m+NT?=
 =?iso-8859-1?Q?nrv0wIvC6/16zvVOQyqvhyUNUJq8LK4Khw5N++8x8Xw+QeHwMgHsNl1FXa?=
 =?iso-8859-1?Q?LY+3Jz8cw2j5ULMykJiVYmz/1h4deGt1FL0K9otb4UKNvknTnBT2XJDCf7?=
 =?iso-8859-1?Q?2Zf2fMJczkV0AjpbzHBnbCmf7t0MW5z7tAe71XC3Ydhsp6/QFK80pLfuEu?=
 =?iso-8859-1?Q?CK229z6IJBkFLmNArG+DMoF5g9rNY2jpFsI+QgBIIQzGXu2XDwtXTsfRYA?=
 =?iso-8859-1?Q?kOVRbTPYbXsNcCXqpmE3BJC9tHSPbHyIx3jnkn187pFsf9NQ8kpPtBkZSQ?=
 =?iso-8859-1?Q?7CKXAxNWP4xxCg61ijPw+96n22PtB1qzOdTn9Ka8JvJNgcc6qP2MqkGFzY?=
 =?iso-8859-1?Q?OEX6a4MNqO0yFu9eHpKyvICGFeVJGaTc+9P5PNgCbSy5Jq+HqwtGaXoTDM?=
 =?iso-8859-1?Q?4saFpaFmjx0O5C7dTzRsqkX83xN1ZJDXJ+t2OB4md/sIyu/mo7TYW3eJMG?=
 =?iso-8859-1?Q?zWarxmVHFPQ2YVYuIR18GReHl1Mq2vOKxal89tNFaG2stfVT+pAO76y81K?=
 =?iso-8859-1?Q?SeTZUmeqDrqDGFo6ksRY7fCR5ooek2Bjugg7YRLL/r7Zl0KBcrh+kvVQgk?=
 =?iso-8859-1?Q?XH8wHhamhmbMy2HT0GLDNLnuZAf1sGvYIRgeskoc0D6vXPfeC3MavuFfgt?=
 =?iso-8859-1?Q?ObNc159iMh3f/X+nC27Qros9jV+K33dYrKH5QjwTD9ZqAyTM1uDnMLA2sa?=
 =?iso-8859-1?Q?rPC4+Lt3VjydYDMev6abDe+86EkvUTJaHUFKNMLiU2xs0TvtzTjbsEncIA?=
 =?iso-8859-1?Q?KivpWQlqZsmB7rj0r18AB1YMhU39oit68ARYReIgRca54WzT4czSb6Ztfj?=
 =?iso-8859-1?Q?UOFQFgW/vl+R7w7qu99mZPDH1oaO/cU091DwSAvbcP7jefOJ4u7DDk4D6o?=
 =?iso-8859-1?Q?Cd7acbDPBZL3K5MQkI2tzAThXMUHyXMK1hmZHvzYpjqYDDfbf/uVv2pT6c?=
 =?iso-8859-1?Q?6G22Cb2S+CWSgH4IZyM0qpng6wusR0TWhslp+b1imjMPtpkL7yt0zfJoo3?=
 =?iso-8859-1?Q?vLgx/wkK93tNMI28paTt9tTH/tqTOX8OGuRXKCKRDpfA3kKUR8xPm2owWe?=
 =?iso-8859-1?Q?7YSoNd8zWnCSDinT8Iqm/IpmsC3QsRFjvUUYj4GSZprzyOWyRLQ1WFOWFX?=
 =?iso-8859-1?Q?t33/16CLM8nMaM6nEo3m/eQa2gfiMPY3z3FDeGQ8xXYlQ3EbGwCMq9+Aey?=
 =?iso-8859-1?Q?NVj84FVmv6EPF/upDKPLJx0JhNEVCx3jNd4c1k2hO7pmZ+rS4Sz+df9ijP?=
 =?iso-8859-1?Q?m9dNRws0ZqzyrVi9DPr9rkDMQAKAPnvIKGiv2rkT9Mgd8KqoXeD1bp7f7i?=
 =?iso-8859-1?Q?KSy8V9g84Csw4oLTYrmH91mX19UKmY4=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: 23c83c3f-7dd6-4421-9978-08da53c75191
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:11.6438
 (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: lToZgTnD/eijN3xNpat8MZr2km/n8F/vqcBWpiIHZGpy+5Lof9zZWEwFjdGLCdIqq58jXPTHsRtRUo0oLO6w/g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5392
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 phishscore=0 suspectscore=0 spamscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2206210087
X-Proofpoint-GUID: AGxlK1906hcmBz1dTo0vrjFrPM-xllhz
X-Proofpoint-ORIG-GUID: AGxlK1906hcmBz1dTo0vrjFrPM-xllhz
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>

Link: https://lkml.kernel.org/r/20220504011345.662299-43-Liam.Howlett@oracl=
e.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