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 51/69] mm/gup: use maple tree navigation instead of linked
 list
Thread-Topic: [PATCH v12 51/69] mm/gup: use maple tree navigation instead of
 linked list
Thread-Index: AQHYm97u9I1w7jGCLUqVc5A93L6SEg==
Date:   Wed, 20 Jul 2022 02:17:59 +0000
Message-ID: <20220720021727.17018-52-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?dKjtFjYeG+6kN8eJSQ0OyfGX1NCLIEDNcC9rFK1J5OeRwFoDDUh7HSR28w?=
 =?iso-8859-1?Q?FoEyfUTZhVP7stW+87jqWLb7YUsVRnHiWKGGlkNaX1LOHQa5gr16ufdBVh?=
 =?iso-8859-1?Q?Xuigjj1srZDdiuisQAlNCSepOfDwoNQHiMxMyppTp8hRFKJYm1Y8Dk8vzi?=
 =?iso-8859-1?Q?tb4s67Im9BnE9njoiVM/9nWt8xoJKzNui4uzoLqHx2/F6Rn4dHwnmfJFiX?=
 =?iso-8859-1?Q?XLvprA5E+bVUGjPOsNQElaxanzRo+ADhXJqK6U0/l4JdtgMP9ZmjrlI24T?=
 =?iso-8859-1?Q?6zCIzRHJJ7bwWIEf99/AyI9W67WYQgj7iESEl16XjGJfdeNCEju8EUb/Vf?=
 =?iso-8859-1?Q?LeBv4MfuDjBnxOi6FZZ3QJVKrsWzZa55LVVAtkKFhUlMy3YK61A7Z3DtmD?=
 =?iso-8859-1?Q?qIa6ULnOwlyIdpJqNOr9QZY3Yh1+gMG75thfzGDg7HJSZiHUWvEUgHxA4n?=
 =?iso-8859-1?Q?349J0A3CwZ3OBol06Pqmbvy0szMwIEsVrDB0oC2Sag+TqRwnfLA1gteUup?=
 =?iso-8859-1?Q?KNujEw4ITJHf/u2NyiGJSbKxaToBULA0nrwptXtaOkRzLGY5Ll1lHRTnkS?=
 =?iso-8859-1?Q?TWy5BtU+znIDBda4uWwaIgT5GD2EHc7szwPjFD+aQMElliqSroS2m29v9d?=
 =?iso-8859-1?Q?ShAFU7ZiAmntK9QkNvyEMLcHDrirbkhdixFQ5tgPv+oqlZmrov+Gw2QSs1?=
 =?iso-8859-1?Q?qV2mEl76ptmxKNG0JBDgjdRYdy7HzlmduheeLRymslPzWK+L93II2nQuH4?=
 =?iso-8859-1?Q?HhsfZztkUd4PFmnz+AlxpTwHJagQ3P530FMTbtBzBERODY9lwIBdLyA6Rr?=
 =?iso-8859-1?Q?JpAtbWdbJkSOfs1JkL4i0iG3mbkOuM+M2tx+jGlWE5VRqrgcMyYDXJ4540?=
 =?iso-8859-1?Q?LaHZSPJdJr0/HSQXy6xVaPZdfKmWPq3oxal5FgHaY2VdeUa3wmimRfkt1c?=
 =?iso-8859-1?Q?ED0QE7CuRfMO+88walqXNgGMNbE4Ml8dCpDkhMNFIE9Pn6qTPXPeLHQFXs?=
 =?iso-8859-1?Q?cbeiEN6ODWieToZdDoiujelxKZLx6VX5UcIBySG1sj+wiscMgLqqcWkcfg?=
 =?iso-8859-1?Q?/cKM0gVT9BNESJVuAD/h5mibHPtA3dLbUBfypXdu5CBnjDAglXSSk8QVOD?=
 =?iso-8859-1?Q?jPHOBtkEE4ohL533dALY+1r0ijogR9uF/5U34l77skVv8JAKRU4KLnNOEc?=
 =?iso-8859-1?Q?T/IMqpvFn6fXNIYir51ReQyx7b8548Kfp/Y4QpXFfAG3XH6ieGitKtcsAu?=
 =?iso-8859-1?Q?pOWWlPu+vkUxKlKW4fm87utIJ5Gip8DfDOUzw1mHdET62eWEi4R6P+PZKv?=
 =?iso-8859-1?Q?YkzsHw79nnXBI4OHksgmmKphD+UgphYMKGoMxMUhPF+xaRHMRFY+fspu96?=
 =?iso-8859-1?Q?FQFtJ9U4n6NHsxkr/vD1rHq3mlrVGYRcpGM12l8hbRVOe6/DZ+OHT0sRX1?=
 =?iso-8859-1?Q?X7P9Y4IsKGVzu9O79njS6EufxXPpBIt0iLl5nPfQqRMntXZny+O11YwGn4?=
 =?iso-8859-1?Q?SZqaUNew/mPU+Hsu6NwncKz1VnlmqN7+W4DQ8a6GXvT57OgC/nwd0eVg7m?=
 =?iso-8859-1?Q?ePFpqK+tPp0a6wgFMv9HaVO73YDQ8B31hFJZydRE8RXoA6ydGTI5pEdd64?=
 =?iso-8859-1?Q?p8t69o4OK51UErT0X1PPg0EBYP836kOAmXV4ODYcvHidAvdJ5NQaJ1+w?=
 =?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: b1a9e0a0-5a0c-4114-fb2e-08da69f62931
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Jul 2022 02:17:59.9301
 (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: l7PQLc/r6LyE8AVRvxsROZ9S5VFodPqI9ZsEdFWBvGUSt89X+/a08A0v+M1feCOKF1/H1NNrNrAuQ+7isd7KWA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR10MB3797
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 bulkscore=0 suspectscore=0
 mlxlogscore=999 malwarescore=0 adultscore=0 mlxscore=0 spamscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2206140000 definitions=main-2207200008
X-Proofpoint-ORIG-GUID: USVKRtC4n2J5rXFKJ5xkNnsj243_JKca
X-Proofpoint-GUID: USVKRtC4n2J5rXFKJ5xkNnsj243_JKca
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>

Use find_vma_intersection() to locate the VMAs in __mm_populate() instead
of using find_vma() and the linked list.

Link: https://lkml.kernel.org/r/20220504011345.662299-36-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-52-Liam.Howlett@orac=
le.com
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
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: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 mm/gup.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/gup.c b/mm/gup.c
index 407a81d5ca03..f0e5d68ea932 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1641,10 +1641,11 @@ int __mm_populate(unsigned long start, unsigned lon=
g len, int ignore_errors)
 		if (!locked) {
 			locked =3D 1;
 			mmap_read_lock(mm);
-			vma =3D find_vma(mm, nstart);
+			vma =3D find_vma_intersection(mm, nstart, end);
 		} else if (nstart >=3D vma->vm_end)
-			vma =3D vma->vm_next;
-		if (!vma || vma->vm_start >=3D end)
+			vma =3D find_vma_intersection(mm, vma->vm_end, end);
+
+		if (!vma)
 			break;
 		/*
 		 * Set [nstart; nend) to intersection of desired address
--=20
2.35.1